You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2014/03/06 19:26:28 UTC

[1/4] git commit: Fixed MESOS-1058: check failure in the master.

Repository: mesos
Updated Branches:
  refs/heads/master ca50df15a -> 719be2502


Fixed MESOS-1058: check failure in the master.

Review: https://reviews.apache.org/r/18828


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4a70f14b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4a70f14b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4a70f14b

Branch: refs/heads/master
Commit: 4a70f14b2cef5710daf46b0e35e7b8f750a4f2f0
Parents: ca50df1
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Wed Mar 5 18:11:23 2014 -0800
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Thu Mar 6 10:02:34 2014 -0800

----------------------------------------------------------------------
 src/master/master.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/4a70f14b/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index f328bd9..3c7f59a 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -3024,9 +3024,7 @@ void Master::removeSlave(Slave* slave)
 
   // We do this first, to make sure any of the resources recovered
   // below (e.g., removeTask()) are ignored by the allocator.
-  if (!slave->disconnected) {
-    allocator->slaveRemoved(slave->id);
-  }
+  allocator->slaveRemoved(slave->id);
 
   // Remove pointers to slave's tasks in frameworks, and send status
   // updates.


[3/4] git commit: Removed unneeded boost::tuple include.

Posted by bm...@apache.org.
Removed unneeded boost::tuple include.

Review: https://reviews.apache.org/r/18835


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

Branch: refs/heads/master
Commit: a6497b3dff9b66f23d46cb562a4fde2cbde9feb2
Parents: 237c93f
Author: Till Toenshoff <to...@me.com>
Authored: Thu Mar 6 10:10:18 2014 -0800
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Thu Mar 6 10:10:18 2014 -0800

----------------------------------------------------------------------
 3rdparty/libprocess/3rdparty/stout/include/stout/foreach.hpp | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/a6497b3d/3rdparty/libprocess/3rdparty/stout/include/stout/foreach.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/foreach.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/foreach.hpp
index d64e2a4..b76b0b0 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/foreach.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/foreach.hpp
@@ -16,8 +16,6 @@
 
 #include <boost/foreach.hpp>
 
-#include <boost/tuple/tuple.hpp>
-
 namespace __foreach__ {
 
 // NOTE: This is a copied from Boost


[2/4] git commit: Updated stout tuple to pull in tr1::tuple instead of boost::tuple for pre-C++11.

Posted by bm...@apache.org.
Updated stout tuple to pull in tr1::tuple instead of boost::tuple for pre-C++11.

Review: https://reviews.apache.org/r/18833


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/237c93f7
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/237c93f7
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/237c93f7

Branch: refs/heads/master
Commit: 237c93f752aad74392c2680780cbce8bd9c6461d
Parents: 4a70f14
Author: Till Toenshoff <to...@me.com>
Authored: Thu Mar 6 10:09:00 2014 -0800
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Thu Mar 6 10:09:00 2014 -0800

----------------------------------------------------------------------
 3rdparty/libprocess/3rdparty/stout/include/stout/tuple.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/237c93f7/3rdparty/libprocess/3rdparty/stout/include/stout/tuple.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/tuple.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/tuple.hpp
index 469c159..ce77c90 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/tuple.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/tuple.hpp
@@ -17,7 +17,7 @@
 #if __cplusplus >= 201103L
 #include <tuple>
 #else
-#include <boost/tuple/tuple.hpp>
+#include <tr1/tuple>
 #endif // __cplusplus >= 201103L
 
 namespace tuples {
@@ -27,9 +27,9 @@ using std::tuple;
 using std::make_tuple;
 using std::get;
 #else // __cplusplus >= 201103L
-using boost::tuples::tuple;
-using boost::tuples::make_tuple;
-using boost::get;
+using std::tr1::tuple;
+using std::tr1::make_tuple;
+using std::tr1::get;
 #endif // __cplusplus >= 201103L
 
 } // namespace tuples


[4/4] git commit: Exchanged use of boost::tuple with tuples::tuple.

Posted by bm...@apache.org.
Exchanged use of boost::tuple with tuples::tuple.

Review: https://reviews.apache.org/r/18836


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/719be250
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/719be250
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/719be250

Branch: refs/heads/master
Commit: 719be2502854234a67fe1708e428d147e42bf0e0
Parents: a6497b3
Author: Till Toenshoff <to...@me.com>
Authored: Thu Mar 6 10:10:40 2014 -0800
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Thu Mar 6 10:10:40 2014 -0800

----------------------------------------------------------------------
 src/zookeeper/zookeeper.cpp | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/719be250/src/zookeeper/zookeeper.cpp
----------------------------------------------------------------------
diff --git a/src/zookeeper/zookeeper.cpp b/src/zookeeper/zookeeper.cpp
index f90515d..e27312d 100644
--- a/src/zookeeper/zookeeper.cpp
+++ b/src/zookeeper/zookeeper.cpp
@@ -21,8 +21,6 @@
 #include <iostream>
 #include <map>
 
-#include <boost/tuple/tuple.hpp>
-
 #include <process/dispatch.hpp>
 #include <process/once.hpp>
 #include <process/process.hpp>
@@ -32,11 +30,10 @@
 #include <stout/foreach.hpp>
 #include <stout/path.hpp>
 #include <stout/strings.hpp>
+#include <stout/tuple.hpp>
 
 #include "zookeeper/zookeeper.hpp"
 
-using boost::tuple;
-
 using process::Future;
 using process::PID;
 using process::Process;
@@ -46,6 +43,8 @@ using std::map;
 using std::string;
 using std::vector;
 
+using tuples::tuple;
+
 
 class ZooKeeperImpl
 {
@@ -249,7 +248,7 @@ private:
     const tuple<Promise<int>*>* args =
       reinterpret_cast<const tuple<Promise<int>*>*>(data);
 
-    Promise<int>* promise = (*args).get<0>();
+    Promise<int>* promise = tuples::get<0>(*args);
 
     promise->set(ret);
 
@@ -263,8 +262,8 @@ private:
     const tuple<Promise<int>*, string*> *args =
       reinterpret_cast<const tuple<Promise<int>*, string*>*>(data);
 
-    Promise<int>* promise = (*args).get<0>();
-    string* result = (*args).get<1>();
+    Promise<int>* promise = tuples::get<0>(*args);
+    string* result = tuples::get<1>(*args);
 
     if (ret == 0) {
       if (result != NULL) {
@@ -284,8 +283,8 @@ private:
     const tuple<Promise<int>*, Stat*>* args =
       reinterpret_cast<const tuple<Promise<int>*, Stat*>*>(data);
 
-    Promise<int>* promise = (*args).get<0>();
-    Stat *stat_result = (*args).get<1>();
+    Promise<int>* promise = tuples::get<0>(*args);
+    Stat *stat_result = tuples::get<1>(*args);
 
     if (ret == 0) {
       if (stat_result != NULL) {
@@ -310,9 +309,9 @@ private:
     const tuple<Promise<int>*, string*, Stat*>* args =
       reinterpret_cast<const tuple<Promise<int>*, string*, Stat*>*>(data);
 
-    Promise<int>* promise = (*args).get<0>();
-    string* result = (*args).get<1>();
-    Stat* stat_result = (*args).get<2>();
+    Promise<int>* promise = tuples::get<0>(*args);
+    string* result = tuples::get<1>(*args);
+    Stat* stat_result = tuples::get<2>(*args);
 
     if (ret == 0) {
       if (result != NULL) {
@@ -339,8 +338,8 @@ private:
     const tuple<Promise<int>*, vector<string>*>* args =
       reinterpret_cast<const tuple<Promise<int>*, vector<string>*>*>(data);
 
-    Promise<int>* promise = (*args).get<0>();
-    vector<string>* results = (*args).get<1>();
+    Promise<int>* promise = tuples::get<0>(*args);
+    vector<string>* results = tuples::get<1>(*args);
 
     if (ret == 0) {
       if (results != NULL) {