Merge pull request #15956 from vespa-engine/balder/gc-direct-rpc-feature-flag

GC feature flag for defunct use-direct-storage-rpc

2 files changed, 1 insertions, 35 deletions

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 3e7017b78e1..c2478e097e3 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
@@ -37,7 +37,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     private final Set<ContainerEndpoint> endpoints = Collections.emptySet();
     private boolean useDedicatedNodeForLogserver = false;
     private boolean useThreePhaseUpdates = false;
-    private boolean useDirectStorageApiRpc = false;
     private boolean useFastValueTensorImplementation = true;
     private double defaultTermwiseLimit = 1.0;
     private String jvmGCOptions = null;
@@ -74,7 +73,7 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     @Override public Optional<EndpointCertificateSecrets> endpointCertificateSecrets() { return endpointCertificateSecrets; }
     @Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; }
     @Override public boolean useThreePhaseUpdates() { return useThreePhaseUpdates; }
-    @Override public boolean useDirectStorageApiRpc() { return useDirectStorageApiRpc; }
+    @Override public boolean useDirectStorageApiRpc() { return true; }
     @Override public boolean useFastValueTensorImplementation() { return useFastValueTensorImplementation; }
     @Override public Optional<AthenzDomain> athenzDomain() { return Optional.ofNullable(athenzDomain); }
     @Override public Optional<ApplicationRoles> applicationRoles() { return Optional.ofNullable(applicationRoles); }
@@ -137,11 +136,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
         return this;
     }
 
-    public TestProperties setUseDirectStorageApiRpc(boolean useDirectStorageApiRpc) {
-        this.useDirectStorageApiRpc = useDirectStorageApiRpc;
-        return this;
-    }
-
     public TestProperties setApplicationId(ApplicationId applicationId) {
         this.applicationId = applicationId;
         return this;
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 61056856242..9f17a1c4142 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
@@ -17,7 +17,6 @@ import com.yahoo.vespa.config.content.AllClustersBucketSpacesConfig;
 import com.yahoo.vespa.config.content.FleetcontrollerConfig;
 import com.yahoo.vespa.config.content.StorDistributionConfig;
 import com.yahoo.vespa.config.content.StorFilestorConfig;
-import com.yahoo.vespa.config.content.core.StorCommunicationmanagerConfig;
 import com.yahoo.vespa.config.content.core.StorDistributormanagerConfig;
 import com.yahoo.vespa.config.content.core.StorServerConfig;
 import com.yahoo.vespa.config.search.DispatchConfig;
@@ -967,33 +966,6 @@ public class ContentClusterTest extends ContentBaseTest {
         assertTrue(resolveThreePhaseUpdateConfigWithFeatureFlag(true));
     }
 
-    void assertDirectStorageApiRpcConfig(boolean expUseDirectStorageApiRpc, ContentNode node) {
-        var builder = new StorCommunicationmanagerConfig.Builder();
-        node.getConfig(builder);
-        var config = new StorCommunicationmanagerConfig(builder);
-        assertEquals(expUseDirectStorageApiRpc, config.use_direct_storageapi_rpc());
-    }
-
-    void assertDirectStorageApiRpcFlagIsPropagatedToConfig(boolean useDirectStorageApiRpc) {
-        VespaModel model = createEnd2EndOneNode(new TestProperties().setUseDirectStorageApiRpc(useDirectStorageApiRpc));
-
-        ContentCluster cc = model.getContentClusters().get("storage");
-        assertFalse(cc.getDistributorNodes().getChildren().isEmpty());
-        for (Distributor d : cc.getDistributorNodes().getChildren().values()) {
-            assertDirectStorageApiRpcConfig(useDirectStorageApiRpc, d);
-        }
-        assertFalse(cc.getStorageNodes().getChildren().isEmpty());
-        for (StorageNode node : cc.getStorageNodes().getChildren().values()) {
-            assertDirectStorageApiRpcConfig(useDirectStorageApiRpc, node);
-        }
-    }
-
-    @Test
-    public void use_direct_storage_api_rpc_config_is_controlled_by_properties() {
-        assertDirectStorageApiRpcFlagIsPropagatedToConfig(false);
-        assertDirectStorageApiRpcFlagIsPropagatedToConfig(true);
-    }
-
     void assertZookeeperServerImplementation(boolean reconfigurable, String expectedClassName) {
         VespaModel model = createEnd2EndOneNode(
                 new TestProperties()