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 2014/10/01 20:03:13 UTC
[13/15] git commit: address the rest of @sjcorbett's comments
address the rest of @sjcorbett's comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/6ba1639e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/6ba1639e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/6ba1639e
Branch: refs/heads/master
Commit: 6ba1639e3af23f6cae31f2062647b7900b3ccd5e
Parents: 6d58882
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Oct 1 18:28:00 2014 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Oct 1 18:28:00 2014 +0100
----------------------------------------------------------------------
.../management/ha/HighAvailabilityManagerImpl.java | 4 +---
.../management/internal/LocalEntityManager.java | 17 +++++++++--------
.../management/internal/LocalLocationManager.java | 10 +++++-----
.../internal/NonDeploymentLocationManager.java | 2 +-
.../ha/HighAvailabilityManagerSplitBrainTest.java | 5 +++--
.../brooklyn/management/ha/HotStandbyTest.java | 8 +++++---
.../brooklyn/management/ha/WarmStandbyTest.java | 1 +
7 files changed, 25 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6ba1639e/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java b/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java
index 200a902..c71d352 100644
--- a/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java
+++ b/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java
@@ -53,10 +53,10 @@ import brooklyn.util.task.ScheduledTask;
import brooklyn.util.text.Strings;
import brooklyn.util.time.Duration;
-import com.google.api.client.repackaged.com.google.common.base.Preconditions;
import com.google.common.annotations.Beta;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
import com.google.common.base.Ticker;
import com.google.common.collect.Iterables;
@@ -718,8 +718,6 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager {
try {
Preconditions.checkState(nodeStateTransitionComplete==false, "Must be in transitioning state to go into hot standby");
nodeState = ManagementNodeState.HOT_STANDBY;
-
- // XXX
managementContext.getRebindManager().startReadOnly();
return true;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6ba1639e/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java b/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java
index 0eae80b..adc9839 100644
--- a/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java
+++ b/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java
@@ -23,6 +23,7 @@ import groovy.util.ObservableList;
import java.lang.reflect.Proxy;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -88,7 +89,7 @@ public class LocalEntityManager implements EntityManagerInternal {
protected final Map<String,Entity> entitiesById = Maps.newLinkedHashMap();
/** Management mode for each entity */
- protected final Map<String,ManagementTransitionMode> entityModesById = Maps.newLinkedHashMap();
+ protected final Map<String,ManagementTransitionMode> entityModesById = Collections.synchronizedMap(Maps.<String,ManagementTransitionMode>newLinkedHashMap());
/** Proxies of the managed entities */
protected final ObservableList entities = new ObservableList();
@@ -282,7 +283,7 @@ public class LocalEntityManager implements EntityManagerInternal {
if (it.getManagementSupport().isReadOnlyRaw()==null) {
if (mode.isReadOnly()) {
// should have been marked by rebinder
- log.warn("Read-only entity "+it+" not marked as such on call to manage");
+ log.warn("Read-only entity "+it+" not marked as such on call to manage; marking and continuing");
}
it.getManagementSupport().setReadOnly(mode.isReadOnly());
}
@@ -345,8 +346,9 @@ public class LocalEntityManager implements EntityManagerInternal {
if (managementContext.gc != null) managementContext.gc.onUnmanaged(e);
} else {
// should be coming *from* read only; nothing needed
- if (!mode.wasReadOnly())
- log.warn("Should not be unmanaging "+e+" in mode "+mode);
+ if (!mode.wasReadOnly()) {
+ log.warn("Should not be unmanaging "+e+" in mode "+mode+"; ignoring");
+ }
}
} else if (mode==ManagementTransitionMode.REBINDING_DESTROYED) {
@@ -439,7 +441,6 @@ public class LocalEntityManager implements EntityManagerInternal {
* Note that refs to the given entity are stored in a a weak hashmap so if the subsequent management
* attempt fails then this reference to the entity will eventually be discarded (if no-one else holds
* a reference).
- * @param isOrWasReadOnly
*/
private synchronized boolean preManageNonRecursive(Entity e, ManagementTransitionMode mode) {
Entity realE = toRealEntity(e);
@@ -449,7 +450,7 @@ public class LocalEntityManager implements EntityManagerInternal {
if (old!=null && mode==ManagementTransitionMode.CREATING) {
if (old.equals(e)) {
- log.warn("{} redundant call to pre-start management of entity {}", this, e);
+ log.warn("{} redundant call to pre-start management of entity {}; ignoring", this, e);
} else {
throw new IllegalStateException("call to pre-manage entity "+e+" but different entity "+old+" already known under that id at "+this);
}
@@ -471,7 +472,7 @@ public class LocalEntityManager implements EntityManagerInternal {
if (old!=null && mode==ManagementTransitionMode.CREATING) {
if (old.equals(e)) {
- log.warn("{} redundant call to start management of entity {}", this, e);
+ log.warn("{} redundant call to start management of entity {}; ignoring", this, e);
} else {
throw new IllegalStateException("call to manage entity "+e+" but different entity "+old+" already known under that id at "+this);
}
@@ -565,7 +566,7 @@ public class LocalEntityManager implements EntityManagerInternal {
entityTypes.remove(e.getId());
if (old==null) {
- log.warn("{} call to stop management of unknown entity (already unmanaged?) {}", this, e);
+ log.warn("{} call to stop management of unknown entity (already unmanaged?) {}; ignoring", this, e);
return false;
} else if (!old.equals(e)) {
// shouldn't happen...
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6ba1639e/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java b/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java
index 47087f9..b70d4f3 100644
--- a/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java
+++ b/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java
@@ -41,8 +41,8 @@ import brooklyn.util.config.ConfigBag;
import brooklyn.util.exceptions.Exceptions;
import brooklyn.util.exceptions.RuntimeInterruptedException;
-import com.google.api.client.repackaged.com.google.common.base.Preconditions;
import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
@@ -251,7 +251,7 @@ public class LocalLocationManager implements LocationManagerInternal {
} else {
// should be coming *from* read only; nothing needed
if (!mode.wasReadOnly())
- log.warn("Should not be unmanaging "+loc+" in mode "+mode);
+ log.warn("Should not be unmanaging "+loc+" in mode "+mode+"; ignoring");
}
} else if (mode==ManagementTransitionMode.REBINDING_DESTROYED) {
@@ -299,7 +299,7 @@ public class LocalLocationManager implements LocationManagerInternal {
} catch (RuntimeInterruptedException e) {
throw e;
} catch (RuntimeException e) {
- log.warn("Failed to store location lifecycle event for "+loc, e);
+ log.warn("Failed to store location lifecycle event for "+loc+" (ignoring)", e);
}
}
@@ -352,11 +352,11 @@ public class LocalLocationManager implements LocationManagerInternal {
locationModesById.remove(loc.getId());
if (old==null) {
- log.warn("{} call to stop management of unknown location (already unmanaged?) {}", this, loc);
+ log.warn("{} call to stop management of unknown location (already unmanaged?) {}; ignoring", this, loc);
return false;
} else if (!old.equals(loc)) {
// shouldn't happen...
- log.error("{} call to stop management of location {} removed different location {}", new Object[] { this, loc, old });
+ log.error("{} call to stop management of location {} removed different location {}; ignoring", new Object[] { this, loc, old });
return true;
} else {
if (log.isDebugEnabled()) log.debug("{} stopped management of location {}", this, loc);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6ba1639e/core/src/main/java/brooklyn/management/internal/NonDeploymentLocationManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/NonDeploymentLocationManager.java b/core/src/main/java/brooklyn/management/internal/NonDeploymentLocationManager.java
index 3628231..a11d876 100644
--- a/core/src/main/java/brooklyn/management/internal/NonDeploymentLocationManager.java
+++ b/core/src/main/java/brooklyn/management/internal/NonDeploymentLocationManager.java
@@ -76,7 +76,7 @@ public class NonDeploymentLocationManager implements LocationManagerInternal {
if (isInitialManagementContextReal()) {
return ((LocationManagerInternal)initialManagementContext.getLocationManager()).getLocationIds();
} else {
- return null;
+ return Collections.emptyList();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6ba1639e/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerSplitBrainTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerSplitBrainTest.java b/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerSplitBrainTest.java
index a0b7feb..48bdfa5 100644
--- a/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerSplitBrainTest.java
+++ b/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerSplitBrainTest.java
@@ -69,7 +69,8 @@ public class HighAvailabilityManagerSplitBrainTest {
private ClassLoader classLoader = getClass().getClassLoader();
public class HaMgmtNode {
-
+ // TODO share with HotStandbyTest and WarmStandbyTest and a few others (minor differences but worth it ultimately)
+
private ManagementContextInternal mgmt;
private String ownNodeId;
private String nodeName;
@@ -278,7 +279,7 @@ public class HighAvailabilityManagerSplitBrainTest {
// right number of entities at n2; n1 may or may not depending whether hot standby is default
assertEquals(n2.mgmt.getApplications().size(), 1);
-// assertEquals(n1.mgmt.getApplications().size(), 0);
+ assertEquals(n1.mgmt.getApplications().size(), BrooklynFeatureEnablement.isEnabled(BrooklynFeatureEnablement.FEATURE_DEFAULT_STANDBY_IS_HOT_PROPERTY) ? 1 : 0);
}
@Test(invocationCount=50, groups="Integration")
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6ba1639e/core/src/test/java/brooklyn/management/ha/HotStandbyTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/management/ha/HotStandbyTest.java b/core/src/test/java/brooklyn/management/ha/HotStandbyTest.java
index 1a41c19..a34f26b 100644
--- a/core/src/test/java/brooklyn/management/ha/HotStandbyTest.java
+++ b/core/src/test/java/brooklyn/management/ha/HotStandbyTest.java
@@ -70,7 +70,8 @@ public class HotStandbyTest {
private ClassLoader classLoader = getClass().getClassLoader();
public class HaMgmtNode {
-
+ // TODO share with WarmStandbyTest and SplitBrainTest and a few others (minor differences but worth it ultimately)
+
private ManagementContextInternal mgmt;
private String ownNodeId;
private String nodeName;
@@ -204,7 +205,7 @@ public class HotStandbyTest {
}
@Test
- public void testHotStandbySeesChangedNameConfigAndSensorValueButDoesntAllowChange() throws Exception {
+ public void testHotStandbySeesInitialCustomNameConfigAndSensorValueButDoesntAllowChange() throws Exception {
HaMgmtNode n1 = createMaster(Duration.PRACTICALLY_FOREVER);
TestApplication app = createFirstAppAndPersist(n1);
HaMgmtNode n2 = createHotStandby(Duration.PRACTICALLY_FOREVER);
@@ -223,10 +224,11 @@ public class HotStandbyTest {
} catch (Exception e) {
Assert.assertTrue(e.toString().toLowerCase().contains("read-only"), "Error message did not contain expected text: "+e);
}
+ assertEquals(appRO.getAttribute(TestEntity.SEQUENCE), (Integer)3);
}
@Test
- public void testHotStandbySeesChangedNameConfigAndSensorValue() throws Exception {
+ public void testHotStandbySeesChangesToNameConfigAndSensorValue() throws Exception {
HaMgmtNode n1 = createMaster(Duration.PRACTICALLY_FOREVER);
TestApplication app = createFirstAppAndPersist(n1);
HaMgmtNode n2 = createHotStandby(Duration.PRACTICALLY_FOREVER);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6ba1639e/core/src/test/java/brooklyn/management/ha/WarmStandbyTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/management/ha/WarmStandbyTest.java b/core/src/test/java/brooklyn/management/ha/WarmStandbyTest.java
index d955d50..8c40947 100644
--- a/core/src/test/java/brooklyn/management/ha/WarmStandbyTest.java
+++ b/core/src/test/java/brooklyn/management/ha/WarmStandbyTest.java
@@ -56,6 +56,7 @@ public class WarmStandbyTest {
private ClassLoader classLoader = getClass().getClassLoader();
public class HaMgmtNode {
+ // TODO share with HotStandbyTest and SplitBrainTest and a few others (minor differences but worth it ultimately)
private ManagementContextInternal mgmt;
private String ownNodeId;