You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2016/08/02 16:45:09 UTC
[3/5] mesos git commit: Clarified log messages during master startup.
Clarified log messages during master startup.
In particular, it is confusing to have two separate log messages:
"detected a new leader" and "elected as the new leader".
Review: https://reviews.apache.org/r/50518/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/961f29bf
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/961f29bf
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/961f29bf
Branch: refs/heads/master
Commit: 961f29bf859673607c9ceb94c23925f090c28825
Parents: 9417ae4
Author: Neil Conway <ne...@gmail.com>
Authored: Tue Aug 2 09:36:32 2016 -0700
Committer: Anand Mazumdar <an...@apache.org>
Committed: Tue Aug 2 09:36:32 2016 -0700
----------------------------------------------------------------------
src/master/main.cpp | 2 --
src/master/master.cpp | 23 ++++++++++++-----------
src/master/registrar.cpp | 2 +-
3 files changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/961f29bf/src/master/main.cpp
----------------------------------------------------------------------
diff --git a/src/master/main.cpp b/src/master/main.cpp
index e202973..0bce1df 100644
--- a/src/master/main.cpp
+++ b/src/master/main.cpp
@@ -540,8 +540,6 @@ int main(int argc, char** argv)
slaveRemovalLimiter = new RateLimiter(permits.get(), duration.get());
}
- LOG(INFO) << "Starting Mesos master";
-
Master* master =
new Master(
allocator.get(),
http://git-wip-us.apache.org/repos/asf/mesos/blob/961f29bf/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index 060dc7f..17d5c58 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -1653,8 +1653,8 @@ Future<Nothing> Master::_recover(const Registry& registry)
// Recovery is now complete!
LOG(INFO) << "Recovered " << registry.slaves().slaves().size() << " agents"
- << " from the Registry (" << Bytes(registry.ByteSize()) << ")"
- << " ; allowing " << flags.agent_reregister_timeout
+ << " from the registry (" << Bytes(registry.ByteSize()) << ")"
+ << "; allowing " << flags.agent_reregister_timeout
<< " for agents to re-register";
return Nothing();
@@ -1844,15 +1844,6 @@ void Master::detected(const Future<Option<MasterInfo>>& _leader)
bool wasElected = elected();
leader = _leader.get();
- LOG(INFO) << "The newly elected leader is "
- << (leader.isSome()
- ? (leader.get().pid() + " with id " + leader.get().id())
- : "None");
-
- if (wasElected && !elected()) {
- EXIT(EXIT_FAILURE) << "Lost leadership... committing suicide!";
- }
-
if (elected()) {
electedTime = Clock::now();
@@ -1868,6 +1859,16 @@ void Master::detected(const Future<Option<MasterInfo>>& _leader)
// but the same leading master is elected as leader.
LOG(INFO) << "Re-elected as the leading master";
}
+ } else {
+ // A different node has been elected as the leading master.
+ LOG(INFO) << "The newly elected leader is "
+ << (leader.isSome()
+ ? (leader.get().pid() + " with id " + leader.get().id())
+ : "None");
+
+ if (wasElected) {
+ EXIT(EXIT_FAILURE) << "Lost leadership... committing suicide!";
+ }
}
// Keep detecting.
http://git-wip-us.apache.org/repos/asf/mesos/blob/961f29bf/src/master/registrar.cpp
----------------------------------------------------------------------
diff --git a/src/master/registrar.cpp b/src/master/registrar.cpp
index 4589d2f..4d1eaa0 100644
--- a/src/master/registrar.cpp
+++ b/src/master/registrar.cpp
@@ -329,7 +329,7 @@ string RegistrarProcess::registryHelp()
Future<Registry> RegistrarProcess::recover(const MasterInfo& info)
{
if (recovered.isNone()) {
- LOG(INFO) << "Recovering registrar";
+ VLOG(1) << "Recovering registrar";
metrics.state_fetch.start();
state->fetch<Registry>("registry")