Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-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 66C6B1866D for ; Thu, 28 May 2015 16:21:13 +0000 (UTC) Received: (qmail 71446 invoked by uid 500); 28 May 2015 16:21:13 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 71412 invoked by uid 500); 28 May 2015 16:21:13 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 71360 invoked by uid 99); 28 May 2015 16:21:13 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 May 2015 16:21:13 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id D2D81182202 for ; Thu, 28 May 2015 16:21:12 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 4uDBL0pV3zzY for ; Thu, 28 May 2015 16:21:10 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 6E74020C27 for ; Thu, 28 May 2015 16:21:09 +0000 (UTC) Received: (qmail 71184 invoked by uid 99); 28 May 2015 16:21:08 -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, 28 May 2015 16:21:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A0C2CE1083; Thu, 28 May 2015 16:21:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 28 May 2015 16:21:34 -0000 Message-Id: In-Reply-To: <52af0a2737b34038a1014f048dacf79f@git.apache.org> References: <52af0a2737b34038a1014f048dacf79f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [29/32] incubator-ignite git commit: #IGNITE-857 Fixed review notes. #IGNITE-857 Fixed review notes. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3a0b5daf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3a0b5daf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3a0b5daf Branch: refs/heads/ignite-sprint-5 Commit: 3a0b5daf0e23b456f68a15b2faa7080af671fca2 Parents: 62d1540 Author: nikolay_tikhonov Authored: Thu May 28 18:02:28 2015 +0300 Committer: nikolay_tikhonov Committed: Thu May 28 18:02:28 2015 +0300 ---------------------------------------------------------------------- modules/mesos/README.txt | 26 +++++++++++++++++++- modules/mesos/pom.xml | 2 +- .../apache/ignite/mesos/ClusterProperties.java | 8 +++--- .../apache/ignite/mesos/IgniteScheduler.java | 13 +++++----- 4 files changed, 36 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a0b5daf/modules/mesos/README.txt ---------------------------------------------------------------------- diff --git a/modules/mesos/README.txt b/modules/mesos/README.txt index 084ccce..75a62f8 100644 --- a/modules/mesos/README.txt +++ b/modules/mesos/README.txt @@ -1,4 +1,28 @@ Apache Ignite Mesos Module ------------------------ -TODO \ No newline at end of file +Apache Ignite Mesos module provides integration Apache Ignite with Apache Mesos. + +Importing Apache Ignite Mesos Module In Maven Project +------------------------------------- + +If you are using Maven to manage dependencies of your project, you can add Cloud module +dependency like this (replace '${ignite.version}' with actual Ignite version you are +interested in): + + + ... + + ... + + org.apache.ignite + ignite-mesos + ${ignite.version} + + ... + + ... + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a0b5daf/modules/mesos/pom.xml ---------------------------------------------------------------------- diff --git a/modules/mesos/pom.xml b/modules/mesos/pom.xml index d3a2cef..3cf9028 100644 --- a/modules/mesos/pom.xml +++ b/modules/mesos/pom.xml @@ -25,7 +25,7 @@ org.apache.ignite ignite-mesos - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT 9.2.10.v20150310 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a0b5daf/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java ---------------------------------------------------------------------- diff --git a/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java b/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java index 785eddc..956dd6e 100644 --- a/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java +++ b/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java @@ -201,7 +201,7 @@ public class ClusterProperties { } /** - * Set CPU count limit. + * Sets CPU count limit. */ public void cpus(double cpu) { this.cpu = cpu; @@ -215,7 +215,7 @@ public class ClusterProperties { } /** - * Set CPU count limit. + * Sets CPU count limit. */ public void cpusPerNode(double cpu) { this.cpuPerNode = cpu; @@ -229,7 +229,7 @@ public class ClusterProperties { } /** - * Set mem limit. + * Sets mem limit. * * @param mem Memory. */ @@ -245,7 +245,7 @@ public class ClusterProperties { } /** - * Set mem limit. + * Sets mem limit. * * @param mem Memory. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a0b5daf/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java ---------------------------------------------------------------------- diff --git a/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java b/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java index 64e2931..263123c 100644 --- a/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java +++ b/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java @@ -77,9 +77,10 @@ public class IgniteScheduler implements Scheduler { for (Protos.Offer offer : offers) { Protos.TaskID taskId; Protos.TaskInfo task; + IgniteTask igniteTask; synchronized (mux) { - IgniteTask igniteTask = checkOffer(offer); + igniteTask = checkOffer(offer); // Decline offer which doesn't match by mem or cpu. if (igniteTask == null) { @@ -96,8 +97,6 @@ public class IgniteScheduler implements Scheduler { // Create task to run. task = createTask(offer, igniteTask, taskId); - - tasks.put(taskId.getValue(), igniteTask); } try { @@ -106,12 +105,12 @@ public class IgniteScheduler implements Scheduler { Protos.Filters.newBuilder().setRefuseSeconds(1).build()); } catch (Exception e) { - synchronized (mux) { - tasks.remove(taskId.getValue()); - } - log.error("Failed launch task. Task id: {}. Task info: {}", taskId, task); } + + synchronized (mux) { + tasks.put(taskId.getValue(), igniteTask); + } } }