You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2017/03/04 19:14:09 UTC
[1/3] mesos git commit: Sent `UpdateFrameworkMessage` even to
disconnected frameworks.
Repository: mesos
Updated Branches:
refs/heads/master 882f65ad3 -> a152828e1
Sent `UpdateFrameworkMessage` even to disconnected frameworks.
We used to only send `UpdateFrameworkMessage` to connected frameworks
because it only included `PID`s. However, since now it also includes
updates to the `FrameworkInfo`, we choose to lift this optimization and
send it to all agents for (dis)connected frameworks.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/80a2e24b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/80a2e24b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/80a2e24b
Branch: refs/heads/master
Commit: 80a2e24b78f21c0c41a12787eced85fd42e4dce0
Parents: 882f65a
Author: Michael Park <mp...@apache.org>
Authored: Fri Mar 3 03:49:28 2017 -0800
Committer: Michael Park <mp...@apache.org>
Committed: Sat Mar 4 10:55:17 2017 -0800
----------------------------------------------------------------------
src/master/master.cpp | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/80a2e24b/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index 449e25a..c2cebd1 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -5958,18 +5958,15 @@ void Master::__reregisterSlave(
foreach (const FrameworkID& frameworkId, ids) {
Framework* framework = getFramework(frameworkId);
-
- // We don't need to send the PIDs of disconnected frameworks to
- // re-registering slaves.
- if (framework != nullptr && framework->connected()) {
+ if (framework != nullptr) {
UpdateFrameworkMessage message;
message.mutable_framework_id()->CopyFrom(framework->id());
+ message.mutable_framework_info()->CopyFrom(framework->info);
// TODO(anand): We set 'pid' to UPID() for http frameworks
// as 'pid' was made optional in 0.24.0. In 0.25.0, we
// no longer have to set pid here for http frameworks.
message.set_pid(framework->pid.getOrElse(UPID()));
- message.mutable_framework_info()->CopyFrom(framework->info);
send(slave->pid, message);
}
[3/3] mesos git commit: Fixed a formatting error in
`hierarchical.cpp`.
Posted by mp...@apache.org.
Fixed a formatting error in `hierarchical.cpp`.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a152828e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a152828e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a152828e
Branch: refs/heads/master
Commit: a152828e13fcebb49bd813d391d3836144bd817b
Parents: 5e94f3c
Author: Michael Park <mp...@apache.org>
Authored: Sat Mar 4 10:53:14 2017 -0800
Committer: Michael Park <mp...@apache.org>
Committed: Sat Mar 4 10:55:34 2017 -0800
----------------------------------------------------------------------
src/master/allocator/mesos/hierarchical.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a152828e/src/master/allocator/mesos/hierarchical.cpp
----------------------------------------------------------------------
diff --git a/src/master/allocator/mesos/hierarchical.cpp b/src/master/allocator/mesos/hierarchical.cpp
index 6968157..dcafc79 100644
--- a/src/master/allocator/mesos/hierarchical.cpp
+++ b/src/master/allocator/mesos/hierarchical.cpp
@@ -456,7 +456,7 @@ void HierarchicalAllocatorProcess::addSlave(
foreachpair (const FrameworkID& frameworkId,
const Resources& used_,
used) {
- if (!frameworks.contains(frameworkId) ) {
+ if (!frameworks.contains(frameworkId)) {
continue;
}
[2/3] mesos git commit: Fixed an indentation error in
`src/master/master.cpp`.
Posted by mp...@apache.org.
Fixed an indentation error in `src/master/master.cpp`.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5e94f3cf
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5e94f3cf
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5e94f3cf
Branch: refs/heads/master
Commit: 5e94f3cfac4cadb1c192a7d3d428b28c556fec93
Parents: 80a2e24
Author: Michael Park <mp...@apache.org>
Authored: Sat Mar 4 10:48:14 2017 -0800
Committer: Michael Park <mp...@apache.org>
Committed: Sat Mar 4 10:55:33 2017 -0800
----------------------------------------------------------------------
src/master/master.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/5e94f3cf/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index c2cebd1..a15c6d8 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -5168,7 +5168,7 @@ void Master::acknowledge(
if (protobuf::isTerminalState(task->status_update_state()) &&
UUID::fromBytes(task->status_update_uuid()).get() == uuid) {
removeTask(task);
- }
+ }
}
StatusUpdateAcknowledgementMessage message;