Riak - remove unnecessary commit cluster plan effector
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/50ea9910 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/50ea9910 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/50ea9910 Branch: refs/heads/master Commit: 50ea99104c7e8de397ca5bdbe48f43a586ce1c05 Parents: 63bac13 Author: Valentin Aitken <[email protected]> Authored: Tue Apr 7 15:39:33 2015 +0300 Committer: Valentin Aitken <[email protected]> Committed: Wed Apr 8 02:11:15 2015 +0300 ---------------------------------------------------------------------- .../entity/nosql/riak/RiakClusterImpl.java | 5 ----- .../brooklyn/entity/nosql/riak/RiakNode.java | 7 +++---- .../entity/nosql/riak/RiakNodeDriver.java | 2 -- .../entity/nosql/riak/RiakNodeImpl.java | 5 ----- .../entity/nosql/riak/RiakNodeSshDriver.java | 20 -------------------- 5 files changed, 3 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/50ea9910/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakClusterImpl.java b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakClusterImpl.java index 386815d..becaee7 100644 --- a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakClusterImpl.java +++ b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakClusterImpl.java @@ -83,8 +83,6 @@ public class RiakClusterImpl extends DynamicClusterImpl implements RiakCluster { EntityPredicates.attributeEqualTo(RiakNode.RIAK_NODE_HAS_JOINED_CLUSTER, true), EntityPredicates.attributeEqualTo(RiakNode.SERVICE_UP, true))); if (anyNode.isPresent()) { - log.info("Planning and Committing cluster changes on node: {}, cluster: {}", anyNode.get().getId(), getId()); - Entities.invokeEffector(this, anyNode.get(), RiakNode.COMMIT_RIAK_CLUSTER).blockUntilEnded(); setAttribute(IS_CLUSTER_INIT, true); } else { log.warn("No Riak Nodes are found on the cluster: {}. Initialization Failed", getId()); @@ -152,9 +150,6 @@ public class RiakClusterImpl extends DynamicClusterImpl implements RiakCluster { if (!nodes.containsKey(member) && member.getAttribute(RiakNode.RIAK_NODE_HAS_JOINED_CLUSTER) == null) { String anyNodeName = anyNodeInCluster.get().getAttribute(RiakNode.RIAK_NODE_NAME); Entities.invokeEffectorWithArgs(this, member, RiakNode.JOIN_RIAK_CLUSTER, anyNodeName).blockUntilEnded(); - if (getAttribute(IS_CLUSTER_INIT)) { - Entities.invokeEffector(this, member, RiakNode.COMMIT_RIAK_CLUSTER).blockUntilEnded(); - } nodes.put(member, riakName); setAttribute(RIAK_CLUSTER_NODES, nodes); log.info("Added Riak node {}: {}; {} to cluster", new Object[] { this, member, getRiakName(member) }); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/50ea9910/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java index dd984b8..4625a8d 100644 --- a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java +++ b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java @@ -143,7 +143,6 @@ public interface RiakNode extends SoftwareProcess { MethodEffector<Void> JOIN_RIAK_CLUSTER = new MethodEffector<Void>(RiakNode.class, "joinCluster"); MethodEffector<Void> LEAVE_RIAK_CLUSTER = new MethodEffector<Void>(RiakNode.class, "leaveCluster"); MethodEffector<Void> REMOVE_FROM_CLUSTER = new MethodEffector<Void>(RiakNode.class, "removeNode"); - MethodEffector<Void> COMMIT_RIAK_CLUSTER = new MethodEffector<Void>(RiakNode.class, "commitCluster"); AttributeSensor<Integer> RIAK_NODE_GET_FSM_TIME_MEAN = Sensors.newIntegerSensor("riak.node_get_fsm_time_mean", "Time between reception of client read request and subsequent response to client"); AttributeSensor<Integer> RIAK_NODE_PUT_FSM_TIME_MEAN = Sensors.newIntegerSensor("riak.node_put_fsm_time_mean", "Time between reception of client write request and subsequent response to client"); @@ -182,6 +181,9 @@ public interface RiakNode extends SoftwareProcess { String getOsMajorVersion(); + // TODO add commitCluster() effector and add effectors joinCluster, leaveCluster, removeNode, recoverFailedNode which do not execute commitCluster() + // the commit where the commitCluster effector was available is adbf2dc1cb5df98b1e52d3ab35fa6bb4983b722f + @Effector(description = "Join the Riak cluster on the given node") void joinCluster(@EffectorParam(name = "nodeName") String nodeName); @@ -194,9 +196,6 @@ public interface RiakNode extends SoftwareProcess { @Effector(description = "Recover and join the Riak cluster on the given node") void recoverFailedNode(@EffectorParam(name = "nodeName") String nodeName); - @Effector(description = "Commit changes made to the Riak cluster") - void commitCluster(); - @Effector(description = "Create or modify a bucket type before activation") void bucketTypeCreate(@EffectorParam(name = "bucketTypeName") String bucketTypeName, @EffectorParam(name = "bucketTypeProperties") String bucketTypeProperties); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/50ea9910/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeDriver.java b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeDriver.java index 13ce842..5fca3cc 100644 --- a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeDriver.java +++ b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeDriver.java @@ -34,8 +34,6 @@ public interface RiakNodeDriver extends SoftwareProcessDriver { void recoverFailedNode(String nodeName); - void commitCluster(); - String getOsMajorVersion(); void bucketTypeCreate(String bucketTypeName, String bucketTypeProperties); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/50ea9910/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeImpl.java b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeImpl.java index e001989..25484d2 100644 --- a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeImpl.java +++ b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeImpl.java @@ -203,11 +203,6 @@ public class RiakNodeImpl extends SoftwareProcessImpl implements RiakNode { } @Override - public void commitCluster() { - getDriver().commitCluster(); - } - - @Override public void bucketTypeCreate(String bucketTypeName, String bucketTypeProperties) { getDriver().bucketTypeCreate(bucketTypeName, bucketTypeProperties); } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/50ea9910/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 6d67827..632d4d5 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 @@ -445,24 +445,6 @@ public class RiakNodeSshDriver extends AbstractSoftwareProcessSshDriver implemen } @Override - public void commitCluster() { - if (hasJoinedCluster()) { - ScriptHelper commitClusterScript = newScript("commitCluster") - .body.append(sudo(format("%s cluster plan", getRiakAdminCmd()))) - .body.append(sudo(format("%s cluster commit", getRiakAdminCmd()))) - .failOnNonZeroResultCode(); - - if (!isRiakOnPath()) { - addRiakOnPath(commitClusterScript); - } - commitClusterScript.execute(); - - } else { - log.warn("entity {}: is not in the riak cluster", entity.getId()); - } - } - - @Override public void bucketTypeCreate(String bucketTypeName, String bucketTypeProperties) { ScriptHelper bucketTypeCreateScript = newScript("bucket-type_create " + bucketTypeName) .body.append(sudo(format("%s bucket-type create %s %s", @@ -515,7 +497,6 @@ public class RiakNodeSshDriver extends AbstractSoftwareProcessSshDriver implemen getRiakAdminCmd(), bucketTypeName, escapeLiteralForDoubleQuotedBash(bucketTypeProperties)))) - .noExtraOutput() .failOnNonZeroResultCode(); if (!isRiakOnPath()) { addRiakOnPath(bucketTypeStatusScript); @@ -527,7 +508,6 @@ public class RiakNodeSshDriver extends AbstractSoftwareProcessSshDriver implemen public void bucketTypeActivate(String bucketTypeName) { ScriptHelper bucketTypeStatusScript = newScript("bucket-type_activate") .body.append(sudo(format("%s bucket-type activate %s", getRiakAdminCmd(), bucketTypeName))) - .noExtraOutput() .failOnNonZeroResultCode(); if (!isRiakOnPath()) { addRiakOnPath(bucketTypeStatusScript);
