File tree 2 files changed +5
-6
lines changed
server/src/internalClusterTest/java/org/elasticsearch/snapshots
2 files changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -417,9 +417,6 @@ tests:
417
417
- class : org.elasticsearch.action.admin.indices.diskusage.IndexDiskUsageAnalyzerTests
418
418
method : testKnnVectors
419
419
issue : https://github.com/elastic/elasticsearch/issues/127689
420
- - class : org.elasticsearch.snapshots.SnapshotShutdownIT
421
- method : testSnapshotShutdownProgressTracker
422
- issue : https://github.com/elastic/elasticsearch/issues/127690
423
420
- class : org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
424
421
method : test {p0=search/350_point_in_time/point-in-time with index filter}
425
422
issue : https://github.com/elastic/elasticsearch/issues/127741
Original file line number Diff line number Diff line change @@ -480,7 +480,7 @@ public void testShutdownWhileSuccessInFlight() throws Exception {
480
480
)
481
481
public void testSnapshotShutdownProgressTracker () throws Exception {
482
482
final var repoName = randomIdentifier ();
483
- final int numShards = randomIntBetween (1 , 10 );
483
+ final int numShards = randomIntBetween (1 , 9 );
484
484
createRepository (repoName , "mock" );
485
485
486
486
// Create another index on another node which will be blocked (remain in state INIT) throughout.
@@ -540,12 +540,14 @@ public void testSnapshotShutdownProgressTracker() throws Exception {
540
540
mockLog .awaitAllExpectationsMatched ();
541
541
resetMockLog ();
542
542
543
+ // At least one shard reached the MockRepository's blocking code when waitForBlock was called. However, there's no guarantee that
544
+ // the other shards got that far before the shutdown flag was put in place, in which case the other shards may be paused instead.
543
545
mockLog .addExpectation (
544
- new MockLog .SeenEventExpectation (
546
+ new MockLog .PatternSeenEventExpectation (
545
547
"SnapshotShutdownProgressTracker running number of snapshots" ,
546
548
SnapshotShutdownProgressTracker .class .getCanonicalName (),
547
549
Level .INFO ,
548
- "* Number shard snapshots running [ " + numShards + "].* "
550
+ ".+ Number shard snapshots running \\ [[1- " + numShards + "]].+ "
549
551
)
550
552
);
551
553
You can’t perform that action at this time.
0 commit comments