Repository: incubator-brooklyn Updated Branches: refs/heads/master 882a4d68e -> 5f36cb028
Trivial fixes to doc/formatting/etc. Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c06c23d9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c06c23d9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c06c23d9 Branch: refs/heads/master Commit: c06c23d93939a2f041b79ab91e04973e2046c7e0 Parents: 882a4d6 Author: Sam Corbett <[email protected]> Authored: Fri Nov 20 18:14:34 2015 +0000 Committer: Sam Corbett <[email protected]> Committed: Fri Nov 20 18:14:34 2015 +0000 ---------------------------------------------------------------------- .../core/mgmt/ha/HighAvailabilityManagerImpl.java | 2 +- .../mgmt/internal/EntityManagementSupport.java | 10 ++++++++-- .../demo/WebClusterDatabaseExampleApp.java | 18 +++++++++--------- .../location/jclouds/BrooklynImageChooser.java | 2 +- .../base/AbstractSoftwareProcessDriver.java | 2 +- .../entity/nosql/couchbase/CouchbaseNodeImpl.java | 3 ++- .../entity/nosql/redis/RedisStoreImpl.java | 2 +- .../camp/brooklyn/DslAndRebindYamlTest.java | 3 ++- 8 files changed, 25 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c06c23d9/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java index d6a3efa..7e6868c 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java @@ -282,7 +282,7 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager { boolean weAreRecognisedAsMaster = existingMaster!=null && ownNodeId.equals(existingMaster.getNodeId()); boolean weAreMasterLocally = getInternalNodeState()==ManagementNodeState.MASTER; - // catch error in some tests where mgmt context has a different mgmt context + // catch error in some tests where mgmt context has a different HA manager if (managementContext.getHighAvailabilityManager()!=this) throw new IllegalStateException("Cannot start an HA manager on a management context with a different HA manager!"); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c06c23d9/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityManagementSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityManagementSupport.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityManagementSupport.java index 6b61bf6..3811542 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityManagementSupport.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityManagementSupport.java @@ -97,12 +97,18 @@ public class EntityManagementSupport { * Whether this entity is managed (i.e. "onManagementStarting" has been called, so the framework knows about it, * and it has not been unmanaged). */ - public boolean isDeployed() { return currentlyDeployed.get(); } + public boolean isDeployed() { + return currentlyDeployed.get(); + } + public boolean isNoLongerManaged() { return wasDeployed() && !isDeployed(); } + /** whether entity has ever been deployed (managed) */ - public boolean wasDeployed() { return everDeployed.get(); } + public boolean wasDeployed() { + return everDeployed.get(); + } @Beta public void setReadOnly(boolean isReadOnly) { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c06c23d9/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java index 1fb9905..5c58fee 100644 --- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java +++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java @@ -133,16 +133,16 @@ public class WebClusterDatabaseExampleApp extends AbstractApplication implements .configure(DynamicCluster.INITIAL_SIZE, 2) .configure(WebAppService.ENABLED_PROTOCOLS, ImmutableSet.of(getConfig(USE_HTTPS) ? "https" : "http")) ); - web.enrichers().add(HttpLatencyDetector.builder(). - url(ROOT_URL). - rollup(10, TimeUnit.SECONDS). - build()); + web.enrichers().add(HttpLatencyDetector.builder() + .url(ROOT_URL) + .rollup(10, TimeUnit.SECONDS) + .build()); - web.getCluster().policies().add(AutoScalerPolicy.builder(). - metric(DynamicWebAppCluster.REQUESTS_PER_SECOND_IN_WINDOW_PER_NODE). - metricRange(10, 100). - sizeRange(2, 5). - build()); + web.getCluster().policies().add(AutoScalerPolicy.builder() + .metric(DynamicWebAppCluster.REQUESTS_PER_SECOND_IN_WINDOW_PER_NODE) + .metricRange(10, 100) + .sizeRange(2, 5) + .build()); enrichers().add(Enrichers.builder() .propagating(WebAppServiceConstants.ROOT_URL, http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c06c23d9/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java index 608a949..56c2ef9 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java @@ -152,7 +152,7 @@ public class BrooklynImageChooser implements Cloneable { // on softlayer, prefer images where family is part of the image id // (this is the only way to identiy official images; but in other clouds // it can cause not-so-good images to get selected!) - if (img.getId().toLowerCase().indexOf(os.getFamily().toString().toLowerCase()) >= 0) + if (img.getId().toLowerCase().contains(os.getFamily().toString().toLowerCase())) score += 0.5; } } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c06c23d9/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java index 32de606..59dac4f 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java @@ -85,7 +85,7 @@ public abstract class AbstractSoftwareProcessDriver implements SoftwareProcessDr * process may not be completely initialised at this stage, so care is * required when implementing these stages. * <p> - * The {@link BrooklynConfigKeys#ENTITY_RUNNING} key can be set on the location + * The {@link BrooklynConfigKeys#ENTITY_STARTED} key can be set on the location * or the entity to skip the startup process if the entity is already running, * according to the {@link #isRunning()} method. To force the startup to be * skipped, {@link BrooklynConfigKeys#SKIP_ENTITY_START} can be set on the entity. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c06c23d9/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java index 049253f..68d3a54 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java @@ -192,7 +192,8 @@ public class CouchbaseNodeImpl extends SoftwareProcessImpl implements CouchbaseN Charsets.UTF_8.encode("hostname="+Urls.encode(accessible.getHostText())).array()); log.debug("Renamed Couchbase server "+this+" via "+apiUri+": "+response); if (!HttpTool.isStatusCodeHealthy(response.getResponseCode())) { - log.warn("Invalid response code, renaming "+apiUri+": "+response); + log.warn("Invalid response code, renaming {} ({}): {}", + new Object[]{apiUri, response.getResponseCode(), response.getContentAsString()}); } } catch (Exception e) { Exceptions.propagateIfFatal(e); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c06c23d9/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreImpl.java index 5b35c63..2fed9b1 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreImpl.java @@ -45,7 +45,7 @@ import com.google.common.collect.Iterables; */ public class RedisStoreImpl extends SoftwareProcessImpl implements RedisStore { @SuppressWarnings("unused") - private static final Logger LOG = LoggerFactory.getLogger(RedisStore.class); + private static final Logger LOG = LoggerFactory.getLogger(RedisStoreImpl.class); private transient SshFeed sshFeed; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c06c23d9/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/DslAndRebindYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/DslAndRebindYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/DslAndRebindYamlTest.java index 39b7ab5..31a7951 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/DslAndRebindYamlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/DslAndRebindYamlTest.java @@ -61,6 +61,7 @@ public class DslAndRebindYamlTest extends AbstractYamlTest { protected LocalManagementContext newTestManagementContext() { if (mementoDir!=null) throw new IllegalStateException("already created mgmt context"); mementoDir = Files.createTempDir(); + mementoDir.deleteOnExit(); LocalManagementContext mgmt = RebindTestUtils.newPersistingManagementContext(mementoDir, classLoader, 1); mgmtContexts.add(mgmt); return mgmt; @@ -103,7 +104,7 @@ public class DslAndRebindYamlTest extends AbstractYamlTest { Entity entity = app.getChildren().iterator().next(); Assert.assertTrue(entity instanceof TestEntity, "Expected TestEntity, found " + entity.getClass()); - return (TestEntity)entity; + return entity; } public static <T> T getConfigInTask(final Entity entity, final ConfigKey<T> key) {
