You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by tb...@apache.org on 2018/06/01 10:00:50 UTC
[4/5] brooklyn-server git commit: PR #964: Incorporate review comments
PR #964: Incorporate review comments
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/49ee11d6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/49ee11d6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/49ee11d6
Branch: refs/heads/master
Commit: 49ee11d6c90620cf935330249b1c6d5ea9351d27
Parents: 492ebd5
Author: Aled Sage <al...@gmail.com>
Authored: Tue May 29 20:30:09 2018 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue May 29 20:30:09 2018 +0100
----------------------------------------------------------------------
.../core/BrooklynFeatureEnablement.java | 4 ++--
.../rebind/PeriodicDeltaChangeListener.java | 24 ++++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/49ee11d6/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java b/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
index 8c142d8..2ff62d3 100644
--- a/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
+++ b/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
@@ -68,7 +68,7 @@ public class BrooklynFeatureEnablement {
* still be persisted. For example, they could change 'state' without telling the listener, and hope
* that the entity they were attached to would soon persist (thus piggy-backing off it).
*/
- public static final String FEATURE_REFERENCED_OBJECTS_PERSISTENCE_PROPERTY = FEATURE_PROPERTY_PREFIX+".referencedObjectsPersistence";
+ public static final String FEATURE_REFERENCED_OBJECTS_REPERSISTENCE_PROPERTY = FEATURE_PROPERTY_PREFIX+".referencedObjectsRepersistence";
/** whether feeds are automatically registered when set on entities, so that they are persisted */
public static final String FEATURE_FEED_REGISTRATION_PROPERTY = FEATURE_PROPERTY_PREFIX+".feedRegistration";
@@ -161,7 +161,7 @@ public class BrooklynFeatureEnablement {
setDefault(FEATURE_FEED_REGISTRATION_PROPERTY, false);
setDefault(FEATURE_BUNDLE_PERSISTENCE_PROPERTY, true);
setDefault(FEATURE_CATALOG_PERSISTENCE_PROPERTY, true);
- setDefault(FEATURE_REFERENCED_OBJECTS_PERSISTENCE_PROPERTY, false);
+ setDefault(FEATURE_REFERENCED_OBJECTS_REPERSISTENCE_PROPERTY, false);
setDefault(FEATURE_DEFAULT_STANDBY_IS_HOT_PROPERTY, false);
setDefault(FEATURE_PERSIST_ENTITY_SPEC_AS_SUPPLIER, true);
setDefault(FEATURE_RENAME_THREADS, false);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/49ee11d6/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java
index 349f47f..56da64d 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java
@@ -195,7 +195,7 @@ public class PeriodicDeltaChangeListener implements ChangeListener {
private final boolean persistPoliciesEnabled;
private final boolean persistEnrichersEnabled;
private final boolean persistFeedsEnabled;
- private final boolean persistReferencedObjectsEnabled;
+ private final boolean rePersistReferencedObjectsEnabled;
private final Semaphore persistingMutex = new Semaphore(1);
private final Object startStopMutex = new Object();
@@ -223,7 +223,7 @@ public class PeriodicDeltaChangeListener implements ChangeListener {
this.persistPoliciesEnabled = BrooklynFeatureEnablement.isEnabled(BrooklynFeatureEnablement.FEATURE_POLICY_PERSISTENCE_PROPERTY);
this.persistEnrichersEnabled = BrooklynFeatureEnablement.isEnabled(BrooklynFeatureEnablement.FEATURE_ENRICHER_PERSISTENCE_PROPERTY);
this.persistFeedsEnabled = BrooklynFeatureEnablement.isEnabled(BrooklynFeatureEnablement.FEATURE_FEED_PERSISTENCE_PROPERTY);
- this.persistReferencedObjectsEnabled = BrooklynFeatureEnablement.isEnabled(BrooklynFeatureEnablement.FEATURE_REFERENCED_OBJECTS_PERSISTENCE_PROPERTY);
+ this.rePersistReferencedObjectsEnabled = BrooklynFeatureEnablement.isEnabled(BrooklynFeatureEnablement.FEATURE_REFERENCED_OBJECTS_REPERSISTENCE_PROPERTY);
}
public void start() {
@@ -450,16 +450,16 @@ public class PeriodicDeltaChangeListener implements ChangeListener {
limitedCountString(prevDeltaCollector.entities), limitedCountString(prevDeltaCollector.locations), limitedCountString(prevDeltaCollector.policies), limitedCountString(prevDeltaCollector.enrichers), limitedCountString(prevDeltaCollector.catalogItems), limitedCountString(prevDeltaCollector.bundles),
limitedCountString(prevDeltaCollector.removedEntityIds), limitedCountString(prevDeltaCollector.removedLocationIds), limitedCountString(prevDeltaCollector.removedPolicyIds), limitedCountString(prevDeltaCollector.removedEnricherIds), limitedCountString(prevDeltaCollector.removedCatalogItemIds), limitedCountString(prevDeltaCollector.removedBundleIds)});
- if (persistReferencedObjectsEnabled) {
+ if (rePersistReferencedObjectsEnabled) {
addReferencedObjects(prevDeltaCollector);
- }
- if (LOG.isTraceEnabled()) LOG.trace("Checkpointing delta of memento with references: "
- + "updating {} entities, {} locations, {} policies, {} enrichers, {} catalog items, {} bundles; "
- + "removing {} entities, {} locations, {} policies, {} enrichers, {} catalog items, {} bundles",
- new Object[] {
- prevDeltaCollector.entities.size(), prevDeltaCollector.locations.size(), prevDeltaCollector.policies.size(), prevDeltaCollector.enrichers.size(), prevDeltaCollector.catalogItems.size(), prevDeltaCollector.bundles.size(),
- prevDeltaCollector.removedEntityIds.size(), prevDeltaCollector.removedLocationIds.size(), prevDeltaCollector.removedPolicyIds.size(), prevDeltaCollector.removedEnricherIds.size(), prevDeltaCollector.removedCatalogItemIds.size(), prevDeltaCollector.removedBundleIds.size()});
+ if (LOG.isTraceEnabled()) LOG.trace("Checkpointing delta of memento with references: "
+ + "updating {} entities, {} locations, {} policies, {} enrichers, {} catalog items, {} bundles; "
+ + "removing {} entities, {} locations, {} policies, {} enrichers, {} catalog items, {} bundles",
+ new Object[] {
+ prevDeltaCollector.entities.size(), prevDeltaCollector.locations.size(), prevDeltaCollector.policies.size(), prevDeltaCollector.enrichers.size(), prevDeltaCollector.catalogItems.size(), prevDeltaCollector.bundles.size(),
+ prevDeltaCollector.removedEntityIds.size(), prevDeltaCollector.removedLocationIds.size(), prevDeltaCollector.removedPolicyIds.size(), prevDeltaCollector.removedEnricherIds.size(), prevDeltaCollector.removedCatalogItemIds.size(), prevDeltaCollector.removedBundleIds.size()});
+ }
// Generate mementos for everything that has changed in this time period
if (prevDeltaCollector.isEmpty()) {
@@ -536,10 +536,10 @@ public class PeriodicDeltaChangeListener implements ChangeListener {
public synchronized void onManaged(BrooklynObject instance) {
if (LOG.isTraceEnabled()) LOG.trace("onManaged: {}", instance);
onChanged(instance);
- addReferencedObjects(instance);
+ addReferencedObjectsForInitialPersist(instance);
}
- private void addReferencedObjects(BrooklynObject instance) {
+ private void addReferencedObjectsForInitialPersist(BrooklynObject instance) {
if (!(instance instanceof Entity)) return;
Entity entity = (Entity) instance;