From 3e301f6906fc78e93990865e2524c7b4c3166d8e Mon Sep 17 00:00:00 2001 From: Boaz Leskes Date: Sun, 18 May 2014 20:32:06 +0200 Subject: [PATCH] Updated to use ClusterBlocks new constructor signature Introduced with: 11a3201a092ed6c5d31516ae4b30dbb618ba348c --- .../java/org/elasticsearch/discovery/DiscoverySettings.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java b/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java index 8903e73922b11..8c1ba757d9bd0 100644 --- a/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java +++ b/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java @@ -29,6 +29,8 @@ import org.elasticsearch.node.settings.NodeSettingsService; import org.elasticsearch.rest.RestStatus; +import java.util.EnumSet; + /** * Exposes common discovery settings that may be supported by all the different discovery implementations */ @@ -42,8 +44,8 @@ public class DiscoverySettings extends AbstractComponent { public final static int NO_MASTER_BLOCK_ID = 2; private final static ClusterBlock ALL = new ClusterBlock(NO_MASTER_BLOCK_ID, "no master", true, true, RestStatus.SERVICE_UNAVAILABLE, ClusterBlockLevel.ALL); - private final static ClusterBlock WRITE = new ClusterBlock(NO_MASTER_BLOCK_ID, "no master", true, false, RestStatus.SERVICE_UNAVAILABLE, ClusterBlockLevel.WRITE, ClusterBlockLevel.METADATA); - private final static ClusterBlock METADATA = new ClusterBlock(NO_MASTER_BLOCK_ID, "no master", true, false, RestStatus.SERVICE_UNAVAILABLE, ClusterBlockLevel.METADATA); + private final static ClusterBlock WRITE = new ClusterBlock(NO_MASTER_BLOCK_ID, "no master", true, false, RestStatus.SERVICE_UNAVAILABLE, EnumSet.of(ClusterBlockLevel.WRITE, ClusterBlockLevel.METADATA)); + private final static ClusterBlock METADATA = new ClusterBlock(NO_MASTER_BLOCK_ID, "no master", true, false, RestStatus.SERVICE_UNAVAILABLE, EnumSet.of(ClusterBlockLevel.METADATA)); private volatile ClusterBlock noMasterBlock; private volatile TimeValue publishTimeout = DEFAULT_PUBLISH_TIMEOUT;