IGNITE-9408: Update Apache Mesos version. - Fixes #4650. Signed-off-by: shroman <rsht...@yahoo.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5b4d5630 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5b4d5630 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5b4d5630 Branch: refs/heads/ignite-5960 Commit: 5b4d56301887cbcde844da5b4b9fe1bb348e0f86 Parents: 35706b9 Author: shroman <rsht...@yahoo.com> Authored: Wed Sep 5 16:24:07 2018 +0900 Committer: shroman <rsht...@yahoo.com> Committed: Wed Sep 5 16:24:07 2018 +0900 ---------------------------------------------------------------------- modules/mesos/pom.xml | 2 +- .../java/org/apache/ignite/mesos/IgniteFramework.java | 3 +-- .../org/apache/ignite/mesos/IgniteSchedulerSelfTest.java | 11 +++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5b4d5630/modules/mesos/pom.xml ---------------------------------------------------------------------- diff --git a/modules/mesos/pom.xml b/modules/mesos/pom.xml index 5880259..a8c7d8b 100644 --- a/modules/mesos/pom.xml +++ b/modules/mesos/pom.xml @@ -35,7 +35,7 @@ <url>http://ignite.apache.org</url> <properties> - <mesos.version>0.22.0</mesos.version> + <mesos.version>1.5.0</mesos.version> <ignite.latest.url>http://ignite.run/download_ignite.php</ignite.latest.url> <ignite.direct.url>https://archive.apache.org/dist/ignite/%s/apache-ignite-fabric-%s-bin.zip</ignite.direct.url> </properties> http://git-wip-us.apache.org/repos/asf/ignite/blob/5b4d5630/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteFramework.java ---------------------------------------------------------------------- diff --git a/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteFramework.java b/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteFramework.java index eea510a..addd3e0 100644 --- a/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteFramework.java +++ b/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteFramework.java @@ -17,7 +17,6 @@ package org.apache.ignite.mesos; -import com.google.protobuf.ByteString; import java.util.logging.Level; import java.util.logging.Logger; import org.apache.ignite.mesos.resource.IgniteProvider; @@ -105,7 +104,7 @@ public class IgniteFramework { Protos.Credential cred = Protos.Credential.newBuilder() .setPrincipal(System.getenv(DEFAULT_PRINCIPAL)) - .setSecret(ByteString.copyFrom(System.getenv(DEFAULT_SECRET).getBytes())) + .setSecret(System.getenv(DEFAULT_SECRET)) .build(); driver = new MesosSchedulerDriver(scheduler, igniteFramework.getFrameworkInfo(), clusterProps.masterUrl(), http://git-wip-us.apache.org/repos/asf/ignite/blob/5b4d5630/modules/mesos/src/test/java/org/apache/ignite/mesos/IgniteSchedulerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/mesos/src/test/java/org/apache/ignite/mesos/IgniteSchedulerSelfTest.java b/modules/mesos/src/test/java/org/apache/ignite/mesos/IgniteSchedulerSelfTest.java index 099daa2..4e48569 100644 --- a/modules/mesos/src/test/java/org/apache/ignite/mesos/IgniteSchedulerSelfTest.java +++ b/modules/mesos/src/test/java/org/apache/ignite/mesos/IgniteSchedulerSelfTest.java @@ -466,6 +466,12 @@ public class IgniteSchedulerSelfTest extends TestCase { } /** {@inheritDoc} */ + @Override public Protos.Status acceptOffers(Collection<Protos.OfferID> collection, + Collection<Protos.Offer.Operation> collection1, Protos.Filters filters) { + return null; + } + + /** {@inheritDoc} */ @Override public Protos.Status declineOffer(Protos.OfferID offerId, Protos.Filters filters) { declinedOffer = offerId; @@ -485,6 +491,11 @@ public class IgniteSchedulerSelfTest extends TestCase { } /** {@inheritDoc} */ + @Override public Protos.Status suppressOffers() { + return null; + } + + /** {@inheritDoc} */ @Override public Protos.Status acknowledgeStatusUpdate(Protos.TaskStatus status) { return null; }
