spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pwend...@apache.org
Subject git commit: Revert "SPARK-1433: Upgrade Mesos dependency to 0.17.0"
Date Thu, 10 Apr 2014 21:43:47 GMT
Repository: spark
Updated Branches:
  refs/heads/master 3bd312940 -> 7b52b6631


Revert "SPARK-1433: Upgrade Mesos dependency to 0.17.0"

This reverts commit 12c077d5aa0b76a808a55db625c9677a52bd43f9.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7b52b663
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7b52b663
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7b52b663

Branch: refs/heads/master
Commit: 7b52b66312994d4dbf243eadb6d27eb06350a81f
Parents: 3bd3129
Author: Patrick Wendell <pwendell@gmail.com>
Authored: Thu Apr 10 14:43:29 2014 -0700
Committer: Patrick Wendell <pwendell@gmail.com>
Committed: Thu Apr 10 14:43:29 2014 -0700

----------------------------------------------------------------------
 .../scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala  | 6 ++----
 .../spark/scheduler/cluster/mesos/MesosSchedulerBackend.scala  | 2 +-
 docs/_config.yml                                               | 2 +-
 pom.xml                                                        | 6 +++---
 project/SparkBuild.scala                                       | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/7b52b663/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
index c478e68..06b041e 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
@@ -194,12 +194,10 @@ private[spark] class CoarseMesosSchedulerBackend(
             .addResources(createResource("cpus", cpusToUse))
             .addResources(createResource("mem", sc.executorMemory))
             .build()
-          d.launchTasks(Collections.singletonList(offer.getId),
-                        Collections.singletonList(task),
-                        filters)
+          d.launchTasks(offer.getId, Collections.singletonList(task), filters)
         } else {
           // Filter it out
-          d.declineOffer(offer.getId, filters)
+          d.launchTasks(offer.getId, Collections.emptyList[MesosTaskInfo](), filters)
         }
       }
     }

http://git-wip-us.apache.org/repos/asf/spark/blob/7b52b663/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackend.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackend.scala
b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackend.scala
index f878ae3..dfdcafe 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackend.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackend.scala
@@ -223,7 +223,7 @@ private[spark] class MesosSchedulerBackend(
         // Reply to the offers
         val filters = Filters.newBuilder().setRefuseSeconds(1).build() // TODO: lower timeout?
         for (i <- 0 until offers.size) {
-          d.launchTasks(Collections.singletonList(offers(i).getId), mesosTasks(i), filters)
+          d.launchTasks(offers(i).getId, mesosTasks(i), filters)
         }
       }
     } finally {

http://git-wip-us.apache.org/repos/asf/spark/blob/7b52b663/docs/_config.yml
----------------------------------------------------------------------
diff --git a/docs/_config.yml b/docs/_config.yml
index bd5ed6c..d585b8c 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -7,6 +7,6 @@ SPARK_VERSION: 1.0.0-SNAPSHOT
 SPARK_VERSION_SHORT: 1.0.0
 SCALA_BINARY_VERSION: "2.10"
 SCALA_VERSION: "2.10.4"
-MESOS_VERSION: 0.17.0
+MESOS_VERSION: 0.13.0
 SPARK_ISSUE_TRACKER_URL: https://spark-project.atlassian.net
 SPARK_GITHUB_URL: https://github.com/apache/spark

http://git-wip-us.apache.org/repos/asf/spark/blob/7b52b663/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 11511bc..c03bb35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,7 @@
 
     <scala.version>2.10.4</scala.version>
     <scala.binary.version>2.10</scala.binary.version>
-    <mesos.version>0.17.0</mesos.version>
+    <mesos.version>0.13.0</mesos.version>
     <akka.group>org.spark-project.akka</akka.group>
     <akka.version>2.2.3-shaded-protobuf</akka.version>
     <slf4j.version>1.7.5</slf4j.version>
@@ -848,7 +848,7 @@
       </modules>
 
     </profile>
-
+    
    <!-- Build without Hadoop dependencies that are included in some runtime environments.
-->
     <profile>
       <id>hadoop-provided</id>
@@ -893,6 +893,6 @@
         </dependency>
       </dependencies>
     </profile>
-
+    
   </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/spark/blob/7b52b663/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 694f90a..2116376 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -333,7 +333,7 @@ object SparkBuild extends Build {
         "org.json4s"                %% "json4s-jackson"   % "3.2.6" excludeAll(excludeScalap),
         "it.unimi.dsi"               % "fastutil"         % "6.4.4",
         "colt"                       % "colt"             % "1.2.0",
-        "org.apache.mesos"           % "mesos"            % "0.17.0",
+        "org.apache.mesos"           % "mesos"            % "0.13.0",
         "commons-net"                % "commons-net"      % "2.2",
         "net.java.dev.jets3t"        % "jets3t"           % "0.7.1" excludeAll(excludeCommonsLogging),
         "org.apache.derby"           % "derby"            % "10.4.2.0"                  
  % "test",


Mime
View raw message