Skip to content

Commit 053d746

Browse files
committed
Only be lenient if the master changes
1 parent af11d61 commit 053d746

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

server/src/main/java/org/elasticsearch/cluster/coordination/CoordinationState.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,8 @@ public PublishResponse handlePublishRequest(PublishRequest publishRequest) {
323323
getCurrentTerm());
324324
}
325325
if (clusterState.term() == getLastAcceptedTerm() && clusterState.version() <= getLastAcceptedVersion()) {
326-
if (clusterState.term() == ZEN1_BWC_TERM) {
326+
if (clusterState.term() == ZEN1_BWC_TERM
327+
&& clusterState.nodes().getMasterNode().equals(getLastAcceptedState().nodes().getMasterNode()) == false) {
327328
logger.debug("handling publish request in compatibility mode despite version mismatch (expected: >[{}], actual: [{}])",
328329
getLastAcceptedVersion(), clusterState.version());
329330
} else {

0 commit comments

Comments
 (0)