diff options
Diffstat (limited to 'orchestrator')
-rw-r--r-- | orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java | 4 | ||||
-rw-r--r-- | orchestrator/src/test/java/com/yahoo/vespa/orchestrator/TestIds.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java index f05d87dacde..ea45d955861 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java @@ -232,7 +232,7 @@ public class OrchestratorImpl implements Orchestrator { * * SOLUTION * The solution we're using is to order the hostnames by the globally unique application instance ID, - * e.g. hosted-vespa:routing:dev:ci-corp-us-east-1:default. In the example above, it would guarantee + * e.g. hosted-vespa:routing:dev:some-region:default. In the example above, it would guarantee * Docker host 2 would ensure ask to suspend B2 before A2. We take care of that ordering here. * * NodeGroups complicate the above picture a little: Each A1, A2, B1, and B2 is a NodeGroup that may @@ -261,7 +261,7 @@ public class OrchestratorImpl implements Orchestrator { ApplicationInstanceReference leftApplicationReference = leftNodeGroup.getApplicationReference(); ApplicationInstanceReference rightApplicationReference = rightNodeGroup.getApplicationReference(); - // ApplicationInstanceReference.toString() is e.g. "hosted-vespa:routing:dev:ci-corp-us-east-1:default" + // ApplicationInstanceReference.toString() is e.g. "hosted-vespa:routing:dev:some-region:default" return leftApplicationReference.asString().compareTo(rightApplicationReference.asString()); } diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/TestIds.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/TestIds.java index 3da844fcd7f..c71643b08e0 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/TestIds.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/TestIds.java @@ -20,5 +20,5 @@ public class TestIds { new TenantId("test-tenant2"), new ApplicationInstanceId("test-application2:test-environment:test-region:test-instance-key")); - public static final HostName HOST_NAME1 = new HostName("host1.test.corp.yahoo.com"); + public static final HostName HOST_NAME1 = new HostName("host1"); } |