diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-11-03 15:35:27 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-11-04 15:25:28 +0100 |
commit | d0e5af97a5d4c09e2a3eed92a366bcaa76db040a (patch) | |
tree | a9a43be6ba77e746acc47dfe2580e49a2e97cbc7 /container-disc | |
parent | 3aca43e7f71c54bb2ab61bc495f85e535d4cd3fd (diff) |
- Remove cluster() from SystemInfo to only keep static information there.
- Instead provide only the cluster name.
- If you need cluster information have Cluster injected directly.
Diffstat (limited to 'container-disc')
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/SystemInfoProvider.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/SystemInfoProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/SystemInfoProvider.java index d8298491944..e9325936157 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/SystemInfoProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/SystemInfoProvider.java @@ -3,14 +3,12 @@ package com.yahoo.container.jdisc; import ai.vespa.cloud.ApplicationId; import ai.vespa.cloud.Cloud; -import ai.vespa.cloud.Cluster; import ai.vespa.cloud.Environment; import ai.vespa.cloud.Node; import ai.vespa.cloud.SystemInfo; import ai.vespa.cloud.Zone; import com.yahoo.component.annotation.Inject; import com.yahoo.cloud.config.ApplicationIdConfig; -import com.yahoo.cloud.config.ClusterInfoConfig; import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.component.AbstractComponent; import com.yahoo.container.QrConfig; @@ -29,14 +27,13 @@ public class SystemInfoProvider extends AbstractComponent implements Provider<Sy @Inject public SystemInfoProvider(ConfigserverConfig csConfig, QrConfig qrConfig, - ClusterInfoConfig ciConfig, ApplicationIdConfig applicationIdConfig) { this.instance = new SystemInfo(new ApplicationId(applicationIdConfig.tenant(), applicationIdConfig.application(), applicationIdConfig.instance()), new Zone(Environment.valueOf(csConfig.environment()), csConfig.region()), new Cloud(csConfig.cloud()), - new Cluster(ciConfig.clusterId(), ciConfig.nodeCount(), ciConfig.nodeIndices()), + qrConfig.clustername(), new Node(qrConfig.nodeIndex())); } |