Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ public Collection<?> createComponents(PluginServices services) {
actions.add(new ActionHandler<>(DeleteDataStreamLifecycleAction.INSTANCE, TransportDeleteDataStreamLifecycleAction.class));
actions.add(new ActionHandler<>(ExplainDataStreamLifecycleAction.INSTANCE, TransportExplainDataStreamLifecycleAction.class));
actions.add(new ActionHandler<>(GetDataStreamLifecycleStatsAction.INSTANCE, TransportGetDataStreamLifecycleStatsAction.class));
if (DataStream.isFailureStoreFeatureFlagEnabled()) {
if (DataStream.isFailureStoreFeatureFlagEnabled) {
actions.add(new ActionHandler<>(GetDataStreamOptionsAction.INSTANCE, TransportGetDataStreamOptionsAction.class));
actions.add(new ActionHandler<>(PutDataStreamOptionsAction.INSTANCE, TransportPutDataStreamOptionsAction.class));
actions.add(new ActionHandler<>(DeleteDataStreamOptionsAction.INSTANCE, TransportDeleteDataStreamOptionsAction.class));
Expand Down Expand Up @@ -295,7 +295,7 @@ public List<RestHandler> getRestHandlers(
handlers.add(new RestDeleteDataStreamLifecycleAction());
handlers.add(new RestExplainDataStreamLifecycleAction());
handlers.add(new RestDataStreamLifecycleStatsAction());
if (DataStream.isFailureStoreFeatureFlagEnabled()) {
if (DataStream.isFailureStoreFeatureFlagEnabled) {
handlers.add(new RestGetDataStreamOptionsAction());
handlers.add(new RestPutDataStreamOptionsAction());
handlers.add(new RestDeleteDataStreamOptionsAction());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ static GetDataStreamAction.Response innerOperation(
Map<Index, IndexProperties> backingIndicesSettingsValues = new HashMap<>();
Metadata metadata = state.getMetadata();
collectIndexSettingsValues(dataStream, backingIndicesSettingsValues, metadata, dataStream.getIndices());
if (DataStream.isFailureStoreFeatureFlagEnabled() && dataStream.getFailureIndices().getIndices().isEmpty() == false) {
if (DataStream.isFailureStoreFeatureFlagEnabled && dataStream.getFailureIndices().getIndices().isEmpty() == false) {
collectIndexSettingsValues(dataStream, backingIndicesSettingsValues, metadata, dataStream.getFailureIndices().getIndices());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@ static List<Index> getTargetIndices(
}
}
if (withFailureStore
&& DataStream.isFailureStoreFeatureFlagEnabled()
&& DataStream.isFailureStoreFeatureFlagEnabled
&& dataStream.getFailureIndices().getIndices().isEmpty() == false) {
for (Index index : dataStream.getFailureIndices().getIndices()) {
if (dataStream.isIndexManagedByDataStreamLifecycle(index, indexMetadataSupplier)
Expand Down Expand Up @@ -806,7 +806,7 @@ private void clearErrorStoreForUnmanagedIndices(DataStream dataStream) {
private Set<Index> maybeExecuteRollover(ClusterState state, DataStream dataStream) {
Set<Index> currentRunWriteIndices = new HashSet<>();
currentRunWriteIndices.add(maybeExecuteRollover(state, dataStream, false));
if (DataStream.isFailureStoreFeatureFlagEnabled()) {
if (DataStream.isFailureStoreFeatureFlagEnabled) {
Index failureStoreWriteIndex = maybeExecuteRollover(state, dataStream, true);
if (failureStoreWriteIndex != null) {
currentRunWriteIndices.add(failureStoreWriteIndex);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public class RestGetDataStreamsAction extends BaseRestHandler {
IndicesOptions.GatekeeperOptions.IGNORE_THROTTLED,
"verbose"
),
DataStream.isFailureStoreFeatureFlagEnabled() ? Set.of(IndicesOptions.FAILURE_STORE_QUERY_PARAM) : Set.of()
DataStream.isFailureStoreFeatureFlagEnabled ? Set.of(IndicesOptions.FAILURE_STORE_QUERY_PARAM) : Set.of()
)
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public void testDeleteDataStream() {
}

public void testDeleteDataStreamWithFailureStore() {
Assume.assumeTrue(DataStream.isFailureStoreFeatureFlagEnabled());
Assume.assumeTrue(DataStream.isFailureStoreFeatureFlagEnabled);

final String dataStreamName = "my-data-stream";
final List<String> otherIndices = randomSubsetOf(List.of("foo", "bar", "baz"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public void testResponseIlmAndDataStreamLifecycleRepresentation() throws Excepti
is(ManagedBy.LIFECYCLE.displayValue)
);

if (DataStream.isFailureStoreFeatureFlagEnabled()) {
if (DataStream.isFailureStoreFeatureFlagEnabled) {
var failureStore = (Map<String, Object>) dataStreamMap.get(DataStream.FAILURE_STORE_FIELD.getPreferredName());
List<Object> failureStoresRepresentation = (List<Object>) failureStore.get(DataStream.INDICES_FIELD.getPreferredName());
Map<String, Object> failureStoreRepresentation = (Map<String, Object>) failureStoresRepresentation.get(0);
Expand Down Expand Up @@ -254,7 +254,7 @@ public void testResponseIlmAndDataStreamLifecycleRepresentation() throws Excepti
is(ManagedBy.UNMANAGED.displayValue)
);

if (DataStream.isFailureStoreFeatureFlagEnabled()) {
if (DataStream.isFailureStoreFeatureFlagEnabled) {
var failureStore = (Map<String, Object>) dataStreamMap.get(DataStream.FAILURE_STORE_FIELD.getPreferredName());
List<Object> failureStoresRepresentation = (List<Object>) failureStore.get(DataStream.INDICES_FIELD.getPreferredName());
Map<String, Object> failureStoreRepresentation = (Map<String, Object>) failureStoresRepresentation.get(0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public class CreateSnapshotRequest extends MasterNodeRequest<CreateSnapshotReque

private String[] indices = EMPTY_ARRAY;

private IndicesOptions indicesOptions = DataStream.isFailureStoreFeatureFlagEnabled()
private IndicesOptions indicesOptions = DataStream.isFailureStoreFeatureFlagEnabled
? IndicesOptions.strictExpandHiddenIncludeFailureStore()
: IndicesOptions.strictExpandHidden();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class RestoreSnapshotRequest extends MasterNodeRequest<RestoreSnapshotReq
private String snapshot;
private String repository;
private String[] indices = Strings.EMPTY_ARRAY;
private IndicesOptions indicesOptions = DataStream.isFailureStoreFeatureFlagEnabled()
private IndicesOptions indicesOptions = DataStream.isFailureStoreFeatureFlagEnabled
? IndicesOptions.strictExpandOpenIncludeFailureStore()
: IndicesOptions.strictExpandOpen();
private String[] featureStates = Strings.EMPTY_ARRAY;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public static Feature[] fromRequest(RestRequest request) {

public GetIndexRequest() {
super(
DataStream.isFailureStoreFeatureFlagEnabled()
DataStream.isFailureStoreFeatureFlagEnabled
? IndicesOptions.builder(IndicesOptions.strictExpandOpen())
.selectorOptions(IndicesOptions.SelectorOptions.ALL_APPLICABLE)
.build()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public IndicesOptions indicesOptions() {
* @return true of the rollover request targets the failure store, false otherwise.
*/
public boolean targetsFailureStore() {
return DataStream.isFailureStoreFeatureFlagEnabled() && indicesOptions.includeFailureIndices();
return DataStream.isFailureStoreFeatureFlagEnabled && indicesOptions.includeFailureIndices();
}

public void setIndicesOptions(IndicesOptions indicesOptions) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ private void doRedirectFailures() {
*/
private void rollOverFailureStores(Runnable runnable) {
// Skip allocation of some objects if we don't need to roll over anything.
if (failureStoresToBeRolledOver.isEmpty() || DataStream.isFailureStoreFeatureFlagEnabled() == false) {
if (failureStoresToBeRolledOver.isEmpty() || DataStream.isFailureStoreFeatureFlagEnabled == false) {
runnable.run();
return;
}
Expand Down Expand Up @@ -405,7 +405,7 @@ private void executeBulkRequestsByShard(
}

private void redirectFailuresOrCompleteBulkOperation() {
if (DataStream.isFailureStoreFeatureFlagEnabled() && failureStoreRedirects.isEmpty() == false) {
if (DataStream.isFailureStoreFeatureFlagEnabled && failureStoreRedirects.isEmpty() == false) {
doRedirectFailures();
} else {
completeBulkOperation();
Expand Down Expand Up @@ -594,7 +594,7 @@ private IndexDocFailureStoreStatus processFailure(BulkItemRequest bulkItemReques
*/
private static DataStream getRedirectTargetCandidate(DocWriteRequest<?> docWriteRequest, Metadata metadata) {
// Feature flag guard
if (DataStream.isFailureStoreFeatureFlagEnabled() == false) {
if (DataStream.isFailureStoreFeatureFlagEnabled == false) {
return null;
}
// If there is no index abstraction, then the request is using a pattern of some sort, which data streams do not support
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ synchronized void markItemAsDropped(int slot) {
* @param e the failure encountered.
*/
public void markItemForFailureStore(int slot, String targetIndexName, Exception e) {
if (DataStream.isFailureStoreFeatureFlagEnabled() == false) {
if (DataStream.isFailureStoreFeatureFlagEnabled == false) {
// Assert false for development, but if we somehow find ourselves here, default to failure logic.
assert false
: "Attempting to route a failed write request type to a failure store but the failure store is not enabled! "
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public static IndexDocFailureStoreStatus fromId(byte id) {
@Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
// We avoid adding the not_applicable status in the response to not increase the size of bulk responses.
if (DataStream.isFailureStoreFeatureFlagEnabled() && this.equals(NOT_APPLICABLE_OR_UNKNOWN) == false) {
if (DataStream.isFailureStoreFeatureFlagEnabled && this.equals(NOT_APPLICABLE_OR_UNKNOWN) == false) {
builder.field("failure_store", label);
}
return builder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ private void populateMissingTargets(
Map<String, Boolean> indexExistence = new HashMap<>();
Function<String, Boolean> indexExistenceComputation = (index) -> indexNameExpressionResolver.hasIndexAbstraction(index, state);
boolean lazyRolloverFeature = featureService.clusterHasFeature(state, LazyRolloverAction.DATA_STREAM_LAZY_ROLLOVER);
boolean lazyRolloverFailureStoreFeature = DataStream.isFailureStoreFeatureFlagEnabled();
boolean lazyRolloverFailureStoreFeature = DataStream.isFailureStoreFeatureFlagEnabled;
Set<String> indicesThatRequireAlias = new HashSet<>();

for (DocWriteRequest<?> request : bulkRequest.requests) {
Expand Down Expand Up @@ -595,7 +595,7 @@ void executeBulk(
*/
// Visibility for testing
static Boolean resolveFailureInternal(String indexName, Metadata metadata, long epochMillis) {
if (DataStream.isFailureStoreFeatureFlagEnabled() == false) {
if (DataStream.isFailureStoreFeatureFlagEnabled == false) {
return null;
}
var resolution = resolveFailureStoreFromMetadata(indexName, metadata, epochMillis);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ public XContentBuilder toXContent(
builder.endArray();
builder.endObject();
}
if (DataStream.isFailureStoreFeatureFlagEnabled()) {
if (DataStream.isFailureStoreFeatureFlagEnabled) {
builder.startObject(DataStream.FAILURE_STORE_FIELD.getPreferredName());
builder.field(FAILURE_STORE_ENABLED.getPreferredName(), dataStream.isFailureStoreEnabled());
builder.field(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -866,7 +866,7 @@ public IndexRequest setRequireDataStream(boolean requireDataStream) {

@Override
public Index getConcreteWriteIndex(IndexAbstraction ia, Metadata metadata) {
if (DataStream.isFailureStoreFeatureFlagEnabled() && writeToFailureStore) {
if (DataStream.isFailureStoreFeatureFlagEnabled && writeToFailureStore) {
if (ia.isDataStreamRelated() == false) {
throw new ElasticsearchException(
"Attempting to write a document to a failure store but the targeted index is not a data stream"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1202,13 +1202,13 @@ public static IndicesOptions fromRequest(RestRequest request, IndicesOptions def
request.param(ConcreteTargetOptions.IGNORE_UNAVAILABLE),
request.param(WildcardOptions.ALLOW_NO_INDICES),
request.param(GatekeeperOptions.IGNORE_THROTTLED),
DataStream.isFailureStoreFeatureFlagEnabled() ? request.param(FAILURE_STORE_QUERY_PARAM) : INCLUDE_ONLY_REGULAR_INDICES,
DataStream.isFailureStoreFeatureFlagEnabled ? request.param(FAILURE_STORE_QUERY_PARAM) : INCLUDE_ONLY_REGULAR_INDICES,
defaultSettings
);
}

public static IndicesOptions fromMap(Map<String, Object> map, IndicesOptions defaultSettings) {
if (DataStream.isFailureStoreFeatureFlagEnabled()) {
if (DataStream.isFailureStoreFeatureFlagEnabled) {
return fromParameters(
map.containsKey(WildcardOptions.EXPAND_WILDCARDS) ? map.get(WildcardOptions.EXPAND_WILDCARDS) : map.get("expandWildcards"),
map.containsKey(ConcreteTargetOptions.IGNORE_UNAVAILABLE)
Expand Down Expand Up @@ -1246,8 +1246,8 @@ public static boolean isIndicesOptions(String name) {
|| "ignoreThrottled".equals(name)
|| WildcardOptions.ALLOW_NO_INDICES.equals(name)
|| "allowNoIndices".equals(name)
|| (DataStream.isFailureStoreFeatureFlagEnabled() && FAILURE_STORE_QUERY_PARAM.equals(name))
|| (DataStream.isFailureStoreFeatureFlagEnabled() && "failureStore".equals(name));
|| (DataStream.isFailureStoreFeatureFlagEnabled && FAILURE_STORE_QUERY_PARAM.equals(name))
|| (DataStream.isFailureStoreFeatureFlagEnabled && "failureStore".equals(name));
}

public static IndicesOptions fromParameters(
Expand Down Expand Up @@ -1278,7 +1278,7 @@ public static IndicesOptions fromParameters(

WildcardOptions wildcards = WildcardOptions.parseParameters(wildcardsString, allowNoIndicesString, defaultSettings.wildcardOptions);
GatekeeperOptions gatekeeperOptions = GatekeeperOptions.parseParameter(ignoreThrottled, defaultSettings.gatekeeperOptions);
SelectorOptions selectorOptions = DataStream.isFailureStoreFeatureFlagEnabled()
SelectorOptions selectorOptions = DataStream.isFailureStoreFeatureFlagEnabled
? parseFailureStoreParameters(failureStoreString, defaultSettings.selectorOptions)
: SelectorOptions.DEFAULT;

Expand Down Expand Up @@ -1313,7 +1313,7 @@ public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params par
concreteTargetOptions.toXContent(builder, params);
wildcardOptions.toXContent(builder, params);
gatekeeperOptions.toXContent(builder, params);
if (DataStream.isFailureStoreFeatureFlagEnabled()) {
if (DataStream.isFailureStoreFeatureFlagEnabled) {
String displayValue;
if (SelectorOptions.ALL_APPLICABLE.equals(selectorOptions())) {
displayValue = INCLUDE_ALL;
Expand Down Expand Up @@ -1392,7 +1392,7 @@ public static IndicesOptions fromXContent(XContentParser parser, @Nullable Indic
allowNoIndices = parser.booleanValue();
} else if (IGNORE_THROTTLED_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
generalOptions.ignoreThrottled(parser.booleanValue());
} else if (DataStream.isFailureStoreFeatureFlagEnabled()
} else if (DataStream.isFailureStoreFeatureFlagEnabled
&& FAILURE_STORE_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
selectorOptions = parseFailureStoreParameters(parser.text(), selectorOptions);
} else {
Expand Down Expand Up @@ -1565,7 +1565,7 @@ public String toString() {
+ ignoreAliases()
+ ", ignore_throttled="
+ ignoreThrottled()
+ (DataStream.isFailureStoreFeatureFlagEnabled()
+ (DataStream.isFailureStoreFeatureFlagEnabled
? ", include_regular_indices="
+ includeRegularIndices()
+ ", include_failure_indices="
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -380,14 +380,14 @@ public static class DataStreamTemplate implements Writeable, ToXContentObject {
args -> new DataStreamTemplate(
args[0] != null && (boolean) args[0],
args[1] != null && (boolean) args[1],
DataStream.isFailureStoreFeatureFlagEnabled() && args[2] != null && (boolean) args[2]
DataStream.isFailureStoreFeatureFlagEnabled && args[2] != null && (boolean) args[2]
)
);

static {
PARSER.declareBoolean(ConstructingObjectParser.optionalConstructorArg(), HIDDEN);
PARSER.declareBoolean(ConstructingObjectParser.optionalConstructorArg(), ALLOW_CUSTOM_ROUTING);
if (DataStream.isFailureStoreFeatureFlagEnabled()) {
if (DataStream.isFailureStoreFeatureFlagEnabled) {
PARSER.declareBoolean(ConstructingObjectParser.optionalConstructorArg(), FAILURE_STORE);
}
}
Expand Down Expand Up @@ -482,7 +482,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
builder.startObject();
builder.field("hidden", hidden);
builder.field(ALLOW_CUSTOM_ROUTING.getPreferredName(), allowCustomRouting);
if (DataStream.isFailureStoreFeatureFlagEnabled()) {
if (DataStream.isFailureStoreFeatureFlagEnabled) {
builder.field(FAILURE_STORE.getPreferredName(), failureStore);
}
builder.endObject();
Expand Down
Loading