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 2017/07/19 20:21:21 UTC
[2/7] mesos git commit: Changes for libprocess Message optimization.
Changes for libprocess Message optimization.
Review: https://reviews.apache.org/r/60884
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/102e8694
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/102e8694
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/102e8694
Branch: refs/heads/master
Commit: 102e86946d1f467cf30da7bd3f0fb89440866456
Parents: 7413a3c
Author: Benjamin Hindman <be...@gmail.com>
Authored: Fri Jul 14 16:40:29 2017 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Wed Jul 19 13:18:40 2017 -0700
----------------------------------------------------------------------
src/master/master.cpp | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/102e8694/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index d895154..a902bfc 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -1489,9 +1489,9 @@ void Master::visit(const MessageEvent& event)
// framework and whether the framework has a principal so we use
// these two temp variables to simplify the condition checks below.
bool isRegisteredFramework =
- frameworks.principals.contains(event.message->from);
+ frameworks.principals.contains(event.message.from);
const Option<string> principal = isRegisteredFramework
- ? frameworks.principals[event.message->from]
+ ? frameworks.principals[event.message.from]
: Option<string>::none();
// Increment the "message_received" counter if the message is from
@@ -1508,7 +1508,7 @@ void Master::visit(const MessageEvent& event)
// All messages are filtered when non-leading.
if (!elected()) {
- VLOG(1) << "Dropping '" << event.message->name << "' message since "
+ VLOG(1) << "Dropping '" << event.message.name << "' message since "
<< "not elected yet";
++metrics->dropped_messages;
return;
@@ -1522,7 +1522,7 @@ void Master::visit(const MessageEvent& event)
// the additional queueing delay and the accumulated backlog
// of messages post-recovery?
if (!recovered.get().isReady()) {
- VLOG(1) << "Dropping '" << event.message->name << "' message since "
+ VLOG(1) << "Dropping '" << event.message.name << "' message since "
<< "not recovered yet";
++metrics->dropped_messages;
return;
@@ -1636,8 +1636,8 @@ void Master::_visit(const MessageEvent& event)
// mapping may be deleted in handling 'UnregisterFrameworkMessage'
// but its counter still needs to be incremented for this message.
const Option<string> principal =
- frameworks.principals.contains(event.message->from)
- ? frameworks.principals[event.message->from]
+ frameworks.principals.contains(event.message.from)
+ ? frameworks.principals[event.message.from]
: Option<string>::none();
ProtobufProcess<Master>::visit(event);
@@ -1661,8 +1661,8 @@ void Master::exceededCapacity(
const Option<string>& principal,
uint64_t capacity)
{
- LOG(WARNING) << "Dropping message " << event.message->name << " from "
- << event.message->from
+ LOG(WARNING) << "Dropping message " << event.message.name << " from "
+ << event.message.from
<< (principal.isSome() ? "(" + principal.get() + ")" : "")
<< ": capacity(" << capacity << ") exceeded";
@@ -1674,9 +1674,9 @@ void Master::exceededCapacity(
// unrecoverable error and should take action to recover.
FrameworkErrorMessage message;
message.set_message(
- "Message " + event.message->name +
+ "Message " + event.message.name +
" dropped: capacity(" + stringify(capacity) + ") exceeded");
- send(event.message->from, message);
+ send(event.message.from, message);
}