Backport 90117 (#90169)

elastic · Sep 20, 2022 · c53ef93 · c53ef93
1 parent 938a39e
commit c53ef93
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...alClusterTest/java/org/elasticsearch/reservedstate/service/SnaphotsAndFileSettingsIT.java b/...alClusterTest/java/org/elasticsearch/reservedstate/service/SnaphotsAndFileSettingsIT.java
@@ -94,7 +94,7 @@ private Tuple<CountDownLatch, AtomicLong> setupClusterStateListener(String node)
             @Override
             public void clusterChanged(ClusterChangedEvent event) {
                 ReservedStateMetadata reservedState = event.state().metadata().reservedStateMetadata().get(FileSettingsService.NAMESPACE);
-                if (reservedState != null) {
+                if (reservedState != null && reservedState.version() != 0L) {
                     ReservedStateHandlerMetadata handlerMetadata = reservedState.handlers().get(ReservedClusterSettingsAction.NAME);
                     if (handlerMetadata == null) {
                         fail("Should've found cluster settings in this metadata");