You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ge...@apache.org on 2018/01/23 12:30:39 UTC
[1/2] brooklyn-server git commit: BROOKLYN-574: wait for child running
Repository: brooklyn-server
Updated Branches:
refs/heads/master 41af8d5fd -> 3d5bade5f
BROOKLYN-574: wait for child running
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/826865d2
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/826865d2
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/826865d2
Branch: refs/heads/master
Commit: 826865d2c72b43367a41ad934ba05731591a8bb3
Parents: 5a0c7a8
Author: Aled Sage <al...@gmail.com>
Authored: Mon Jan 22 15:49:34 2018 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Jan 22 15:49:34 2018 +0000
----------------------------------------------------------------------
.../LoopOverGroupMembersTestCaseImpl.java | 27 ++++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/826865d2/test-framework/src/main/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCaseImpl.java
----------------------------------------------------------------------
diff --git a/test-framework/src/main/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCaseImpl.java b/test-framework/src/main/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCaseImpl.java
index d64b270..d8d768e 100644
--- a/test-framework/src/main/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCaseImpl.java
+++ b/test-framework/src/main/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCaseImpl.java
@@ -21,6 +21,7 @@ package org.apache.brooklyn.test.framework;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.concurrent.Callable;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.EntitySpec;
@@ -32,6 +33,8 @@ import org.apache.brooklyn.core.entity.lifecycle.Lifecycle;
import org.apache.brooklyn.core.entity.trait.Startable;
import org.apache.brooklyn.util.exceptions.Exceptions;
import org.apache.brooklyn.util.guava.Maybe;
+import org.apache.brooklyn.util.repeat.Repeater;
+import org.apache.brooklyn.util.time.Duration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -78,10 +81,10 @@ public class LoopOverGroupMembersTestCaseImpl extends TargetableTestComponentImp
try {
TargetableTestComponent targetableTestComponent = this.addChild(testSpecCopy);
targetableTestComponent.start(locations);
- if (Lifecycle.RUNNING.equals(targetableTestComponent.sensors().get(Attributes.SERVICE_STATE_ACTUAL))) {
+ if (isChildRunningEventually(targetableTestComponent, Duration.FIVE_SECONDS)) {
logger.debug("Task of {} successfully run, targetting {}", this, member);
} else {
- logger.warn("Problem in child test-case of {}, targetting {}", this, member);
+ logger.warn("Problem in child test-case of {}, child {} targetting {}", new Object[] {this, targetableTestComponent, member});
allSuccesful = false;
}
} catch (Throwable t) {
@@ -132,4 +135,24 @@ public class LoopOverGroupMembersTestCaseImpl extends TargetableTestComponentImp
stop();
start(locations);
}
+
+ private boolean isChildRunningEventually(Entity entity, Duration timeout) {
+ // Use 'eventually' because start() does not guarantee that service.state will have been set;
+ // it could set service.isUp and expected state, so slight delay before service.state is inferred.
+ // However, if on_fire then fail immediately.
+
+ Callable<Boolean> untilCondition = () -> {
+ return Lifecycle.RUNNING.equals(entity.sensors().get(Attributes.SERVICE_STATE_ACTUAL))
+ || Lifecycle.ON_FIRE.equals(entity.sensors().get(Attributes.SERVICE_STATE_ACTUAL));
+ };
+
+ Repeater.create("is-child-running "+entity)
+ .backoffTo(timeout.multiply(0.1))
+ .limitTimeTo(timeout)
+ .rethrowException()
+ .until(untilCondition)
+ .run();
+
+ return Lifecycle.RUNNING.equals(entity.sensors().get(Attributes.SERVICE_STATE_ACTUAL));
+ }
}
[2/2] brooklyn-server git commit: Closes #937
Posted by ge...@apache.org.
Closes #937
BROOKLYN-574: wait for child running
See https://issues.apache.org/jira/browse/BROOKLYN-574
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3d5bade5
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3d5bade5
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/3d5bade5
Branch: refs/heads/master
Commit: 3d5bade5fd753db178a7f6e083b7aeaae1eff955
Parents: 41af8d5 826865d
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Tue Jan 23 12:30:34 2018 +0000
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Tue Jan 23 12:30:34 2018 +0000
----------------------------------------------------------------------
.../LoopOverGroupMembersTestCaseImpl.java | 27 ++++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-)
----------------------------------------------------------------------