-
Notifications
You must be signed in to change notification settings - Fork 25.3k
Rename no-master-block setting #38350
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
DaveCTurner
merged 2 commits into
elastic:master
from
DaveCTurner:2019-02-04-rename-no-master-block-setting
Feb 5, 2019
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
server/src/main/java/org/elasticsearch/cluster/coordination/NoMasterBlockService.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.elasticsearch.cluster.coordination; | ||
|
|
||
| import org.elasticsearch.cluster.block.ClusterBlock; | ||
| import org.elasticsearch.cluster.block.ClusterBlockLevel; | ||
| import org.elasticsearch.common.settings.ClusterSettings; | ||
| import org.elasticsearch.common.settings.Setting; | ||
| import org.elasticsearch.common.settings.Setting.Property; | ||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.rest.RestStatus; | ||
|
|
||
| import java.util.EnumSet; | ||
|
|
||
| public class NoMasterBlockService { | ||
| public static final int NO_MASTER_BLOCK_ID = 2; | ||
| public static final ClusterBlock NO_MASTER_BLOCK_WRITES = new ClusterBlock(NO_MASTER_BLOCK_ID, "no master", true, false, false, | ||
| RestStatus.SERVICE_UNAVAILABLE, EnumSet.of(ClusterBlockLevel.WRITE, ClusterBlockLevel.METADATA_WRITE)); | ||
| public static final ClusterBlock NO_MASTER_BLOCK_ALL = new ClusterBlock(NO_MASTER_BLOCK_ID, "no master", true, true, false, | ||
| RestStatus.SERVICE_UNAVAILABLE, ClusterBlockLevel.ALL); | ||
|
|
||
| public static final Setting<ClusterBlock> LEGACY_NO_MASTER_BLOCK_SETTING = | ||
| new Setting<>("discovery.zen.no_master_block", "write", NoMasterBlockService::parseNoMasterBlock, | ||
| Property.Dynamic, Property.NodeScope, Property.Deprecated); | ||
| public static final Setting<ClusterBlock> NO_MASTER_BLOCK_SETTING = | ||
| new Setting<>("cluster.no_master_block", "write", NoMasterBlockService::parseNoMasterBlock, | ||
| Property.Dynamic, Property.NodeScope); | ||
|
|
||
| private volatile ClusterBlock noMasterBlock; | ||
|
|
||
| public NoMasterBlockService(Settings settings, ClusterSettings clusterSettings) { | ||
| this.noMasterBlock = NO_MASTER_BLOCK_SETTING.get(settings); | ||
| clusterSettings.addSettingsUpdateConsumer(NO_MASTER_BLOCK_SETTING, this::setNoMasterBlock); | ||
|
|
||
| LEGACY_NO_MASTER_BLOCK_SETTING.get(settings); // for deprecation warnings | ||
| clusterSettings.addSettingsUpdateConsumer(LEGACY_NO_MASTER_BLOCK_SETTING, b -> {}); // for deprecation warnings | ||
| } | ||
|
|
||
| private static ClusterBlock parseNoMasterBlock(String value) { | ||
| switch (value) { | ||
| case "all": | ||
| return NO_MASTER_BLOCK_ALL; | ||
| case "write": | ||
| return NO_MASTER_BLOCK_WRITES; | ||
| default: | ||
| throw new IllegalArgumentException("invalid no-master block [" + value + "], must be one of [all, write]"); | ||
| } | ||
| } | ||
|
|
||
| public ClusterBlock getNoMasterBlock() { | ||
| return noMasterBlock; | ||
| } | ||
|
|
||
| private void setNoMasterBlock(ClusterBlock noMasterBlock) { | ||
| this.noMasterBlock = noMasterBlock; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🕺