Skip to content

Commit 167ce63

Browse files
authored
[8.19] Add extra logging to the downsample action (#137148) (#137477)
1 parent 88c5c27 commit 167ce63

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/DownsampleTransportFailureIT.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
3131
import org.elasticsearch.test.ESIntegTestCase;
3232
import org.elasticsearch.test.InternalTestCluster;
33+
import org.elasticsearch.test.junit.annotations.TestIssueLogging;
3334
import org.elasticsearch.test.transport.MockTransportService;
3435
import org.elasticsearch.xcontent.XContentBuilder;
3536
import org.elasticsearch.xcontent.XContentFactory;
@@ -263,6 +264,10 @@ private void assertIndexDoesNotExist(final String nodeName, final String indexNa
263264
assertEquals("no such index [" + indexName + "]", targetIndexNotFoundException.getMessage());
264265
}
265266

267+
@TestIssueLogging(
268+
value = "org.elasticsearch.xpack.downsample.TransportDownsampleAction:DEBUG",
269+
issueUrl = "https://github.com/elastic/elasticsearch/issues/137148"
270+
)
266271
public void testNoDisruption() {
267272
// GIVEN
268273

@@ -277,6 +282,7 @@ public void testNoDisruption() {
277282
// WHEN nothing happens
278283

279284
// THEN
285+
logger.info("Executing downsample action from [{}] to [{}]", SOURCE_INDEX_NAME, TARGET_INDEX_NAME);
280286
final AcknowledgedResponse downsampleResponse = testCluster.masterClient()
281287
.execute(DownsampleAction.INSTANCE, downsampleRequest)
282288
.actionGet(TimeValue.timeValueMillis(DOWNSAMPLE_ACTION_TIMEOUT_MILLIS));

x-pack/plugin/downsample/src/main/java/org/elasticsearch/xpack/downsample/TransportDownsampleAction.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,11 @@ protected void masterOperation(
231231
ClusterState state,
232232
ActionListener<AcknowledgedResponse> listener
233233
) {
234+
logger.debug(
235+
"Starting downsampling [{}] with [{}] interval",
236+
request.getSourceIndex(),
237+
request.getDownsampleConfig().getFixedInterval()
238+
);
234239
long startTime = nowSupplier.get();
235240
String sourceIndexName = request.getSourceIndex();
236241
IndexNameExpressionResolver.assertExpressionHasNullOrDataSelector(sourceIndexName);
@@ -1000,6 +1005,7 @@ private void createDownsampleIndex(
10001005
taskQueue.submitTask("create-downsample-index [" + downsampleIndexName + "]", new DownsampleClusterStateUpdateTask(listener) {
10011006
@Override
10021007
public ClusterState execute(ClusterState currentState) throws Exception {
1008+
logger.debug("Creating downsample index [{}]", downsampleIndexName);
10031009
return metadataCreateIndexService.applyCreateIndexRequest(
10041010
currentState,
10051011
createIndexClusterStateUpdateRequest,
@@ -1060,6 +1066,7 @@ class UpdateDownsampleIndexSettingsActionListener implements ActionListener<Ackn
10601066

10611067
@Override
10621068
public void onResponse(final AcknowledgedResponse response) {
1069+
logger.debug("Preparing to refresh downsample index [{}]", downsampleIndexName);
10631070
final RefreshRequest request = new RefreshRequest(downsampleIndexName);
10641071
request.setParentTask(parentTask);
10651072
client.admin()
@@ -1128,6 +1135,7 @@ public void onResponse(final BroadcastResponse response) {
11281135

11291136
@Override
11301137
public ClusterState execute(ClusterState currentState) {
1138+
logger.debug("Updating downsample index status for [{}]", downsampleIndexName);
11311139
final Metadata metadata = currentState.metadata();
11321140
final IndexMetadata downsampleIndex = metadata.index(metadata.index(downsampleIndexName).getIndex());
11331141
if (IndexMetadata.INDEX_DOWNSAMPLE_STATUS.get(downsampleIndex.getSettings()) == DownsampleTaskStatus.SUCCESS) {
@@ -1179,6 +1187,7 @@ class ForceMergeActionListener implements ActionListener<AcknowledgedResponse> {
11791187

11801188
@Override
11811189
public void onResponse(final AcknowledgedResponse response) {
1190+
logger.debug("Preparing to force merge downsample index [{}]", downsampleIndexName);
11821191
ForceMergeRequest request = new ForceMergeRequest(downsampleIndexName);
11831192
request.maxNumSegments(1);
11841193
request.setParentTask(parentTask);
@@ -1218,12 +1227,14 @@ class MeasurementActionListener implements ActionListener<AcknowledgedResponse>
12181227
@Override
12191228
public void onResponse(final AcknowledgedResponse response) {
12201229
recordSuccessMetrics(startTime);
1230+
logger.debug("Downsampling measured successfully");
12211231
actionListener.onResponse(AcknowledgedResponse.TRUE);
12221232
}
12231233

12241234
@Override
12251235
public void onFailure(Exception e) {
12261236
recordSuccessMetrics(startTime);
1237+
logger.debug("Downsampling measured successfully", e);
12271238
this.actionListener.onFailure(e);
12281239
}
12291240

0 commit comments

Comments
 (0)