Skip to content

Commit cb9dc28

Browse files
authored
Ensure index commit released when testing timeouts (#39273)
This fixes #39245. Currently it is possible in this test that the clear session call times-out. This means that the index commit will not be released and there will be an assertion triggered in the test teardown. This commit ensures that we wipe the leader index in the test to avoid this assertion. It is okay if the clear session call times-out in normal usage. This scenario is unavoidable due to potential network issues. We have a local timeout on the leader to clean it up when this scenario happens.
1 parent a745b36 commit cb9dc28

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CcrRepositoryIT.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,11 @@ public void testIndividualActionsTimeout() throws Exception {
358358
settingsRequest.persistentSettings(Settings.builder().put(CcrSettings.INDICES_RECOVERY_ACTION_TIMEOUT_SETTING.getKey(),
359359
defaultValue));
360360
assertAcked(followerClient().admin().cluster().updateSettings(settingsRequest).actionGet());
361+
// This test sets individual action timeouts low to attempt to replicated timeouts. Although the
362+
// clear session action is not blocked, it is possible that it will still occasionally timeout.
363+
// By wiping the leader index here, we ensure we do not trigger the index commit hanging around
364+
// assertion because the commit is released when the index shard is closed.
365+
getLeaderCluster().wipeIndices(leaderIndex);
361366
}
362367
}
363368

0 commit comments

Comments
 (0)