Improve logging for unexpected planeId states.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/4405909e Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/4405909e Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/4405909e Branch: refs/heads/master Commit: 4405909e2f0a8981afe635191b081d69437813b6 Parents: cb41895 Author: Svetoslav Neykov <svetoslav.ney...@cloudsoftcorp.com> Authored: Tue Apr 11 18:07:56 2017 +0300 Committer: Svetoslav Neykov <svetoslav.ney...@cloudsoftcorp.com> Committed: Wed Apr 19 15:12:23 2017 +0300 ---------------------------------------------------------------------- .../api/mgmt/rebind/mementos/BrooklynMementoRawData.java | 2 +- .../brooklyn/core/mgmt/internal/LocalManagementContext.java | 1 + .../org/apache/brooklyn/core/mgmt/rebind/RebindIteration.java | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4405909e/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/mementos/BrooklynMementoRawData.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/mementos/BrooklynMementoRawData.java b/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/mementos/BrooklynMementoRawData.java index e0a4c87..9df4bb6 100644 --- a/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/mementos/BrooklynMementoRawData.java +++ b/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/mementos/BrooklynMementoRawData.java @@ -195,7 +195,7 @@ public class BrooklynMementoRawData { } public boolean isEmpty() { - return entities.isEmpty() && locations.isEmpty() && policies.isEmpty() && enrichers.isEmpty() && feeds.isEmpty() && catalogItems.isEmpty(); + return planeId == null && entities.isEmpty() && locations.isEmpty() && policies.isEmpty() && enrichers.isEmpty() && feeds.isEmpty() && catalogItems.isEmpty(); } public Map<String, String> getObjectsOfType(BrooklynObjectType type) { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4405909e/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContext.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContext.java index 5a40111..ccc59b1 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContext.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContext.java @@ -224,6 +224,7 @@ public class LocalManagementContext extends AbstractManagementContext { public void setManagementPlaneId(String newPlaneId) { if (managementPlaneId != null && !managementPlaneId.equals(newPlaneId)) { log.warn("Management plane ID changed from {} to {}", managementPlaneId, newPlaneId); + log.debug("Management plane ID changed from {} to {}", new Object[] {managementPlaneId, newPlaneId, new RuntimeException("Stack trace for setManagementPlaneId")}); } this.managementPlaneId = newPlaneId; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4405909e/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindIteration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindIteration.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindIteration.java index c4b171e..6df8232 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindIteration.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindIteration.java @@ -472,6 +472,10 @@ public abstract class RebindIteration { protected void initPlaneId() { String persistedPlaneId = mementoRawData.getPlaneId(); if (persistedPlaneId == null) { + if (!mementoRawData.isEmpty()) { + LOG.warn("Rebinding against existing persisted state, but no planeId found. Will generate a new one. " + + "Expected if this is the first rebind after upgrading to Brooklyn 0.12.0+"); + } ((LocalManagementContext)managementContext).generateManagementPlaneId(); } else { ((LocalManagementContext)managementContext).setManagementPlaneId(persistedPlaneId);
