Skip to content

[9.1] Fixes testSnapshotShutdownProgressTracker (#134926) #135416

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
merged 1 commit into from
Sep 25, 2025
+17 −19
Merged

[9.1] Fixes testSnapshotShutdownProgressTracker (#134926) #135416

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
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,9 +452,6 @@ tests:
- class: org.elasticsearch.simdvec.ESVectorUtilTests
method: testSoarDistance
issue: https://github.com/elastic/elasticsearch/issues/135139
- class: org.elasticsearch.snapshots.SnapshotShutdownIT
method: testSnapshotShutdownProgressTracker
issue: https://github.com/elastic/elasticsearch/issues/134620
- class: org.elasticsearch.upgrades.TextRollingUpgradeIT
method: testIndexing {upgradedNodes=1}
issue: https://github.com/elastic/elasticsearch/issues/135236
Expand Down
33 changes: 17 additions & 16 deletions server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotShutdownIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,7 @@ public void testSnapshotShutdownProgressTracker() throws Exception {
final var otherNode = internalCluster().startDataOnlyNode();
final var otherIndex = randomIdentifier();
createIndexWithContent(otherIndex, indexSettings(numShards, 0).put(REQUIRE_NODE_NAME_SETTING, otherNode).build());
indexAllShardsToAnEqualOrGreaterMinimumSize(otherIndex, ByteSizeValue.of(2, ByteSizeUnit.KB).getBytes());
blockDataNode(repoName, otherNode);

final var nodeForRemoval = internalCluster().startDataOnlyNode(
Expand All @@ -498,6 +499,7 @@ public void testSnapshotShutdownProgressTracker() throws Exception {
final var indexName = randomIdentifier();
createIndexWithContent(indexName, indexSettings(numShards, 0).put(REQUIRE_NODE_NAME_SETTING, nodeForRemoval).build());
indexAllShardsToAnEqualOrGreaterMinimumSize(indexName, ByteSizeValue.of(2, ByteSizeUnit.KB).getBytes());
logger.info("---> nodeForRemovalId: " + nodeForRemovalId + ", numShards: " + numShards);

// Start the snapshot with blocking in place on the data node not to allow shard snapshots to finish yet.
final var clusterService = internalCluster().getCurrentMasterNodeInstance(ClusterService.class);
Expand All @@ -507,7 +509,21 @@ public void testSnapshotShutdownProgressTracker() throws Exception {

waitForBlock(otherNode, repoName);

logger.info("---> nodeForRemovalId: " + nodeForRemovalId + ", numShards: " + numShards);
// Block on the master when a shard snapshot request comes in, until we can verify that the Tracker saw the outgoing request.
final CountDownLatch snapshotStatusUpdateLatch = new CountDownLatch(1);
final var masterTransportService = MockTransportService.getInstance(internalCluster().getMasterName());
masterTransportService.addRequestHandlingBehavior(
SnapshotsService.UPDATE_SNAPSHOT_STATUS_ACTION_NAME,
(handler, request, channel, task) -> masterTransportService.getThreadPool().generic().execute(() -> {
safeAwait(snapshotStatusUpdateLatch);
try {
handler.messageReceived(request, channel, task);
} catch (Exception e) {
fail(e);
}
})
);

mockLog.addExpectation(
new MockLog.SeenEventExpectation(
"SnapshotShutdownProgressTracker start log message",
Expand Down Expand Up @@ -555,21 +571,6 @@ public void testSnapshotShutdownProgressTracker() throws Exception {
mockLog.awaitAllExpectationsMatched();
resetMockLog();

// Block on the master when a shard snapshot request comes in, until we can verify that the Tracker saw the outgoing request.
final CountDownLatch snapshotStatusUpdateLatch = new CountDownLatch(1);
final var masterTransportService = MockTransportService.getInstance(internalCluster().getMasterName());
masterTransportService.addRequestHandlingBehavior(
SnapshotsService.UPDATE_SNAPSHOT_STATUS_ACTION_NAME,
(handler, request, channel, task) -> masterTransportService.getThreadPool().generic().execute(() -> {
safeAwait(snapshotStatusUpdateLatch);
try {
handler.messageReceived(request, channel, task);
} catch (Exception e) {
fail(e);
}
})
);

mockLog.addExpectation(
new MockLog.SeenEventExpectation(
"SnapshotShutdownProgressTracker shard snapshot has paused log message",
Expand Down