more logging for orphaned bug
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/73c69c62 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/73c69c62 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/73c69c62 Branch: refs/heads/master Commit: 73c69c628c2444f4c8f5d0857333a17db40df31e Parents: 0cea488 Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Authored: Sat Feb 18 12:55:22 2017 +0000 Committer: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Committed: Wed Mar 1 08:54:55 2017 +0000 ---------------------------------------------------------------------- .../transformer/impl/DeleteOrphanedStateTransformer.java | 8 ++++---- .../org/apache/brooklyn/launcher/common/BasicLauncher.java | 2 +- .../launcher/CleanOrphanedLocationsIntegrationTest.java | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/73c69c62/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/transformer/impl/DeleteOrphanedStateTransformer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/transformer/impl/DeleteOrphanedStateTransformer.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/transformer/impl/DeleteOrphanedStateTransformer.java index e92750d..04fdef5 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/transformer/impl/DeleteOrphanedStateTransformer.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/transformer/impl/DeleteOrphanedStateTransformer.java @@ -91,10 +91,10 @@ public class DeleteOrphanedStateTransformer extends CompoundTransformer { Set<String> enrichersToDelete = Sets.difference(input.getEnrichers().keySet(), enrichersToKeep.keySet()); Set<String> policiesToDelete = Sets.difference(input.getPolicies().keySet(), policiesToKeep.keySet()); Set<String> feedsToDelete = Sets.difference(input.getFeeds().keySet(), feedsToKeep.keySet()); - LOG.info("Deleting {} orphaned location{}: {}", new Object[] {locsToDelete.size(), Strings.s(locsToDelete.size()), locsToDelete}); - LOG.info("Deleting {} orphaned enricher{}: {}", new Object[] {enrichersToDelete.size(), Strings.s(enrichersToDelete.size()), enrichersToDelete}); - LOG.info("Deleting {} orphaned polic{}: {}", new Object[] {policiesToDelete.size(), (policiesToDelete.size() == 1 ? "y" : "ies"), policiesToDelete}); - LOG.info("Deleting {} orphaned feed{}: {}", new Object[] {feedsToDelete.size(), Strings.s(feedsToDelete.size()), feedsToDelete}); + LOG.info("Deleting {} orphaned location{} (of {}): {}", new Object[] {locsToDelete.size(), Strings.s(locsToDelete.size()), input.getLocations().size(), locsToDelete}); + LOG.info("Deleting {} orphaned enricher{} (of {}): {}", new Object[] {enrichersToDelete.size(), Strings.s(enrichersToDelete.size()), input.getEnrichers().size(), enrichersToDelete}); + LOG.info("Deleting {} orphaned polic{} (of {}): {}", new Object[] {policiesToDelete.size(), (policiesToDelete.size() == 1 ? "y" : "ies"), input.getPolicies().size(), policiesToDelete}); + LOG.info("Deleting {} orphaned feed{} (of {}): {}", new Object[] {feedsToDelete.size(), Strings.s(feedsToDelete.size()), input.getFeeds().size(), feedsToDelete}); return BrooklynMementoRawData.builder() .brooklynVersion(input.getBrooklynVersion()) http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/73c69c62/launcher-common/src/main/java/org/apache/brooklyn/launcher/common/BasicLauncher.java ---------------------------------------------------------------------- diff --git a/launcher-common/src/main/java/org/apache/brooklyn/launcher/common/BasicLauncher.java b/launcher-common/src/main/java/org/apache/brooklyn/launcher/common/BasicLauncher.java index d098c1d..5b157a3 100644 --- a/launcher-common/src/main/java/org/apache/brooklyn/launcher/common/BasicLauncher.java +++ b/launcher-common/src/main/java/org/apache/brooklyn/launcher/common/BasicLauncher.java @@ -371,7 +371,7 @@ public class BasicLauncher<T extends BasicLauncher<T>> { ManagementPlaneSyncRecord planeState = managementContext.getHighAvailabilityManager().loadManagementPlaneSyncRecord(true); - LOG.info("Persisting state to "+destinationDir+(destinationLocationSpec!=null ? " @ "+destinationLocationSpec : "")); + LOG.info("Copying persisted state to "+destinationDir+(destinationLocationSpec!=null ? " @ "+destinationLocationSpec : "")); PersistenceObjectStore destinationObjectStore = BrooklynPersistenceUtils.newPersistenceObjectStore( managementContext, destinationLocationSpec, destinationDir); BrooklynPersistenceUtils.writeMemento(managementContext, memento, destinationObjectStore); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/73c69c62/launcher/src/test/java/org/apache/brooklyn/launcher/CleanOrphanedLocationsIntegrationTest.java ---------------------------------------------------------------------- diff --git a/launcher/src/test/java/org/apache/brooklyn/launcher/CleanOrphanedLocationsIntegrationTest.java b/launcher/src/test/java/org/apache/brooklyn/launcher/CleanOrphanedLocationsIntegrationTest.java index 3ae2155..0348892 100644 --- a/launcher/src/test/java/org/apache/brooklyn/launcher/CleanOrphanedLocationsIntegrationTest.java +++ b/launcher/src/test/java/org/apache/brooklyn/launcher/CleanOrphanedLocationsIntegrationTest.java @@ -41,6 +41,7 @@ import org.apache.brooklyn.core.server.BrooklynServerPaths; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.javalang.JavaClassNames; import org.apache.brooklyn.util.os.Os; import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; @@ -147,6 +148,7 @@ public class CleanOrphanedLocationsIntegrationTest extends AbstractCleanOrphaned @Test public void testCleanedCopiedPersistedState() throws Exception { + LOG.info(JavaClassNames.niceClassAndMethod()+" taking persistence from "+persistenceDirWithOrphanedLocations); BrooklynLauncher launcher = BrooklynLauncher.newInstance() .webconsole(false) .brooklynProperties(OsgiManager.USE_OSGI, false)
