mark task names needing tidy as TODO and tidy some
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/4c2468d0 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/4c2468d0 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/4c2468d0 Branch: refs/heads/master Commit: 4c2468d0f001bfdde74dd5b48c90935d0d746981 Parents: 9a105e0 Author: Alex Heneveld <[email protected]> Authored: Mon Sep 11 11:04:08 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Fri Sep 15 10:29:08 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/brooklyn/core/config/BasicConfigKey.java | 4 ++-- .../org/apache/brooklyn/core/config/ConfigConstraints.java | 1 + .../org/apache/brooklyn/core/mgmt/EntityManagementUtils.java | 1 + .../brooklyn/core/mgmt/internal/EntityManagementSupport.java | 1 + .../core/mgmt/internal/QueueingSubscriptionManager.java | 2 ++ .../core/objs/AbstractConfigurationSupportInternal.java | 8 ++++++-- .../org/apache/brooklyn/util/core/task/DynamicTasks.java | 1 + 7 files changed, 14 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4c2468d0/core/src/main/java/org/apache/brooklyn/core/config/BasicConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/config/BasicConfigKey.java b/core/src/main/java/org/apache/brooklyn/core/config/BasicConfigKey.java index 8c6c25b..61f4874 100644 --- a/core/src/main/java/org/apache/brooklyn/core/config/BasicConfigKey.java +++ b/core/src/main/java/org/apache/brooklyn/core/config/BasicConfigKey.java @@ -441,9 +441,9 @@ public class BasicConfigKey<T> implements ConfigKeySelfExtracting<T>, Serializab protected Object resolveValue(Object v, ExecutionContext exec) throws ExecutionException, InterruptedException { if (v instanceof Collection || v instanceof Map) { - return Tasks.resolveDeepValue(v, Object.class, exec, "config "+name); + return Tasks.resolveDeepValue(v, Object.class, exec, "Resolving deep config "+name); } else { - return Tasks.resolveValue(v, getType(), exec, "config "+name); + return Tasks.resolveValue(v, getType(), exec, "Resolving config "+name); } } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4c2468d0/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 c508349..2d0cf7d 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 @@ -112,6 +112,7 @@ public abstract class ConfigConstraints<T extends BrooklynObject> { abstract Iterable<ConfigKey<?>> getBrooklynObjectTypeConfigKeys(); public Iterable<ConfigKey<?>> getViolations() { + // TODO in new task return validateAll(); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4c2468d0/core/src/main/java/org/apache/brooklyn/core/mgmt/EntityManagementUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/EntityManagementUtils.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/EntityManagementUtils.java index a036622..0cd18fc 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/EntityManagementUtils.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/EntityManagementUtils.java @@ -91,6 +91,7 @@ public class EntityManagementUtils { */ @Beta public static <T extends Application> T createUnstarted(ManagementContext mgmt, EntitySpec<T> spec, Optional<String> entityId) { + // TODO wrap in task T app = ((EntityManagerInternal)mgmt.getEntityManager()).createEntity(spec, entityId); return app; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4c2468d0/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 852166b..97c7bac 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 @@ -160,6 +160,7 @@ public class EntityManagementSupport { public void onManagementStarting(ManagementTransitionInfo info) { try { + // TODO same-thread task on this entity, with internal tag ? synchronized (this) { boolean alreadyManaging = isDeployed(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4c2468d0/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/QueueingSubscriptionManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/QueueingSubscriptionManager.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/QueueingSubscriptionManager.java index d24e7a4..83facda 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/QueueingSubscriptionManager.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/QueueingSubscriptionManager.java @@ -76,6 +76,7 @@ public class QueueingSubscriptionManager extends AbstractSubscriptionManager { @SuppressWarnings("unchecked") public synchronized void startDelegatingForSubscribing() { + // TODO wrap in same-thread task assert delegate!=null; for (QueuedSubscription s: queuedSubscriptions) { delegate.subscribe(s.flags, s.s); @@ -86,6 +87,7 @@ public class QueueingSubscriptionManager extends AbstractSubscriptionManager { @SuppressWarnings("unchecked") public synchronized void startDelegatingForPublishing() { + // TODO wrap in same-thread task assert delegate!=null; for (SensorEvent evt: queuedSensorEvents) { delegate.publish(evt); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4c2468d0/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java index 4b3876b..460c8c4 100644 --- a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java +++ b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java @@ -106,9 +106,10 @@ public abstract class AbstractConfigurationSupportInternal implements BrooklynOb } }; + // TODO can we remove the DST ? this is structured so maybe not Task<T> t = Tasks.<T>builder().body(job) - .displayName("Resolving dependent value") - .description("Resolving "+key.getName()) + .displayName("Resolving config "+key.getName()) + .description("Internal non-blocking structured key resolution") .tag(BrooklynTaskTags.TRANSIENT_TASK_TAG) .build(); try { @@ -131,6 +132,9 @@ public abstract class AbstractConfigurationSupportInternal implements BrooklynOb // getRaw returns Maybe(val) if the key was explicitly set (where val can be null) // or Absent if the config key was unset. Object unresolved = getRaw(key).or(key.getDefaultValue()); + // TODO add description that we are evaluating this config key to be used if the code below submits futher tasks + // and look at other uses of "description" method + // and make sure it is marked transient Maybe<Object> resolved = Tasks.resolving(unresolved) .as(Object.class) .immediately(true) http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4c2468d0/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicTasks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicTasks.java b/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicTasks.java index c966cf0..15b062a 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicTasks.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicTasks.java @@ -292,6 +292,7 @@ public class DynamicTasks { * only permitted in a queueing context (ie a DST main job) if the task is not yet submitted */ // things get really confusing if you try to queueInTaskHierarchy -- easy to cause deadlocks! public static <T> T get(TaskAdaptable<T> t) { + // TODO do in foreground? return queueIfNeeded(t).asTask().getUnchecked(); }
