diff options
author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2021-09-10 13:50:49 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2021-09-10 13:50:49 +0200 |
commit | 93cefb8353a04ff532b6e46d40863193a1114aca (patch) | |
tree | a6b3f08335c596c010f9afb6ed62ca185ef82aa3 /node-admin | |
parent | 0d078821e520188a3c65918770eb658c6bce04ba (diff) |
Revert "Add use-real-resources feature flag"
This reverts commit 7f862e85
Diffstat (limited to 'node-admin')
3 files changed, 8 insertions, 19 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/RealConfigServerClients.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/RealConfigServerClients.java index 061a06f4687..7d52b9d72b0 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/RealConfigServerClients.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/RealConfigServerClients.java @@ -2,7 +2,6 @@ package com.yahoo.vespa.hosted.node.admin.configserver; import com.yahoo.vespa.flags.FlagRepository; -import com.yahoo.vespa.flags.FlagSource; import com.yahoo.vespa.hosted.node.admin.configserver.flags.RealFlagRepository; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeRepository; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.RealNodeRepository; @@ -27,9 +26,9 @@ public class RealConfigServerClients implements ConfigServerClients { /** * @param configServerApi the backend API to use - will be closed at {@link #stop()}. */ - public RealConfigServerClients(ConfigServerApi configServerApi, FlagSource flagSource) { + public RealConfigServerClients(ConfigServerApi configServerApi) { this.configServerApi = configServerApi; - nodeRepository = new RealNodeRepository(configServerApi, flagSource); + nodeRepository = new RealNodeRepository(configServerApi); orchestrator = new OrchestratorImpl(configServerApi); state = new StateImpl(configServerApi); flagRepository = new RealFlagRepository(configServerApi); diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java index 8934100a463..50c39d5407c 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java @@ -9,10 +9,6 @@ import com.yahoo.config.provision.DockerImage; import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.NodeType; import com.yahoo.config.provision.host.FlavorOverrides; -import com.yahoo.vespa.flags.BooleanFlag; -import com.yahoo.vespa.flags.FetchVector; -import com.yahoo.vespa.flags.FlagSource; -import com.yahoo.vespa.flags.Flags; import com.yahoo.vespa.hosted.node.admin.configserver.ConfigServerApi; import com.yahoo.vespa.hosted.node.admin.configserver.HttpException; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.bindings.GetAclResponse; @@ -41,11 +37,9 @@ public class RealNodeRepository implements NodeRepository { private static final Logger logger = Logger.getLogger(RealNodeRepository.class.getName()); private final ConfigServerApi configServerApi; - private final BooleanFlag useRealResourcesFlag; - public RealNodeRepository(ConfigServerApi configServerApi, FlagSource flagSource) { + public RealNodeRepository(ConfigServerApi configServerApi) { this.configServerApi = configServerApi; - this.useRealResourcesFlag = Flags.USE_REAL_RESOURCES.bindTo(flagSource); } @Override @@ -65,7 +59,7 @@ public class RealNodeRepository implements NodeRepository { final GetNodesResponse nodesForHost = configServerApi.get(path, GetNodesResponse.class); return nodesForHost.nodes.stream() - .map(this::createNodeSpec) + .map(RealNodeRepository::createNodeSpec) .collect(Collectors.toList()); } @@ -75,7 +69,7 @@ public class RealNodeRepository implements NodeRepository { NodeRepositoryNode nodeResponse = configServerApi.get("/nodes/v2/node/" + hostName, NodeRepositoryNode.class); - return Optional.ofNullable(nodeResponse).map(this::createNodeSpec); + return Optional.ofNullable(nodeResponse).map(RealNodeRepository::createNodeSpec); } catch (HttpException.NotFoundException | HttpException.ForbiddenException e) { // Return empty on 403 in addition to 404 as it likely means we're trying to access a node that // has been deleted. When a node is deleted, the parent-child relationship no longer exists and @@ -147,7 +141,7 @@ public class RealNodeRepository implements NodeRepository { throw new NodeRepositoryException("Failed to set node state: " + response.message + " " + response.errorCode); } - private NodeSpec createNodeSpec(NodeRepositoryNode node) { + private static NodeSpec createNodeSpec(NodeRepositoryNode node) { Objects.requireNonNull(node.type, "Unknown node type"); NodeType nodeType = NodeType.valueOf(node.type); @@ -157,9 +151,6 @@ public class RealNodeRepository implements NodeRepository { Optional<NodeMembership> membership = Optional.ofNullable(node.membership) .map(m -> new NodeMembership(m.clusterType, m.clusterId, m.group, m.index, m.retired)); NodeReports reports = NodeReports.fromMap(Optional.ofNullable(node.reports).orElseGet(Map::of)); - boolean useRealResources = useRealResourcesFlag.with(FetchVector.Dimension.CLUSTER_TYPE, membership.map(m -> m.type().value())) - .with(FetchVector.Dimension.NODE_TYPE, nodeType.name()) - .value(); return new NodeSpec( node.hostname, Optional.ofNullable(node.openStackId), @@ -183,7 +174,7 @@ public class RealNodeRepository implements NodeRepository { Optional.ofNullable(node.currentFirmwareCheck).map(Instant::ofEpochMilli), Optional.ofNullable(node.modelName), nodeResources(node.resources), - nodeResources(useRealResources ? node.realResources : node.resources), + nodeResources(node.realResources), node.ipAddresses, node.additionalIpAddresses, reports, diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java index af88890f4a2..fe06812c608 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java @@ -7,7 +7,6 @@ import com.yahoo.config.provision.DockerImage; import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.NodeType; import com.yahoo.config.provision.host.FlavorOverrides; -import com.yahoo.vespa.flags.InMemoryFlagSource; import com.yahoo.vespa.hosted.node.admin.configserver.ConfigServerApi; import com.yahoo.vespa.hosted.node.admin.configserver.ConfigServerApiImpl; import com.yahoo.vespa.hosted.provision.restapi.NodesV2ApiHandler; @@ -80,7 +79,7 @@ public class RealNodeRepositoryTest { private void waitForJdiscContainerToServe(ConfigServerApi configServerApi) throws InterruptedException { Instant start = Instant.now(); - nodeRepositoryApi = new RealNodeRepository(configServerApi, new InMemoryFlagSource()); + nodeRepositoryApi = new RealNodeRepository(configServerApi); while (Instant.now().minusSeconds(120).isBefore(start)) { try { nodeRepositoryApi.getNodes("foobar"); |