From 072b9c5b30dccbb0d375974fc8dd9a5d39710878 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Mon, 11 Sep 2017 14:19:26 +0200 Subject: Revert "Revert "Move orchestrator.def to configdefinititions/"" --- configdefinitions/src/vespa/CMakeLists.txt | 2 ++ configdefinitions/src/vespa/orchestrator.def | 5 +++++ orchestrator/pom.xml | 6 ++++++ orchestrator/src/main/resources/configdefinitions/orchestrator.def | 5 ----- 4 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 configdefinitions/src/vespa/orchestrator.def delete mode 100644 orchestrator/src/main/resources/configdefinitions/orchestrator.def diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt index 96a48acb72b..1566e97ff3a 100644 --- a/configdefinitions/src/vespa/CMakeLists.txt +++ b/configdefinitions/src/vespa/CMakeLists.txt @@ -34,6 +34,8 @@ vespa_generate_config(configdefinitions messagetyperouteselectorpolicy.def) install(FILES messagetyperouteselectorpolicy.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(configdefinitions model.def) install(FILES model.def DESTINATION var/db/vespa/config_server/serverdb/classes) +vespa_generate_config(configdefinitions orchestrator.def) +install(FILES orchestrator.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(configdefinitions persistence.def) install(FILES persistence.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(configdefinitions rank-profiles.def) diff --git a/configdefinitions/src/vespa/orchestrator.def b/configdefinitions/src/vespa/orchestrator.def new file mode 100644 index 00000000000..a546f8e8a1c --- /dev/null +++ b/configdefinitions/src/vespa/orchestrator.def @@ -0,0 +1,5 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=vespa.orchestrator + +# TODO: Change the default to actual latency in real setup. +serviceMonitorConvergenceLatencySeconds int default=0 diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml index 55bf086dfc7..c2091e74435 100644 --- a/orchestrator/pom.xml +++ b/orchestrator/pom.xml @@ -71,6 +71,12 @@ ${project.version} provided + + com.yahoo.vespa + configdefinitions + ${project.version} + provided + org.glassfish.jersey.ext jersey-proxy-client diff --git a/orchestrator/src/main/resources/configdefinitions/orchestrator.def b/orchestrator/src/main/resources/configdefinitions/orchestrator.def deleted file mode 100644 index a546f8e8a1c..00000000000 --- a/orchestrator/src/main/resources/configdefinitions/orchestrator.def +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=vespa.orchestrator - -# TODO: Change the default to actual latency in real setup. -serviceMonitorConvergenceLatencySeconds int default=0 -- cgit v1.2.3 From 7fa3328a3bb885f0e376c5dd39ca6b27c18c213b Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Sat, 16 Sep 2017 13:38:56 +0200 Subject: Move orchestrator config to itw own package --- .../main/java/com/yahoo/vespa/orchestrator/config/package-info.java | 6 ++++++ configdefinitions/src/vespa/orchestrator.def | 2 +- .../main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java | 1 + .../java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 configdefinitions/src/main/java/com/yahoo/vespa/orchestrator/config/package-info.java diff --git a/configdefinitions/src/main/java/com/yahoo/vespa/orchestrator/config/package-info.java b/configdefinitions/src/main/java/com/yahoo/vespa/orchestrator/config/package-info.java new file mode 100644 index 00000000000..f6ee478cc9f --- /dev/null +++ b/configdefinitions/src/main/java/com/yahoo/vespa/orchestrator/config/package-info.java @@ -0,0 +1,6 @@ +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +@ExportPackage +package com.yahoo.vespa.orchestrator.config; + +import com.yahoo.api.annotations.PublicApi; +import com.yahoo.osgi.annotation.ExportPackage; diff --git a/configdefinitions/src/vespa/orchestrator.def b/configdefinitions/src/vespa/orchestrator.def index a546f8e8a1c..ab52c777398 100644 --- a/configdefinitions/src/vespa/orchestrator.def +++ b/configdefinitions/src/vespa/orchestrator.def @@ -1,5 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=vespa.orchestrator +namespace=vespa.orchestrator.config # TODO: Change the default to actual latency in real setup. serviceMonitorConvergenceLatencySeconds int default=0 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 ea45d955861..e88e8a7dd4a 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java @@ -9,6 +9,7 @@ import com.yahoo.vespa.applicationmodel.ApplicationInstanceReference; import com.yahoo.vespa.applicationmodel.ClusterId; import com.yahoo.vespa.applicationmodel.HostName; import com.yahoo.vespa.applicationmodel.ServiceCluster; +import com.yahoo.vespa.orchestrator.config.OrchestratorConfig; import com.yahoo.vespa.orchestrator.controller.ClusterControllerClient; import com.yahoo.vespa.orchestrator.controller.ClusterControllerClientFactory; import com.yahoo.vespa.orchestrator.controller.ClusterControllerNodeState; diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java index 11518bb4545..92d6216583f 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java @@ -5,6 +5,7 @@ import com.yahoo.config.provision.ApplicationId; import com.yahoo.vespa.applicationmodel.ApplicationInstance; import com.yahoo.vespa.applicationmodel.ApplicationInstanceReference; import com.yahoo.vespa.applicationmodel.HostName; +import com.yahoo.vespa.orchestrator.config.OrchestratorConfig; import com.yahoo.vespa.orchestrator.controller.ClusterControllerClientFactoryMock; import com.yahoo.vespa.orchestrator.policy.BatchHostStateChangeDeniedException; import com.yahoo.vespa.orchestrator.policy.HostStateChangeDeniedException; -- cgit v1.2.3