You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2012/10/04 01:37:26 UTC
svn commit: r1393817 - in /incubator/mesos/trunk/src: detector/detector.cpp
messages/messages.proto
Author: benh
Date: Wed Oct 3 23:37:26 2012
New Revision: 1393817
URL: http://svn.apache.org/viewvc?rev=1393817&view=rev
Log:
Removed unused GotMasterTokenMessage
(https://reviews.apache.org/r/7291).
Modified:
incubator/mesos/trunk/src/detector/detector.cpp
incubator/mesos/trunk/src/messages/messages.proto
Modified: incubator/mesos/trunk/src/detector/detector.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/detector/detector.cpp?rev=1393817&r1=1393816&r2=1393817&view=diff
==============================================================================
--- incubator/mesos/trunk/src/detector/detector.cpp (original)
+++ incubator/mesos/trunk/src/detector/detector.cpp Wed Oct 3 23:37:26 2012
@@ -196,19 +196,10 @@ void MasterDetector::destroy(MasterDetec
BasicMasterDetector::BasicMasterDetector(const UPID& _master)
: master(_master)
{
- // Send a master token.
- {
- GotMasterTokenMessage message;
- message.set_token("0");
- process::post(master, message);
- }
-
// Elect the master.
- {
- NewMasterDetectedMessage message;
- message.set_pid(master);
- process::post(master, message);
- }
+ NewMasterDetectedMessage message;
+ message.set_pid(master);
+ process::post(master, message);
}
@@ -218,19 +209,10 @@ BasicMasterDetector::BasicMasterDetector
: master(_master)
{
if (elect) {
- // Send a master token.
- {
- GotMasterTokenMessage message;
- message.set_token("0");
- process::post(master, message);
- }
-
// Elect the master.
- {
- NewMasterDetectedMessage message;
- message.set_pid(master);
- process::post(master, message);
- }
+ NewMasterDetectedMessage message;
+ message.set_pid(master);
+ process::post(master, message);
}
// Tell the pid about the master.
@@ -246,19 +228,10 @@ BasicMasterDetector::BasicMasterDetector
: master(_master)
{
if (elect) {
- // Send a master token.
- {
- GotMasterTokenMessage message;
- message.set_token("0");
- process::post(master, message);
- }
-
// Elect the master.
- {
- NewMasterDetectedMessage message;
- message.set_pid(master);
- process::post(master, message);
- }
+ NewMasterDetectedMessage message;
+ message.set_pid(master);
+ process::post(master, message);
}
// Tell each pid about the master.
@@ -377,10 +350,6 @@ void ZooKeeperMasterDetectorProcess::con
}
LOG(INFO) << "Created ephemeral/sequence:" << mySeq.get();
-
- GotMasterTokenMessage message;
- message.set_token(mySeq.get());
- process::post(pid, message);
}
// Now determine who the master is (it may be us).
Modified: incubator/mesos/trunk/src/messages/messages.proto
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/messages/messages.proto?rev=1393817&r1=1393816&r2=1393817&view=diff
==============================================================================
--- incubator/mesos/trunk/src/messages/messages.proto (original)
+++ incubator/mesos/trunk/src/messages/messages.proto Wed Oct 3 23:37:26 2012
@@ -293,8 +293,3 @@ message NoMasterDetectedMessage {}
message NewMasterDetectedMessage {
required string pid = 2;
}
-
-
-message GotMasterTokenMessage {
- required string token = 1;
-}