[brooklyn-server] 05/05: make some other common tasks logged at trace

[he...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git

commit 5309315bb07e1b63048ac26917c9a147aa5ee13c
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Sep 10 01:42:49 2021 +0100

    make some other common tasks logged at trace
---
 .../brooklyn/util/core/task/DynamicSequentialTask.java     | 14 ++++++++++----
 .../org/apache/brooklyn/util/core/task/ValueResolver.java  |  7 ++++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicSequentialTask.java b/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicSequentialTask.java
index 362fd5d..5953909 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicSequentialTask.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicSequentialTask.java
@@ -30,6 +30,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.apache.brooklyn.api.mgmt.HasTaskChildren;
 import org.apache.brooklyn.api.mgmt.Task;
+import org.apache.brooklyn.api.mgmt.TaskAdaptable;
 import org.apache.brooklyn.api.mgmt.TaskQueueingContext;
 import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;
 import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal;
@@ -65,7 +66,12 @@ import com.google.common.collect.ImmutableList;
 public class DynamicSequentialTask<T> extends BasicTask<T> implements HasTaskChildren, TaskQueueingContext {
 
     private static final Logger log = LoggerFactory.getLogger(CompoundTask.class);
-                
+
+    private static String TASK_NAME = "DST manager (internal)";
+    static {
+        BasicExecutionManager.registerUninterestingTaskName(TASK_NAME);
+    }
+
     protected final Queue<Task<?>> secondaryJobsAll = new ConcurrentLinkedQueue<Task<?>>();
     protected final Queue<Task<?>> secondaryJobsRemaining = new ConcurrentLinkedQueue<Task<?>>();
     protected final Object jobTransitionLock = new Object();
@@ -85,7 +91,7 @@ public class DynamicSequentialTask<T> extends BasicTask<T> implements HasTaskChi
         /** as {@link #abortSecondaryQueueOnPrimaryFailure} but controls cancelling of secondary queue*/
         public final boolean cancelSecondariesOnPrimaryFailure;
         /** secondary queue can continue submitting+blocking tasks even if a secondary task fails (unusual;
-         * typically handled by {@link TaskTags#markInessential(Task)} on the secondary tasks, in which case
+         * typically handled by {@link TaskTags#markInessential(TaskAdaptable)} on the secondary tasks, in which case
          * the secondary queue is never aborted */
         public final boolean abortSecondaryQueueOnSecondaryFailure;
         /** unsubmitted secondary tasks (ie those further in the queue) can be cancelled if a secondary task fails */
@@ -279,8 +285,8 @@ public class DynamicSequentialTask<T> extends BasicTask<T> implements HasTaskChi
             // optimisation would either use newTaskEndCallback property on task to submit
             // or use some kind of single threaded executor for the queued tasks
             Task<List<Object>> secondaryJobMaster = Tasks.<List<Object>>builder().dynamic(false)
-                    .displayName("DST manager (internal)")
-                    // TODO marking it transient helps it be GC'd sooner, 
+                    .displayName(TASK_NAME)
+                    // marking it transient helps it be GC'd sooner,
                     // but ideally we wouldn't have this,
                     // or else it would be a child
                     .tag(BrooklynTaskTags.TRANSIENT_TASK_TAG)
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java b/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java
index 9b5ac10..fcbd928 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java
@@ -66,6 +66,11 @@ import javax.annotation.Nullable;
  */
 public class ValueResolver<T> implements DeferredSupplier<T>, Iterable<Maybe<Object>> {
 
+    private static final String TYPE_COERCION_TASK_NAME = "type coercion";
+    static {
+        BasicExecutionManager.registerUninterestingTaskName(TYPE_COERCION_TASK_NAME);
+    }
+
     // TODO most of these usages should be removed when we have
     // an ability to run resolution in a non-blocking mode
     // (i.e. running resolution tasks in the same thread,
@@ -658,7 +663,7 @@ public class ValueResolver<T> implements DeferredSupplier<T>, Iterable<Maybe<Obj
                         ((v instanceof List) && !((List)v).isEmpty())) ) {
                     // do type coercion in a task to allow registered types
                     Object vf = v;
-                    Task<Maybe<T>> task = Tasks.create("type coercion", () -> TypeCoercions.tryCoerce(vf, typeT));
+                    Task<Maybe<T>> task = Tasks.create(TYPE_COERCION_TASK_NAME, () -> TypeCoercions.tryCoerce(vf, typeT));
                     BrooklynTaskTags.setTransient(task);
                     return exec.get(task);
                 } else {