Repository: mesos Updated Branches: refs/heads/master 6fff95c45 -> ecdd58a5a
Augmented continuation name in default executor. Review: https://reviews.apache.org/r/56448 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ecdd58a5 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ecdd58a5 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ecdd58a5 Branch: refs/heads/master Commit: ecdd58a5ab75326a9e167f6cfda049c39c267a37 Parents: 6fff95c Author: Alexander Rukletsov <[email protected]> Authored: Wed Feb 8 10:26:49 2017 +0100 Committer: Alexander Rukletsov <[email protected]> Committed: Tue Feb 28 15:27:10 2017 +0100 ---------------------------------------------------------------------- src/launcher/default_executor.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/ecdd58a5/src/launcher/default_executor.cpp ---------------------------------------------------------------------- diff --git a/src/launcher/default_executor.cpp b/src/launcher/default_executor.cpp index d97324b..0ed436f 100644 --- a/src/launcher/default_executor.cpp +++ b/src/launcher/default_executor.cpp @@ -292,7 +292,7 @@ protected: LOG(ERROR) << "Unable to establish connection with the agent: " << (connection.isFailed() ? connection.failure() : "discarded"); - __shutdown(); + _shutdown(); return; } @@ -301,7 +301,7 @@ protected: if (state == DISCONNECTED || state == CONNECTED) { LOG(ERROR) << "Unable to complete the launch operation " << "as the executor is in state " << state; - __shutdown(); + _shutdown(); return; } @@ -365,7 +365,7 @@ protected: LOG(ERROR) << "Unable to receive a response from the agent for " << "the LAUNCH_NESTED_CONTAINER call: " << (responses.isFailed() ? responses.failure() : "discarded"); - __shutdown(); + _shutdown(); return; } @@ -376,7 +376,7 @@ protected: if (response.code != process::http::Status::OK) { LOG(ERROR) << "Received '" << response.status << "' (" << response.body << ") while launching child container"; - __shutdown(); + _shutdown(); return; } } @@ -386,7 +386,7 @@ protected: if (state == DISCONNECTED || state == CONNECTED) { LOG(ERROR) << "Unable to complete the operation of launching child " << "containers as the executor is in state " << state; - __shutdown(); + _shutdown(); return; } @@ -421,7 +421,7 @@ protected: // TODO(anand): Should we send a TASK_FAILED instead? LOG(ERROR) << "Failed to create health checker: " << _checker.error(); - __shutdown(); + _shutdown(); return; } @@ -508,7 +508,7 @@ protected: LOG(ERROR) << "Unable to establish connection with the agent: " << (_connections.isFailed() ? _connections.failure() : "discarded"); - __shutdown(); + _shutdown(); return; } @@ -619,7 +619,7 @@ protected: LOG(ERROR) << "Received '" << response->status << "' (" << response->body << ") waiting on child container " << container->containerId << " of task '" << taskId << "'"; - __shutdown(); + _shutdown(); return; } @@ -678,7 +678,7 @@ protected: // Shutdown the executor if all the active child containers have terminated. if (containers.empty()) { - __shutdown(); + _shutdown(); return; } @@ -746,7 +746,7 @@ protected: checkers.clear(); if (!launched) { - __shutdown(); + _shutdown(); return; } @@ -756,7 +756,7 @@ protected: // This could also happen when the executor is connected but the agent // asked it to shutdown because it didn't subscribe in time. if (state == CONNECTED || state == DISCONNECTED) { - __shutdown(); + _shutdown(); return; } @@ -789,11 +789,11 @@ protected: << "child containers: " << (future.isFailed() ? future.failure() : "discarded"); - __shutdown(); + _shutdown(); })); } - void __shutdown() + void _shutdown() { const Duration duration = Seconds(1);
