SNAPSHOT: Deterministic ClusterState Tests

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

@@ -71,11 +71,12 @@ public class ClusterService extends AbstractLifecycleComponent {
 
     private final String nodeName;
 
-    public ClusterService(Settings settings, ClusterSettings clusterSettings, ThreadPool threadPool) {
+    public ClusterService(Settings settings, ClusterSettings clusterSettings, ThreadPool threadPool,
+        MasterService masterService) {
         super(settings);
         this.settings = settings;
         this.nodeName = Node.NODE_NAME_SETTING.get(settings);
-        this.masterService = new MasterService(nodeName, settings, threadPool);
+        this.masterService = masterService;
         this.operationRouting = new OperationRouting(settings, clusterSettings);
         this.clusterSettings = clusterSettings;
         this.clusterName = ClusterName.CLUSTER_NAME_SETTING.get(settings);
@@ -86,6 +87,10 @@ public ClusterService(Settings settings, ClusterSettings clusterSettings, Thread
         this.clusterApplierService = new ClusterApplierService(nodeName, settings, clusterSettings, threadPool);
     }
 
+    public ClusterService(Settings settings, ClusterSettings clusterSettings, ThreadPool threadPool) {
+        this(settings, clusterSettings, threadPool, new MasterService(Node.NODE_NAME_SETTING.get(settings), settings, threadPool));
+    }
+
     private void setSlowTaskLoggingThreshold(TimeValue slowTaskLoggingThreshold) {
         masterService.setSlowTaskLoggingThreshold(slowTaskLoggingThreshold);
         clusterApplierService.setSlowTaskLoggingThreshold(slowTaskLoggingThreshold);

server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java

@@ -1698,7 +1698,7 @@ private List<TransportAddress> provideUnicastHosts(HostsResolver ignored) {
         }
     }
 
-    private static Runnable onNode(DiscoveryNode node, Runnable runnable) {
+    public static Runnable onNode(DiscoveryNode node, Runnable runnable) {
         final String nodeId = "{" + node.getId() + "}{" + node.getEphemeralId() + "}";
         return new Runnable() {
             @Override