You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2017/01/16 16:46:22 UTC
[1/2] mesos git commit: Ensured master always relinks during
scheduler re-registration.
Repository: mesos
Updated Branches:
refs/heads/1.0.x c82a283d8 -> 64b7a192f
Ensured master always relinks during scheduler re-registration.
In the following scenario:
* Master sees a re-registration attempt from a PID-based scheduler,
* The scheduler was previously registered with the master,
* and the "force" flag is not set
The master neglected to re-link with the scheduler. For example, this
might happen if:
* The master sees an ExitedEvent for the framework and marks it
disconnected.
* The master sends a FrameworkErrorMessage to the framework but this
message is dropped, e.g., due to a transient network failure.
* The scheduler attempts to re-register with the master, e.g., because
it detects (spuriously) that the current leading master has changed.
This is problematic, because it might leave the master -> scheduler
connection using an ephemeral socket.
Review: https://reviews.apache.org/r/54495/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8002792b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8002792b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8002792b
Branch: refs/heads/1.0.x
Commit: 8002792bcf2a31db6e5f085cbc911791428aed09
Parents: c82a283
Author: Neil Conway <ne...@gmail.com>
Authored: Wed Dec 7 17:03:58 2016 -0800
Committer: Vinod Kone <vi...@gmail.com>
Committed: Mon Jan 16 17:43:07 2017 +0100
----------------------------------------------------------------------
src/master/master.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/8002792b/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index 7f17c6a..b9f75f8 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -2612,7 +2612,9 @@ void Master::_subscribe(
removeInverseOffer(inverseOffer, true); // Rescind.
}
- // TODO(bmahler): Shouldn't this re-link with the scheduler?
+ // Relink to the framework and mark it connected. Relinking
+ // might be necessary if the framework link previously broke.
+ link(framework->pid.get());
framework->connected = true;
// Reactivate the framework.
[2/2] mesos git commit: Added MESOS-6676 to CHANGELOG for 1.0.3.
Posted by vi...@apache.org.
Added MESOS-6676 to CHANGELOG for 1.0.3.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/64b7a192
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/64b7a192
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/64b7a192
Branch: refs/heads/1.0.x
Commit: 64b7a192f101ee6bb81a58222c10aeda2250aae7
Parents: 8002792
Author: Vinod Kone <vi...@gmail.com>
Authored: Mon Jan 16 17:44:54 2017 +0100
Committer: Vinod Kone <vi...@gmail.com>
Committed: Mon Jan 16 17:45:36 2017 +0100
----------------------------------------------------------------------
CHANGELOG | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/64b7a192/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 8db2cb0..1195cd2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ All Issues:
** Bug
* [MESOS-6142] - Frameworks may RESERVE for an arbitrary role.
* [MESOS-6621] - SSL downgrade path will CHECK-fail when using both temporary and persistent sockets
+ * [MESOS-6676] - Always re-link with scheduler during re-registration.
Release Notes - Mesos - Version 1.0.2