diff options
6 files changed, 14 insertions, 14 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index 398c6e9fca3..abeca38a0c4 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -79,11 +79,11 @@ public interface ModelContext { @ModelFeatureFlag(owners = {"baldersheim"}) default double queryDispatchWarmup() { return 5.0; } @ModelFeatureFlag(owners = {"baldersheim"}) default int defaultNumResponseThreads() { return 2; } @ModelFeatureFlag(owners = {"baldersheim"}) default int mbusNetworkThreads() { return 1; } - @ModelFeatureFlag(owners = {"baldersheim"}) default int mbusJavaRpcNumTargets() { return 1; } + @ModelFeatureFlag(owners = {"baldersheim"}) default int mbusJavaRpcNumTargets() { return 2; } @ModelFeatureFlag(owners = {"baldersheim"}) default int mbusJavaEventsBeforeWakeup() { return 1; } - @ModelFeatureFlag(owners = {"baldersheim"}) default int mbusCppRpcNumTargets() { return 1; } + @ModelFeatureFlag(owners = {"baldersheim"}) default int mbusCppRpcNumTargets() { return 2; } @ModelFeatureFlag(owners = {"baldersheim"}) default int mbusCppEventsBeforeWakeup() { return 1; } - @ModelFeatureFlag(owners = {"baldersheim"}) default int rpcNumTargets() { return 1; } + @ModelFeatureFlag(owners = {"baldersheim"}) default int rpcNumTargets() { return 2; } @ModelFeatureFlag(owners = {"baldersheim"}) default int rpcEventsBeforeWakeup() { return 1; } @ModelFeatureFlag(owners = {"baldersheim"}) default boolean useAsyncMessageHandlingOnSchedule() { throw new UnsupportedOperationException("TODO specify default value"); } @ModelFeatureFlag(owners = {"baldersheim"}) default double feedConcurrency() { throw new UnsupportedOperationException("TODO specify default value"); } diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java index 7c0e3048328..7cb0672699f 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java @@ -70,11 +70,11 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea private List<String> environmentVariables = List.of(); private boolean loadCodeAsHugePages = false; private boolean sharedStringRepoNoReclaim = false; - private int mbus_java_num_targets = 1; + private int mbus_java_num_targets = 2; private int mbus_java_events_before_wakeup = 1; - private int mbus_cpp_num_targets = 1; + private int mbus_cpp_num_targets = 2; private int mbus_cpp_events_before_wakeup = 1; - private int rpc_num_targets = 1; + private int rpc_num_targets = 2; private int rpc_events_before_wakeup = 1; private int mbus_network_threads = 1; private int heapSizePercentage = ApplicationContainerCluster.defaultHeapSizePercentageOfTotalNodeMemory; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java index f3a59733ece..9fb4eefba75 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java @@ -149,9 +149,9 @@ public class StorageClusterTest { void verifyDefaultMbusConfig() { var confg = communicationmanagerConfigFromProperties(new TestProperties()); assertEquals(1, confg.mbus().num_network_threads()); - assertEquals(1, confg.mbus().num_rpc_targets()); + assertEquals(2, confg.mbus().num_rpc_targets()); assertEquals(1, confg.mbus().events_before_wakeup()); - assertEquals(1, confg.rpc().num_targets_per_node()); + assertEquals(2, confg.rpc().num_targets_per_node()); assertEquals(1, confg.rpc().events_before_wakeup()); } diff --git a/configdefinitions/src/vespa/stor-filestor.def b/configdefinitions/src/vespa/stor-filestor.def index ef4094a02bf..cd89530c89c 100644 --- a/configdefinitions/src/vespa/stor-filestor.def +++ b/configdefinitions/src/vespa/stor-filestor.def @@ -27,7 +27,7 @@ num_visitor_threads int default=16 restart ## Number of handler objects that might be created by network threads ## This is a temporary setting that only skilled vespa developers should modify ## This must be kept in line with stor-communicationmanager:rpc.num_network_threads -num_network_threads int default=1 restart +num_network_threads int default=2 restart ## Type of sequenced thread executor use for persistence replies. response_sequencer_type enum {LATENCY, THROUGHPUT, ADAPTIVE} default=ADAPTIVE restart diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index 3b89d2babe8..8cd64347f8c 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -139,19 +139,19 @@ public class Flags { public static final UnboundIntFlag MBUS_JAVA_NUM_TARGETS = defineIntFlag( - "mbus-java-num-targets", 1, + "mbus-java-num-targets", 2, List.of("baldersheim"), "2022-07-05", "2023-12-31", "Number of rpc targets per service", "Takes effect at redeployment", ZONE_ID, APPLICATION_ID); public static final UnboundIntFlag MBUS_CPP_NUM_TARGETS = defineIntFlag( - "mbus-cpp-num-targets", 1, + "mbus-cpp-num-targets", 2, List.of("baldersheim"), "2022-07-05", "2023-12-31", "Number of rpc targets per service", "Takes effect at redeployment", ZONE_ID, APPLICATION_ID); public static final UnboundIntFlag RPC_NUM_TARGETS = defineIntFlag( - "rpc-num-targets", 1, + "rpc-num-targets", 2, List.of("baldersheim"), "2022-07-05", "2023-12-31", "Number of rpc targets per content node", "Takes effect at redeployment", diff --git a/storage/src/vespa/storage/config/stor-communicationmanager.def b/storage/src/vespa/storage/config/stor-communicationmanager.def index 3083fb37081..b398440f5f6 100644 --- a/storage/src/vespa/storage/config/stor-communicationmanager.def +++ b/storage/src/vespa/storage/config/stor-communicationmanager.def @@ -30,7 +30,7 @@ mbus.compress.type enum {NONE, LZ4, ZSTD} default=LZ4 restart mbus.rpctargetcache.ttl double default = 600 restart ## Number of rpc targets per spec -mbus.num_rpc_targets int default=1 restart +mbus.num_rpc_targets int default=2 restart ## Use tcpNoDelay for mbus network writes mbus.tcp_no_delay bool default=true restart @@ -64,7 +64,7 @@ rpc.events_before_wakeup int default=1 restart ## and the RPC target itself handles sequencing of these messages. ## NB !! It is vital that this number is kept in sync with stor-filestor:num_network_threads. ## Only skilled vespa core developers should touch this. -rpc.num_targets_per_node int default=1 restart +rpc.num_targets_per_node int default=2 restart # Minimum size of packets to compress (0 means no compression) rpc.compress.limit int default=1024 restart |