address issue of back-ref from BasicTask to BasicExecutionManager by introducing interface for advanced cancellation semantics
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/4b7844ce Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/4b7844ce Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/4b7844ce Branch: refs/heads/master Commit: 4b7844ce80eeee87f0b4ca1a44eb891c177548df Parents: 8077f16 Author: Alex Heneveld <[email protected]> Authored: Thu Sep 28 15:34:32 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Thu Sep 28 15:34:32 2017 +0100 ---------------------------------------------------------------------- .../util/core/task/BasicExecutionManager.java | 5 +-- .../brooklyn/util/core/task/BasicTask.java | 5 ++- .../brooklyn/util/core/task/TaskInternal.java | 7 ++--- .../task/TaskInternalCancellableWithMode.java | 32 ++++++++++++++++++++ 4 files changed, 39 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4b7844ce/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java index 5818568..c2bf12c 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java @@ -574,7 +574,7 @@ public class BasicExecutionManager implements ExecutionManager { } } - final static class CancellingListenableForwardingFutureForTask<T> extends SimpleForwardingFuture<T> implements ListenableFuture<T> { + final static class CancellingListenableForwardingFutureForTask<T> extends SimpleForwardingFuture<T> implements ListenableFuture<T>, TaskInternalCancellableWithMode { private final Task<T> task; private BasicExecutionManager execMgmt; private final ExecutionList listeners; @@ -600,7 +600,8 @@ public class BasicExecutionManager implements ExecutionManager { return listeners; } - boolean cancel(TaskCancellationMode mode) { + @Override + public boolean cancel(TaskCancellationMode mode) { boolean result = false; if (log.isTraceEnabled()) { log.trace("CLFFT cancelling "+task+" mode "+mode); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4b7844ce/core/src/main/java/org/apache/brooklyn/util/core/task/BasicTask.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicTask.java b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicTask.java index d952f9e..9367b4a 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicTask.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicTask.java @@ -45,7 +45,6 @@ import org.apache.brooklyn.api.mgmt.HasTaskChildren; import org.apache.brooklyn.api.mgmt.Task; import org.apache.brooklyn.api.objs.Identifiable; import org.apache.brooklyn.util.JavaGroovyEquivalents; -import org.apache.brooklyn.util.core.task.BasicExecutionManager.CancellingListenableForwardingFutureForTask; import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.guava.Maybe; import org.apache.brooklyn.util.guava.Maybe.MaybeSupplier; @@ -330,8 +329,8 @@ public class BasicTask<T> implements TaskInternal<T> { protected boolean doCancel(TaskCancellationMode mode) { if (internalFuture!=null) { - if (internalFuture instanceof CancellingListenableForwardingFutureForTask) { - return ((CancellingListenableForwardingFutureForTask<?>)internalFuture).cancel(mode); + if (internalFuture instanceof TaskInternalCancellableWithMode) { + return ((TaskInternalCancellableWithMode)internalFuture).cancel(mode); } else { return internalFuture.cancel(mode.isAllowedToInterruptTask()); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4b7844ce/core/src/main/java/org/apache/brooklyn/util/core/task/TaskInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/TaskInternal.java b/core/src/main/java/org/apache/brooklyn/util/core/task/TaskInternal.java index c49544a..7c82f6e 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/TaskInternal.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/TaskInternal.java @@ -45,7 +45,7 @@ import com.google.common.util.concurrent.ListenableFuture; * @author aled */ @Beta -public interface TaskInternal<T> extends Task<T> { +public interface TaskInternal<T> extends Task<T>, TaskInternalCancellableWithMode { /** sets the internal future object used to record the association to a job submitted to an {@link ExecutorService} */ void initInternalFuture(ListenableFuture<T> result); @@ -128,12 +128,9 @@ public interface TaskInternal<T> extends Task<T> { * this returns the "real" task represented by this one */ Task<?> getProxyTarget(); - /** clearer semantics around cancellation; may be promoted to {@link Task} */ - @Beta - public boolean cancel(TaskCancellationMode mode); - @Beta public static class TaskCancellationMode { + public static final TaskCancellationMode DO_NOT_INTERRUPT = new TaskCancellationMode(false, false, false); public static final TaskCancellationMode INTERRUPT_TASK_BUT_NOT_SUBMITTED_TASKS = new TaskCancellationMode(true, false, false); public static final TaskCancellationMode INTERRUPT_TASK_AND_DEPENDENT_SUBMITTED_TASKS = new TaskCancellationMode(true, true, false); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4b7844ce/core/src/main/java/org/apache/brooklyn/util/core/task/TaskInternalCancellableWithMode.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/TaskInternalCancellableWithMode.java b/core/src/main/java/org/apache/brooklyn/util/core/task/TaskInternalCancellableWithMode.java new file mode 100644 index 0000000..75aac91 --- /dev/null +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/TaskInternalCancellableWithMode.java @@ -0,0 +1,32 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.brooklyn.util.core.task; + +import org.apache.brooklyn.api.mgmt.Task; +import org.apache.brooklyn.util.core.task.TaskInternal.TaskCancellationMode; + +import com.google.common.annotations.Beta; + +/** clearer semantics around cancellation; may be promoted to {@link Task} */ +@Beta +public interface TaskInternalCancellableWithMode { + + boolean cancel(TaskCancellationMode mode); + +} \ No newline at end of file
