You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/29 09:06:25 UTC
[02/50] incubator-ignite git commit: temp commit
temp commit
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/21a1514d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/21a1514d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/21a1514d
Branch: refs/heads/ignite-471-2
Commit: 21a1514dd80e6a9083559de85da873f165390eba
Parents: fbdcb70
Author: nikolay tikhonov <nt...@gridgain.com>
Authored: Mon May 18 12:48:21 2015 +0300
Committer: nikolay tikhonov <nt...@gridgain.com>
Committed: Mon May 18 12:48:21 2015 +0300
----------------------------------------------------------------------
.../ignite/messo/IgniteAmazonScheduler.java | 8 ++--
.../apache/ignite/messo/IgniteScheduler.java | 44 +++++++++++++-------
2 files changed, 33 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/21a1514d/modules/mesos/src/main/java/org/apache/ignite/messo/IgniteAmazonScheduler.java
----------------------------------------------------------------------
diff --git a/modules/mesos/src/main/java/org/apache/ignite/messo/IgniteAmazonScheduler.java b/modules/mesos/src/main/java/org/apache/ignite/messo/IgniteAmazonScheduler.java
index 250fec6..b11e7c6 100644
--- a/modules/mesos/src/main/java/org/apache/ignite/messo/IgniteAmazonScheduler.java
+++ b/modules/mesos/src/main/java/org/apache/ignite/messo/IgniteAmazonScheduler.java
@@ -44,7 +44,7 @@ public class IgniteAmazonScheduler extends IgniteScheduler {
}
/** {@inheritDoc} */
- @Override protected Protos.TaskInfo createTask(Protos.Offer offer, Pair<Double, Double> cpuMem,
+ @Override protected Protos.TaskInfo createTask(Protos.Offer offer, Tuple<Double, Double> cpuMem,
Protos.TaskID taskId) {
// Docker image info.
Protos.ContainerInfo.DockerInfo.Builder docker = Protos.ContainerInfo.DockerInfo.newBuilder()
@@ -63,16 +63,16 @@ public class IgniteAmazonScheduler extends IgniteScheduler {
.addResources(Protos.Resource.newBuilder()
.setName(CPUS)
.setType(Protos.Value.Type.SCALAR)
- .setScalar(Protos.Value.Scalar.newBuilder().setValue(cpuMem._1)))
+ .setScalar(Protos.Value.Scalar.newBuilder().setValue(cpuMem.get1())))
.addResources(Protos.Resource.newBuilder()
.setName(MEM)
.setType(Protos.Value.Type.SCALAR)
- .setScalar(Protos.Value.Scalar.newBuilder().setValue(cpuMem._2)))
+ .setScalar(Protos.Value.Scalar.newBuilder().setValue(cpuMem.get2())))
.setContainer(cont)
.setCommand(Protos.CommandInfo.newBuilder()
.setShell(false)
.addArguments(STARTUP_SCRIPT)
- .addArguments(String.valueOf(cpuMem._2.intValue()))
+ .addArguments(String.valueOf(cpuMem.get2().intValue()))
.addArguments(AMAZON)
.addArguments(accessKey)
.addArguments(secretKey))
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/21a1514d/modules/mesos/src/main/java/org/apache/ignite/messo/IgniteScheduler.java
----------------------------------------------------------------------
diff --git a/modules/mesos/src/main/java/org/apache/ignite/messo/IgniteScheduler.java b/modules/mesos/src/main/java/org/apache/ignite/messo/IgniteScheduler.java
index a029e69..c8b577f 100644
--- a/modules/mesos/src/main/java/org/apache/ignite/messo/IgniteScheduler.java
+++ b/modules/mesos/src/main/java/org/apache/ignite/messo/IgniteScheduler.java
@@ -64,7 +64,7 @@ public class IgniteScheduler implements Scheduler {
log.info("resourceOffers() with {} offers", offers.size());
for (Protos.Offer offer : offers) {
- Pair<Double, Double> cpuMem = checkOffer(offer);
+ Tuple<Double, Double> cpuMem = checkOffer(offer);
// Decline offer which doesn't match by mem or cpu.
if (cpuMem == null) {
@@ -95,11 +95,11 @@ public class IgniteScheduler implements Scheduler {
* @param taskId Task id.
* @return Task.
*/
- protected Protos.TaskInfo createTask(Protos.Offer offer, Pair<Double, Double> cpuMem, Protos.TaskID taskId) {
+ protected Protos.TaskInfo createTask(Protos.Offer offer, Tuple<Double, Double> cpuMem, Protos.TaskID taskId) {
// Docker image info.
Protos.ContainerInfo.DockerInfo.Builder docker = Protos.ContainerInfo.DockerInfo.newBuilder()
- .setImage(IMAGE)
- .setNetwork(Protos.ContainerInfo.DockerInfo.Network.HOST);
+ .setImage(IMAGE)
+ .setNetwork(Protos.ContainerInfo.DockerInfo.Network.HOST);
// Container info.
Protos.ContainerInfo.Builder cont = Protos.ContainerInfo.newBuilder();
@@ -113,16 +113,16 @@ public class IgniteScheduler implements Scheduler {
.addResources(Protos.Resource.newBuilder()
.setName(CPUS)
.setType(Protos.Value.Type.SCALAR)
- .setScalar(Protos.Value.Scalar.newBuilder().setValue(cpuMem._1)))
+ .setScalar(Protos.Value.Scalar.newBuilder().setValue(cpuMem.get2())))
.addResources(Protos.Resource.newBuilder()
.setName(MEM)
.setType(Protos.Value.Type.SCALAR)
- .setScalar(Protos.Value.Scalar.newBuilder().setValue(cpuMem._2)))
+ .setScalar(Protos.Value.Scalar.newBuilder().setValue(cpuMem.get2())))
.setContainer(cont)
.setCommand(Protos.CommandInfo.newBuilder()
.setShell(false)
.addArguments(STARTUP_SCRIPT)
- .addArguments(String.valueOf(cpuMem._2.intValue())))
+ .addArguments(String.valueOf(cpuMem.get2().intValue())))
.build();
}
@@ -132,7 +132,7 @@ public class IgniteScheduler implements Scheduler {
* @param offer Offer request.
* @return Pair where first is cpus, second is memory.
*/
- private Pair<Double, Double> checkOffer(Protos.Offer offer) {
+ private Tuple<Double, Double> checkOffer(Protos.Offer offer) {
double cpus = -1;
double mem = -1;
@@ -159,7 +159,7 @@ public class IgniteScheduler implements Scheduler {
log.debug("No mem resource present");
if (cpus >= 1 && MIN_MEMORY <= mem)
- return new Pair<>(cpus, mem);
+ return new Tuple<>(cpus, mem);
else {
log.info("Offer not sufficient for slave request:\n" + offer.getResourcesList().toString() +
"\n" + offer.getAttributesList().toString() +
@@ -211,19 +211,33 @@ public class IgniteScheduler implements Scheduler {
/**
* Tuple.
*/
- public static class Pair<A, B> {
+ public static class Tuple<A, B> {
/** */
- public final A _1;
+ private final A val1;
/** */
- public final B _2;
+ private final B val2;
/**
*
*/
- public Pair(A _1, B _2) {
- this._1 = _1;
- this._2 = _2;
+ public Tuple(A val1, B val2) {
+ this.val1 = val1;
+ this.val2 = val2;
+ }
+
+ /**
+ * @return val1
+ */
+ public A get1() {
+ return val1;
+ }
+
+ /**
+ * @return val2
+ */
+ public B get2() {
+ return val2;
}
}
}