honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-08 14:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed itv2 and data streams feature flag naming (#54431) (#54500)

Browse Source 
from `*_flag_registered` to `#_feature_enabled`.

This previous name indicated that a flag was registered,
whilst the feature flag actually controls whether a
feature is enabled.
This commit is contained in:
Martijn van Groningen 2020-04-03 10:12:00 +02:00 committed by GitHub
parent d025b90cd1
commit ec0bbda52f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -514,8 +514,8 @@ subprojects {
pluginManager.withPlugin('elasticsearch.testclusters') { pluginManager.withPlugin('elasticsearch.testclusters') {
testClusters.all { testClusters.all {
if (org.elasticsearch.gradle.info.BuildParams.isSnapshotBuild() == false) { if (org.elasticsearch.gradle.info.BuildParams.isSnapshotBuild() == false) {
systemProperty 'es.itv2_feature_flag_registered', 'true' systemProperty 'es.itv2_feature_enabled', 'true'
systemProperty 'es.datastreams_feature_flag_registered', 'true' systemProperty 'es.datastreams_feature_enabled', 'true'
} }
} }
} }

28
server/src/main/java/org/elasticsearch/action/ActionModule.java
View File

@ -390,31 +390,31 @@ public class ActionModule extends AbstractModule {
private final boolean transportClient; private final boolean transportClient;
private static final boolean ITV2_FEATURE_FLAG_REGISTERED; private static final boolean ITV2_FEATURE_ENABLED;
static { static {
final String property = System.getProperty("es.itv2_feature_flag_registered"); final String property = System.getProperty("es.itv2_feature_enabled");
if (Build.CURRENT.isSnapshot() || "true".equals(property)) { if (Build.CURRENT.isSnapshot() || "true".equals(property)) {
ITV2_FEATURE_FLAG_REGISTERED = true; ITV2_FEATURE_ENABLED = true;
} else if ("false".equals(property) || property == null) { } else if ("false".equals(property) || property == null) {
ITV2_FEATURE_FLAG_REGISTERED = false; ITV2_FEATURE_ENABLED = false;
} else { } else {
throw new IllegalArgumentException("expected es.itv2_feature_flag_registered to be unset, true, or false but was [" + throw new IllegalArgumentException("expected es.itv2_feature_enabled to be unset, true, or false but was [" +
property + "]"); property + "]");
} }
} }
private static final boolean DATASTREAMS_FEATURE_FLAG_REGISTERED; private static final boolean DATASTREAMS_FEATURE_ENABLED;
static { static {
final String property = System.getProperty("es.datastreams_feature_flag_registered"); final String property = System.getProperty("es.datastreams_feature_enabled");
if (Build.CURRENT.isSnapshot() || "true".equals(property)) { if (Build.CURRENT.isSnapshot() || "true".equals(property)) {
DATASTREAMS_FEATURE_FLAG_REGISTERED = true; DATASTREAMS_FEATURE_ENABLED = true;
} else if ("false".equals(property) || property == null) { } else if ("false".equals(property) || property == null) {
DATASTREAMS_FEATURE_FLAG_REGISTERED = false; DATASTREAMS_FEATURE_ENABLED = false;
} else { } else {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"expected es.datastreams_feature_flag_registered to be unset or [true|false] but was [" + property + "]" "expected es.datastreams_feature_enabled to be unset or [true|false] but was [" + property + "]"
); );
} }
} }
@ -554,7 +554,7 @@ public class ActionModule extends AbstractModule {
actions.register(PutIndexTemplateAction.INSTANCE, TransportPutIndexTemplateAction.class); actions.register(PutIndexTemplateAction.INSTANCE, TransportPutIndexTemplateAction.class);
actions.register(GetIndexTemplatesAction.INSTANCE, TransportGetIndexTemplatesAction.class); actions.register(GetIndexTemplatesAction.INSTANCE, TransportGetIndexTemplatesAction.class);
actions.register(DeleteIndexTemplateAction.INSTANCE, TransportDeleteIndexTemplateAction.class); actions.register(DeleteIndexTemplateAction.INSTANCE, TransportDeleteIndexTemplateAction.class);
if (ITV2_FEATURE_FLAG_REGISTERED) { if (ITV2_FEATURE_ENABLED) {
actions.register(PutComponentTemplateAction.INSTANCE, TransportPutComponentTemplateAction.class); actions.register(PutComponentTemplateAction.INSTANCE, TransportPutComponentTemplateAction.class);
actions.register(GetComponentTemplateAction.INSTANCE, TransportGetComponentTemplateAction.class); actions.register(GetComponentTemplateAction.INSTANCE, TransportGetComponentTemplateAction.class);
actions.register(DeleteComponentTemplateAction.INSTANCE, TransportDeleteComponentTemplateAction.class); actions.register(DeleteComponentTemplateAction.INSTANCE, TransportDeleteComponentTemplateAction.class);
@ -612,7 +612,7 @@ public class ActionModule extends AbstractModule {
actionPlugins.stream().flatMap(p -> p.getActions().stream()).forEach(actions::register); actionPlugins.stream().flatMap(p -> p.getActions().stream()).forEach(actions::register);
// Data streams: // Data streams:
if (DATASTREAMS_FEATURE_FLAG_REGISTERED) { if (DATASTREAMS_FEATURE_ENABLED) {
actions.register(CreateDataStreamAction.INSTANCE, CreateDataStreamAction.TransportAction.class); actions.register(CreateDataStreamAction.INSTANCE, CreateDataStreamAction.TransportAction.class);
actions.register(DeleteDataStreamAction.INSTANCE, DeleteDataStreamAction.TransportAction.class); actions.register(DeleteDataStreamAction.INSTANCE, DeleteDataStreamAction.TransportAction.class);
actions.register(GetDataStreamsAction.INSTANCE, GetDataStreamsAction.TransportAction.class); actions.register(GetDataStreamsAction.INSTANCE, GetDataStreamsAction.TransportAction.class);
@ -696,7 +696,7 @@ public class ActionModule extends AbstractModule {
registerHandler.accept(new RestGetIndexTemplateAction()); registerHandler.accept(new RestGetIndexTemplateAction());
registerHandler.accept(new RestPutIndexTemplateAction()); registerHandler.accept(new RestPutIndexTemplateAction());
registerHandler.accept(new RestDeleteIndexTemplateAction()); registerHandler.accept(new RestDeleteIndexTemplateAction());
if (ITV2_FEATURE_FLAG_REGISTERED) { if (ITV2_FEATURE_ENABLED) {
registerHandler.accept(new RestPutComponentTemplateAction()); registerHandler.accept(new RestPutComponentTemplateAction());
registerHandler.accept(new RestGetComponentTemplateAction()); registerHandler.accept(new RestGetComponentTemplateAction());
registerHandler.accept(new RestDeleteComponentTemplateAction()); registerHandler.accept(new RestDeleteComponentTemplateAction());
@ -764,7 +764,7 @@ public class ActionModule extends AbstractModule {
registerHandler.accept(new RestSimulatePipelineAction()); registerHandler.accept(new RestSimulatePipelineAction());
// Data Stream API // Data Stream API
if (DATASTREAMS_FEATURE_FLAG_REGISTERED) { if (DATASTREAMS_FEATURE_ENABLED) {
registerHandler.accept(new RestCreateDataStreamAction()); registerHandler.accept(new RestCreateDataStreamAction());
registerHandler.accept(new RestDeleteDataStreamAction()); registerHandler.accept(new RestDeleteDataStreamAction());
registerHandler.accept(new RestGetDataStreamsAction()); registerHandler.accept(new RestGetDataStreamsAction());