Riak - Cluster join - Add additional cluster plan and cluster commit commands
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/adbf2dc1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/adbf2dc1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/adbf2dc1 Branch: refs/heads/master Commit: adbf2dc1cb5df98b1e52d3ab35fa6bb4983b722f Parents: 02efc29 Author: Valentin Aitken <[email protected]> Authored: Fri Apr 3 23:56:50 2015 +0300 Committer: Valentin Aitken <[email protected]> Committed: Fri Apr 3 23:56:50 2015 +0300 ---------------------------------------------------------------------- .../main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/adbf2dc1/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java index da336db..6d67827 100644 --- a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java +++ b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java @@ -390,6 +390,8 @@ public class RiakNodeSshDriver extends AbstractSoftwareProcessSshDriver implemen if (!hasJoinedCluster()) { ScriptHelper joinClusterScript = newScript("joinCluster") .body.append(sudo(format("%s cluster join %s", getRiakAdminCmd(), nodeName))) + .body.append(sudo(format("%s cluster plan", getRiakAdminCmd()))) + .body.append(sudo(format("%s cluster commit", getRiakAdminCmd()))) .failOnNonZeroResultCode(); if (!isRiakOnPath()) { @@ -603,7 +605,7 @@ public class RiakNodeSshDriver extends AbstractSoftwareProcessSshDriver implemen private void addRiakOnPath(ScriptHelper scriptHelper) { Map<String, String> newPathVariable = ImmutableMap.of("PATH", sbinPath); - log.warn("riak command not found on PATH. Altering future commands' environment variables from {} to {}", getShellEnvironment(), newPathVariable); +// log.warn("riak command not found on PATH. Altering future commands' environment variables from {} to {}", getShellEnvironment(), newPathVariable); scriptHelper.environmentVariablesReset(newPathVariable); } }
