honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TransportMasterNodeOperationAction: tighter postAdded change check 

If a node fails to forward a master node operation to the current master, it will schedule a retry using a listener for cluster state changes. Once the listener is in place (and future changes are guaranteed to be observed) it will double check nothing has change during the addition of the listener. This check has previously been change to use cluster state versions (see: #5499). This is however not reliable solution as master elections (which change the master) do not increment the cluster state version and thus could be missed. This commit changes the check to use reference equality making it stricter.

Closes #5548
This commit is contained in:
Boaz Leskes 2014-03-26 14:00:25 +01:00
parent 5007bf7aa0
commit 3f37a0ff5c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeOperationAction.java
View File

@ -220,8 +220,9 @@ public abstract class TransportMasterNodeOperationAction<Request extends MasterN
@Override
public void postAdded() {
ClusterState clusterStateV2 = clusterService.state();
if (clusterState.version() != clusterStateV2.version()) {
// something changed while adding, try again
// checking for changes that happened while adding the listener. We can't check using cluster
// state versions as mater election doesn't increase version numbers
if (clusterState != clusterStateV2) {
clusterService.remove(this);
innerExecute(request, listener, false);
}