Return-Path: X-Original-To: apmail-myriad-commits-archive@minotaur.apache.org Delivered-To: apmail-myriad-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 503411878E for ; Wed, 18 Nov 2015 19:28:29 +0000 (UTC) Received: (qmail 60229 invoked by uid 500); 18 Nov 2015 19:28:29 -0000 Delivered-To: apmail-myriad-commits-archive@myriad.apache.org Received: (qmail 60199 invoked by uid 500); 18 Nov 2015 19:28:29 -0000 Mailing-List: contact commits-help@myriad.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@myriad.incubator.apache.org Delivered-To: mailing list commits@myriad.incubator.apache.org Received: (qmail 60190 invoked by uid 99); 18 Nov 2015 19:28:29 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Nov 2015 19:28:29 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id AE4C8C3F97 for ; Wed, 18 Nov 2015 19:28:28 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.248 X-Spam-Level: * X-Spam-Status: No, score=1.248 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.553, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 8PfX_sbLhWzo for ; Wed, 18 Nov 2015 19:28:16 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 5EEBA43DC8 for ; Wed, 18 Nov 2015 19:28:16 +0000 (UTC) Received: (qmail 60000 invoked by uid 99); 18 Nov 2015 19:28:15 -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; Wed, 18 Nov 2015 19:28:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8E7D8E0243; Wed, 18 Nov 2015 19:28:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kensipe@apache.org To: commits@myriad.incubator.apache.org Date: Wed, 18 Nov 2015 19:28:16 -0000 Message-Id: <2e7d9e29fb944af496cb1e16ffe14fb9@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-myriad git commit: This closes: #47 Review: https://github.com/apache/incubator-myriad/pull/47 This closes: #47 Review: https://github.com/apache/incubator-myriad/pull/47 Prepended FrameworkName to the task-name Removed the 'task' declaration in taskName per git discussion Project: http://git-wip-us.apache.org/repos/asf/incubator-myriad/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-myriad/commit/7e54db01 Tree: http://git-wip-us.apache.org/repos/asf/incubator-myriad/tree/7e54db01 Diff: http://git-wip-us.apache.org/repos/asf/incubator-myriad/diff/7e54db01 Branch: refs/heads/master Commit: 7e54db015b2a94e44379973ef06c96ff7a0311d9 Parents: fe941a6 Author: Brandon Gulla Authored: Wed Nov 18 12:51:49 2015 -0500 Committer: Ken Sipe Committed: Wed Nov 18 13:26:07 2015 -0600 ---------------------------------------------------------------------- .../src/main/java/org/apache/myriad/scheduler/TaskFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/7e54db01/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/TaskFactory.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/TaskFactory.java b/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/TaskFactory.java index 00de037..8412eba 100644 --- a/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/TaskFactory.java +++ b/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/TaskFactory.java @@ -184,7 +184,7 @@ public interface TaskFactory { CommandInfo commandInfo = getCommandInfo(serviceProfile, ports); ExecutorInfo executorInfo = getExecutorInfoForSlave(frameworkId, offer, commandInfo); - TaskInfo.Builder taskBuilder = TaskInfo.newBuilder().setName(cfg.getFrameworkName() + "-task-" + taskId.getValue()).setTaskId(taskId).setSlaveId( + TaskInfo.Builder taskBuilder = TaskInfo.newBuilder().setName(cfg.getFrameworkName() + "-" + taskId.getValue()).setTaskId(taskId).setSlaveId( offer.getSlaveId()); return taskBuilder