updated to allow services a bit longer to start jboss

This commit is contained in:
Adrian Cole 2011-07-23 17:51:43 +10:00
parent 76abbe8906
commit 0a73d5a22a
1 changed files with 3 additions and 3 deletions

View File

@ -185,8 +185,8 @@ public abstract class BaseComputeServiceLiveTest {
protected void buildSocketTester() { protected void buildSocketTester() {
SocketOpen socketOpen = Guice.createInjector(getSshModule()).getInstance(SocketOpen.class); SocketOpen socketOpen = Guice.createInjector(getSshModule()).getInstance(SocketOpen.class);
socketTester = new RetryablePredicate<IPSocket>(socketOpen, 60, 1, TimeUnit.SECONDS); socketTester = new RetryablePredicate<IPSocket>(socketOpen, 60, 1, TimeUnit.SECONDS);
// wait a maximum of 30 seconds for port 8080 to open. // wait a maximum of 60 seconds for port 8080 to open.
long maxWait = TimeUnit.SECONDS.toMillis(30); long maxWait = TimeUnit.SECONDS.toMillis(60);
long interval = 50; long interval = 50;
// get more precise than default socket tester // get more precise than default socket tester
preciseSocketTester = new RetryablePredicate<IPSocket>(socketOpen, maxWait, interval, interval, preciseSocketTester = new RetryablePredicate<IPSocket>(socketOpen, maxWait, interval, interval,
@ -560,7 +560,7 @@ public abstract class BaseComputeServiceLiveTest {
stats.backgroundProcessSeconds = (currentTimeMillis() - startSeconds) / 1000; stats.backgroundProcessSeconds = (currentTimeMillis() - startSeconds) / 1000;
IPSocket socket = new IPSocket(Iterables.get(node.getPublicAddresses(), 0), 8080); IPSocket socket = new IPSocket(Iterables.get(node.getPublicAddresses(), 0), 8080);
assert preciseSocketTester.apply(socket) : node; assert preciseSocketTester.apply(socket) : String.format("failed to open socket %s on node %s", socket, node);
stats.socketOpenMilliseconds = currentTimeMillis() - startSeconds; stats.socketOpenMilliseconds = currentTimeMillis() - startSeconds;
exec = client.runScriptOnNode(node.getId(), "./" + processName + " tail", runAsRoot(false) exec = client.runScriptOnNode(node.getId(), "./" + processName + " tail", runAsRoot(false)