feedback

Author: ywelsch

server/src/main/java/org/elasticsearch/cluster/service/MasterService.java

@@ -53,7 +53,6 @@
 import org.elasticsearch.discovery.Discovery;
 import org.elasticsearch.cluster.coordination.FailedToCommitClusterStateException;
 import org.elasticsearch.threadpool.ThreadPool;
-import org.elasticsearch.transport.Transports;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -173,14 +172,17 @@ ClusterState state() {
         return clusterStateSupplier.get();
     }
 
+    private static boolean isMasterUpdateThread() {
+        return Thread.currentThread().getName().contains(MASTER_UPDATE_THREAD_NAME);
+    }
+
     public static boolean assertMasterUpdateThread() {
-        assert Thread.currentThread().getName().contains(MASTER_UPDATE_THREAD_NAME) :
-            "not called from the master service thread";
+        assert isMasterUpdateThread() : "not called from the master service thread";
         return true;
     }
 
     public static boolean assertNotMasterUpdateThread(String reason) {
-        assert Thread.currentThread().getName().contains(MASTER_UPDATE_THREAD_NAME) == false :
+        assert isMasterUpdateThread() == false :
             "Expected current thread [" + Thread.currentThread() + "] to not be the master service thread. Reason: [" + reason + "]";
         return true;
     }
@@ -240,10 +242,7 @@ protected void publish(ClusterChangedEvent clusterChangedEvent, TaskOutputs task
         final PlainActionFuture<Void> fut = new PlainActionFuture<Void>() {
             @Override
             protected boolean blockingAllowed() {
-                // allow this one to block on the MasterServiceUpdateThread
-                return Transports.assertNotTransportThread(BLOCKING_OP_REASON) &&
-                    ThreadPool.assertNotScheduleThread(BLOCKING_OP_REASON) &&
-                    ClusterApplierService.assertNotClusterStateUpdateThread(BLOCKING_OP_REASON);
+                return isMasterUpdateThread() || super.blockingAllowed();
             }
         };
         clusterStatePublisher.publish(clusterChangedEvent, fut, taskOutputs.createAckListener(threadPool, clusterChangedEvent.state()));

server/src/main/java/org/elasticsearch/common/util/concurrent/BaseFuture.java

@@ -35,7 +35,7 @@
 
 public abstract class BaseFuture<V> implements Future<V> {
 
-    protected static final String BLOCKING_OP_REASON = "Blocking operation";
+    private static final String BLOCKING_OP_REASON = "Blocking operation";
 
     /**
      * Synchronization control for AbstractFutures.

server/src/test/java/org/elasticsearch/ExceptionSerializationTests.java

@@ -57,7 +57,6 @@
 import org.elasticsearch.common.xcontent.UnknownNamedObjectException;
 import org.elasticsearch.common.xcontent.XContentLocation;
 import org.elasticsearch.discovery.DiscoverySettings;
-import org.elasticsearch.cluster.coordination.FailedToCommitClusterStateException;
 import org.elasticsearch.env.ShardLockObtainFailedException;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.engine.RecoveryEngineException;
@@ -802,7 +801,7 @@ public void testIds() {
         ids.put(137, org.elasticsearch.indices.TypeMissingException.class);
         ids.put(138, null);
         ids.put(139, null);
-        ids.put(140, FailedToCommitClusterStateException.class);
+        ids.put(140, org.elasticsearch.cluster.coordination.FailedToCommitClusterStateException.class);
         ids.put(141, org.elasticsearch.index.query.QueryShardException.class);
         ids.put(142, ShardStateAction.NoLongerPrimaryShardException.class);
         ids.put(143, org.elasticsearch.script.ScriptException.class);