Merge pull request #31283 from vespa-engine/vekterli/add-replica-selection-symmetry-feature-flag

Add feature flag for Put/Activate replica selection symmetry

1 files changed, 27 insertions, 6 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
index 786caa4b317..a24abc21b76 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
@@ -48,6 +48,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.Set;
+import java.util.function.Consumer;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -1471,13 +1472,18 @@ public class ContentClusterTest extends ContentBaseTest {
         assertEquals(expectedGroupsAllowedDown, config.max_number_of_groups_allowed_to_be_down());
     }
 
-    private boolean resolveDistributorOperationCancellationConfig(Integer featureLevel) throws Exception {
+    private StorDistributormanagerConfig resolveDistributorConfig(Consumer<TestProperties> propertyMutator) throws Exception {
         var properties = new TestProperties();
-        if (featureLevel != null) {
-            properties.setContentLayerMetadataFeatureLevel(featureLevel);
-        }
-        var cfg = resolveStorDistributormanagerConfig(properties);
-        return cfg.enable_operation_cancellation();
+        propertyMutator.accept(properties);
+        return resolveStorDistributormanagerConfig(properties);
+    }
+
+    private boolean resolveDistributorOperationCancellationConfig(Integer featureLevel) throws Exception {
+        return resolveDistributorConfig((props) -> {
+            if (featureLevel != null) {
+                props.setContentLayerMetadataFeatureLevel(featureLevel);
+            }
+        }).enable_operation_cancellation();
     }
 
     @Test
@@ -1488,6 +1494,21 @@ public class ContentClusterTest extends ContentBaseTest {
         assertTrue(resolveDistributorOperationCancellationConfig(2));
     }
 
+    private boolean resolveDistributorSymmetricReplicaSelectionConfig(Boolean flagValue) throws Exception {
+        return resolveDistributorConfig((props) -> {
+            if (flagValue != null) {
+                props.setSymmetricPutAndActivateReplicaSelection(flagValue);
+            }
+        }).symmetric_put_and_activate_replica_selection();
+    }
+
+    @Test
+    void distributor_symmetric_replica_selection_config_controlled_by_properties() throws Exception {
+        assertFalse(resolveDistributorSymmetricReplicaSelectionConfig(null)); // defaults to false
+        assertFalse(resolveDistributorSymmetricReplicaSelectionConfig(false));
+        assertTrue(resolveDistributorSymmetricReplicaSelectionConfig(true));
+    }
+
     @Test
     void node_distribution_key_outside_legal_range_is_disallowed() {
         // Only [0, UINT16_MAX - 1] is a valid range. UINT16_MAX is a special content layer-internal