You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/04/13 02:51:23 UTC
[3/4] incubator-brooklyn git commit: Add uniqueTag for policies
Add uniqueTag for policies
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/68464399
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/68464399
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/68464399
Branch: refs/heads/master
Commit: 68464399e2ee455e2d8beff37330f1e6cedd575e
Parents: 75f0002
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Tue Mar 31 14:20:18 2015 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Tue Apr 7 14:38:18 2015 +0300
----------------------------------------------------------------------
.../src/main/java/brooklyn/policy/ha/ConditionalSuspendPolicy.java | 2 ++
policy/src/main/java/brooklyn/policy/ha/ServiceRestarter.java | 2 ++
.../main/java/brooklyn/policy/ha/SshMachineFailureDetector.java | 2 ++
3 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68464399/policy/src/main/java/brooklyn/policy/ha/ConditionalSuspendPolicy.java
----------------------------------------------------------------------
diff --git a/policy/src/main/java/brooklyn/policy/ha/ConditionalSuspendPolicy.java b/policy/src/main/java/brooklyn/policy/ha/ConditionalSuspendPolicy.java
index 6e37ef9..cc2ab3a 100644
--- a/policy/src/main/java/brooklyn/policy/ha/ConditionalSuspendPolicy.java
+++ b/policy/src/main/java/brooklyn/policy/ha/ConditionalSuspendPolicy.java
@@ -30,6 +30,7 @@ import brooklyn.event.SensorEventListener;
import brooklyn.policy.Policy;
import brooklyn.policy.basic.AbstractPolicy;
import brooklyn.util.flags.SetFromFlag;
+import brooklyn.util.javalang.JavaClassNames;
import com.google.common.base.Preconditions;
@@ -57,6 +58,7 @@ public class ConditionalSuspendPolicy extends AbstractPolicy {
Preconditions.checkNotNull(target, "Suspend target required");
Preconditions.checkNotNull(getTargetPolicy(), "Can't find target policy set in " + SUSPEND_TARGET.getName() + ": " + target);
subscribe();
+ uniqueTag = JavaClassNames.simpleClassName(getClass())+":"+getConfig(SUSPEND_SENSOR).getName()+":"+getConfig(RESUME_SENSOR).getName();
}
private void subscribe() {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68464399/policy/src/main/java/brooklyn/policy/ha/ServiceRestarter.java
----------------------------------------------------------------------
diff --git a/policy/src/main/java/brooklyn/policy/ha/ServiceRestarter.java b/policy/src/main/java/brooklyn/policy/ha/ServiceRestarter.java
index 3a0b6d4..b71d6d6 100644
--- a/policy/src/main/java/brooklyn/policy/ha/ServiceRestarter.java
+++ b/policy/src/main/java/brooklyn/policy/ha/ServiceRestarter.java
@@ -43,6 +43,7 @@ import brooklyn.policy.ha.HASensors.FailureDescriptor;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.config.ConfigBag;
import brooklyn.util.flags.SetFromFlag;
+import brooklyn.util.javalang.JavaClassNames;
import brooklyn.util.time.Duration;
import brooklyn.util.time.Time;
@@ -91,6 +92,7 @@ public class ServiceRestarter extends AbstractPolicy {
public ServiceRestarter(ConfigBag configBag) {
// TODO hierarchy should use ConfigBag, and not change flags
super(configBag.getAllConfigMutable());
+ uniqueTag = JavaClassNames.simpleClassName(getClass())+":"+getConfig(FAILURE_SENSOR_TO_MONITOR).getName();
}
public ServiceRestarter(Sensor<?> failureSensorToMonitor) {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68464399/policy/src/main/java/brooklyn/policy/ha/SshMachineFailureDetector.java
----------------------------------------------------------------------
diff --git a/policy/src/main/java/brooklyn/policy/ha/SshMachineFailureDetector.java b/policy/src/main/java/brooklyn/policy/ha/SshMachineFailureDetector.java
index 435592e..ee1c6ee 100644
--- a/policy/src/main/java/brooklyn/policy/ha/SshMachineFailureDetector.java
+++ b/policy/src/main/java/brooklyn/policy/ha/SshMachineFailureDetector.java
@@ -43,6 +43,7 @@ import com.google.common.collect.ImmutableMap;
+ "emitting an event if the connection is lost/restored")
public class SshMachineFailureDetector extends AbstractFailureDetector {
private static final Logger LOG = LoggerFactory.getLogger(SshMachineFailureDetector.class);
+ public static final String DEFAULT_UNIQUE_TAG = "failureDetector.sshMachine.tag";
public static final BasicNotificationSensor<FailureDescriptor> CONNECTION_FAILED = HASensors.CONNECTION_FAILED;
@@ -63,6 +64,7 @@ public class SshMachineFailureDetector extends AbstractFailureDetector {
if (config().getRaw(POLL_PERIOD).isAbsent()) {
config().set(POLL_PERIOD, Duration.ONE_MINUTE);
}
+ uniqueTag = DEFAULT_UNIQUE_TAG;
}
@Override