Check term earlier in publication process (elastic#39909)

in order to avoid tripping assertPreviousStateConsistency. Closes elastic#39314
danielmitterdorfer · Mar 11, 2019 · b7be724 · b7be724
1 parent 368b548
commit b7be724
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java b/server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java
@@ -982,10 +982,11 @@ private ClusterState clusterStateWithNoMasterBlock(ClusterState clusterState) {
     public void publish(ClusterChangedEvent clusterChangedEvent, ActionListener<Void> publishListener, AckListener ackListener) {
         try {
             synchronized (mutex) {
-                if (mode != Mode.LEADER) {
-                    logger.debug(() -> new ParameterizedMessage("[{}] failed publication as not currently leading",
-                        clusterChangedEvent.source()));
-                    publishListener.onFailure(new FailedToCommitClusterStateException("node stepped down as leader during publication"));
+                if (mode != Mode.LEADER || getCurrentTerm() != clusterChangedEvent.state().term()) {
+                    logger.debug(() -> new ParameterizedMessage("[{}] failed publication as node is no longer master for term {}",
+                        clusterChangedEvent.source(), clusterChangedEvent.state().term()));
+                    publishListener.onFailure(new FailedToCommitClusterStateException("node is no longer master for term " +
+                        clusterChangedEvent.state().term() + " while handling publication"));
                     return;
                 }