#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-868 Commit: 3a0b5daf0e23b456f68a15b2faa7080af671fca2 Parents: 62d1540 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Thu May 28 18:02:28 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> 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): + +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd";> + ... + <dependencies> + ... + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-mesos</artifactId> + <version>${ignite.version}</version> + </dependency> + ... + </dependencies> + ... +</project> 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 @@ <groupId>org.apache.ignite</groupId> <artifactId>ignite-mesos</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> <properties> <jetty.version>9.2.10.v20150310</jetty.version> 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); + } } }
