You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ti...@apache.org on 2017/11/09 10:04:42 UTC
mesos git commit: Dropped scheduler call if a connection has been
interrupted.
Repository: mesos
Updated Branches:
refs/heads/master 50068a1fc -> bd3302bdf
Dropped scheduler call if a connection has been interrupted.
Prior to this patch, if a connection to the master is interrupted
between `send()` and `_send()`, scheduler library will crash on
`CHECK`. Since the connection can turn into pumpkin at any time, we
should not fail in this case.
Review: https://reviews.apache.org/r/63662/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/bd3302bd
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/bd3302bd
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/bd3302bd
Branch: refs/heads/master
Commit: bd3302bdfaf1123654b90e89340fbbb760524715
Parents: 50068a1
Author: Alexander Rukletsov <ru...@gmail.com>
Authored: Thu Nov 9 11:04:12 2017 +0100
Committer: Till Toenshoff <to...@me.com>
Committed: Thu Nov 9 11:04:12 2017 +0100
----------------------------------------------------------------------
src/scheduler/scheduler.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/bd3302bd/src/scheduler/scheduler.cpp
----------------------------------------------------------------------
diff --git a/src/scheduler/scheduler.cpp b/src/scheduler/scheduler.cpp
index fe37454..ba61969 100644
--- a/src/scheduler/scheduler.cpp
+++ b/src/scheduler/scheduler.cpp
@@ -550,7 +550,10 @@ protected:
::Request request = future.get();
- CHECK_SOME(connections);
+ if (connections.isNone()) {
+ drop(call, "Connection to master interrupted");
+ return;
+ }
Future<Response> response;
if (call.type() == Call::SUBSCRIBE) {