summaryrefslogtreecommitdiffstats
path: root/orchestrator
diff options
context:
space:
mode:
authorHarald Musum <musum@yahoo-inc.com>2016-11-24 10:43:16 +0100
committerHarald Musum <musum@yahoo-inc.com>2016-11-24 10:43:16 +0100
commitcb637a8ed2ab0a8ef3cd27788e051e0034d61fc2 (patch)
tree12d14a4262066372e132ddc001e34ee4ffc41176 /orchestrator
parent749ee91c5f504f923cf0cc4aa6c09a0959d8819f (diff)
Improve logging and javadoc a bit
Diffstat (limited to 'orchestrator')
-rw-r--r--orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClient.java2
-rw-r--r--orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClientImpl.java10
2 files changed, 6 insertions, 6 deletions
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClient.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClient.java
index 01ce05d5a51..9d70c90fabd 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClient.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClient.java
@@ -16,7 +16,7 @@ public interface ClusterControllerClient {
ClusterControllerStateResponse setNodeState(final int storageNodeIndex, final ClusterControllerState wantedState) throws IOException;
/**
- * Requests that a cluster controller sets the requested node to the requested state.
+ * Requests that a cluster controller sets all nodes in the cluster to the requested state.
*
* @throws IOException if there was a problem communicating with the cluster controller
*/
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClientImpl.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClientImpl.java
index 0e81fdd390c..97612d5309c 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClientImpl.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClientImpl.java
@@ -34,12 +34,12 @@ public class ClusterControllerClientImpl implements ClusterControllerClient{
final ClusterControllerStateRequest stateRequest = new ClusterControllerStateRequest(state, ClusterControllerStateRequest.Condition.SAFE);
try {
- return clusterControllerApi.apply(api ->
- api.setNodeState(clusterName, storageNodeIndex, stateRequest));
+ return clusterControllerApi.apply(api -> api.setNodeState(clusterName, storageNodeIndex, stateRequest));
} catch (IOException e) {
final String message = String.format(
- "Giving up setting %s for cluster %s",
+ "Giving up setting %s for storage node with index %d in cluster %s",
stateRequest,
+ storageNodeIndex,
clusterName);
throw new IOException(message, e);
@@ -47,7 +47,7 @@ public class ClusterControllerClientImpl implements ClusterControllerClient{
}
/**
- * Requests that a cluster controller sets the requested node to the requested state.
+ * Requests that a cluster controller sets all nodes in the cluster to the requested state.
*
* @throws IOException if there was a problem communicating with the cluster controller
*/
@@ -57,7 +57,7 @@ public class ClusterControllerClientImpl implements ClusterControllerClient{
final ClusterControllerStateRequest stateRequest = new ClusterControllerStateRequest(state, ClusterControllerStateRequest.Condition.FORCE);
try {
- return clusterControllerApi.apply(api -> api.setClusterState(clusterName,stateRequest));
+ return clusterControllerApi.apply(api -> api.setClusterState(clusterName, stateRequest));
} catch (IOException e) {
final String message = String.format(
"Giving up setting %s for cluster %s",