Skip to content

[9.1] Add logging so we can time the downsampling action (#137496) #137504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gmarouli merged 1 commit into from
Nov 3, 2025
Merged

[9.1] Add logging so we can time the downsampling action (#137496) #137504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...rnalClusterTest/java/org/elasticsearch/xpack/downsample/DownsampleTransportFailureIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
import org.elasticsearch.test.ESIntegTestCase;
import org.elasticsearch.test.InternalTestCluster;
import org.elasticsearch.test.junit.annotations.TestIssueLogging;
import org.elasticsearch.test.transport.MockTransportService;
import org.elasticsearch.xcontent.XContentBuilder;
import org.elasticsearch.xcontent.XContentFactory;
Expand Down Expand Up @@ -263,6 +264,10 @@ private void assertIndexDoesNotExist(final String nodeName, final String indexNa
assertEquals("no such index [" + indexName + "]", targetIndexNotFoundException.getMessage());
}

@TestIssueLogging(
value = "org.elasticsearch.xpack.downsample.TransportDownsampleAction:DEBUG",
issueUrl = "https://github.com/elastic/elasticsearch/issues/137148"
)
public void testNoDisruption() {
// GIVEN

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

// THEN
logger.info("Executing downsample action from [{}] to [{}]", SOURCE_INDEX_NAME, TARGET_INDEX_NAME);
final AcknowledgedResponse downsampleResponse = testCluster.masterClient()
.execute(DownsampleAction.INSTANCE, downsampleRequest)
.actionGet(TimeValue.timeValueMillis(DOWNSAMPLE_ACTION_TIMEOUT_MILLIS));
Expand Down
11 changes: 11 additions & 0 deletions ...ownsample/src/main/java/org/elasticsearch/xpack/downsample/TransportDownsampleAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,11 @@ protected void masterOperation(
ClusterState state,
ActionListener<AcknowledgedResponse> listener
) {
logger.debug(
"Starting downsampling [{}] with [{}] interval",
request.getSourceIndex(),
request.getDownsampleConfig().getFixedInterval()
);
long startTime = nowSupplier.get();
String sourceIndexName = request.getSourceIndex();
IndexNameExpressionResolver.assertExpressionHasNullOrDataSelector(sourceIndexName);
Expand Down Expand Up @@ -1019,6 +1024,7 @@ private void createDownsampleIndex(
taskQueue.submitTask("create-downsample-index [" + downsampleIndexName + "]", new DownsampleClusterStateUpdateTask(listener) {
@Override
public ClusterState execute(ClusterState currentState) throws Exception {
logger.debug("Creating downsample index [{}]", downsampleIndexName);
return metadataCreateIndexService.applyCreateIndexRequest(
currentState,
createIndexClusterStateUpdateRequest,
Expand Down Expand Up @@ -1083,6 +1089,7 @@ class UpdateDownsampleIndexSettingsActionListener implements ActionListener<Ackn

@Override
public void onResponse(final AcknowledgedResponse response) {
logger.debug("Preparing to refresh downsample index [{}]", downsampleIndexName);
final RefreshRequest request = new RefreshRequest(downsampleIndexName);
request.setParentTask(parentTask);
client.admin()
Expand Down Expand Up @@ -1155,6 +1162,7 @@ public void onResponse(final BroadcastResponse response) {

@Override
public ClusterState execute(ClusterState currentState) {
logger.debug("Updating downsample index status for [{}]", downsampleIndexName);
final ProjectMetadata project = currentState.metadata().getProject(projectId);
final IndexMetadata downsampleIndex = project.index(downsampleIndexName);
if (IndexMetadata.INDEX_DOWNSAMPLE_STATUS.get(downsampleIndex.getSettings()) == DownsampleTaskStatus.SUCCESS) {
Expand Down Expand Up @@ -1206,6 +1214,7 @@ class ForceMergeActionListener implements ActionListener<AcknowledgedResponse> {

@Override
public void onResponse(final AcknowledgedResponse response) {
logger.debug("Preparing to force merge downsample index [{}]", downsampleIndexName);
ForceMergeRequest request = new ForceMergeRequest(downsampleIndexName);
request.maxNumSegments(1);
request.setParentTask(parentTask);
Expand Down Expand Up @@ -1245,12 +1254,14 @@ class MeasurementActionListener implements ActionListener<AcknowledgedResponse>
@Override
public void onResponse(final AcknowledgedResponse response) {
recordSuccessMetrics(startTime);
logger.debug("Downsampling measured successfully");
actionListener.onResponse(AcknowledgedResponse.TRUE);
}

@Override
public void onFailure(Exception e) {
recordSuccessMetrics(startTime);
logger.debug("Downsampling measured successfully", e);
this.actionListener.onFailure(e);
}

Expand Down