From 7b1dfeff2ecdaa1b01418444dc35e24edbc63093 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Thu, 20 Dec 2018 15:08:04 +0100 Subject: [PATCH] Renamed `WHITE_LISTED_SETTINGS` to `NON_REPLICATED_SETTINGS` because the latter better describes the purpose of this field. --- .../action/TransportResumeFollowAction.java | 162 +++++++++--------- .../TransportResumeFollowActionTests.java | 2 +- 2 files changed, 82 insertions(+), 82 deletions(-) diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportResumeFollowAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportResumeFollowAction.java index 5d6982d8a38..4fc3efedd82 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportResumeFollowAction.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportResumeFollowAction.java @@ -350,95 +350,95 @@ public class TransportResumeFollowAction extends TransportMasterNodeAction> WHITE_LISTED_SETTINGS; + static final Set> NON_REPLICATED_SETTINGS; static { - final Set> whiteListedSettings = new HashSet<>(); - whiteListedSettings.add(IndexMetaData.INDEX_NUMBER_OF_REPLICAS_SETTING); - whiteListedSettings.add(IndexMetaData.INDEX_AUTO_EXPAND_REPLICAS_SETTING); - whiteListedSettings.add(IndexMetaData.INDEX_ROUTING_EXCLUDE_GROUP_SETTING); - whiteListedSettings.add(IndexMetaData.INDEX_ROUTING_INCLUDE_GROUP_SETTING); - whiteListedSettings.add(IndexMetaData.INDEX_ROUTING_REQUIRE_GROUP_SETTING); - whiteListedSettings.add(IndexMetaData.INDEX_READ_ONLY_SETTING); - whiteListedSettings.add(IndexMetaData.INDEX_BLOCKS_READ_SETTING); - whiteListedSettings.add(IndexMetaData.INDEX_BLOCKS_WRITE_SETTING); - whiteListedSettings.add(IndexMetaData.INDEX_BLOCKS_METADATA_SETTING); - whiteListedSettings.add(IndexMetaData.INDEX_BLOCKS_READ_ONLY_ALLOW_DELETE_SETTING); - whiteListedSettings.add(IndexMetaData.INDEX_PRIORITY_SETTING); - whiteListedSettings.add(IndexMetaData.SETTING_WAIT_FOR_ACTIVE_SHARDS); + final Set> nonReplicatedSettings = new HashSet<>(); + nonReplicatedSettings.add(IndexMetaData.INDEX_NUMBER_OF_REPLICAS_SETTING); + nonReplicatedSettings.add(IndexMetaData.INDEX_AUTO_EXPAND_REPLICAS_SETTING); + nonReplicatedSettings.add(IndexMetaData.INDEX_ROUTING_EXCLUDE_GROUP_SETTING); + nonReplicatedSettings.add(IndexMetaData.INDEX_ROUTING_INCLUDE_GROUP_SETTING); + nonReplicatedSettings.add(IndexMetaData.INDEX_ROUTING_REQUIRE_GROUP_SETTING); + nonReplicatedSettings.add(IndexMetaData.INDEX_READ_ONLY_SETTING); + nonReplicatedSettings.add(IndexMetaData.INDEX_BLOCKS_READ_SETTING); + nonReplicatedSettings.add(IndexMetaData.INDEX_BLOCKS_WRITE_SETTING); + nonReplicatedSettings.add(IndexMetaData.INDEX_BLOCKS_METADATA_SETTING); + nonReplicatedSettings.add(IndexMetaData.INDEX_BLOCKS_READ_ONLY_ALLOW_DELETE_SETTING); + nonReplicatedSettings.add(IndexMetaData.INDEX_PRIORITY_SETTING); + nonReplicatedSettings.add(IndexMetaData.SETTING_WAIT_FOR_ACTIVE_SHARDS); - whiteListedSettings.add(EnableAllocationDecider.INDEX_ROUTING_REBALANCE_ENABLE_SETTING); - whiteListedSettings.add(EnableAllocationDecider.INDEX_ROUTING_ALLOCATION_ENABLE_SETTING); - whiteListedSettings.add(ShardsLimitAllocationDecider.INDEX_TOTAL_SHARDS_PER_NODE_SETTING); - whiteListedSettings.add(MaxRetryAllocationDecider.SETTING_ALLOCATION_MAX_RETRY); - whiteListedSettings.add(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING); + nonReplicatedSettings.add(EnableAllocationDecider.INDEX_ROUTING_REBALANCE_ENABLE_SETTING); + nonReplicatedSettings.add(EnableAllocationDecider.INDEX_ROUTING_ALLOCATION_ENABLE_SETTING); + nonReplicatedSettings.add(ShardsLimitAllocationDecider.INDEX_TOTAL_SHARDS_PER_NODE_SETTING); + nonReplicatedSettings.add(MaxRetryAllocationDecider.SETTING_ALLOCATION_MAX_RETRY); + nonReplicatedSettings.add(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING); - whiteListedSettings.add(IndexSettings.MAX_RESULT_WINDOW_SETTING); - whiteListedSettings.add(IndexSettings.INDEX_WARMER_ENABLED_SETTING); - whiteListedSettings.add(IndexSettings.INDEX_REFRESH_INTERVAL_SETTING); - whiteListedSettings.add(IndexSettings.MAX_RESCORE_WINDOW_SETTING); - whiteListedSettings.add(IndexSettings.MAX_INNER_RESULT_WINDOW_SETTING); - whiteListedSettings.add(IndexSettings.DEFAULT_FIELD_SETTING); - whiteListedSettings.add(IndexSettings.QUERY_STRING_LENIENT_SETTING); - whiteListedSettings.add(IndexSettings.QUERY_STRING_ANALYZE_WILDCARD); - whiteListedSettings.add(IndexSettings.QUERY_STRING_ALLOW_LEADING_WILDCARD); - whiteListedSettings.add(IndexSettings.ALLOW_UNMAPPED); - whiteListedSettings.add(IndexSettings.INDEX_SEARCH_IDLE_AFTER); - whiteListedSettings.add(IndexSettings.INDEX_SOFT_DELETES_RETENTION_OPERATIONS_SETTING); - whiteListedSettings.add(IndexSettings.MAX_SCRIPT_FIELDS_SETTING); - whiteListedSettings.add(IndexSettings.MAX_REGEX_LENGTH_SETTING); - whiteListedSettings.add(IndexSettings.MAX_TERMS_COUNT_SETTING); - whiteListedSettings.add(IndexSettings.MAX_ANALYZED_OFFSET_SETTING); - whiteListedSettings.add(IndexSettings.MAX_DOCVALUE_FIELDS_SEARCH_SETTING); - whiteListedSettings.add(IndexSettings.MAX_TOKEN_COUNT_SETTING); - whiteListedSettings.add(IndexSettings.MAX_SLICES_PER_SCROLL); - whiteListedSettings.add(IndexSettings.MAX_ADJACENCY_MATRIX_FILTERS_SETTING); - whiteListedSettings.add(IndexSettings.DEFAULT_PIPELINE); - whiteListedSettings.add(IndexSettings.INDEX_SEARCH_THROTTLED); - whiteListedSettings.add(IndexSettings.INDEX_TRANSLOG_RETENTION_AGE_SETTING); - whiteListedSettings.add(IndexSettings.INDEX_TRANSLOG_RETENTION_SIZE_SETTING); - whiteListedSettings.add(IndexSettings.INDEX_TRANSLOG_GENERATION_THRESHOLD_SIZE_SETTING); - whiteListedSettings.add(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING); - whiteListedSettings.add(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING); - whiteListedSettings.add(IndexSettings.INDEX_GC_DELETES_SETTING); - whiteListedSettings.add(IndexSettings.MAX_REFRESH_LISTENERS_PER_SHARD); + nonReplicatedSettings.add(IndexSettings.MAX_RESULT_WINDOW_SETTING); + nonReplicatedSettings.add(IndexSettings.INDEX_WARMER_ENABLED_SETTING); + nonReplicatedSettings.add(IndexSettings.INDEX_REFRESH_INTERVAL_SETTING); + nonReplicatedSettings.add(IndexSettings.MAX_RESCORE_WINDOW_SETTING); + nonReplicatedSettings.add(IndexSettings.MAX_INNER_RESULT_WINDOW_SETTING); + nonReplicatedSettings.add(IndexSettings.DEFAULT_FIELD_SETTING); + nonReplicatedSettings.add(IndexSettings.QUERY_STRING_LENIENT_SETTING); + nonReplicatedSettings.add(IndexSettings.QUERY_STRING_ANALYZE_WILDCARD); + nonReplicatedSettings.add(IndexSettings.QUERY_STRING_ALLOW_LEADING_WILDCARD); + nonReplicatedSettings.add(IndexSettings.ALLOW_UNMAPPED); + nonReplicatedSettings.add(IndexSettings.INDEX_SEARCH_IDLE_AFTER); + nonReplicatedSettings.add(IndexSettings.INDEX_SOFT_DELETES_RETENTION_OPERATIONS_SETTING); + nonReplicatedSettings.add(IndexSettings.MAX_SCRIPT_FIELDS_SETTING); + nonReplicatedSettings.add(IndexSettings.MAX_REGEX_LENGTH_SETTING); + nonReplicatedSettings.add(IndexSettings.MAX_TERMS_COUNT_SETTING); + nonReplicatedSettings.add(IndexSettings.MAX_ANALYZED_OFFSET_SETTING); + nonReplicatedSettings.add(IndexSettings.MAX_DOCVALUE_FIELDS_SEARCH_SETTING); + nonReplicatedSettings.add(IndexSettings.MAX_TOKEN_COUNT_SETTING); + nonReplicatedSettings.add(IndexSettings.MAX_SLICES_PER_SCROLL); + nonReplicatedSettings.add(IndexSettings.MAX_ADJACENCY_MATRIX_FILTERS_SETTING); + nonReplicatedSettings.add(IndexSettings.DEFAULT_PIPELINE); + nonReplicatedSettings.add(IndexSettings.INDEX_SEARCH_THROTTLED); + nonReplicatedSettings.add(IndexSettings.INDEX_TRANSLOG_RETENTION_AGE_SETTING); + nonReplicatedSettings.add(IndexSettings.INDEX_TRANSLOG_RETENTION_SIZE_SETTING); + nonReplicatedSettings.add(IndexSettings.INDEX_TRANSLOG_GENERATION_THRESHOLD_SIZE_SETTING); + nonReplicatedSettings.add(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING); + nonReplicatedSettings.add(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING); + nonReplicatedSettings.add(IndexSettings.INDEX_GC_DELETES_SETTING); + nonReplicatedSettings.add(IndexSettings.MAX_REFRESH_LISTENERS_PER_SHARD); - whiteListedSettings.add(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING); - whiteListedSettings.add(BitsetFilterCache.INDEX_LOAD_RANDOM_ACCESS_FILTERS_EAGERLY_SETTING); + nonReplicatedSettings.add(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING); + nonReplicatedSettings.add(BitsetFilterCache.INDEX_LOAD_RANDOM_ACCESS_FILTERS_EAGERLY_SETTING); - whiteListedSettings.add(SearchSlowLog.INDEX_SEARCH_SLOWLOG_THRESHOLD_FETCH_DEBUG_SETTING); - whiteListedSettings.add(SearchSlowLog.INDEX_SEARCH_SLOWLOG_THRESHOLD_FETCH_WARN_SETTING); - whiteListedSettings.add(SearchSlowLog.INDEX_SEARCH_SLOWLOG_THRESHOLD_FETCH_INFO_SETTING); - whiteListedSettings.add(SearchSlowLog.INDEX_SEARCH_SLOWLOG_THRESHOLD_FETCH_TRACE_SETTING); - whiteListedSettings.add(SearchSlowLog.INDEX_SEARCH_SLOWLOG_THRESHOLD_QUERY_WARN_SETTING); - whiteListedSettings.add(SearchSlowLog.INDEX_SEARCH_SLOWLOG_THRESHOLD_QUERY_DEBUG_SETTING); - whiteListedSettings.add(SearchSlowLog.INDEX_SEARCH_SLOWLOG_THRESHOLD_QUERY_INFO_SETTING); - whiteListedSettings.add(SearchSlowLog.INDEX_SEARCH_SLOWLOG_THRESHOLD_QUERY_TRACE_SETTING); - whiteListedSettings.add(SearchSlowLog.INDEX_SEARCH_SLOWLOG_LEVEL); - whiteListedSettings.add(IndexingSlowLog.INDEX_INDEXING_SLOWLOG_THRESHOLD_INDEX_WARN_SETTING); - whiteListedSettings.add(IndexingSlowLog.INDEX_INDEXING_SLOWLOG_THRESHOLD_INDEX_DEBUG_SETTING); - whiteListedSettings.add(IndexingSlowLog.INDEX_INDEXING_SLOWLOG_THRESHOLD_INDEX_INFO_SETTING); - whiteListedSettings.add(IndexingSlowLog.INDEX_INDEXING_SLOWLOG_THRESHOLD_INDEX_TRACE_SETTING); - whiteListedSettings.add(IndexingSlowLog.INDEX_INDEXING_SLOWLOG_LEVEL_SETTING); - whiteListedSettings.add(IndexingSlowLog.INDEX_INDEXING_SLOWLOG_REFORMAT_SETTING); - whiteListedSettings.add(IndexingSlowLog.INDEX_INDEXING_SLOWLOG_MAX_SOURCE_CHARS_TO_LOG_SETTING); + nonReplicatedSettings.add(SearchSlowLog.INDEX_SEARCH_SLOWLOG_THRESHOLD_FETCH_DEBUG_SETTING); + nonReplicatedSettings.add(SearchSlowLog.INDEX_SEARCH_SLOWLOG_THRESHOLD_FETCH_WARN_SETTING); + nonReplicatedSettings.add(SearchSlowLog.INDEX_SEARCH_SLOWLOG_THRESHOLD_FETCH_INFO_SETTING); + nonReplicatedSettings.add(SearchSlowLog.INDEX_SEARCH_SLOWLOG_THRESHOLD_FETCH_TRACE_SETTING); + nonReplicatedSettings.add(SearchSlowLog.INDEX_SEARCH_SLOWLOG_THRESHOLD_QUERY_WARN_SETTING); + nonReplicatedSettings.add(SearchSlowLog.INDEX_SEARCH_SLOWLOG_THRESHOLD_QUERY_DEBUG_SETTING); + nonReplicatedSettings.add(SearchSlowLog.INDEX_SEARCH_SLOWLOG_THRESHOLD_QUERY_INFO_SETTING); + nonReplicatedSettings.add(SearchSlowLog.INDEX_SEARCH_SLOWLOG_THRESHOLD_QUERY_TRACE_SETTING); + nonReplicatedSettings.add(SearchSlowLog.INDEX_SEARCH_SLOWLOG_LEVEL); + nonReplicatedSettings.add(IndexingSlowLog.INDEX_INDEXING_SLOWLOG_THRESHOLD_INDEX_WARN_SETTING); + nonReplicatedSettings.add(IndexingSlowLog.INDEX_INDEXING_SLOWLOG_THRESHOLD_INDEX_DEBUG_SETTING); + nonReplicatedSettings.add(IndexingSlowLog.INDEX_INDEXING_SLOWLOG_THRESHOLD_INDEX_INFO_SETTING); + nonReplicatedSettings.add(IndexingSlowLog.INDEX_INDEXING_SLOWLOG_THRESHOLD_INDEX_TRACE_SETTING); + nonReplicatedSettings.add(IndexingSlowLog.INDEX_INDEXING_SLOWLOG_LEVEL_SETTING); + nonReplicatedSettings.add(IndexingSlowLog.INDEX_INDEXING_SLOWLOG_REFORMAT_SETTING); + nonReplicatedSettings.add(IndexingSlowLog.INDEX_INDEXING_SLOWLOG_MAX_SOURCE_CHARS_TO_LOG_SETTING); - whiteListedSettings.add(MergePolicyConfig.INDEX_COMPOUND_FORMAT_SETTING); - whiteListedSettings.add(MergePolicyConfig.INDEX_MERGE_POLICY_MAX_MERGE_AT_ONCE_SETTING); - whiteListedSettings.add(MergePolicyConfig.INDEX_MERGE_POLICY_SEGMENTS_PER_TIER_SETTING); - whiteListedSettings.add(MergePolicyConfig.INDEX_MERGE_POLICY_DELETES_PCT_ALLOWED_SETTING); - whiteListedSettings.add(MergePolicyConfig.INDEX_MERGE_POLICY_EXPUNGE_DELETES_ALLOWED_SETTING); - whiteListedSettings.add(MergePolicyConfig.INDEX_MERGE_POLICY_FLOOR_SEGMENT_SETTING); - whiteListedSettings.add(MergePolicyConfig.INDEX_MERGE_POLICY_MAX_MERGE_AT_ONCE_EXPLICIT_SETTING); - whiteListedSettings.add(MergePolicyConfig.INDEX_MERGE_POLICY_MAX_MERGED_SEGMENT_SETTING); - whiteListedSettings.add(MergePolicyConfig.INDEX_MERGE_POLICY_RECLAIM_DELETES_WEIGHT_SETTING); + nonReplicatedSettings.add(MergePolicyConfig.INDEX_COMPOUND_FORMAT_SETTING); + nonReplicatedSettings.add(MergePolicyConfig.INDEX_MERGE_POLICY_MAX_MERGE_AT_ONCE_SETTING); + nonReplicatedSettings.add(MergePolicyConfig.INDEX_MERGE_POLICY_SEGMENTS_PER_TIER_SETTING); + nonReplicatedSettings.add(MergePolicyConfig.INDEX_MERGE_POLICY_DELETES_PCT_ALLOWED_SETTING); + nonReplicatedSettings.add(MergePolicyConfig.INDEX_MERGE_POLICY_EXPUNGE_DELETES_ALLOWED_SETTING); + nonReplicatedSettings.add(MergePolicyConfig.INDEX_MERGE_POLICY_FLOOR_SEGMENT_SETTING); + nonReplicatedSettings.add(MergePolicyConfig.INDEX_MERGE_POLICY_MAX_MERGE_AT_ONCE_EXPLICIT_SETTING); + nonReplicatedSettings.add(MergePolicyConfig.INDEX_MERGE_POLICY_MAX_MERGED_SEGMENT_SETTING); + nonReplicatedSettings.add(MergePolicyConfig.INDEX_MERGE_POLICY_RECLAIM_DELETES_WEIGHT_SETTING); - whiteListedSettings.add(MergeSchedulerConfig.AUTO_THROTTLE_SETTING); - whiteListedSettings.add(MergeSchedulerConfig.MAX_MERGE_COUNT_SETTING); - whiteListedSettings.add(MergeSchedulerConfig.MAX_THREAD_COUNT_SETTING); - whiteListedSettings.add(EngineConfig.INDEX_CODEC_SETTING); + nonReplicatedSettings.add(MergeSchedulerConfig.AUTO_THROTTLE_SETTING); + nonReplicatedSettings.add(MergeSchedulerConfig.MAX_MERGE_COUNT_SETTING); + nonReplicatedSettings.add(MergeSchedulerConfig.MAX_THREAD_COUNT_SETTING); + nonReplicatedSettings.add(EngineConfig.INDEX_CODEC_SETTING); - WHITE_LISTED_SETTINGS = Collections.unmodifiableSet(whiteListedSettings); + NON_REPLICATED_SETTINGS = Collections.unmodifiableSet(nonReplicatedSettings); } static Settings filter(Settings originalSettings) { @@ -455,7 +455,7 @@ public class TransportResumeFollowAction extends TransportMasterNodeAction iterator = settings.keys().iterator(); while (iterator.hasNext()) { String key = iterator.next(); - for (Setting whitelistedSetting : WHITE_LISTED_SETTINGS) { + for (Setting whitelistedSetting : NON_REPLICATED_SETTINGS) { if (whitelistedSetting.match(key)) { iterator.remove(); break; diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/TransportResumeFollowActionTests.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/TransportResumeFollowActionTests.java index fd4b51bec57..85e3a2fb874 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/TransportResumeFollowActionTests.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/TransportResumeFollowActionTests.java @@ -234,7 +234,7 @@ public class TransportResumeFollowActionTests extends ESTestCase { for (Setting setting : IndexScopedSettings.BUILT_IN_INDEX_SETTINGS) { if (setting.isDynamic()) { - boolean notReplicated = TransportResumeFollowAction.WHITE_LISTED_SETTINGS.contains(setting); + boolean notReplicated = TransportResumeFollowAction.NON_REPLICATED_SETTINGS.contains(setting); boolean replicated = replicatedSettings.contains(setting); assertThat("setting [" + setting.getKey() + "] is not classified as replicated xor not replicated", notReplicated ^ replicated, is(true));