minor code review cleanups for rebind/persistence logging
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/45fa39b3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/45fa39b3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/45fa39b3 Branch: refs/heads/master Commit: 45fa39b3d4042c3fbc1e9cc870d96e730f133318 Parents: be5aac2 Author: Alex Heneveld <[email protected]> Authored: Thu Nov 6 10:35:17 2014 +0000 Committer: Alex Heneveld <[email protected]> Committed: Thu Nov 6 10:35:17 2014 +0000 ---------------------------------------------------------------------- .../src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java | 4 +++- .../rebind/persister/BrooklynMementoPersisterToObjectStore.java | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/45fa39b3/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java b/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java index e29d94f..74cfc12 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java @@ -541,7 +541,9 @@ public class RebindManagerImpl implements RebindManager { //The manifest contains full catalog items mementos. Reading them at this stage means that //we don't support references to entities/locations withing tags. - LOG.debug("Rebinding ("+mode+", iteration "+readOnlyRebindCount+") from "+getPersister().getBackingStoreDescription()+"..."); + LOG.debug("Rebinding ("+mode+ + (readOnlyRebindCount>Integer.MIN_VALUE ? ", iteration "+readOnlyRebindCount : "")+ + ") from "+getPersister().getBackingStoreDescription()+"..."); BrooklynMementoRawData mementoRawData = persistenceStoreAccess.loadMementoRawData(exceptionHandler); BrooklynMementoManifest mementoManifest = persistenceStoreAccess.loadMementoManifest(mementoRawData, exceptionHandler); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/45fa39b3/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java index 91b738f..0ee9a73 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java @@ -65,6 +65,7 @@ import com.google.common.annotations.Beta; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Objects; import com.google.common.base.Stopwatch; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.util.concurrent.Futures; @@ -93,9 +94,9 @@ public class BrooklynMementoPersisterToObjectStore implements BrooklynMementoPer "Maximum number of attempts to serialize a memento (e.g. if first attempts fail because of concurrent modifications of an entity)", 5); - static final BrooklynObjectType[] PERSISTED_OBJECT_TYPES_IN_ORDER = new BrooklynObjectType[] { + static final List<BrooklynObjectType> PERSISTED_OBJECT_TYPES_IN_ORDER = ImmutableList.of( BrooklynObjectType.ENTITY, BrooklynObjectType.LOCATION, BrooklynObjectType.POLICY, - BrooklynObjectType.ENRICHER, BrooklynObjectType.FEED, BrooklynObjectType.CATALOG_ITEM }; + BrooklynObjectType.ENRICHER, BrooklynObjectType.FEED, BrooklynObjectType.CATALOG_ITEM); private final PersistenceObjectStore objectStore; private final MementoSerializer<Object> serializer;
