You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/05/03 08:57:23 UTC
[1/4] brooklyn-server git commit: Fixes integration test failures
Repository: brooklyn-server
Updated Branches:
refs/heads/master ba7b4961f -> f07b6f06a
Fixes integration test failures
Or disables failing tests which can't be fixed now.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/30388c17
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/30388c17
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/30388c17
Branch: refs/heads/master
Commit: 30388c171c351273f40ea771617d96279aa1f9ad
Parents: 1599d7a
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Thu Apr 6 17:07:41 2017 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Apr 6 17:07:41 2017 +0300
----------------------------------------------------------------------
.../ApplicationLifecycleStateStressTest.java | 6 ++++
.../entity/ApplicationLifecycleStateTest.java | 9 +++++-
.../core/mgmt/rebind/RebindTestUtils.java | 1 -
...okeEffectorOnCollectionSensorChangeTest.java | 4 ++-
...ftwareProcessAndChildrenIntegrationTest.java | 30 ++++++++++++++++++--
5 files changed, 45 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/30388c17/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java
index f333b43..cacd86b 100644
--- a/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java
@@ -67,16 +67,22 @@ public class ApplicationLifecycleStateStressTest extends ApplicationLifecycleSta
super.testStartsThenSomeChildFailsCausesAppToFail();
}
+ /** See {@link ApplicationLifecycleStateTest#testChildFailuresOnStartButWithQuorumCausesAppToSucceed()} for details on the failure */
+ @Test(groups="Broken")
@Override
public void testChildFailuresOnStartButWithQuorumCausesAppToSucceed() throws Exception {
super.testChildFailuresOnStartButWithQuorumCausesAppToSucceed();
}
+ /** See {@link ApplicationLifecycleStateTest#testChildFailuresOnStartButWithQuorumCausesAppToSucceed()} for details on the failure */
+ @Test(groups="Broken")
@Override
public void testStartsThenChildFailsButWithQuorumCausesAppToSucceed() throws Exception {
super.testStartsThenChildFailsButWithQuorumCausesAppToSucceed();
}
+ /** See {@link ApplicationLifecycleStateTest#testChildFailuresOnStartButWithQuorumCausesAppToSucceed()} for details on the failure */
+ @Test(groups="Broken")
@Override
public void testStartsThenChildFailsButWithQuorumCausesAppToStayHealthy() throws Exception {
super.testStartsThenChildFailsButWithQuorumCausesAppToStayHealthy();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/30388c17/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateTest.java
index a27e3f3..3c21291 100644
--- a/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateTest.java
@@ -158,6 +158,9 @@ public class ApplicationLifecycleStateTest extends BrooklynMgmtUnitTestSupport {
//
// See https://github.com/apache/brooklyn-server/pull/452 and https://github.com/apache/brooklyn-server/pull/454
// for further discussion of fix/issue.
+ //
+ // AbstractMultipleSensorAggregator.onEvent sees SERVICE_STATE_ACTUAL events in the wrong order (running, starting) which leads to
+ // the quorum check failing in ComputeServiceIndicatorsFromChildrenAndMembers.
@Test(groups="Broken")
public void testChildFailuresOnStartButWithQuorumCausesAppToSucceed() throws Exception {
TestApplication app = mgmt.getEntityManager().createEntity(EntitySpec.create(TestApplication.class)
@@ -170,7 +173,9 @@ public class ApplicationLifecycleStateTest extends BrooklynMgmtUnitTestSupport {
startAndAssertException(app, ImmutableList.<Location>of());
assertUpAndRunningEventually(app);
}
-
+
+ // Same as testChildFailuresOnStartButWithQuorumCausesAppToSucceed
+ @Test(groups="Broken")
public void testStartsThenChildFailsButWithQuorumCausesAppToSucceed() throws Exception {
TestApplication app = mgmt.getEntityManager().createEntity(EntitySpec.create(TestApplication.class)
.configure(StartableApplication.UP_QUORUM_CHECK, QuorumCheck.QuorumChecks.atLeastOne())
@@ -186,6 +191,8 @@ public class ApplicationLifecycleStateTest extends BrooklynMgmtUnitTestSupport {
assertHealthContinually(app, Lifecycle.RUNNING, true);
}
+ // Same as testChildFailuresOnStartButWithQuorumCausesAppToSucceed
+ @Test(groups="Broken")
public void testStartsThenChildFailsButWithQuorumCausesAppToStayHealthy() throws Exception {
TestApplication app = mgmt.getEntityManager().createEntity(EntitySpec.create(TestApplication.class)
.configure(StartableApplication.UP_QUORUM_CHECK, QuorumCheck.QuorumChecks.atLeastOne())
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/30388c17/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestUtils.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestUtils.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestUtils.java
index fa59b5a..f274ad5 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestUtils.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestUtils.java
@@ -238,7 +238,6 @@ public class RebindTestUtils {
classLoader);
((RebindManagerImpl) unstarted.getRebindManager()).setPeriodicPersistPeriod(persistPeriod);
unstarted.getRebindManager().setPersister(newPersister, PersistenceExceptionHandlerImpl.builder().build());
- unstarted.getHighAvailabilityManager().disabled();
// set the HA persister, in case any children want to use HA
unstarted.getHighAvailabilityManager().setPersister(new ManagementPlaneSyncRecordPersisterToObjectStore(unstarted, objectStore, classLoader));
return unstarted;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/30388c17/core/src/test/java/org/apache/brooklyn/policy/InvokeEffectorOnCollectionSensorChangeTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/policy/InvokeEffectorOnCollectionSensorChangeTest.java b/core/src/test/java/org/apache/brooklyn/policy/InvokeEffectorOnCollectionSensorChangeTest.java
index ac03b33..b25e76c 100644
--- a/core/src/test/java/org/apache/brooklyn/policy/InvokeEffectorOnCollectionSensorChangeTest.java
+++ b/core/src/test/java/org/apache/brooklyn/policy/InvokeEffectorOnCollectionSensorChangeTest.java
@@ -59,6 +59,7 @@ import com.google.common.reflect.TypeToken;
public class InvokeEffectorOnCollectionSensorChangeTest extends BrooklynAppUnitTestSupport {
+ @SuppressWarnings("serial")
private static final AttributeSensor<Collection<Integer>> DEFAULT_SENSOR = Sensors.newSensor(new TypeToken<Collection<Integer>>() {},
"invokeeffectoronsetchangetest.sensor");
@@ -72,7 +73,7 @@ public class InvokeEffectorOnCollectionSensorChangeTest extends BrooklynAppUnitT
TestEntity testEntity;
@Override
- @BeforeMethod
+ @BeforeMethod(alwaysRun=true)
public void setUp() throws Exception {
super.setUp();
onAddedParameters = new LinkedBlockingQueue<>();
@@ -173,6 +174,7 @@ public class InvokeEffectorOnCollectionSensorChangeTest extends BrooklynAppUnitT
@Test
public void testMapValueUsedAsArgumentDirectly() {
+ @SuppressWarnings("serial")
AttributeSensor<Collection<Map<String, String>>> sensor = Sensors.newSensor(new TypeToken<Collection<Map<String, String>>>() {},
"testMapValueUsedAsArgumentDirectly");
final Set<Map<String, String>> input1 = ImmutableSet.<Map<String, String>>of(
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/30388c17/software/base/src/test/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessAndChildrenIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessAndChildrenIntegrationTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessAndChildrenIntegrationTest.java
index a87aada..f872a63 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessAndChildrenIntegrationTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessAndChildrenIntegrationTest.java
@@ -87,7 +87,20 @@ public class VanillaSoftwareProcessAndChildrenIntegrationTest {
Assert.assertTrue(startTime >= PARENT_TASK_SLEEP_LENGTH_SECS*1000 - EARLY_RETURN_GRACE_MS, "startTime="+Time.makeTimeStringRounded(startTime));
}
- @Test(groups = "Integration")
+// Fails with:
+//
+// Exception java.lang.AssertionError
+//
+// Message: should have started concurrently, not with time difference 11 (VanillaSoftwareProcessImpl{id=ih1ke4z3ck}, VanillaSoftwareProcessImpl{id=vc9jie95kw}) expected [true] but found [false]
+//
+// Stacktrace:
+//
+// at org.testng.Assert.fail(Assert.java:94)
+// at org.testng.Assert.failNotEquals(Assert.java:513)
+// at org.testng.Assert.assertTrue(Assert.java:42)
+// at org.apache.brooklyn.entity.software.base.VanillaSoftwareProcessAndChildrenIntegrationTest.testModeForeground(VanillaSoftwareProcessAndChildrenIntegrationTest.java:96)
+//
+ @Test(groups = {"Integration", "Broken"})
public void testModeForeground() {
prep(ChildStartableMode.FOREGROUND);
long startTime = startApp();
@@ -107,7 +120,20 @@ public class VanillaSoftwareProcessAndChildrenIntegrationTest {
Assert.assertTrue(startTime >= 2*PARENT_TASK_SLEEP_LENGTH_SECS*1000 - EARLY_RETURN_GRACE_MS, "startTime="+Time.makeTimeStringRounded(startTime));
}
- @Test(groups = "Integration")
+// Fails with:
+//
+// Exception java.lang.AssertionError
+//
+// Message: should have started concurrently, not with time difference 10 (VanillaSoftwareProcessImpl{id=qtk67oje92}, VanillaSoftwareProcessImpl{id=ur1wafzwdg}) expected [true] but found [false]
+//
+// Stacktrace:
+//
+// at org.testng.Assert.fail(Assert.java:94)
+// at org.testng.Assert.failNotEquals(Assert.java:513)
+// at org.testng.Assert.assertTrue(Assert.java:42)
+// at org.apache.brooklyn.entity.software.base.VanillaSoftwareProcessAndChildrenIntegrationTest.testModeBackground(VanillaSoftwareProcessAndChildrenIntegrationTest.java:118)
+//
+ @Test(groups = {"Integration", "Broken"})
public void testModeBackground() {
prep(ChildStartableMode.BACKGROUND);
long startTime = startApp();
[2/4] brooklyn-server git commit: Adds tests which trigger the root
cause leading to failures in
testChildFailuresOnStartButWithQuorumCausesAppToSucceed
Posted by dr...@apache.org.
Adds tests which trigger the root cause leading to failures in testChildFailuresOnStartButWithQuorumCausesAppToSucceed
The tests are indeterministic - fail a couple of times per 100 invocations when executing with "mvn test" in the brooklyn-itest docker container.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/49749488
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/49749488
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/49749488
Branch: refs/heads/master
Commit: 49749488e91cb50422a0c0881c80bfef7e78bc2c
Parents: 30388c1
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Thu Apr 6 17:11:17 2017 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Apr 6 17:11:17 2017 +0300
----------------------------------------------------------------------
.../ApplicationLifecycleStateStressTest.java | 18 ++
.../entity/ApplicationLifecycleStateTest.java | 207 +++++++++++++++++++
2 files changed, 225 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/49749488/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java
index cacd86b..a6a6f9f 100644
--- a/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java
@@ -87,4 +87,22 @@ public class ApplicationLifecycleStateStressTest extends ApplicationLifecycleSta
public void testStartsThenChildFailsButWithQuorumCausesAppToStayHealthy() throws Exception {
super.testStartsThenChildFailsButWithQuorumCausesAppToStayHealthy();
}
+
+ @Test(groups="Broken")
+ @Override
+ public void testSettingSensorFromThreads() {
+ super.testSettingSensorFromThreads();
+ }
+
+ @Test(groups="Broken")
+ @Override
+ public void testWrongSensorInitValue() {
+ super.testWrongSensorInitValue();
+ }
+
+ @Test(groups="Broken")
+ @Override
+ public void testAbstractEnricherDeduplicationBroken() {
+ super.testAbstractEnricherDeduplicationBroken();
+ }
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/49749488/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateTest.java
index 3c21291..7afe2f6 100644
--- a/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateTest.java
@@ -18,32 +18,62 @@
*/
package org.apache.brooklyn.core.entity;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.EntitySpec;
import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.api.mgmt.Task;
+import org.apache.brooklyn.api.sensor.AttributeSensor;
+import org.apache.brooklyn.api.sensor.EnricherSpec;
+import org.apache.brooklyn.api.sensor.Sensor;
+import org.apache.brooklyn.api.sensor.SensorEvent;
+import org.apache.brooklyn.api.sensor.SensorEventListener;
+import org.apache.brooklyn.core.enricher.AbstractEnricher;
import org.apache.brooklyn.core.entity.lifecycle.Lifecycle;
import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic;
+import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic.ServiceNotUpLogic;
import org.apache.brooklyn.core.entity.trait.FailingEntity;
+import org.apache.brooklyn.core.entity.trait.Startable;
+import org.apache.brooklyn.core.sensor.Sensors;
import org.apache.brooklyn.core.test.BrooklynMgmtUnitTestSupport;
import org.apache.brooklyn.core.test.entity.TestApplication;
import org.apache.brooklyn.core.test.entity.TestApplicationImpl;
+import org.apache.brooklyn.core.test.entity.TestApplicationNoEnrichersImpl;
import org.apache.brooklyn.core.test.entity.TestEntity;
+import org.apache.brooklyn.core.test.entity.TestEntityNoEnrichersImpl;
+import org.apache.brooklyn.enricher.stock.AbstractMultipleSensorAggregator;
+import org.apache.brooklyn.entity.stock.BasicEntity;
import org.apache.brooklyn.test.Asserts;
import org.apache.brooklyn.util.collections.CollectionFunctionals;
+import org.apache.brooklyn.util.collections.MutableList;
import org.apache.brooklyn.util.collections.QuorumCheck;
import org.apache.brooklyn.util.core.task.ValueResolver;
+import org.apache.brooklyn.util.time.Time;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.testng.annotations.Test;
import com.google.common.base.Predicates;
+import com.google.common.base.Suppliers;
+import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
+import com.google.common.collect.Ordering;
@Test
public class ApplicationLifecycleStateTest extends BrooklynMgmtUnitTestSupport {
+ private static final Logger log = LoggerFactory.getLogger(ApplicationLifecycleStateTest.class);
public void testHappyPathEmptyApp() throws Exception {
TestApplication app = mgmt.getEntityManager().createEntity(EntitySpec.create(TestApplication.class));
@@ -182,13 +212,19 @@ public class ApplicationLifecycleStateTest extends BrooklynMgmtUnitTestSupport {
.configure(StartableApplication.RUNNING_QUORUM_CHECK, QuorumCheck.QuorumChecks.atLeastOne())
.child(EntitySpec.create(TestEntity.class))
.child(EntitySpec.create(TestEntity.class)));
+
TestEntity child = (TestEntity) Iterables.get(app.getChildren(), 0);
app.start(ImmutableList.<Location>of());
assertUpAndRunningEventually(app);
+
+ for (Entity childr : app.getChildren()) {
+ EntityAsserts.assertAttributeEquals(childr, TestEntity.SERVICE_STATE_ACTUAL, Lifecycle.RUNNING);
+ }
ServiceStateLogic.ServiceNotUpLogic.updateNotUpIndicator(child, "myIndicator", "Simulate not-up of child");
assertHealthContinually(app, Lifecycle.RUNNING, true);
+ mgmt.getEntityManager().unmanage(app);
}
// Same as testChildFailuresOnStartButWithQuorumCausesAppToSucceed
@@ -208,6 +244,169 @@ public class ApplicationLifecycleStateTest extends BrooklynMgmtUnitTestSupport {
assertUpAndRunningEventually(app);
}
+ /**
+ * Sensor value does not match the order of events. For example events are running, starting,
+ * but sensor value is running.
+ * Causes a problem with ComputeServiceIndicatorsFromChildrenAndMembers which will flag the entity
+ * on-fire event though children are running.
+ *
+ * Indeterministic, fails a couple of times per 100 invocations when run with "mvn test" in the
+ * brooklyn-itest docker container.
+ */
+ @Test(groups="Broken")
+ public void testSettingSensorFromThreads() {
+ final TestApplication app = mgmt.getEntityManager().createEntity(EntitySpec.create(TestApplication.class));
+ final AttributeSensor<String> TEST_SENSOR = Sensors.newStringSensor("test.sensor");
+
+ final AtomicReference<String> lastSeenState = new AtomicReference<>();
+ app.subscriptions().subscribe(app, TEST_SENSOR, new SensorEventListener<String>() {
+ @Override
+ public void onEvent(SensorEvent<String> event) {
+ lastSeenState.set(event.getValue());
+ log.debug("seen event=" + event);
+ }
+ });
+
+ Task<?> first = mgmt.getExecutionManager().submit(new Runnable() {
+ @Override
+ public void run() {
+ app.sensors().set(TEST_SENSOR, "first");
+ log.debug("set first");
+ }
+ });
+ Task<?> second = mgmt.getExecutionManager().submit(new Runnable() {
+ @Override
+ public void run() {
+ app.sensors().set(TEST_SENSOR, "second");
+ log.debug("set second");
+ }
+ });
+ first.blockUntilEnded();
+ second.blockUntilEnded();
+
+ Asserts.succeedsEventually(new Runnable() {
+ @Override
+ public void run() {
+ EntityAsserts.assertAttributeEquals(app, TEST_SENSOR, lastSeenState.get());
+ }
+ });
+ }
+
+ public static class RecodingChildSensorEnricher extends AbstractMultipleSensorAggregator<Void> {
+ public static AttributeSensor<String> RECORDED_SENSOR = Sensors.newStringSensor("recorded.sensor");
+ List<String> seenValues = new ArrayList<>();
+
+ @Override
+ protected Collection<Sensor<?>> getSourceSensors() {
+ return ImmutableList.<Sensor<?>>of(RECORDED_SENSOR);
+ }
+
+ @Override
+ protected Object compute() {
+ throw new UnsupportedOperationException("Not expected to be called since onUpdated is overriden");
+ }
+
+ @Override
+ protected void setEntityLoadingTargetConfig() {
+ }
+
+ @Override
+ protected void onUpdated() {
+ Iterator<String> values = getValues(RECORDED_SENSOR).values().iterator();
+ if (values.hasNext()) {
+ seenValues.add(values.next());
+ }
+ }
+ }
+
+ /**
+ * Enricher sees state in the wrong order -> running, starting, running
+ *
+ * Indeterministic, fails a couple of times per 100 invocations when run with "mvn test" in the
+ * brooklyn-itest docker container.
+ */
+ @Test(groups="Broken")
+ public void testWrongSensorInitValue() {
+ TestApplication app = mgmt.getEntityManager().createEntity(EntitySpec.create(TestApplication.class)
+ .impl(TestApplicationNoEnrichersImpl.class)
+ .enricher(EnricherSpec.create(RecodingChildSensorEnricher.class))
+ .child(EntitySpec.create(TestEntity.class)
+ .impl(TestEntityNoEnrichersImpl.class)));
+
+ Entity child = Iterables.get(app.getChildren(), 0);
+ child.sensors().set(RecodingChildSensorEnricher.RECORDED_SENSOR, "first");
+ child.sensors().set(RecodingChildSensorEnricher.RECORDED_SENSOR, "second");
+
+ final RecodingChildSensorEnricher enricher = getFirstEnricher(app, RecodingChildSensorEnricher.class);
+
+ // setEntity -> onUpdate
+ // CHILD_ADDED -> onUpdate
+ // set RECORDED_SENSOR=first -> onUpdate
+ // set RECORDED_SENSOR=second -> onUpdate
+ Asserts.eventually(Suppliers.ofInstance(enricher.seenValues), CollectionFunctionals.sizeEquals(4));
+
+ boolean isOrdered = Ordering.explicit(MutableList.of("first", "second"))
+ .nullsFirst()
+ .isOrdered(enricher.seenValues);
+ assertTrue(isOrdered, "Unexpected ordering for " + enricher.seenValues);
+ }
+
+ public static class EmittingEnricher extends AbstractEnricher {
+ @Override
+ public void setEntity(@SuppressWarnings("deprecation") org.apache.brooklyn.api.entity.EntityLocal entity) {
+ super.setEntity(entity);
+ this.suppressDuplicates = true;
+ }
+
+ @Override
+ public <T> void emit(Sensor<T> sensor, Object val) {
+ super.emit(sensor, val);
+ }
+ }
+
+ /**
+ * The deduplication logic in AbstractEnricher does not work for parallel invocations.
+
+ * Indeterministic, fails a couple of times per 100 invocations when run with "mvn test" in the
+ * brooklyn-itest docker container.
+ */
+ @Test(groups="Broken")
+ public void testAbstractEnricherDeduplicationBroken() {
+ final TestApplication app = mgmt.getEntityManager().createEntity(EntitySpec.create(TestApplication.class)
+ .enricher(EnricherSpec.create(EmittingEnricher.class)));
+ final AttributeSensor<String> TEST_SENSOR = Sensors.newStringSensor("test.sensor");
+
+ final List<String> seenValues = Collections.synchronizedList(new ArrayList<String>());
+ app.subscriptions().subscribe(app, TEST_SENSOR, new SensorEventListener<String>() {
+ @Override
+ public void onEvent(SensorEvent<String> event) {
+ seenValues.add(event.getValue());
+ }
+ });
+
+ app.sensors().set(TEST_SENSOR, "initial");
+
+ final EmittingEnricher enricher = getFirstEnricher(app, EmittingEnricher.class);
+ Runnable overrideJob = new Runnable() {
+ @Override
+ public void run() {
+ enricher.emit(TEST_SENSOR, "override");
+ }
+ };
+
+ // Simulates firing the emit method from event handlers in different threads
+ mgmt.getExecutionManager().submit(overrideJob);
+ mgmt.getExecutionManager().submit(overrideJob);
+
+ Asserts.eventually(Suppliers.ofInstance(seenValues), CollectionFunctionals.sizeEquals(2));
+ Asserts.succeedsContinually(new Runnable() {
+ @Override
+ public void run() {
+ assertEquals(seenValues, ImmutableList.of("initial", "override"));
+ }
+ });
+ }
+
private void assertHealthEventually(Entity entity, Lifecycle expectedState, Boolean expectedUp) {
EntityAsserts.assertAttributeEqualsEventually(entity, Attributes.SERVICE_STATE_ACTUAL, expectedState);
EntityAsserts.assertAttributeEqualsEventually(entity, Attributes.SERVICE_UP, expectedUp);
@@ -245,4 +444,12 @@ public class ApplicationLifecycleStateTest extends BrooklynMgmtUnitTestSupport {
Asserts.expectedFailureContains(e, "Error invoking start");
}
}
+
+ protected <T> T getFirstEnricher(TestApplication app, Class<T> type) {
+ return FluentIterable.from(app.enrichers())
+ .filter(type)
+ .first()
+ .get();
+ }
+
}
[3/4] brooklyn-server git commit: Fixes the deduplication logic in
AbstractEnricher
Posted by dr...@apache.org.
Fixes the deduplication logic in AbstractEnricher
Could incorrectly deduplicate (for example result in setting the same value twice) when the value is set from parallel threads.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/28dc13e8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/28dc13e8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/28dc13e8
Branch: refs/heads/master
Commit: 28dc13e888edb77c9010c8ab13a56d7782f50e28
Parents: 4974948
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Apr 7 19:31:04 2017 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Mon Apr 24 17:31:46 2017 +0300
----------------------------------------------------------------------
.../core/enricher/AbstractEnricher.java | 36 ++++++++++++++++----
.../ApplicationLifecycleStateStressTest.java | 1 -
.../entity/ApplicationLifecycleStateTest.java | 9 +++--
3 files changed, 33 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/28dc13e8/core/src/main/java/org/apache/brooklyn/core/enricher/AbstractEnricher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/enricher/AbstractEnricher.java b/core/src/main/java/org/apache/brooklyn/core/enricher/AbstractEnricher.java
index f957b18..39b23ba 100644
--- a/core/src/main/java/org/apache/brooklyn/core/enricher/AbstractEnricher.java
+++ b/core/src/main/java/org/apache/brooklyn/core/enricher/AbstractEnricher.java
@@ -22,7 +22,6 @@ import static com.google.common.base.Preconditions.checkState;
import java.util.Map;
-import org.apache.brooklyn.api.entity.EntityLocal;
import org.apache.brooklyn.api.mgmt.rebind.RebindSupport;
import org.apache.brooklyn.api.mgmt.rebind.mementos.EnricherMemento;
import org.apache.brooklyn.api.sensor.AttributeSensor;
@@ -36,7 +35,9 @@ import org.apache.brooklyn.core.entity.EntityInternal;
import org.apache.brooklyn.core.mgmt.rebind.BasicEnricherRebindSupport;
import org.apache.brooklyn.core.objs.AbstractEntityAdjunct;
import org.apache.brooklyn.util.core.flags.TypeCoercions;
+import org.apache.brooklyn.util.guava.Maybe;
+import com.google.common.base.Function;
import com.google.common.base.Objects;
import com.google.common.collect.Maps;
@@ -49,6 +50,27 @@ public abstract class AbstractEnricher extends AbstractEntityAdjunct implements
"enricher.suppressDuplicates",
"Whether duplicate values published by this enricher should be suppressed");
+ private static class DeduplicatingAttributeModifier<T> implements Function<T, Maybe<T>> {
+ public static <T> Function<T, Maybe<T>> create(T newVal) {
+ return new DeduplicatingAttributeModifier<T>(newVal);
+ }
+
+ private DeduplicatingAttributeModifier(T newVal) {
+ this.newValue = newVal;
+ }
+
+ private T newValue;
+
+ @Override
+ public Maybe<T> apply(T oldValue) {
+ if (Objects.equal(oldValue, newValue)) {
+ return Maybe.absent("Skipping update, values equal");
+ } else {
+ return Maybe.of(newValue);
+ }
+ }
+ }
+
private final EnricherDynamicType enricherType;
protected Boolean suppressDuplicates;
@@ -83,7 +105,7 @@ public abstract class AbstractEnricher extends AbstractEntityAdjunct implements
}
@Override
- public void setEntity(EntityLocal entity) {
+ public void setEntity(@SuppressWarnings("deprecation") org.apache.brooklyn.api.entity.EntityLocal entity) {
super.setEntity(entity);
Boolean suppressDuplicates = getConfig(SUPPRESS_DUPLICATES);
if (suppressDuplicates!=null)
@@ -102,18 +124,18 @@ public abstract class AbstractEnricher extends AbstractEntityAdjunct implements
return;
}
if (val == Entities.REMOVE) {
- ((EntityInternal)entity).removeAttribute((AttributeSensor<T>) sensor);
+ ((EntityInternal)entity).sensors().remove((AttributeSensor<T>) sensor);
return;
}
T newVal = TypeCoercions.coerce(val, sensor.getTypeToken());
if (sensor instanceof AttributeSensor) {
+ AttributeSensor<T> attribute = (AttributeSensor<T>)sensor;
if (Boolean.TRUE.equals(suppressDuplicates)) {
- T oldValue = entity.getAttribute((AttributeSensor<T>)sensor);
- if (Objects.equal(oldValue, newVal))
- return;
+ entity.sensors().modify(attribute, DeduplicatingAttributeModifier.create(newVal));
+ } else {
+ entity.sensors().set(attribute, newVal);
}
- entity.sensors().set((AttributeSensor<T>)sensor, newVal);
} else {
entity.sensors().emit(sensor, newVal);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/28dc13e8/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java
index a6a6f9f..02f8ec2 100644
--- a/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java
@@ -100,7 +100,6 @@ public class ApplicationLifecycleStateStressTest extends ApplicationLifecycleSta
super.testWrongSensorInitValue();
}
- @Test(groups="Broken")
@Override
public void testAbstractEnricherDeduplicationBroken() {
super.testAbstractEnricherDeduplicationBroken();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/28dc13e8/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateTest.java
index 7afe2f6..e8a3eee 100644
--- a/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateTest.java
@@ -365,12 +365,11 @@ public class ApplicationLifecycleStateTest extends BrooklynMgmtUnitTestSupport {
}
/**
- * The deduplication logic in AbstractEnricher does not work for parallel invocations.
-
- * Indeterministic, fails a couple of times per 100 invocations when run with "mvn test" in the
- * brooklyn-itest docker container.
+ * The deduplication logic in AbstractEnricher previously did not work for parallel invocations.
+ * It used to do a get and then a compare, so another thread could change the value between
+ * those two operations.
*/
- @Test(groups="Broken")
+ @Test
public void testAbstractEnricherDeduplicationBroken() {
final TestApplication app = mgmt.getEntityManager().createEntity(EntitySpec.create(TestApplication.class)
.enricher(EnricherSpec.create(EmittingEnricher.class)));
[4/4] brooklyn-server git commit: This closes #622
Posted by dr...@apache.org.
This closes #622
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f07b6f06
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f07b6f06
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f07b6f06
Branch: refs/heads/master
Commit: f07b6f06a506a28d7bc0b7eba178ba8eacbd3dc9
Parents: ba7b496 28dc13e
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Wed May 3 09:57:16 2017 +0100
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Wed May 3 09:57:16 2017 +0100
----------------------------------------------------------------------
.../core/enricher/AbstractEnricher.java | 36 +++-
.../ApplicationLifecycleStateStressTest.java | 23 ++
.../entity/ApplicationLifecycleStateTest.java | 215 ++++++++++++++++++-
...okeEffectorOnCollectionSensorChangeTest.java | 4 +-
...ftwareProcessAndChildrenIntegrationTest.java | 30 ++-
5 files changed, 297 insertions(+), 11 deletions(-)
----------------------------------------------------------------------