From d7be8b7567a7e8804f749f45aa328eea8978c6a2 Mon Sep 17 00:00:00 2001 From: Rahul Karajgikar Date: Wed, 4 Sep 2024 11:42:10 +0530 Subject: [PATCH] fix merge conflict Signed-off-by: Rahul Karajgikar --- .../coordination/PublicationTransportHandler.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/server/src/main/java/org/opensearch/cluster/coordination/PublicationTransportHandler.java b/server/src/main/java/org/opensearch/cluster/coordination/PublicationTransportHandler.java index 8e58192d85015..ca36011b3a0e9 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/PublicationTransportHandler.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/PublicationTransportHandler.java @@ -499,21 +499,7 @@ public void onFailure(Exception e) { } else { responseActionListener = listener; } -<<<<<<< HEAD sendClusterState(destination, responseActionListener); -======= - // TODO Decide to send remote state before starting publication by checking remote publication on all nodes - if (sendRemoteState && destination.isRemoteStatePublicationEnabled()) { - logger.trace("sending remote cluster state version [{}] to [{}]", newState.version(), destination); - sendRemoteClusterState(destination, publishRequest.getAcceptedState(), responseActionListener); - } else if (sendFullVersion || previousState.nodes().nodeExists(destination) == false) { - logger.trace("sending full cluster state version [{}] to [{}]", newState.version(), destination); - sendFullClusterState(destination, responseActionListener); - } else { - logger.trace("sending cluster state diff for version [{}] to [{}]", newState.version(), destination); - sendClusterStateDiff(destination, responseActionListener); - } ->>>>>>> f0cf40ce03f (cleanup unused code and remove added log lines) } public void sendApplyCommit(