[5/5] brooklyn-server git commit: This closes #365
This closes #365 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f2ce1cf9 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f2ce1cf9 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f2ce1cf9 Branch: refs/heads/master Commit: f2ce1cf9204759bcb6f4fc3ea5835e13642305dd Parents: a77b338 670f83d Author: Aled Sage Authored: Wed Oct 12 14:08:20 2016 +0100 Committer: Aled Sage Committed: Wed Oct 12 14:08:20 2016 +0100 -- .../TransformerEnricherWithDslTest.java | 79 .../core/BrooklynFeatureEnablement.java | 9 +++ .../util/core/task/BasicExecutionManager.java | 54 + 3 files changed, 129 insertions(+), 13 deletions(-) --
[1/5] brooklyn-server git commit: Adds optional task startup jitter
Repository: brooklyn-server
Updated Branches:
refs/heads/master a77b33878 -> f2ce1cf92
Adds optional task startup jitter
Useful for troubleshooting/testing concurrency related code.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/42db8640
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/42db8640
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/42db8640
Branch: refs/heads/master
Commit: 42db86403e0c4f96651b93a6f720c520f92bd619
Parents: fea8a6e
Author: Svetoslav Neykov
Authored: Sun Oct 2 12:20:58 2016 +0300
Committer: Svetoslav Neykov
Committed: Tue Oct 11 09:20:11 2016 +0300
--
.../core/BrooklynFeatureEnablement.java | 9
.../util/core/task/BasicExecutionManager.java | 43 ++--
2 files changed, 49 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/42db8640/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
--
diff --git
a/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
b/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
index f2e8a0a..8bc2ffd 100644
--- a/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
+++ b/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
@@ -84,6 +84,14 @@ public class BrooklynFeatureEnablement {
public static final String FEATURE_RENAME_THREADS =
"brooklyn.executionManager.renameThreads";
/**
+ * Add a jitter to the startup of tasks for testing concurrency code.
+ * Use {@code brooklyn.executionManager.jitterThreads.maxDelay} to tune
the maximum time task
+ * startup gets delayed in milliseconds. The actual time will be a random
value between [0, maxDelay).
+ * Default is 200 milliseconds.
+ */
+public static final String FEATURE_JITTER_THREADS =
"brooklyn.executionManager.jitterThreads";
+
+/**
* When rebinding to state created from very old versions, the
catalogItemId properties will be missing which
* results in errors when OSGi bundles are used. When enabled the code
tries to infer the catalogItemId from
*
@@ -149,6 +157,7 @@ public class BrooklynFeatureEnablement {
setDefault(FEATURE_DEFAULT_STANDBY_IS_HOT_PROPERTY, false);
setDefault(FEATURE_USE_BROOKLYN_LIVE_OBJECTS_DATAGRID_STORAGE, false);
setDefault(FEATURE_RENAME_THREADS, false);
+setDefault(FEATURE_JITTER_THREADS, false);
setDefault(FEATURE_BACKWARDS_COMPATIBILITY_INFER_CATALOG_ITEM_ON_REBIND, true);
setDefault(FEATURE_AUTO_FIX_CATALOG_REF_ON_REBIND, false);
setDefault(FEATURE_SSH_ASYNC_EXEC, false);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/42db8640/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java
--
diff --git
a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java
b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java
index 8f43827..70672f9 100644
---
a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java
+++
b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java
@@ -19,7 +19,6 @@
package org.apache.brooklyn.util.core.task;
import static com.google.common.base.Preconditions.checkNotNull;
-import groovy.lang.Closure;
import java.util.Collection;
import java.util.Collections;
@@ -41,6 +40,7 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@@ -70,12 +70,13 @@ import com.google.common.base.CaseFormat;
import com.google.common.base.Function;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.common.util.concurrent.ExecutionList;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import groovy.lang.Closure;
+
/**
* Manages the execution of atomic tasks and scheduled (recurring) tasks,
* including setting tags and invoking callbacks.
@@ -84,7 +85,11 @@ public class BasicExecutionManager implements
ExecutionManager {
private static final Logger log =
LoggerFactory
[4/5] brooklyn-server git commit: Test Transformer reliability when resolving DSL
Test Transformer reliability when resolving DSL
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/670f83d1
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/670f83d1
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/670f83d1
Branch: refs/heads/master
Commit: 670f83d19ce90ab94c5446506ebeb81c23cd2a56
Parents: 05622be
Author: Svetoslav Neykov
Authored: Sun Oct 2 15:19:46 2016 +0200
Committer: Svetoslav Neykov
Committed: Tue Oct 11 09:20:19 2016 +0300
--
.../TransformerEnricherWithDslTest.java | 79
1 file changed, 79 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/670f83d1/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/enricher/TransformerEnricherWithDslTest.java
--
diff --git
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/enricher/TransformerEnricherWithDslTest.java
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/enricher/TransformerEnricherWithDslTest.java
new file mode 100644
index 000..2f4465a
--- /dev/null
+++
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/enricher/TransformerEnricherWithDslTest.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2016 The Apache Software Foundation.
+ *
+ * Licensed 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.camp.brooklyn.enricher;
+
+import static org.testng.Assert.assertEquals;
+
+import org.apache.brooklyn.api.sensor.AttributeSensor;
+import org.apache.brooklyn.api.sensor.EnricherSpec;
+import org.apache.brooklyn.camp.brooklyn.spi.dsl.methods.BrooklynDslCommon;
+import org.apache.brooklyn.core.entity.EntityAsserts;
+import org.apache.brooklyn.core.sensor.Sensors;
+import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport;
+import org.apache.brooklyn.enricher.stock.Transformer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.Test;
+
+public class TransformerEnricherWithDslTest extends BrooklynAppUnitTestSupport
{
+private static final Logger LOG =
LoggerFactory.getLogger(TransformerEnricherWithDslTest.class);
+
+int START_PORT = 1;
+
+@Test(groups="Broken")
+// See https://issues.apache.org/jira/browse/BROOKLYN-356
+public void testTransformerResolvesResolvableValues() {
+testTransformerResolvesResolvableValues(START_PORT, 200);
+}
+
+@Test(groups={"Integration", "Broken"}, invocationCount=10)
+// See https://issues.apache.org/jira/browse/BROOKLYN-356
+public void testTransformerResolvesResolvableValuesIntegration() {
+LOG.info("Starting 1000 iterations");
+testTransformerResolvesResolvableValues(START_PORT, 1000);
+}
+
+private void testTransformerResolvesResolvableValues(int portStart, int
portCount) {
+// Note: The test gets progressively slower with iterations, probably
due to the GC triggering much more frequently.
+// There's no memory leak, but doesn't seem right to be putting
so much pressure on the GC with such a simple test.
+AttributeSensor sourceSensor =
Sensors.newIntegerSensor("port");
+AttributeSensor targetSensor =
Sensors.newStringSensor("port.transformed");
+app.enrichers().add(EnricherSpec.create(Transformer.class)
+.configure(Transformer.SOURCE_SENSOR, sourceSensor)
+.configure(Transformer.TARGET_SENSOR, targetSensor)
+.configure(Transformer.TARGET_VALUE,
+// Can only use the inner-most sensor, but including
the
+// wrapping formatStrings amplifies the resolving
effort, making
+// a bug more probable to manifest.
+BrooklynDslCommon.formatString("%s",
+BrooklynDslCommon.formatString("%d",
+
BrooklynDslCommon.attributeWhenReady("port");
+
+int failures = 0;
+for (int port = portStart; port < portStart + portCount; port++) {
+app.sensors().set(sourceSensor, port);
+try {
+EntityAsserts.assertAttributeEqualsEvent
[3/5] brooklyn-server git commit: Logging - link thread name to running task
Logging - link thread name to running task
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/5fc8344c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/5fc8344c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/5fc8344c
Branch: refs/heads/master
Commit: 5fc8344c8640ac641dadaa9482cfe2314db0bbb5
Parents: 42db864
Author: Svetoslav Neykov
Authored: Sun Oct 2 15:26:49 2016 +0200
Committer: Svetoslav Neykov
Committed: Tue Oct 11 09:20:18 2016 +0300
--
.../org/apache/brooklyn/util/core/task/BasicExecutionManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5fc8344c/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java
--
diff --git
a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java
b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java
index 70672f9..8bb7705 100644
---
a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java
+++
b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java
@@ -754,7 +754,7 @@ public class BasicExecutionManager implements
ExecutionManager {
activeTaskCount.incrementAndGet();
//set thread _before_ start time, so we won't get a null thread when
there is a start-time
-if (log.isTraceEnabled()) log.trace(""+this+" beforeStart, task:
"+task);
+if (log.isTraceEnabled()) log.trace(""+this+" beforeStart, task:
"+task + " running on thread " + Thread.currentThread().getName());
if (!task.isCancelled()) {
Thread thread = Thread.currentThread();
((TaskInternal)task).setThread(thread);
[2/5] brooklyn-server git commit: Remove duplicate thread renaming
Remove duplicate thread renaming
The code in beforeStartAtomicTask overrides the value set here. Keeping the
other one as it's called for scheduled tasks as well.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/05622be2
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/05622be2
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/05622be2
Branch: refs/heads/master
Commit: 05622be2cd4ad252d1e0be6bdc086fe81563ff9d
Parents: 5fc8344
Author: Svetoslav Neykov
Authored: Sun Oct 2 12:52:13 2016 +0300
Committer: Svetoslav Neykov
Committed: Tue Oct 11 09:20:18 2016 +0300
--
.../brooklyn/util/core/task/BasicExecutionManager.java | 9 -
1 file changed, 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/05622be2/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java
--
diff --git
a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java
b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java
index 8bb7705..1bf5eca 100644
---
a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java
+++
b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java
@@ -516,13 +516,7 @@ public class BasicExecutionManager implements
ExecutionManager {
try {
T result = null;
Throwable error = null;
-String oldThreadName = Thread.currentThread().getName();
try {
-if (RENAME_THREADS) {
-String newThreadName =
oldThreadName+"-"+task.getDisplayName()+
-"["+task.getId().substring(0, 8)+"]";
-Thread.currentThread().setName(newThreadName);
-}
beforeStartAtomicTask(flags, task);
if (!task.isCancelled()) {
result = ((TaskInternal)task).getJob().call();
@@ -530,9 +524,6 @@ public class BasicExecutionManager implements
ExecutionManager {
} catch(Throwable e) {
error = e;
} finally {
-if (RENAME_THREADS) {
-Thread.currentThread().setName(oldThreadName);
-}
afterEndAtomicTask(flags, task);
}
if (error!=null) {
[2/3] brooklyn-server git commit: BROOKLYN-356: workaround, by increasing timeout
BROOKLYN-356: workaround, by increasing timeout
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/0edce987
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/0edce987
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/0edce987
Branch: refs/heads/master
Commit: 0edce9879670560c245f2f6f4df3eae9fd2c27a8
Parents: c45777f
Author: Aled Sage
Authored: Wed Oct 12 14:17:01 2016 +0100
Committer: Aled Sage
Committed: Wed Oct 12 14:17:01 2016 +0100
--
.../core/objs/AbstractConfigurationSupportInternal.java | 2 +-
.../org/apache/brooklyn/enricher/stock/Transformer.java | 2 +-
.../apache/brooklyn/util/core/task/ValueResolver.java | 12 +++-
3 files changed, 13 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0edce987/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java
--
diff --git
a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java
b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java
index 1b87d3c..61dc513 100644
---
a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java
+++
b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java
@@ -111,7 +111,7 @@ public abstract class AbstractConfigurationSupportInternal
implements BrooklynOb
.tag(BrooklynTaskTags.TRANSIENT_TASK_TAG)
.build());
try {
-T result = t.get(ValueResolver.PRETTY_QUICK_WAIT);
+T result = t.get(ValueResolver.NON_BLOCKING_WAIT);
return Maybe.of(result);
} catch (TimeoutException e) {
t.cancel(true);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0edce987/core/src/main/java/org/apache/brooklyn/enricher/stock/Transformer.java
--
diff --git
a/core/src/main/java/org/apache/brooklyn/enricher/stock/Transformer.java
b/core/src/main/java/org/apache/brooklyn/enricher/stock/Transformer.java
index 8445076..9c4e657 100644
--- a/core/src/main/java/org/apache/brooklyn/enricher/stock/Transformer.java
+++ b/core/src/main/java/org/apache/brooklyn/enricher/stock/Transformer.java
@@ -90,7 +90,7 @@ public class Transformer extends
AbstractTransformer {
return (U)
Tasks.resolving(targetValueRaw).as(targetSensor.getType())
.context(entity)
.description("Computing sensor "+targetSensor+" from
"+targetValueRaw)
-.timeout(ValueResolver.PRETTY_QUICK_WAIT)
+.timeout(ValueResolver.NON_BLOCKING_WAIT)
.getMaybe().orNull();
}
public String toString() {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0edce987/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java
--
diff --git
a/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java
b/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java
index 73309ef..2942b23 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java
@@ -83,7 +83,17 @@ public class ValueResolver implements DeferredSupplier
{
*
* See {@link #REAL_QUICK_WAIT}. */
public static Duration PRETTY_QUICK_WAIT = Duration.millis(200);
-
+
+/**
+ * Period to wait if we're expecting the operation to be non-blocking, so
want to abort if the
+ * invoked task/supplier is taking too long (likely because its value is
not yet ready, and
+ * the invoked task is blocked waiting for it).
+ *
+ * See {@link #REAL_QUICK_WAIT} and https://issues.apache.org/jira/browse/BROOKLYN-356";>BROOKLYN-356.
+ */
+@Beta
+public static final Duration NON_BLOCKING_WAIT = Duration.millis(500);
+
/** Period to wait when we have to poll but want to give the illusion of
no wait.
* See {@link Repeater#DEFAULT_REAL_QUICK_PERIOD} */
public static Duration REAL_QUICK_PERIOD =
Repeater.DEFAULT_REAL_QUICK_PERIOD;
[1/3] brooklyn-server git commit: JcloudsByonLocationResolverStubbedRebindTest: avoid taking 5 minutes
Repository: brooklyn-server
Updated Branches:
refs/heads/master f2ce1cf92 -> 0547ffab9
JcloudsByonLocationResolverStubbedRebindTest: avoid taking 5 minutes
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/c45777f3
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/c45777f3
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/c45777f3
Branch: refs/heads/master
Commit: c45777f33402b1326e637b8bd5314c295608d9a7
Parents: a77b338
Author: Aled Sage
Authored: Wed Oct 12 14:16:52 2016 +0100
Committer: Aled Sage
Committed: Wed Oct 12 14:16:52 2016 +0100
--
.../jclouds/JcloudsByonLocationResolverStubbedRebindTest.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c45777f3/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedRebindTest.java
--
diff --git
a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedRebindTest.java
b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedRebindTest.java
index 26da5e9..6d9fabd 100644
---
a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedRebindTest.java
+++
b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedRebindTest.java
@@ -55,6 +55,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -137,7 +138,10 @@ public class JcloudsByonLocationResolverStubbedRebindTest
extends AbstractJcloud
@Test
public void testRebind() throws Exception {
String spec =
"jcloudsByon:(provider=\""+SOFTLAYER_PROVIDER+"\",region=\""+SOFTLAYER_AMS01_REGION_NAME+"\",user=\"myuser\",password=\"mypassword\",hosts=\""+nodeId+"\")";
-Map specFlags =
ImmutableMap.of(JcloudsLocationConfig.COMPUTE_SERVICE_REGISTRY,
computeServiceRegistry);
+Map specFlags = ImmutableMap.builder()
+.put(JcloudsLocationConfig.COMPUTE_SERVICE_REGISTRY,
computeServiceRegistry)
+
.put(JcloudsLocation.POLL_FOR_FIRST_REACHABLE_ADDRESS_PREDICATE,
Predicates.alwaysTrue())
+.build();
FixedListMachineProvisioningLocation location =
getLocationManaged(spec, specFlags);
JcloudsSshMachineLocation machine = (JcloudsSshMachineLocation)
Iterables.getOnlyElement(location.getAllMachines());
[3/3] brooklyn-server git commit: This closes #381
This closes #381 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/0547ffab Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/0547ffab Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/0547ffab Branch: refs/heads/master Commit: 0547ffab9be131b042bdcb73330fbef6639dca16 Parents: f2ce1cf 0edce98 Author: Aled Sage Authored: Wed Oct 12 15:26:52 2016 +0100 Committer: Aled Sage Committed: Wed Oct 12 15:26:52 2016 +0100 -- .../core/objs/AbstractConfigurationSupportInternal.java | 2 +- .../org/apache/brooklyn/enricher/stock/Transformer.java | 2 +- .../apache/brooklyn/util/core/task/ValueResolver.java | 12 +++- .../JcloudsByonLocationResolverStubbedRebindTest.java | 6 +- 4 files changed, 18 insertions(+), 4 deletions(-) --
[1/2] brooklyn-server git commit: Destroy the management context after tests complete
Repository: brooklyn-server
Updated Branches:
refs/heads/master 0547ffab9 -> 1de3fb87b
Destroy the management context after tests complete
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/733a24fd
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/733a24fd
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/733a24fd
Branch: refs/heads/master
Commit: 733a24fddefe0277afad3b4639f3af7903ca92a9
Parents: a77b338
Author: Svetoslav Neykov
Authored: Wed Oct 12 13:04:46 2016 +0300
Committer: Svetoslav Neykov
Committed: Wed Oct 12 13:04:46 2016 +0300
--
.../core/objs/BasicSpecParameterFromClassTest.java | 11 ++-
1 file changed, 2 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/733a24fd/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromClassTest.java
--
diff --git
a/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromClassTest.java
b/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromClassTest.java
index 6cb33f7..3cdd66a 100644
---
a/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromClassTest.java
+++
b/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromClassTest.java
@@ -27,27 +27,20 @@ import java.util.Map;
import org.apache.brooklyn.api.catalog.CatalogConfig;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.ImplementedBy;
-import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.api.objs.SpecParameter;
import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.core.config.ConfigKeys;
import org.apache.brooklyn.core.entity.AbstractEntity;
import org.apache.brooklyn.core.entity.BrooklynConfigKeys;
-import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests;
+import org.apache.brooklyn.core.test.BrooklynMgmtUnitTestSupport;
import org.apache.brooklyn.util.core.ClassLoaderUtils;
-import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableMap;
import com.google.common.reflect.TypeToken;
-public class BasicSpecParameterFromClassTest {
-private ManagementContext mgmt;
-@BeforeMethod(alwaysRun=true)
-public void setUp() {
-mgmt = LocalManagementContextForTests.newInstance();
-}
+public class BasicSpecParameterFromClassTest extends
BrooklynMgmtUnitTestSupport {
public interface SpecParameterTestEntity extends Entity {
@CatalogConfig(label="String Key", priority=3, pinned = false)
[2/2] brooklyn-server git commit: This closes #380
This closes #380 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/1de3fb87 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/1de3fb87 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/1de3fb87 Branch: refs/heads/master Commit: 1de3fb87b723af16aa0cc587fa4ebf3f8b2fcbc7 Parents: 0547ffa 733a24f Author: Aled Sage Authored: Wed Oct 12 15:28:35 2016 +0100 Committer: Aled Sage Committed: Wed Oct 12 15:28:35 2016 +0100 -- .../core/objs/BasicSpecParameterFromClassTest.java | 11 ++- 1 file changed, 2 insertions(+), 9 deletions(-) --
