Skip to content

Commit

Permalink
Merge pull request #9353 from vespa-engine/freva/dynamic-flavors-feat…
Browse files Browse the repository at this point in the history
…ure-flag

Add flag for additional dynamic provisioning flavors
  • Loading branch information
freva committed May 10, 2019
2 parents 24c10ad + ca40f9c commit 900d9fb
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions flags/src/main/java/com/yahoo/vespa/flags/Flags.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

import com.yahoo.vespa.defaults.Defaults;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.TreeMap;
Expand Down Expand Up @@ -66,7 +64,7 @@ public class Flags {
HOSTNAME);

public static final UnboundListFlag<String> DISABLED_HOST_ADMIN_TASKS = defineListFlag(
"disabled-host-admin-tasks", Collections.emptyList(),
"disabled-host-admin-tasks", List.of(),
"List of host-admin task names (as they appear in the log, e.g. root>main>UpgradeTask) that should be skipped",
"Takes effect on next host admin tick",
HOSTNAME, NODE_TYPE);
Expand Down Expand Up @@ -119,6 +117,11 @@ public class Flags {
"Takes effect on next deployment",
APPLICATION_ID);

public static final UnboundListFlag<String> DYNAMIC_PROVISIONING_FLAVORS = defineListFlag(
"dynamic-provisioning-flavors", List.of(),
"List of additional Vespa flavor names that can be used for dynamic provisioning",
"Takes effect on next provisioning");

public static final UnboundBooleanFlag ENABLE_DISK_WRITE_TEST = defineFeatureFlag(
"enable-disk-write-test", false,
"Regularly issue a small write to disk and fail the host if it is not successful",
Expand Down Expand Up @@ -237,7 +240,7 @@ private interface TypedUnboundFlagFactory<T, U extends UnboundFlag<?, ?, ?>> {
}

public static List<FlagDefinition> getAllFlags() {
return new ArrayList<>(flags.values());
return List.copyOf(flags.values());
}

public static Optional<FlagDefinition> getFlag(FlagId flagId) {
Expand Down

0 comments on commit 900d9fb

Please sign in to comment.