You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2017/10/05 00:22:25 UTC
[1/4] brooklyn-library git commit: add load test without persistence
Repository: brooklyn-library
Updated Branches:
refs/heads/master bde6dee42 -> 7c23ff046
add load test without persistence
so we can see what else is chewing up cpu
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/71a3fd2e
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/71a3fd2e
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/71a3fd2e
Branch: refs/heads/master
Commit: 71a3fd2ebd2652dce2fd2b9678bffaed613eec27
Parents: e6eb89a
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Sep 13 17:52:08 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Sep 13 17:52:08 2017 +0100
----------------------------------------------------------------------
.../SimulatedVanillaSoftwareProcessImpl.java | 9 +++
.../brooklyn/qa/load/AbstractLoadTest.java | 8 ++-
.../qa/load/LoadWithoutPersistenceTest.java | 65 ++++++++++++++++++++
3 files changed, 80 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/71a3fd2e/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedVanillaSoftwareProcessImpl.java
----------------------------------------------------------------------
diff --git a/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedVanillaSoftwareProcessImpl.java b/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedVanillaSoftwareProcessImpl.java
index e5aea80..6b1d096 100644
--- a/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedVanillaSoftwareProcessImpl.java
+++ b/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedVanillaSoftwareProcessImpl.java
@@ -216,5 +216,14 @@ public class SimulatedVanillaSoftwareProcessImpl extends VanillaSoftwareProcessI
// no-op
}
}
+
+ @Override
+ public boolean isRunning() {
+ if (Boolean.TRUE.equals(entity.getConfig(USE_SSH_MONITORING))) {
+ return super.isRunning();
+ } else {
+ return true;
+ }
+ }
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/71a3fd2e/qa/src/test/java/org/apache/brooklyn/qa/load/AbstractLoadTest.java
----------------------------------------------------------------------
diff --git a/qa/src/test/java/org/apache/brooklyn/qa/load/AbstractLoadTest.java b/qa/src/test/java/org/apache/brooklyn/qa/load/AbstractLoadTest.java
index c07f329..56cd756 100644
--- a/qa/src/test/java/org/apache/brooklyn/qa/load/AbstractLoadTest.java
+++ b/qa/src/test/java/org/apache/brooklyn/qa/load/AbstractLoadTest.java
@@ -161,8 +161,8 @@ public class AbstractLoadTest extends AbstractYamlTest {
// Create management node
persistenceDir = Files.createTempDir();
launcher = BrooklynLauncher.newInstance()
- .persistMode(PersistMode.CLEAN)
- .highAvailabilityMode(HighAvailabilityMode.MASTER)
+ .persistMode(doPersistence() ? PersistMode.CLEAN : PersistMode.DISABLED)
+ .highAvailabilityMode(doPersistence() ? HighAvailabilityMode.MASTER : HighAvailabilityMode.DISABLED)
.persistenceDir(persistenceDir)
.start();
@@ -171,6 +171,10 @@ public class AbstractLoadTest extends AbstractYamlTest {
return launcher.getServerDetails().getManagementContext();
}
+
+ protected boolean doPersistence() {
+ return true;
+ }
@Override
protected void tearDownPlatform() {
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/71a3fd2e/qa/src/test/java/org/apache/brooklyn/qa/load/LoadWithoutPersistenceTest.java
----------------------------------------------------------------------
diff --git a/qa/src/test/java/org/apache/brooklyn/qa/load/LoadWithoutPersistenceTest.java b/qa/src/test/java/org/apache/brooklyn/qa/load/LoadWithoutPersistenceTest.java
new file mode 100644
index 0000000..c69fc4f
--- /dev/null
+++ b/qa/src/test/java/org/apache/brooklyn/qa/load/LoadWithoutPersistenceTest.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.brooklyn.qa.load;
+
+import org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess;
+import org.apache.brooklyn.util.time.Duration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.Test;
+
+import com.google.common.base.Predicates;
+import com.google.common.base.Stopwatch;
+
+public class LoadWithoutPersistenceTest extends AbstractLoadTest {
+
+ private static final Logger log = LoggerFactory.getLogger(LoadWithoutPersistenceTest.class);
+
+ @Override
+ protected boolean doPersistence() {
+ return false;
+ }
+
+ /**
+ * Creates many SSH simulated external monitor apps, to ensure resource usage not extreme.
+ *
+ * Long-term target is 2500 VMs under management.
+ * Until we reach that point, we can partition the load across multiple (separate) brooklyn management nodes.
+ */
+ @Test(groups="Acceptance")
+ public void testManyAppsExternallyMonitored() throws Exception {
+ // TODO Getting ssh error ("Server closed connection during identification exchange")
+ // with only two cycles (i.e. 20 entities).
+ //
+ // The ssh activity is from `SoftwareProcessImpl.waitForEntityStart`, which calls
+ // `VanillaSoftwareProcessSshDriver.isRunning`.
+ final int TOTAL_APPS = 500; // target is 2500 VMs; each blueprint has 2 VanillaSoftwareProcess
+ final int NUM_APPS_PER_BATCH = 10;
+ Stopwatch startTime = Stopwatch.createStarted();
+ super.runLocalhostManyApps(new TestConfig(this)
+ .execSshOnStart(false) // getting ssh errors otherwise!
+ .useSshMonitoring(false) // getting ssh errors otherwise!
+ .simulateExternalMonitor(Predicates.instanceOf(VanillaSoftwareProcess.class), 5, Duration.ONE_SECOND)
+ .clusterSize(5)
+ .totalApps(TOTAL_APPS, NUM_APPS_PER_BATCH)
+ .sleepBetweenBatch(Duration.seconds(0)));
+ log.info("Created "+TOTAL_APPS+" apps in "+Duration.of(startTime));
+ }
+
+}
[2/4] brooklyn-library git commit: set highlights on
software-specific enrichers and policies
Posted by he...@apache.org.
set highlights on software-specific enrichers and policies
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/4babb503
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/4babb503
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/4babb503
Branch: refs/heads/master
Commit: 4babb503460bbd938352b603c397214e53a1ef08
Parents: 71a3fd2
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Sep 13 17:52:43 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Sep 13 17:52:43 2017 +0100
----------------------------------------------------------------------
.../brooklyn/entity/network/bind/PrefixAndIdEnricher.java | 2 ++
.../nosql/mongodb/sharding/MongoDBRouterClusterImpl.java | 9 +++++++++
.../brooklyn/entity/dns/AbstractGeoDnsServiceImpl.java | 1 +
.../brooklyn/entity/proxy/AbstractControllerImpl.java | 1 +
.../entity/proxy/AbstractNonProvisionedControllerImpl.java | 3 +++
.../brooklyn/entity/proxy/nginx/NginxControllerImpl.java | 1 +
6 files changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/4babb503/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/PrefixAndIdEnricher.java
----------------------------------------------------------------------
diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/PrefixAndIdEnricher.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/PrefixAndIdEnricher.java
index cf03530..87a72e8 100644
--- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/PrefixAndIdEnricher.java
+++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/PrefixAndIdEnricher.java
@@ -37,6 +37,7 @@ public class PrefixAndIdEnricher extends AbstractEnricher {
public static final ConfigKey<String> PREFIX = ConfigKeys.newStringConfigKey(
"prefixandid.prefix", "Sets SENSOR to prefix+entity id");
+ @SuppressWarnings("serial")
public static final ConfigKey<AttributeSensor<?>> MONITOR = ConfigKeys.newConfigKey(new TypeToken<AttributeSensor<?>>() {},
"prefixandid.attributetomonitor", "Changes on this sensor are monitored and the prefix/id republished");
@@ -52,6 +53,7 @@ public class PrefixAndIdEnricher extends AbstractEnricher {
entity.sensors().set(SENSOR, getConfig(PREFIX) + entity.getId());
}
});
+ highlightTriggers(getConfig(MONITOR), null);
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/4babb503/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterClusterImpl.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterClusterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterClusterImpl.java
index 48b501c..ccff4e2 100644
--- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterClusterImpl.java
+++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterClusterImpl.java
@@ -30,12 +30,16 @@ import org.apache.brooklyn.core.entity.EntityPredicates;
import org.apache.brooklyn.core.entity.trait.Startable;
import org.apache.brooklyn.entity.group.AbstractMembershipTrackingPolicy;
import org.apache.brooklyn.entity.group.DynamicClusterImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
public class MongoDBRouterClusterImpl extends DynamicClusterImpl implements MongoDBRouterCluster {
+ private static final Logger log = LoggerFactory.getLogger(MongoDBRouterClusterImpl.class);
+
@Override
public void init() {
super.init();
@@ -56,12 +60,17 @@ public class MongoDBRouterClusterImpl extends DynamicClusterImpl implements Mong
public static class MemberTrackingPolicy extends AbstractMembershipTrackingPolicy {
@Override protected void onEntityEvent(EventType type, Entity member) {
+ defaultHighlightAction(type, entity);
((MongoDBRouterClusterImpl)super.entity).setAnyRouter();
}
@Override protected void onEntityRemoved(Entity member) {
+ // TODO shouldn't be invoked - remove
+ log.warn("Removal handler should be hidden by event handler", new Throwable("Trace for unexpected mongo node handler"));
((MongoDBRouterClusterImpl)super.entity).setAnyRouter();
}
@Override protected void onEntityChange(Entity member) {
+ // TODO shouldn't be invoked - remove
+ log.warn("Change handler should be hidden by event handler", new Throwable("Trace for unexpected mongo node handler"));
((MongoDBRouterClusterImpl)super.entity).setAnyRouter();
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/4babb503/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceImpl.java
index 0f96c87..d94d551 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceImpl.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceImpl.java
@@ -180,6 +180,7 @@ public abstract class AbstractGeoDnsServiceImpl extends AbstractEntity implement
public static class MemberTrackingPolicy extends AbstractMembershipTrackingPolicy {
@Override
protected void onEntityEvent(EventType type, Entity entity) {
+ defaultHighlightAction(type, entity);
((AbstractGeoDnsServiceImpl)super.entity).refreshGroupMembership();
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/4babb503/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java
index c24b2bc..34c324e 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java
@@ -154,6 +154,7 @@ public abstract class AbstractControllerImpl extends SoftwareProcessImpl impleme
public static class ServerPoolMemberTrackerPolicy extends AbstractMembershipTrackingPolicy {
@Override
protected void onEntityEvent(EventType type, Entity entity) {
+ defaultHighlightAction(type, entity);
// relies on policy-rebind injecting the implementation rather than the dynamic-proxy
((AbstractControllerImpl)super.entity).onServerPoolMemberChanged(entity);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/4babb503/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractNonProvisionedControllerImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractNonProvisionedControllerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractNonProvisionedControllerImpl.java
index c26235a..7ad7224 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractNonProvisionedControllerImpl.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractNonProvisionedControllerImpl.java
@@ -51,6 +51,7 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
+/** For use by downstream load-balancers. */
public abstract class AbstractNonProvisionedControllerImpl extends AbstractEntity implements AbstractNonProvisionedController {
private static final Logger LOG = LoggerFactory.getLogger(AbstractNonProvisionedControllerImpl.class);
@@ -66,6 +67,7 @@ public abstract class AbstractNonProvisionedControllerImpl extends AbstractEntit
public static class MemberTrackingPolicy extends AbstractMembershipTrackingPolicy {
@Override protected void onEntityEvent(EventType type, Entity member) {
+ defaultHighlightAction(type, entity);
((AbstractNonProvisionedControllerImpl)super.entity).onServerPoolMemberChanged(member);
}
}
@@ -216,6 +218,7 @@ public abstract class AbstractNonProvisionedControllerImpl extends AbstractEntit
public static class ServerPoolMemberTrackerPolicy extends AbstractMembershipTrackingPolicy {
@Override
protected void onEntityEvent(EventType type, Entity entity) {
+ defaultHighlightAction(type, entity);
// relies on policy-rebind injecting the implementation rather than the dynamic-proxy
((AbstractNonProvisionedControllerImpl)super.entity).onServerPoolMemberChanged(entity);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/4babb503/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java
index 7756909..979f915 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java
@@ -178,6 +178,7 @@ public class NginxControllerImpl extends AbstractControllerImpl implements Nginx
public static class UrlMappingsMemberTrackerPolicy extends AbstractMembershipTrackingPolicy {
@Override
protected void onEntityEvent(EventType type, Entity entity) {
+ defaultHighlightAction(type, entity);
// relies on policy-rebind injecting the implementation rather than the dynamic-proxy
((NginxControllerImpl)super.entity).updateNeeded();
}
[3/4] brooklyn-library git commit: Merge branch 'master' into
highlights-and-load
Posted by he...@apache.org.
Merge branch 'master' into highlights-and-load
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/582d2b69
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/582d2b69
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/582d2b69
Branch: refs/heads/master
Commit: 582d2b69afc45663d5422fd30f4ff334735ae245
Parents: 4babb50 bde6dee
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Oct 4 16:23:12 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Oct 4 16:23:12 2017 +0100
----------------------------------------------------------------------
examples/pom.xml | 2 +-
examples/simple-web-cluster/pom.xml | 2 +-
.../src/main/resources/catalog.bom | 2 +-
.../apache/brooklyn/demo/nodejs-riak-todo.yaml | 2 +-
.../org/apache/brooklyn/demo/nodejs-todo.yaml | 2 +-
.../main/resources/visitors-creation-script.sql | 19 +-
examples/webapps/hello-world-sql/pom.xml | 2 +-
examples/webapps/hello-world-webapp/pom.xml | 2 +-
examples/webapps/pom.xml | 2 +-
karaf/catalog/pom.xml | 2 +-
karaf/catalog/src/main/resources/catalog.bom | 31 ++
.../main/resources/library-catalog-classes.bom | 402 ------------------
karaf/features/pom.xml | 2 +-
karaf/features/src/main/feature/feature.xml | 1 +
karaf/pom.xml | 2 +-
pom.xml | 2 +-
qa/pom.xml | 2 +-
.../qa/camp/JavaWebAppsIntegrationTest.java | 10 +-
.../projects/downstream-parent-test/pom.xml | 6 +-
.../src/main/resources/catalog.bom | 2 +-
.../java-web-app-and-db-with-function.yaml | 5 +-
.../java-web-app-and-db-with-policy.bom | 7 +-
.../java-web-app-and-db-with-policy.yaml | 5 +-
qa/start-monitor.sh | 2 +-
qa/start-webcluster.sh | 2 +-
sandbox/cassandra-multicloud-snitch/pom.xml | 2 +-
sandbox/database/pom.xml | 2 +-
sandbox/extra/pom.xml | 2 +-
sandbox/mobile-app/pom.xml | 2 +-
sandbox/monitoring/pom.xml | 2 +-
.../monitoring/src/main/resources/catalog.bom | 2 +-
sandbox/nosql/pom.xml | 2 +-
software/cm/ansible/pom.xml | 2 +-
.../cm/ansible/src/main/resources/catalog.bom | 3 +-
software/cm/chef/pom.xml | 84 ++++
.../brooklyn/entity/chef/ChefAttributeFeed.java | 413 +++++++++++++++++++
.../entity/chef/ChefAttributePollConfig.java | 61 +++
.../brooklyn/entity/chef/ChefBashCommands.java | 42 ++
.../apache/brooklyn/entity/chef/ChefConfig.java | 94 +++++
.../brooklyn/entity/chef/ChefConfigs.java | 102 +++++
.../apache/brooklyn/entity/chef/ChefEntity.java | 26 ++
.../brooklyn/entity/chef/ChefEntityImpl.java | 39 ++
.../entity/chef/ChefLifecycleEffectorTasks.java | 364 ++++++++++++++++
.../brooklyn/entity/chef/ChefServerTasks.java | 97 +++++
.../brooklyn/entity/chef/ChefSoloDriver.java | 85 ++++
.../brooklyn/entity/chef/ChefSoloTasks.java | 70 ++++
.../apache/brooklyn/entity/chef/ChefTasks.java | 154 +++++++
.../entity/chef/KnifeConvergeTaskFactory.java | 249 +++++++++++
.../brooklyn/entity/chef/KnifeTaskFactory.java | 241 +++++++++++
.../chef/resolve/ChefEntitySpecResolver.java | 43 ++
...oklyn.core.resolve.entity.EntitySpecResolver | 20 +
.../resources/OSGI-INF/blueprint/blueprint.xml | 32 ++
software/cm/chef/src/main/resources/catalog.bom | 27 ++
.../cm/chef/src/main/resources/chef-logo.png | Bin 0 -> 33776 bytes
.../brooklyn/entity/chef/ChefConfigsTest.java | 40 ++
.../entity/chef/ChefLiveTestSupport.java | 99 +++++
.../chef/ChefServerTasksIntegrationTest.java | 109 +++++
.../AbstractChefToyMySqlEntityLiveTest.java | 41 ++
.../ChefSoloDriverMySqlEntityLiveTest.java | 49 +++
.../mysql/ChefSoloDriverToyMySqlEntity.java | 89 ++++
...micChefAutodetectToyMySqlEntityLiveTest.java | 43 ++
...DynamicChefServerToyMySqlEntityLiveTest.java | 50 +++
.../DynamicChefSoloToyMySqlEntityLiveTest.java | 43 ++
.../chef/mysql/DynamicToyMySqlEntityChef.java | 81 ++++
.../chef/mysql/TypedToyMySqlEntityChef.java | 55 +++
.../brooklyn-tests.pem | 27 ++
.../brooklyn-validator.pem | 27 ++
.../hosted-chef-brooklyn-credentials/knife.rb | 27 ++
software/cm/pom.xml | 7 +-
software/cm/salt/pom.xml | 2 +-
software/cm/salt/src/main/resources/catalog.bom | 3 +-
.../brooklyn/entity/cm/salt/HighstateTest.java | 4 +-
.../entity/cm/salt/SaltConfigsTest.java | 8 +-
software/database/pom.xml | 14 +-
.../entity/database/DatastoreMixins.java | 11 +-
.../database/mysql/MySqlClusterUtils.java | 2 +-
.../entity/database/mysql/MySqlNode.java | 25 +-
.../database/src/main/resources/catalog.bom | 12 +-
software/messaging/pom.xml | 2 +-
.../messaging/src/main/resources/catalog.bom | 22 +-
software/monitoring/pom.xml | 2 +-
.../monitoring/src/main/resources/catalog.bom | 3 +-
software/network/pom.xml | 2 +-
software/network/src/main/resources/catalog.bom | 3 +-
software/nosql/pom.xml | 2 +-
software/nosql/src/main/resources/catalog.bom | 91 ++--
software/osgi/pom.xml | 2 +-
software/osgi/src/main/resources/catalog.bom | 3 +-
software/webapp/pom.xml | 4 +-
.../brooklyn/entity/proxy/LoadBalancer.java | 38 +-
.../entity/proxy/nginx/NginxController.java | 30 +-
.../entity/webapp/tomcat/Tomcat8Server.java | 6 +-
.../entity/webapp/tomcat/TomcatServer.java | 20 +-
software/webapp/src/main/resources/catalog.bom | 182 +-------
94 files changed, 3339 insertions(+), 721 deletions(-)
----------------------------------------------------------------------
[4/4] brooklyn-library git commit: This closes #126
Posted by he...@apache.org.
This closes #126
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/7c23ff04
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/7c23ff04
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/7c23ff04
Branch: refs/heads/master
Commit: 7c23ff04617443a998867a21e190d07e7815b7ce
Parents: bde6dee 582d2b6
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Oct 5 01:22:17 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Oct 5 01:22:17 2017 +0100
----------------------------------------------------------------------
.../SimulatedVanillaSoftwareProcessImpl.java | 9 +++
.../brooklyn/qa/load/AbstractLoadTest.java | 8 ++-
.../qa/load/LoadWithoutPersistenceTest.java | 65 ++++++++++++++++++++
.../network/bind/PrefixAndIdEnricher.java | 2 +
.../sharding/MongoDBRouterClusterImpl.java | 9 +++
.../entity/dns/AbstractGeoDnsServiceImpl.java | 1 +
.../entity/proxy/AbstractControllerImpl.java | 1 +
.../AbstractNonProvisionedControllerImpl.java | 3 +
.../entity/proxy/nginx/NginxControllerImpl.java | 1 +
9 files changed, 97 insertions(+), 2 deletions(-)
----------------------------------------------------------------------