Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 97DE2200BD4 for ; Thu, 1 Dec 2016 13:01:05 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 9678A160B0F; Thu, 1 Dec 2016 12:01:05 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B9252160B0B for ; Thu, 1 Dec 2016 13:01:04 +0100 (CET) Received: (qmail 61761 invoked by uid 500); 1 Dec 2016 12:01:04 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 61733 invoked by uid 99); 1 Dec 2016 12:01:03 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Dec 2016 12:01:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 917C8E09CD; Thu, 1 Dec 2016 12:01:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sjcorbett@apache.org To: commits@brooklyn.apache.org Date: Thu, 01 Dec 2016 12:01:03 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] brooklyn-server git commit: Readability archived-at: Thu, 01 Dec 2016 12:01:05 -0000 Repository: brooklyn-server Updated Branches: refs/heads/master 23f9a715c -> d1ef42a1e Readability Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/5b9f8965 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/5b9f8965 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/5b9f8965 Branch: refs/heads/master Commit: 5b9f89653ee5979665bff445d38750e1d0f234ae Parents: a569463 Author: Sam Corbett Authored: Wed Nov 16 15:36:45 2016 +0000 Committer: Sam Corbett Committed: Fri Nov 18 15:08:31 2016 +0000 ---------------------------------------------------------------------- .../brooklyn/core/effector/Effectors.java | 8 ++++-- .../entity/group/DynamicClusterImpl.java | 3 ++- .../brooklyn/util/core/task/ParallelTask.java | 27 +++++++++++++++----- .../brooklyn/util/core/task/SequentialTask.java | 27 ++++++++++++++------ 4 files changed, 47 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5b9f8965/core/src/main/java/org/apache/brooklyn/core/effector/Effectors.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/effector/Effectors.java b/core/src/main/java/org/apache/brooklyn/core/effector/Effectors.java index 9b10d1d..6240240 100644 --- a/core/src/main/java/org/apache/brooklyn/core/effector/Effectors.java +++ b/core/src/main/java/org/apache/brooklyn/core/effector/Effectors.java @@ -183,14 +183,18 @@ public class Effectors { public static TaskAdaptable> invocationParallel(Effector eff, Map params, Iterable entities) { List> tasks = new ArrayList>(); for (Entity e: entities) tasks.add(invocation(e, eff, params)); - return Tasks.parallel("invoking "+eff+" on "+tasks.size()+" node"+(Strings.s(tasks.size())), tasks.toArray(new TaskAdaptable[tasks.size()])); + return Tasks.parallel( + "invoking " + eff + " on " + tasks.size() + " node" + (Strings.s(tasks.size())), + tasks.toArray(new TaskAdaptable[tasks.size()])); } /** as {@link #invocationParallel(Effector, Map, Iterable)} but executing sequentially */ public static TaskAdaptable> invocationSequential(Effector eff, Map params, Iterable entities) { List> tasks = new ArrayList>(); for (Entity e: entities) tasks.add(invocation(e, eff, params)); - return Tasks.sequential("invoking "+eff+" on "+tasks.size()+" node"+(Strings.s(tasks.size())), tasks.toArray(new TaskAdaptable[tasks.size()])); + return Tasks.sequential( + "invoking " + eff + " on " + tasks.size() + " node" + (Strings.s(tasks.size())), + tasks.toArray(new TaskAdaptable[tasks.size()])); } /** returns an unsubmitted task which will invoke the given effector on the given entities http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5b9f8965/core/src/main/java/org/apache/brooklyn/entity/group/DynamicClusterImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/entity/group/DynamicClusterImpl.java b/core/src/main/java/org/apache/brooklyn/entity/group/DynamicClusterImpl.java index eedefa7..8725b12 100644 --- a/core/src/main/java/org/apache/brooklyn/entity/group/DynamicClusterImpl.java +++ b/core/src/main/java/org/apache/brooklyn/entity/group/DynamicClusterImpl.java @@ -787,7 +787,8 @@ public class DynamicClusterImpl extends AbstractGroupImpl implements DynamicClus Collection removedEntities = pickAndRemoveMembers(delta * -1); // FIXME symmetry in order of added as child, managed, started, and added to group - Task invoke = Entities.invokeEffector(this, (Iterable)(Iterable)Iterables.filter(removedEntities, Startable.class), Startable.STOP, Collections.emptyMap()); + final Iterable removedStartables = (Iterable) (Iterable) Iterables.filter(removedEntities, Startable.class); + Task invoke = Entities.invokeEffector(this, removedStartables, Startable.STOP, Collections.emptyMap()); try { invoke.get(); return removedEntities; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5b9f8965/core/src/main/java/org/apache/brooklyn/util/core/task/ParallelTask.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/ParallelTask.java b/core/src/main/java/org/apache/brooklyn/util/core/task/ParallelTask.java index 82ec564..a2425f7 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/ParallelTask.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/ParallelTask.java @@ -38,13 +38,26 @@ import com.google.common.collect.Lists; * order they were passed as arguments. */ public class ParallelTask extends CompoundTask { - public ParallelTask(Object... tasks) { super(tasks); } - - public ParallelTask(Map flags, Collection tasks) { super(flags, tasks); } - public ParallelTask(Collection tasks) { super(tasks); } - - public ParallelTask(Map flags, Iterable tasks) { super(flags, ImmutableList.copyOf(tasks)); } - public ParallelTask(Iterable tasks) { super(ImmutableList.copyOf(tasks)); } + + public ParallelTask(Object... tasks) { + super(tasks); + } + + public ParallelTask(Map flags, Collection tasks) { + super(flags, tasks); + } + + public ParallelTask(Collection tasks) { + super(tasks); + } + + public ParallelTask(Map flags, Iterable tasks) { + super(flags, ImmutableList.copyOf(tasks)); + } + + public ParallelTask(Iterable tasks) { + super(ImmutableList.copyOf(tasks)); + } @Override protected List runJobs() throws InterruptedException, ExecutionException { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5b9f8965/core/src/main/java/org/apache/brooklyn/util/core/task/SequentialTask.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/SequentialTask.java b/core/src/main/java/org/apache/brooklyn/util/core/task/SequentialTask.java index 9bd40af..1a9fbac 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/SequentialTask.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/SequentialTask.java @@ -28,19 +28,30 @@ import org.apache.brooklyn.api.mgmt.Task; import com.google.common.collect.ImmutableList; - /** runs tasks in order, waiting for one to finish before starting the next; return value here is TBD; * (currently is all the return values of individual tasks, but we * might want some pipeline support and eventually only to return final value...) */ public class SequentialTask extends CompoundTask { - public SequentialTask(Object... tasks) { super(tasks); } - - public SequentialTask(Map flags, Collection tasks) { super(flags, tasks); } - public SequentialTask(Collection tasks) { super(tasks); } - - public SequentialTask(Map flags, Iterable tasks) { super(flags, ImmutableList.copyOf(tasks)); } - public SequentialTask(Iterable tasks) { super(ImmutableList.copyOf(tasks)); } + public SequentialTask(Object... tasks) { + super(tasks); + } + + public SequentialTask(Map flags, Collection tasks) { + super(flags, tasks); + } + + public SequentialTask(Collection tasks) { + super(tasks); + } + + public SequentialTask(Map flags, Iterable tasks) { + super(flags, ImmutableList.copyOf(tasks)); + } + + public SequentialTask(Iterable tasks) { + super(ImmutableList.copyOf(tasks)); + } protected List runJobs() throws InterruptedException, ExecutionException { setBlockingDetails("Executing "+