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/11/13 23:23:48 UTC
[15/18] incubator-brooklyn git commit: OSGi rebind - infer catalog
item ID from entity type
OSGi rebind - infer catalog item ID from entity type
The change allows rebinding to persistence stores from old versions where the catalog item ID used for creating the entities is not included in the serialized state.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e81a260e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e81a260e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e81a260e
Branch: refs/heads/master
Commit: e81a260e58a7b79edc96878f50a714b5a1a9d1b5
Parents: 40eee57
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Thu Nov 13 14:02:45 2014 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Nov 13 14:02:45 2014 +0200
----------------------------------------------------------------------
.../AbstractBrooklynObjectRebindSupport.java | 5 +-
.../entity/rebind/RebindManagerImpl.java | 65 ++++++++++++++++----
.../internal/BrooklynFeatureEnablement.java | 3 +
3 files changed, 61 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e81a260e/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java b/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java
index 5d8bcd6..9cfaf97 100644
--- a/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java
+++ b/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java
@@ -48,7 +48,10 @@ public abstract class AbstractBrooklynObjectRebindSupport<T extends Memento> imp
if (LOG.isTraceEnabled()) LOG.trace("Reconstructing: {}", memento.toVerboseString());
instance.setDisplayName(memento.getDisplayName());
- instance.setCatalogItemId(memento.getCatalogItemId());
+ //check if not already forced at entity creation time
+ if (instance.getCatalogItemId() == null) {
+ instance.setCatalogItemId(memento.getCatalogItemId());
+ }
addConfig(rebindContext, memento);
addTags(rebindContext, memento);
addCustoms(rebindContext, memento);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e81a260e/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 74cfc12..177dca6 100644
--- a/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java
+++ b/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java
@@ -21,6 +21,7 @@ package brooklyn.entity.rebind;
import static com.google.common.base.Preconditions.checkNotNull;
import java.io.IOException;
+import java.lang.reflect.Field;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -35,14 +36,15 @@ import org.slf4j.LoggerFactory;
import brooklyn.basic.AbstractBrooklynObject;
import brooklyn.basic.BrooklynObject;
+import brooklyn.catalog.BrooklynCatalog;
import brooklyn.catalog.CatalogItem;
import brooklyn.catalog.CatalogLoadMode;
import brooklyn.catalog.internal.BasicBrooklynCatalog;
import brooklyn.catalog.internal.CatalogUtils;
import brooklyn.config.BrooklynLogging;
+import brooklyn.config.BrooklynLogging.LoggingLevel;
import brooklyn.config.BrooklynServerConfig;
import brooklyn.config.ConfigKey;
-import brooklyn.config.BrooklynLogging.LoggingLevel;
import brooklyn.enricher.basic.AbstractEnricher;
import brooklyn.entity.Application;
import brooklyn.entity.Entity;
@@ -656,13 +658,17 @@ public class RebindManagerImpl implements RebindManager {
String entityId = entry.getKey();
EntityMementoManifest entityManifest = entry.getValue();
String catalogItemId = findCatalogItemId(mementoManifest.getEntityIdToManifest(), entityManifest);
+
if (LOG.isTraceEnabled()) LOG.trace("RebindManager instantiating entity {}", entityId);
try {
Entity entity = newEntity(entityId, entityManifest.getType(), getLoadingContextFromCatalogItemId(catalogItemId, classLoader, rebindContext));
((EntityInternal)entity).getManagementSupport().setReadOnly( rebindContext.isReadOnly(entity) );
rebindContext.registerEntity(entityId, entity);
-
+
+ if (forceCatalogItem(entityManifest)) {
+ ((EntityInternal)entity).setCatalogItemId(catalogItemId);
+ }
} catch (Exception e) {
exceptionHandler.onCreateFailed(BrooklynObjectType.ENTITY, entityId, entityManifest.getType(), e);
}
@@ -948,17 +954,54 @@ public class RebindManagerImpl implements RebindManager {
RebindTracker.reset();
}
}
-
+
+ private boolean forceCatalogItem(EntityMementoManifest entityManifest) {
+ return entityManifest.getCatalogItemId() == null &&
+ BrooklynFeatureEnablement.isEnabled(BrooklynFeatureEnablement.FEATURE_INFER_CATALOG_ITEM_ON_REBIND);
+ }
+
private String findCatalogItemId(Map<String, EntityMementoManifest> entityIdToManifest, EntityMementoManifest entityManifest) {
- EntityMementoManifest ptr = entityManifest;
- while (ptr != null) {
- if (ptr.getCatalogItemId() != null) {
- return ptr.getCatalogItemId();
+ if (entityManifest.getCatalogItemId() != null) {
+ return entityManifest.getCatalogItemId();
+ }
+
+ if (BrooklynFeatureEnablement.isEnabled(BrooklynFeatureEnablement.FEATURE_INFER_CATALOG_ITEM_ON_REBIND)) {
+ //First check if any of the parent entities has a catalogItemId set.
+ EntityMementoManifest ptr = entityManifest;
+ while (ptr != null) {
+ if (ptr.getCatalogItemId() != null) {
+ CatalogItem<?, ?> catalogItem = CatalogUtils.getCatalogItemOptionalVersion(managementContext, ptr.getCatalogItemId());
+ if (catalogItem != null) {
+ return catalogItem.getId();
+ } else {
+ //Couldn't find a catalog item with this id, but return it anyway and
+ //let the caller deal with the error.
+ return ptr.getCatalogItemId();
+ }
+ }
+ if (ptr.getParent() != null) {
+ ptr = entityIdToManifest.get(ptr.getParent());
+ } else {
+ ptr = null;
+ }
}
- if (ptr.getParent() != null) {
- ptr = entityIdToManifest.get(ptr.getParent());
- } else {
- ptr = null;
+
+ //If no parent entity has the catalogItemId set try to match them by the type we are trying to load.
+ //The current convention is to set catalog item IDs to the java type (for both plain java or CAMP plan) they represent.
+ //This will be applicable only the first time the store is rebinded, while the catalog items don't have the default
+ //version appended to their IDs, but then we will have catalogItemId set on entities so not neede further anyways.
+ BrooklynCatalog catalog = managementContext.getCatalog();
+ ptr = entityManifest;
+ while (ptr != null) {
+ CatalogItem<?, ?> catalogItem = catalog.getCatalogItem(ptr.getType(), BrooklynCatalog.DEFAULT_VERSION);
+ if (catalogItem != null) {
+ return catalogItem.getId();
+ }
+ if (ptr.getParent() != null) {
+ ptr = entityIdToManifest.get(ptr.getParent());
+ } else {
+ ptr = null;
+ }
}
}
return null;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e81a260e/core/src/main/java/brooklyn/internal/BrooklynFeatureEnablement.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/internal/BrooklynFeatureEnablement.java b/core/src/main/java/brooklyn/internal/BrooklynFeatureEnablement.java
index 819c2d1..88c5f6d 100644
--- a/core/src/main/java/brooklyn/internal/BrooklynFeatureEnablement.java
+++ b/core/src/main/java/brooklyn/internal/BrooklynFeatureEnablement.java
@@ -72,6 +72,8 @@ public class BrooklynFeatureEnablement {
* Defaults to false if system property is not set.
*/
public static final String FEATURE_RENAME_THREADS = "brooklyn.executionManager.renameThreads";
+
+ public static final String FEATURE_INFER_CATALOG_ITEM_ON_REBIND = "brooklyn.backwardCompatibility.feature.inferCatalogItemOnRebind";
private static final Map<String, Boolean> FEATURE_ENABLEMENTS = Maps.newLinkedHashMap();
@@ -90,6 +92,7 @@ public class BrooklynFeatureEnablement {
setDefault(FEATURE_DEFAULT_STANDBY_IS_HOT_PROPERTY, false);
setDefault(FEATURE_USE_BROOKLYN_LIVE_OBJECTS_DATAGRID_STORAGE, false);
setDefault(FEATURE_RENAME_THREADS, false);
+ setDefault(FEATURE_INFER_CATALOG_ITEM_ON_REBIND, true);
}
static {