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 2017/10/06 08:06:30 UTC
[06/23] brooklyn-server git commit: entity adjuncts have extra tag
for execution context, used in subscription delivery
entity adjuncts have extra tag for execution context, used in subscription delivery
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d4c9fe12
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d4c9fe12
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d4c9fe12
Branch: refs/heads/master
Commit: d4c9fe12ecfdf884ea8e1945e51cc07e026d7610
Parents: 8ecf395
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Sep 19 13:10:17 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Sep 19 13:12:11 2017 +0100
----------------------------------------------------------------------
.../brooklyn/api/mgmt/ManagementContext.java | 4 ++
.../brooklyn/core/config/ConfigConstraints.java | 9 ++-
.../org/apache/brooklyn/core/feed/Poller.java | 2 +-
.../brooklyn/core/mgmt/BrooklynTaskTags.java | 64 ++++++++++++++++----
.../internal/AbstractManagementContext.java | 8 +++
.../mgmt/internal/EntityManagementSupport.java | 22 ++++---
.../NonDeploymentManagementContext.java | 20 ++++--
.../core/objs/AbstractEntityAdjunct.java | 32 ++++++++--
.../brooklyn/core/objs/AdjunctConfigMap.java | 4 +-
.../SshCommandMembershipTrackingPolicy.java | 2 +-
.../apache/brooklyn/feed/shell/ShellFeed.java | 2 +-
.../util/core/task/BasicExecutionContext.java | 5 +-
.../internal/EntityExecutionManagerTest.java | 5 +-
.../brooklyn/util/core/task/TasksTest.java | 4 +-
.../policy/jclouds/os/CreateUserPolicy.java | 6 +-
.../policy/ha/AbstractFailureDetector.java | 16 +++--
.../policy/ha/ServiceFailureDetector.java | 7 ++-
.../brooklyn/policy/ha/ServiceReplacer.java | 13 +---
.../brooklyn/policy/ha/ServiceRestarter.java | 5 +-
.../brooklyn/entity/chef/ChefAttributeFeed.java | 16 +++--
.../windows/WindowsPerformanceCounterFeed.java | 21 +++----
21 files changed, 172 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4c9fe12/api/src/main/java/org/apache/brooklyn/api/mgmt/ManagementContext.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/mgmt/ManagementContext.java b/api/src/main/java/org/apache/brooklyn/api/mgmt/ManagementContext.java
index 515ec6b..00dd4d3 100644
--- a/api/src/main/java/org/apache/brooklyn/api/mgmt/ManagementContext.java
+++ b/api/src/main/java/org/apache/brooklyn/api/mgmt/ManagementContext.java
@@ -34,6 +34,7 @@ import org.apache.brooklyn.api.mgmt.entitlement.EntitlementManager;
import org.apache.brooklyn.api.mgmt.ha.HighAvailabilityManager;
import org.apache.brooklyn.api.mgmt.rebind.RebindManager;
import org.apache.brooklyn.api.objs.BrooklynObject;
+import org.apache.brooklyn.api.objs.EntityAdjunct;
import org.apache.brooklyn.api.typereg.BrooklynTypeRegistry;
import org.apache.brooklyn.config.StringConfigMap;
import org.apache.brooklyn.util.guava.Maybe;
@@ -176,6 +177,9 @@ public interface ManagementContext {
*/
SubscriptionContext getSubscriptionContext(Entity entity);
+ /** As {@link #getSubscriptionContext(Entity)} where there is also an adjunct */
+ SubscriptionContext getSubscriptionContext(Entity e, EntityAdjunct a);
+
/**
* Returns a {@link SubscriptionContext} instance representing subscriptions
* (from the {@link SubscriptionManager}) associated with this location, and capable
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4c9fe12/core/src/main/java/org/apache/brooklyn/core/config/ConfigConstraints.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/config/ConfigConstraints.java b/core/src/main/java/org/apache/brooklyn/core/config/ConfigConstraints.java
index b891c2b..c4ce81d 100644
--- a/core/src/main/java/org/apache/brooklyn/core/config/ConfigConstraints.java
+++ b/core/src/main/java/org/apache/brooklyn/core/config/ConfigConstraints.java
@@ -25,6 +25,7 @@ import java.util.List;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.api.mgmt.ExecutionContext;
import org.apache.brooklyn.api.objs.BrooklynObject;
import org.apache.brooklyn.api.objs.EntityAdjunct;
import org.apache.brooklyn.config.ConfigKey;
@@ -114,8 +115,12 @@ public abstract class ConfigConstraints<T extends BrooklynObject> {
abstract Iterable<ConfigKey<?>> getBrooklynObjectTypeConfigKeys();
public Iterable<ConfigKey<?>> getViolations() {
- if (getBrooklynObject() instanceof EntityInternal) {
- return ((EntityInternal) getBrooklynObject()).getExecutionContext().get(
+ ExecutionContext exec =
+ getBrooklynObject() instanceof EntityInternal ? ((EntityInternal)getBrooklynObject()).getExecutionContext() :
+ // getBrooklynObject() instanceof AbstractEntityAdjunct ? ((AbstractEntityAdjunct)getBrooklynObject()).getExecutionContext() :
+ null;
+ if (exec!=null) {
+ return exec.get(
Tasks.<Iterable<ConfigKey<?>>>builder().dynamic(false).displayName("Validating config").body(
() -> validateAll() ).build() );
} else {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4c9fe12/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java b/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java
index 940057e..dd7d22d 100644
--- a/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java
+++ b/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java
@@ -139,7 +139,7 @@ public class Poller<V> {
for (final Callable<?> oneOffJob : oneOffJobs) {
Task<?> task = Tasks.builder().dynamic(false).body((Callable<Object>) oneOffJob).displayName("Poll").description("One-time poll job "+oneOffJob).build();
- oneOffTasks.add(((EntityInternal)entity).getExecutionContext().submit(task));
+ oneOffTasks.add(feed.getExecutionContext().submit(task));
}
Duration minPeriod = null;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4c9fe12/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java
index 5cb1027..a68df32 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java
@@ -34,6 +34,7 @@ import org.apache.brooklyn.api.mgmt.ExecutionManager;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.api.mgmt.Task;
import org.apache.brooklyn.api.mgmt.entitlement.EntitlementContext;
+import org.apache.brooklyn.api.objs.EntityAdjunct;
import org.apache.brooklyn.core.mgmt.internal.AbstractManagementContext;
import org.apache.brooklyn.util.core.config.ConfigBag;
import org.apache.brooklyn.util.core.task.DynamicTasks;
@@ -59,13 +60,14 @@ import com.google.common.collect.ImmutableSet;
/** Provides utilities for making Tasks easier to work with in Brooklyn.
* Main thing at present is to supply (and find) wrapped entities for tasks to understand the
* relationship of the entity to the task.
- * TODO Longer term it would be better to remove 'tags' on Tasks and use a strongly typed context object.
+ * <p>
+ * Eventually it may be better to replace these 'tags' on Tasks with strongly typed context objects.
* (Tags there are used mainly for determining who called it (caller), what they called it on (target entity),
* and what type of task it is (effector, schedule/sensor, etc).)
*/
public class BrooklynTaskTags extends TaskTags {
- private static final Logger log = LoggerFactory.getLogger(BrooklynTaskTags.WrappedEntity.class);
+ private static final Logger log = LoggerFactory.getLogger(BrooklynTaskTags.class);
/** Tag for tasks which are running on behalf of the management server, rather than any entity */
public static final String BROOKLYN_SERVER_TASK_TAG = "BROOKLYN-SERVER";
@@ -85,37 +87,66 @@ public class BrooklynTaskTags extends TaskTags {
// ------------- entity tags -------------------------
- public static class WrappedEntity {
+ public abstract static class WrappedItem<T> {
+ /** @deprecated since 0.12.0 going private; use {@link #getWrappingType()} */
+ @Deprecated
public final String wrappingType;
- public final Entity entity;
- protected WrappedEntity(String wrappingType, Entity entity) {
+ protected WrappedItem(String wrappingType) {
Preconditions.checkNotNull(wrappingType);
- Preconditions.checkNotNull(entity);
this.wrappingType = wrappingType;
- this.entity = entity;
+ }
+ public abstract T unwrap();
+ public String getWrappingType() {
+ return wrappingType;
}
@Override
public String toString() {
- return "Wrapped["+wrappingType+":"+entity+"]";
+ return "Wrapped["+getWrappingType()+":"+unwrap()+"]";
}
@Override
public int hashCode() {
- return Objects.hashCode(entity, wrappingType);
+ return Objects.hashCode(unwrap(), getWrappingType());
}
@Override
public boolean equals(Object obj) {
if (this==obj) return true;
- if (!(obj instanceof WrappedEntity)) return false;
+ if (!(obj instanceof WrappedItem)) return false;
return
- Objects.equal(entity, ((WrappedEntity)obj).entity) &&
- Objects.equal(wrappingType, ((WrappedEntity)obj).wrappingType);
+ Objects.equal(unwrap(), ((WrappedItem<?>)obj).unwrap()) &&
+ Objects.equal(getWrappingType(), ((WrappedItem<?>)obj).getWrappingType());
+ }
+ }
+ public static class WrappedEntity extends WrappedItem<Entity> {
+ /** @deprecated since 0.12.0 going private; use {@link #unwrap()} */
+ @Deprecated
+ public final Entity entity;
+ protected WrappedEntity(String wrappingType, Entity entity) {
+ super(wrappingType);
+ this.entity = Preconditions.checkNotNull(entity);
+ }
+ @Override
+ public Entity unwrap() {
+ return entity;
}
}
+ public static class WrappedObject<T> extends WrappedItem<T> {
+ private final T object;
+ protected WrappedObject(String wrappingType, T object) {
+ super(wrappingType);
+ this.object = Preconditions.checkNotNull(object);
+ }
+ @Override
+ public T unwrap() {
+ return object;
+ }
+ }
public static final String CONTEXT_ENTITY = "contextEntity";
public static final String CALLER_ENTITY = "callerEntity";
public static final String TARGET_ENTITY = "targetEntity";
+ public static final String CONTEXT_ADJUNCT = "contextAdjunct";
+
/**
* Marks a task as running in the context of the entity. This means
* resolving any relative/context sensitive values against that entity.
@@ -138,6 +169,15 @@ public class BrooklynTaskTags extends TaskTags {
return new WrappedEntity(TARGET_ENTITY, entity);
}
+ /**
+ * As {@link #tagForContextEntity(Entity)} but wrapping an adjunct.
+ * Tasks with this tag will also have a {@link #tagForContextEntity(Entity)}.
+ */
+ public static WrappedObject<EntityAdjunct> tagForContextAdjunct(EntityAdjunct adjunct) {
+ return new WrappedObject<EntityAdjunct>(CONTEXT_ADJUNCT, adjunct);
+ }
+
+
public static WrappedEntity getWrappedEntityTagOfType(Task<?> t, String wrappingType) {
if (t==null) return null;
return getWrappedEntityTagOfType( getTagsFast(t), wrappingType);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4c9fe12/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java
index 52eed44..f0c9335 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java
@@ -51,6 +51,7 @@ import org.apache.brooklyn.api.mgmt.entitlement.EntitlementManager;
import org.apache.brooklyn.api.mgmt.ha.HighAvailabilityManager;
import org.apache.brooklyn.api.mgmt.rebind.RebindManager;
import org.apache.brooklyn.api.objs.BrooklynObject;
+import org.apache.brooklyn.api.objs.EntityAdjunct;
import org.apache.brooklyn.api.typereg.BrooklynTypeRegistry;
import org.apache.brooklyn.api.typereg.RegisteredType;
import org.apache.brooklyn.config.StringConfigMap;
@@ -258,6 +259,13 @@ public abstract class AbstractManagementContext implements ManagementContextInte
Map<String, ?> flags = ImmutableMap.of("tags", ImmutableList.of(BrooklynTaskTags.tagForContextEntity(e)));
return new BasicSubscriptionContext(flags, getSubscriptionManager(), e);
}
+
+ @Override
+ public SubscriptionContext getSubscriptionContext(Entity e, EntityAdjunct a) {
+ // BSC is a thin wrapper around SM so fine to create a new one here
+ Map<String, ?> flags = ImmutableMap.of("tags", ImmutableList.of(BrooklynTaskTags.tagForContextEntity(e), BrooklynTaskTags.tagForContextAdjunct(a)));
+ return new BasicSubscriptionContext(flags, getSubscriptionManager(), e);
+ }
@Override
public SubscriptionContext getSubscriptionContext(Location loc) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4c9fe12/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityManagementSupport.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityManagementSupport.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityManagementSupport.java
index 96cfd33..e192edd 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityManagementSupport.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityManagementSupport.java
@@ -84,8 +84,8 @@ public class EntityManagementSupport {
protected transient ManagementContext initialManagementContext;
protected transient ManagementContext managementContext;
- protected transient SubscriptionContext subscriptionContext;
- protected transient ExecutionContext executionContext;
+ protected transient volatile SubscriptionContext subscriptionContext;
+ protected transient volatile ExecutionContext executionContext;
protected final AtomicBoolean managementContextUsable = new AtomicBoolean(false);
protected final AtomicBoolean currentlyDeployed = new AtomicBoolean(false);
@@ -357,19 +357,25 @@ public class EntityManagementSupport {
return (managementContextUsable.get()) ? managementContext : nonDeploymentManagementContext;
}
- public synchronized ExecutionContext getExecutionContext() {
+ public ExecutionContext getExecutionContext() {
if (executionContext!=null) return executionContext;
if (managementContextUsable.get()) {
- executionContext = managementContext.getExecutionContext(entity);
- return executionContext;
+ synchronized (this) {
+ if (executionContext!=null) return executionContext;
+ executionContext = managementContext.getExecutionContext(entity);
+ return executionContext;
+ }
}
return nonDeploymentManagementContext.getExecutionContext(entity);
}
- public synchronized SubscriptionContext getSubscriptionContext() {
+ public SubscriptionContext getSubscriptionContext() {
if (subscriptionContext!=null) return subscriptionContext;
if (managementContextUsable.get()) {
- subscriptionContext = managementContext.getSubscriptionContext(entity);
- return subscriptionContext;
+ synchronized (this) {
+ if (subscriptionContext!=null) return subscriptionContext;
+ subscriptionContext = managementContext.getSubscriptionContext(entity);
+ return subscriptionContext;
+ }
}
return nonDeploymentManagementContext.getSubscriptionContext(entity);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4c9fe12/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/NonDeploymentManagementContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/NonDeploymentManagementContext.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/NonDeploymentManagementContext.java
index 2e9238f..91375d2 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/NonDeploymentManagementContext.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/NonDeploymentManagementContext.java
@@ -58,6 +58,7 @@ import org.apache.brooklyn.api.mgmt.rebind.RebindManager;
import org.apache.brooklyn.api.mgmt.rebind.mementos.BrooklynMementoPersister;
import org.apache.brooklyn.api.mgmt.rebind.mementos.BrooklynMementoRawData;
import org.apache.brooklyn.api.objs.BrooklynObject;
+import org.apache.brooklyn.api.objs.EntityAdjunct;
import org.apache.brooklyn.api.typereg.BrooklynTypeRegistry;
import org.apache.brooklyn.config.StringConfigMap;
import org.apache.brooklyn.core.catalog.internal.CatalogInitialization;
@@ -101,7 +102,6 @@ public class NonDeploymentManagementContext implements ManagementContextInternal
private ManagementContextInternal initialManagementContext;
private final QueueingSubscriptionManager qsm;
- private final BasicSubscriptionContext subscriptionContext;
private NonDeploymentEntityManager entityManager;
private NonDeploymentLocationManager locationManager;
private NonDeploymentAccessManager accessManager;
@@ -112,10 +112,6 @@ public class NonDeploymentManagementContext implements ManagementContextInternal
this.mode = checkNotNull(mode, "mode");
qsm = new QueueingSubscriptionManager();
- // For subscription flags, see AbstractManagementContext.getSubscriptionContext. This is
- // needed for callbacks, to ensure the correct entity context is set.
- Map<String, ?> subscriptionFlags = ImmutableMap.of("tags", ImmutableList.of(BrooklynTaskTags.tagForContextEntity(entity)));
- subscriptionContext = new BasicSubscriptionContext(subscriptionFlags, qsm, entity);
entityManager = new NonDeploymentEntityManager(null);
locationManager = new NonDeploymentLocationManager(null);
accessManager = new NonDeploymentAccessManager(null);
@@ -254,7 +250,19 @@ public class NonDeploymentManagementContext implements ManagementContextInternal
if (!this.entity.equals(entity)) throw new IllegalStateException("Non-deployment context "+this+" can only use a single Entity: has "+this.entity+", but passed "+entity);
if (mode==NonDeploymentManagementContextMode.MANAGEMENT_STOPPED)
throw new IllegalStateException("Entity "+entity+" is no longer managed; subscription context not available");
- return subscriptionContext;
+ // see also AbstractManagementContext.getSubscriptionContext - needed for callbacks, to ensure the correct entity context is set
+ Map<String, ?> subscriptionFlags = ImmutableMap.of("tags", ImmutableList.of(BrooklynTaskTags.tagForContextEntity(entity)));
+ return new BasicSubscriptionContext(subscriptionFlags, qsm, entity);
+ }
+
+ @Override
+ public SubscriptionContext getSubscriptionContext(Entity entity, EntityAdjunct adjunct) {
+ if (!this.entity.equals(entity)) throw new IllegalStateException("Non-deployment context "+this+" can only use a single Entity: has "+this.entity+", but passed "+entity);
+ if (mode==NonDeploymentManagementContextMode.MANAGEMENT_STOPPED)
+ throw new IllegalStateException("Entity "+entity+" is no longer managed; subscription context not available");
+ // see also AbstractManagementContext.getSubscriptionContext - needed for callbacks, to ensure the correct entity context is set
+ Map<String, ?> subscriptionFlags = ImmutableMap.of("tags", ImmutableList.of(BrooklynTaskTags.tagForContextEntity(entity), BrooklynTaskTags.tagForContextAdjunct(adjunct)));
+ return new BasicSubscriptionContext(subscriptionFlags, qsm, entity);
}
@Override
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4c9fe12/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java
index 2c4c4b4..9018d5d 100644
--- a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java
+++ b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java
@@ -29,7 +29,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
import javax.annotation.Nullable;
@@ -37,6 +36,7 @@ import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.EntityLocal;
import org.apache.brooklyn.api.entity.Group;
import org.apache.brooklyn.api.mgmt.ExecutionContext;
+import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.api.mgmt.SubscriptionHandle;
import org.apache.brooklyn.api.mgmt.Task;
import org.apache.brooklyn.api.objs.BrooklynObject;
@@ -54,12 +54,15 @@ import org.apache.brooklyn.core.enricher.AbstractEnricher;
import org.apache.brooklyn.core.entity.Entities;
import org.apache.brooklyn.core.entity.EntityInternal;
import org.apache.brooklyn.core.entity.internal.ConfigUtilsInternal;
+import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;
import org.apache.brooklyn.core.mgmt.internal.SubscriptionTracker;
+import org.apache.brooklyn.util.collections.MutableList;
import org.apache.brooklyn.util.collections.MutableSet;
import org.apache.brooklyn.util.core.config.ConfigBag;
import org.apache.brooklyn.util.core.flags.FlagUtils;
import org.apache.brooklyn.util.core.flags.SetFromFlag;
import org.apache.brooklyn.util.core.flags.TypeCoercions;
+import org.apache.brooklyn.util.core.task.BasicExecutionContext;
import org.apache.brooklyn.util.text.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -86,6 +89,8 @@ public abstract class AbstractEntityAdjunct extends AbstractBrooklynObject imple
@Deprecated
protected Map<String,Object> leftoverProperties = Maps.newLinkedHashMap();
+ /** @deprecated since 0.12.0, going private, use {@link #getExecutionContext()} */
+ @Deprecated
protected transient ExecutionContext execution;
private final BasicConfigurationSupport config = new BasicConfigurationSupport();
@@ -213,6 +218,14 @@ public abstract class AbstractEntityAdjunct extends AbstractBrooklynObject imple
return _legacyNoConstructionInit;
}
+ /** If the entity has been set, returns the execution context indicating this adjunct.
+ * Primarily intended for this adjunct to execute tasks, but in some cases, mainly low level,
+ * it may make sense for other components to execute tasks against this adjunct. */
+ @Beta
+ public ExecutionContext getExecutionContext() {
+ return execution;
+ }
+
@Override
public ConfigurationSupportInternal config() {
return config;
@@ -276,7 +289,7 @@ public abstract class AbstractEntityAdjunct extends AbstractBrooklynObject imple
synchronized (AbstractEntityAdjunct.this) {
if (_subscriptionTracker!=null) return _subscriptionTracker;
if (entity==null) return null;
- _subscriptionTracker = new SubscriptionTracker(((EntityInternal)entity).subscriptions().getSubscriptionContext());
+ _subscriptionTracker = new SubscriptionTracker(getManagementContext().getSubscriptionContext(entity, AbstractEntityAdjunct.this));
return _subscriptionTracker;
}
}
@@ -334,7 +347,7 @@ public abstract class AbstractEntityAdjunct extends AbstractBrooklynObject imple
@Override
protected ExecutionContext getContext() {
- return AbstractEntityAdjunct.this.execution;
+ return AbstractEntityAdjunct.this.getExecutionContext();
}
@Override
@@ -402,10 +415,21 @@ public abstract class AbstractEntityAdjunct extends AbstractBrooklynObject imple
this.name = name;
}
+ @Override
+ public ManagementContext getManagementContext() {
+ ManagementContext result = super.getManagementContext();
+ if (result!=null) return result;
+ if (entity!=null) {
+ return ((EntityInternal)entity).getManagementContext();
+ }
+ return null;
+ }
+
public void setEntity(EntityLocal entity) {
if (destroyed.get()) throw new IllegalStateException("Cannot set entity on a destroyed entity adjunct");
this.entity = entity;
- this.execution = ((EntityInternal) entity).getExecutionContext();
+ this.execution = new BasicExecutionContext( getManagementContext().getExecutionManager(),
+ MutableList.of(BrooklynTaskTags.tagForContextAdjunct(this), BrooklynTaskTags.tagForContextEntity(entity)) );
if (entity!=null && getCatalogItemId() == null) {
setCatalogItemIdAndSearchPath(entity.getCatalogItemId(), entity.getCatalogItemIdSearchPath());
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4c9fe12/core/src/main/java/org/apache/brooklyn/core/objs/AdjunctConfigMap.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/AdjunctConfigMap.java b/core/src/main/java/org/apache/brooklyn/core/objs/AdjunctConfigMap.java
index 602d943..71fe16c 100644
--- a/core/src/main/java/org/apache/brooklyn/core/objs/AdjunctConfigMap.java
+++ b/core/src/main/java/org/apache/brooklyn/core/objs/AdjunctConfigMap.java
@@ -69,9 +69,7 @@ public class AdjunctConfigMap extends AbstractConfigMapImpl<EntityAdjunct> {
@Override
protected ExecutionContext getExecutionContext(BrooklynObject bo) {
- // TODO expose ((AbstractEntityAdjunct)bo).execution ?
- Entity entity = ((AbstractEntityAdjunct)bo).entity;
- return (entity != null) ? ((EntityInternal)entity).getExecutionContext() : null;
+ return ((AbstractEntityAdjunct)bo).getExecutionContext();
}
@Override
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4c9fe12/core/src/main/java/org/apache/brooklyn/entity/group/SshCommandMembershipTrackingPolicy.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/entity/group/SshCommandMembershipTrackingPolicy.java b/core/src/main/java/org/apache/brooklyn/entity/group/SshCommandMembershipTrackingPolicy.java
index ea2ec55..373c667 100644
--- a/core/src/main/java/org/apache/brooklyn/entity/group/SshCommandMembershipTrackingPolicy.java
+++ b/core/src/main/java/org/apache/brooklyn/entity/group/SshCommandMembershipTrackingPolicy.java
@@ -186,7 +186,7 @@ public class SshCommandMembershipTrackingPolicy extends AbstractMembershipTracki
// Try to resolve the configuration in the env Map
try {
- env = (Map<String, Object>) Tasks.resolveDeepValue(env, Object.class, ((EntityInternal) entity).getExecutionContext());
+ env = (Map<String, Object>) Tasks.resolveDeepValue(env, Object.class, getExecutionContext());
} catch (InterruptedException | ExecutionException e) {
throw Exceptions.propagate(e);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4c9fe12/core/src/main/java/org/apache/brooklyn/feed/shell/ShellFeed.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/feed/shell/ShellFeed.java b/core/src/main/java/org/apache/brooklyn/feed/shell/ShellFeed.java
index ca41304..3f78c3a 100644
--- a/core/src/main/java/org/apache/brooklyn/feed/shell/ShellFeed.java
+++ b/core/src/main/java/org/apache/brooklyn/feed/shell/ShellFeed.java
@@ -229,7 +229,7 @@ public class ShellFeed extends AbstractFeed {
final ProcessTaskFactory<?> taskFactory = newTaskFactory(pollInfo.command, pollInfo.env, pollInfo.dir,
pollInfo.input, pollInfo.context, pollInfo.timeout);
- final ExecutionContext executionContext = ((EntityInternal) entity).getExecutionContext();
+ final ExecutionContext executionContext = getExecutionContext();
getPoller().scheduleAtFixedRate(
new Callable<SshPollValue>() {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4c9fe12/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionContext.java b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionContext.java
index 429cad7..1b85663 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionContext.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionContext.java
@@ -44,6 +44,7 @@ import org.apache.brooklyn.api.mgmt.entitlement.EntitlementContext;
import org.apache.brooklyn.core.entity.EntityInternal;
import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;
import org.apache.brooklyn.core.mgmt.BrooklynTaskTags.WrappedEntity;
+import org.apache.brooklyn.core.mgmt.BrooklynTaskTags.WrappedItem;
import org.apache.brooklyn.core.mgmt.entitlement.Entitlements;
import org.apache.brooklyn.util.collections.MutableMap;
import org.apache.brooklyn.util.collections.MutableSet;
@@ -107,8 +108,8 @@ public class BasicExecutionContext extends AbstractExecutionContext {
// which may require access to internal methods
// (could remove this check if generalizing; it has been here for a long time and the problem seems gone)
for (Object tag: tags) {
- if (tag instanceof BrooklynTaskTags.WrappedEntity) {
- if (Proxy.isProxyClass(((WrappedEntity)tag).entity.getClass())) {
+ if (tag instanceof BrooklynTaskTags.WrappedItem) {
+ if (Proxy.isProxyClass(((WrappedItem<?>)tag).unwrap().getClass())) {
log.warn(""+this+" has entity proxy in "+tag);
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4c9fe12/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/EntityExecutionManagerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/EntityExecutionManagerTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/EntityExecutionManagerTest.java
index 59ee3cf..97f02b7 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/EntityExecutionManagerTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/EntityExecutionManagerTest.java
@@ -40,6 +40,7 @@ import org.apache.brooklyn.core.entity.EntityInternal;
import org.apache.brooklyn.core.internal.BrooklynProperties;
import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;
import org.apache.brooklyn.core.mgmt.BrooklynTaskTags.WrappedEntity;
+import org.apache.brooklyn.core.mgmt.BrooklynTaskTags.WrappedItem;
import org.apache.brooklyn.core.sensor.BasicAttributeSensor;
import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport;
import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests;
@@ -318,8 +319,8 @@ public class EntityExecutionManagerTest extends BrooklynAppUnitTestSupport {
if (tag instanceof Entity && ((Entity)tag).getId().equals(eId)) {
fail("tags contains unmanaged entity "+tag);
}
- if ((tag instanceof WrappedEntity) && ((WrappedEntity)tag).entity.getId().equals(eId)
- && ((WrappedEntity)tag).wrappingType.equals(BrooklynTaskTags.CONTEXT_ENTITY)) {
+ if ((tag instanceof WrappedEntity) && ((WrappedEntity)tag).unwrap().getId().equals(eId)
+ && ((WrappedItem<?>)tag).getWrappingType().equals(BrooklynTaskTags.CONTEXT_ENTITY)) {
fail("tags contains unmanaged entity (wrapped) "+tag);
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4c9fe12/core/src/test/java/org/apache/brooklyn/util/core/task/TasksTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/task/TasksTest.java b/core/src/test/java/org/apache/brooklyn/util/core/task/TasksTest.java
index 990e7f7..8c656a3 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/task/TasksTest.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/task/TasksTest.java
@@ -248,8 +248,8 @@ public class TasksTest extends BrooklynAppUnitTestSupport {
for (Object tag : Tasks.current().getTags()) {
if (tag instanceof WrappedEntity) {
WrappedEntity wrapped = (WrappedEntity)tag;
- if (BrooklynTaskTags.CONTEXT_ENTITY.equals(wrapped.wrappingType)) {
- context.add(wrapped.entity);
+ if (BrooklynTaskTags.CONTEXT_ENTITY.equals(wrapped.getWrappingType())) {
+ context.add(wrapped.unwrap());
}
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4c9fe12/locations/jclouds/src/main/java/org/apache/brooklyn/policy/jclouds/os/CreateUserPolicy.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/policy/jclouds/os/CreateUserPolicy.java b/locations/jclouds/src/main/java/org/apache/brooklyn/policy/jclouds/os/CreateUserPolicy.java
index 2078779..555d7cb 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/policy/jclouds/os/CreateUserPolicy.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/policy/jclouds/os/CreateUserPolicy.java
@@ -110,11 +110,7 @@ public class CreateUserPolicy extends AbstractPolicy implements SensorEventListe
}
protected void addUserAsync(final Entity entity, final SshMachineLocation machine) {
- ((EntityInternal)entity).getExecutionContext().execute(new Runnable() {
- @Override
- public void run() {
- addUser(entity, machine);
- }});
+ getExecutionContext().execute(() -> addUser(entity, machine));
}
protected void addUser(Entity entity, SshMachineLocation machine) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4c9fe12/policy/src/main/java/org/apache/brooklyn/policy/ha/AbstractFailureDetector.java
----------------------------------------------------------------------
diff --git a/policy/src/main/java/org/apache/brooklyn/policy/ha/AbstractFailureDetector.java b/policy/src/main/java/org/apache/brooklyn/policy/ha/AbstractFailureDetector.java
index 840335a..c6bd33d 100644
--- a/policy/src/main/java/org/apache/brooklyn/policy/ha/AbstractFailureDetector.java
+++ b/policy/src/main/java/org/apache/brooklyn/policy/ha/AbstractFailureDetector.java
@@ -21,7 +21,6 @@ package org.apache.brooklyn.policy.ha;
import static org.apache.brooklyn.util.time.Time.makeTimeStringRounded;
import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
@@ -30,19 +29,18 @@ import org.apache.brooklyn.api.mgmt.Task;
import org.apache.brooklyn.api.sensor.Sensor;
import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.core.config.ConfigKeys;
-import org.apache.brooklyn.core.entity.EntityInternal;
import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;
import org.apache.brooklyn.core.policy.AbstractPolicy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.brooklyn.policy.ha.HASensors.FailureDescriptor;
-import org.apache.brooklyn.util.collections.MutableMap;
import org.apache.brooklyn.util.core.flags.SetFromFlag;
import org.apache.brooklyn.util.core.task.BasicTask;
import org.apache.brooklyn.util.core.task.ScheduledTask;
+import org.apache.brooklyn.util.core.task.Tasks;
import org.apache.brooklyn.util.exceptions.Exceptions;
import org.apache.brooklyn.util.time.Duration;
import org.apache.brooklyn.util.time.Time;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.reflect.TypeToken;
@@ -194,7 +192,7 @@ public abstract class AbstractFailureDetector extends AbstractPolicy {
protected void doStartPolling() {
if (scheduledTask == null || scheduledTask.isDone()) {
ScheduledTask task = ScheduledTask.builder(pollingTaskFactory).displayName( getTaskName() ).period(getPollPeriod()).build();
- scheduledTask = ((EntityInternal)entity).getExecutionContext().submit(task);
+ scheduledTask = getExecutionContext().submit(task);
}
}
@@ -270,7 +268,6 @@ public abstract class AbstractFailureDetector extends AbstractPolicy {
schedulePublish(0);
}
- @SuppressWarnings("unchecked")
protected void schedulePublish(long delay) {
if (isRunning() && executorQueued.compareAndSet(false, true)) {
long now = System.currentTimeMillis();
@@ -279,8 +276,9 @@ public abstract class AbstractFailureDetector extends AbstractPolicy {
Runnable job = new PublishJob();
- ScheduledTask task = new ScheduledTask(MutableMap.of("delay", Duration.of(delay, TimeUnit.MILLISECONDS)), new BasicTask<Void>(job));
- ((EntityInternal)entity).getExecutionContext().submit(task);
+ ScheduledTask task = ScheduledTask.builder(() -> Tasks.builder().body(job).dynamic(false).displayName("Failure detector iteration").build())
+ .delay(Duration.millis(delay)).displayName("Failure detector scheduler").build();
+ getExecutionContext().submit(task);
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4c9fe12/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceFailureDetector.java
----------------------------------------------------------------------
diff --git a/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceFailureDetector.java b/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceFailureDetector.java
index 2cbbf28..e143582 100644
--- a/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceFailureDetector.java
+++ b/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceFailureDetector.java
@@ -39,6 +39,7 @@ import org.apache.brooklyn.util.collections.MutableMap;
import org.apache.brooklyn.util.core.flags.SetFromFlag;
import org.apache.brooklyn.util.core.task.BasicTask;
import org.apache.brooklyn.util.core.task.ScheduledTask;
+import org.apache.brooklyn.util.core.task.Tasks;
import org.apache.brooklyn.util.exceptions.Exceptions;
import org.apache.brooklyn.util.guava.Maybe;
import org.apache.brooklyn.util.time.Duration;
@@ -314,7 +315,6 @@ public class ServiceFailureDetector extends ServiceStateLogic.ComputeServiceStat
return description;
}
- @SuppressWarnings({ "rawtypes" })
protected void recomputeAfterDelay(long delay) {
// TODO Execute in same thread as other onEvent calls are done in (i.e. same conceptually
// single-threaded executor as the subscription-manager will use).
@@ -352,8 +352,9 @@ public class ServiceFailureDetector extends ServiceStateLogic.ComputeServiceStat
}
};
- ScheduledTask task = new ScheduledTask(MutableMap.of("delay", Duration.of(delay, TimeUnit.MILLISECONDS)), new BasicTask(job));
- ((EntityInternal)entity).getExecutionContext().submit(task);
+ ScheduledTask task = ScheduledTask.builder(() -> Tasks.builder().body(job).dynamic(false).displayName("Failure detector recompute").build())
+ .delay(Duration.millis(delay)).displayName("Failure detector recompute after delay").build();
+ getExecutionContext().submit(task);
}
private String getTimeStringSince(Long time) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4c9fe12/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceReplacer.java
----------------------------------------------------------------------
diff --git a/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceReplacer.java b/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceReplacer.java
index 3a1ba80..e14433d 100644
--- a/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceReplacer.java
+++ b/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceReplacer.java
@@ -129,10 +129,7 @@ public class ServiceReplacer extends AbstractPolicy {
if (isRunning()) {
highlightViolation("Failure detected");
LOG.warn("ServiceReplacer notified; dispatching job for "+entity+" ("+event.getValue()+")");
- ((EntityInternal)entity).getExecutionContext().submit(MutableMap.of(), new Runnable() {
- @Override public void run() {
- onDetectedFailure(event);
- }});
+ getExecutionContext().submit(() -> onDetectedFailure(event));
} else {
LOG.warn("ServiceReplacer not running, so not acting on failure detected at "+entity+" ("+event.getValue()+", child of "+entity+")");
}
@@ -176,10 +173,7 @@ public class ServiceReplacer extends AbstractPolicy {
highlightViolation(violationText+", triggering restart");
LOG.warn("ServiceReplacer acting on failure detected at "+failedEntity+" ("+reason+", child of "+entity+")");
- Task<?> t = ((EntityInternal)entity).getExecutionContext().submit(MutableMap.of(), new Runnable() {
-
- @Override
- public void run() {
+ Task<?> t = getExecutionContext().submit(() -> {
try {
Entities.invokeEffectorWithArgs(entity, entity, MemberReplaceable.REPLACE_MEMBER, failedEntity.getId()).get();
consecutiveReplacementFailureTimes.clear();
@@ -191,8 +185,7 @@ public class ServiceReplacer extends AbstractPolicy {
highlightViolation(violationText+" and replace attempt failed: "+Exceptions.collapseText(e));
onReplacementFailed("Replace failure ("+Exceptions.collapseText(e)+") at "+entity+": "+reason);
}
- }
- });
+ });
highlightAction("Replacing "+failedEntity, t);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4c9fe12/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceRestarter.java
----------------------------------------------------------------------
diff --git a/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceRestarter.java b/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceRestarter.java
index 8faaf89..a31e3c0 100644
--- a/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceRestarter.java
+++ b/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceRestarter.java
@@ -112,10 +112,7 @@ public class ServiceRestarter extends AbstractPolicy {
if (isRunning()) {
LOG.info("ServiceRestarter notified; dispatching job for "+entity+" ("+event.getValue()+")");
- ((EntityInternal)entity).getExecutionContext().submit(MutableMap.of(), new Runnable() {
- @Override public void run() {
- onDetectedFailure(event);
- }});
+ getExecutionContext().submit(() -> onDetectedFailure(event));
} else {
LOG.warn("ServiceRestarter not running, so not acting on failure detected at "+entity+" ("+event.getValue()+")");
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4c9fe12/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefAttributeFeed.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefAttributeFeed.java b/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefAttributeFeed.java
index f6d2615..0252dc2 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefAttributeFeed.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefAttributeFeed.java
@@ -225,9 +225,8 @@ public class ChefAttributeFeed extends AbstractFeed {
@Override
public SshPollValue call() throws Exception {
ProcessTaskWrapper<String> taskWrapper = knifeTaskFactory.newTask();
- final ExecutionContext executionContext = ((EntityInternal) entity).getExecutionContext();
log.debug("START: Running knife to query attributes of Chef node {}", nodeName);
- executionContext.submit(taskWrapper);
+ getExecutionContext().submit(taskWrapper);
taskWrapper.block();
log.debug("DONE: Running knife to query attributes of Chef node {}", nodeName);
return new SshPollValue(null, taskWrapper.getExitCode(), taskWrapper.getStdout(), taskWrapper.getStderr());
@@ -235,7 +234,7 @@ public class ChefAttributeFeed extends AbstractFeed {
};
getPoller().scheduleAtFixedRate(
- new CallInEntityExecutionContext<SshPollValue>(entity, getAttributesFromKnife),
+ new CallInExecutionContext<SshPollValue>(this, getAttributesFromKnife),
new SendChefAttributesToSensors(entity, polls),
minPeriod);
}
@@ -269,20 +268,19 @@ public class ChefAttributeFeed extends AbstractFeed {
*
* @param <T> The type of the {@link Callable}.
*/
- private static class CallInEntityExecutionContext<T> implements Callable<T> {
+ private static class CallInExecutionContext<T> implements Callable<T> {
private final Callable<T> job;
- private Entity entity;
+ private AbstractFeed feed;
- private CallInEntityExecutionContext(Entity entity, Callable<T> job) {
+ private CallInExecutionContext(AbstractFeed feed, Callable<T> job) {
this.job = job;
- this.entity = entity;
+ this.feed = feed;
}
@Override
public T call() throws Exception {
- final ExecutionContext executionContext = ((EntityInternal) entity).getExecutionContext();
- return executionContext.submit(Maps.newHashMap(), job).get();
+ return feed.getExecutionContext().submit(Maps.newHashMap(), job).get();
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4c9fe12/software/winrm/src/main/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeed.java
----------------------------------------------------------------------
diff --git a/software/winrm/src/main/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeed.java b/software/winrm/src/main/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeed.java
index d5d9751..55b273e 100644
--- a/software/winrm/src/main/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeed.java
+++ b/software/winrm/src/main/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeed.java
@@ -211,14 +211,14 @@ public class WindowsPerformanceCounterFeed extends AbstractFeed {
String command = JOINER_ON_SPACE.join(allParams);
log.debug("Windows performance counter poll command for {} will be: {}", entity, command);
- GetPerformanceCountersJob<WinRmToolResponse> job = new GetPerformanceCountersJob(getEntity(), command);
+ GetPerformanceCountersJob job = new GetPerformanceCountersJob(getEntity(), command);
getPoller().scheduleAtFixedRate(
- new CallInEntityExecutionContext(entity, job),
+ new CallInExecutionContext<WinRmToolResponse>(this, job),
new SendPerfCountersToSensors(getEntity(), polls),
minPeriod);
}
- private static class GetPerformanceCountersJob<T> implements Callable<T> {
+ private static class GetPerformanceCountersJob implements Callable<WinRmToolResponse> {
private final Entity entity;
private final String command;
@@ -229,15 +229,14 @@ public class WindowsPerformanceCounterFeed extends AbstractFeed {
}
@Override
- @SuppressWarnings("unchecked")
- public T call() throws Exception {
+ public WinRmToolResponse call() throws Exception {
Maybe<WinRmMachineLocation> machineLocationMaybe = Machines.findUniqueMachineLocation(entity.getLocations(), WinRmMachineLocation.class);
if (machineLocationMaybe.isAbsent()) {
return null;
}
WinRmMachineLocation machine = EffectorTasks.getMachine(entity, WinRmMachineLocation.class);
WinRmToolResponse response = machine.executePsScript(command);
- return (T)response;
+ return response;
}
}
@@ -254,18 +253,18 @@ public class WindowsPerformanceCounterFeed extends AbstractFeed {
*
* @param <T> The type of the {@link java.util.concurrent.Callable}.
*/
- private static class CallInEntityExecutionContext<T> implements Callable<T> {
+ private static class CallInExecutionContext<T> implements Callable<T> {
private final Callable<T> job;
- private Entity entity;
+ private AbstractFeed feed;
- private CallInEntityExecutionContext(Entity entity, Callable<T> job) {
+ private CallInExecutionContext(AbstractFeed feed, Callable<T> job) {
this.job = job;
- this.entity = entity;
+ this.feed = feed;
}
@Override
public T call() throws Exception {
- ExecutionContext executionContext = ((EntityInternal) entity).getExecutionContext();
+ ExecutionContext executionContext = feed.getExecutionContext();
return executionContext.submit(Maps.newHashMap(), job).get();
}
}