Repository: incubator-brooklyn Updated Branches: refs/heads/master c5536105e -> 265d1b21a
Update BrooklynNode default expand folder The expand folder name changed to brooklyn-dist-<version>. Also check the healthy status instead of the root URL so we know the instance has warmed up and is ready to service requests. Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ad0eb1f3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ad0eb1f3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ad0eb1f3 Branch: refs/heads/master Commit: ad0eb1f3cdcf78a5dbb62e52dcf2d286411b3fd4 Parents: b2d3f33 Author: Svetoslav Neykov <[email protected]> Authored: Tue Jul 14 22:40:55 2015 +0300 Committer: Svetoslav Neykov <[email protected]> Committed: Tue Jul 14 23:04:58 2015 +0300 ---------------------------------------------------------------------- .../brooklyn/entity/brooklynnode/BrooklynNodeImpl.java | 12 +++++------- .../entity/brooklynnode/BrooklynNodeSshDriver.java | 6 +++--- 2 files changed, 8 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ad0eb1f3/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java index 017a19d..7be6dc5 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java @@ -82,7 +82,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Range; import com.google.common.net.HostAndPort; import com.google.common.util.concurrent.Runnables; import com.google.gson.Gson; @@ -486,12 +485,11 @@ public class BrooklynNodeImpl extends SoftwareProcessImpl implements BrooklynNod .baseUri(webConsoleUri) .credentialsIfNotNull(getConfig(MANAGEMENT_USER), getConfig(MANAGEMENT_PASSWORD)) .poll(new HttpPollConfig<Boolean>(WEB_CONSOLE_ACCESSIBLE) - // TODO `BrooklynNode` shouldn't report `SERVICE_UP` until `/v1/server/healthy` returns true; - // but this should wait until v0.8.0 as we'll need managed nodes to implement `/v1/server/healthy` (added May 2015); - // when that is added BrooklynNodeIntegrationTest.waitForApps can remove the 403 check, it should require 200 always. - // .suburl("/v1/server/healthy") then check: responseTextEquals("true") - .onSuccess(HttpValueFunctions.responseCodeEquals(200)) - .setOnFailureOrException(false)) + .suburl("/v1/server/healthy") + .onSuccess(Functionals.chain(HttpValueFunctions.jsonContents(), JsonFunctions.cast(Boolean.class))) + //if using an old distribution the path doesn't exist, but at least the instance is responding + .onFailure(HttpValueFunctions.responseCodeEquals(404)) + .setOnException(false)) .poll(new HttpPollConfig<ManagementNodeState>(MANAGEMENT_NODE_STATE) .suburl("/v1/server/ha/state") .onSuccess(Functionals.chain(Functionals.chain(HttpValueFunctions.jsonContents(), JsonFunctions.cast(String.class)), Enums.fromStringFunction(ManagementNodeState.class))) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ad0eb1f3/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java index efc9546..82a98d5 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java @@ -112,7 +112,7 @@ public class BrooklynNodeSshDriver extends JavaSoftwareProcessSshDriver implemen } } } - if (subpath==null) subpath = format("brooklyn-%s", getVersion()); + if (subpath==null) subpath = format("brooklyn-dist-%s", getVersion()); setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(subpath))); } @@ -127,8 +127,8 @@ public class BrooklynNodeSshDriver extends JavaSoftwareProcessSshDriver implemen String uploadUrl = entity.getConfig(BrooklynNode.DISTRO_UPLOAD_URL); // Need to explicitly give file, because for snapshot URLs you don't get a clean filename from the URL. - // This filename is used to generate the first URL to try: - // file://$HOME/.brooklyn/repository/BrooklynNode/0.6.0-SNAPSHOT/brooklyn-0.6.0-SNAPSHOT-dist.tar.gz + // This filename is used to generate the first URL to try: [BROOKLYN_VERSION_BELOW] + // file://$HOME/.brooklyn/repository/BrooklynNode/0.8.0-SNAPSHOT/brooklynnode-0.8.0-snapshot.tar.gz // (DOWNLOAD_URL overrides this and has a default which comes from maven) List<String> urls = resolver.getTargets(); String saveAs = resolver.getFilename();
