You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2015/06/16 11:35:03 UTC
[09/50] [abbrv] incubator-ignite git commit: #Added JVM_OPTS for
mesos. Updated DEVNOTE.
#Added JVM_OPTS for mesos. Updated DEVNOTE.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b84e1027
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b84e1027
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b84e1027
Branch: refs/heads/ignite-960
Commit: b84e1027f97cccba245431ab13a1073e78975314
Parents: 420b6bd
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Thu Jun 11 18:47:15 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Thu Jun 11 18:47:15 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 8 ++++++++
modules/mesos/README.txt | 2 +-
.../org/apache/ignite/mesos/ClusterProperties.java | 15 +++++++++++++++
.../org/apache/ignite/mesos/IgniteScheduler.java | 10 +++++++---
4 files changed, 31 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b84e1027/DEVNOTES.txt
----------------------------------------------------------------------
diff --git a/DEVNOTES.txt b/DEVNOTES.txt
index d02e6ba..d7cffa7 100644
--- a/DEVNOTES.txt
+++ b/DEVNOTES.txt
@@ -91,6 +91,14 @@ To test compliance with JCache TCK use:
mvn test -P-release,jcache-tck -pl :ignite-core -am
+Ignite Mesos Maven Build Instructions
+============================================
+cd to ./modules/mesos
+
+mvn clean package
+
+Look for ignite-mesos-<version>-jar-with-dependencies.jar in ./target directory.
+
Run tests
==========
To run tests locally use:
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b84e1027/modules/mesos/README.txt
----------------------------------------------------------------------
diff --git a/modules/mesos/README.txt b/modules/mesos/README.txt
index 75a62f8..e5e4bbb 100644
--- a/modules/mesos/README.txt
+++ b/modules/mesos/README.txt
@@ -6,7 +6,7 @@ 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
+If you are using Maven to manage dependencies of your project, you can add Mesos module
dependency like this (replace '${ignite.version}' with actual Ignite version you are
interested in):
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b84e1027/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 6663625..a97a97f 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
@@ -43,6 +43,12 @@ public class ClusterProperties {
private String mesosUrl = DEFAULT_MESOS_MASTER_URL;
/** */
+ public static final String IGNITE_JVM_OPTS = "IGNITE_JVM_OPTS";
+
+ /** JVM options. */
+ private String jvmOpts = "";
+
+ /** */
public static final String IGNITE_CLUSTER_NAME = "IGNITE_CLUSTER_NAME";
/** */
@@ -253,6 +259,13 @@ public class ClusterProperties {
}
/**
+ * @return JVM opts for ignite.
+ */
+ public String jmvOpts() {
+ return this.jvmOpts;
+ }
+
+ /**
* @return disk limit.
*/
public double disk() {
@@ -435,6 +448,8 @@ public class ClusterProperties {
prop.minCpu = getDoubleProperty(IGNITE_MIN_CPU_PER_NODE, props, DEFAULT_RESOURCE_MIN_CPU);
prop.minMemory = getDoubleProperty(IGNITE_MIN_MEMORY_PER_NODE, props, DEFAULT_RESOURCE_MIN_MEM);
+ prop.jvmOpts = getStringProperty(IGNITE_JVM_OPTS, props, "");
+
prop.igniteVer = getStringProperty(IGNITE_VERSION, props, DEFAULT_IGNITE_VERSION);
prop.igniteWorkDir = getStringProperty(IGNITE_WORK_DIR, props, DEFAULT_IGNITE_WORK_DIR);
prop.igniteCfg = getStringProperty(IGNITE_CONFIG_XML, props, null);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b84e1027/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 fbb9994..7795a31 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
@@ -119,9 +119,13 @@ public class IgniteScheduler implements Scheduler {
clusterProps.igniteConfigUrl() : resourceProvider.igniteConfigUrl();
Protos.CommandInfo.Builder builder = Protos.CommandInfo.newBuilder()
- .setEnvironment(Protos.Environment.newBuilder().addVariables(Protos.Environment.Variable.newBuilder()
- .setName("IGNITE_TCP_DISCOVERY_ADDRESSES")
- .setValue(getAddress(offer.getHostname()))))
+ .setEnvironment(Protos.Environment.newBuilder()
+ .addVariables(Protos.Environment.Variable.newBuilder()
+ .setName("IGNITE_TCP_DISCOVERY_ADDRESSES")
+ .setValue(getAddress(offer.getHostname())))
+ .addVariables(Protos.Environment.Variable.newBuilder()
+ .setName("JVM_OPTS")
+ .setValue(clusterProps.jmvOpts())))
.addUris(Protos.CommandInfo.URI.newBuilder()
.setValue(clusterProps.ignitePackageUrl() != null ?
clusterProps.ignitePackageUrl() : resourceProvider.igniteUrl())