Fixing cluster state

soosinha · Sep 1, 2023 · 6144fc8 · 6144fc8
1 parent 215b936
commit 6144fc8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java b/server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java
@@ -197,7 +197,7 @@ public ClusterTasksResult<Task> execute(ClusterState currentState, List<Task> jo
                      *  join. See
                      * {@link org.opensearch.gateway.GatewayMetaState#prepareInitialClusterState(TransportService, ClusterService, ClusterState)} **/
                     newState = ClusterState.builder(
-                        remoteStoreService.updateClusterStateRepositoriesMetadata(new RemoteStoreNode(node), currentState)
+                        remoteStoreService.updateClusterStateRepositoriesMetadata(new RemoteStoreNode(node), newState.build())
                     );
                 }
             } else {
@@ -224,7 +224,7 @@ public ClusterTasksResult<Task> execute(ClusterState currentState, List<Task> jo
                     if (node.isRemoteStoreNode()) {
                         // Try updating repositories metadata in cluster state once its compatible with the cluster.
                         newState = ClusterState.builder(
-                            remoteStoreService.updateClusterStateRepositoriesMetadata(new RemoteStoreNode(node), currentState)
+                            remoteStoreService.updateClusterStateRepositoriesMetadata(new RemoteStoreNode(node), newState.build())
                         );
                     }
                 } catch (IllegalArgumentException | IllegalStateException | NodeDecommissionedException e) {