This is an automated email from the ASF dual-hosted git repository.
alexr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
The following commit(s) were added to refs/heads/master by this push:
new 221884c Removed an unconditional .get() in DefaultExecutor.
221884c is described below
commit 221884c88447f280dfa61cbbb465d9342f155f61
Author: Benno Evers <[email protected]>
AuthorDate: Thu Dec 13 10:39:16 2018 +0100
Removed an unconditional .get() in DefaultExecutor.
This would fail in some cases where the optional
message is `None`, e.g. when the container is in
killing state.
Review: https://reviews.apache.org/r/66815/
---
src/launcher/default_executor.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/launcher/default_executor.cpp
b/src/launcher/default_executor.cpp
index b89b036..cc7b6b7 100644
--- a/src/launcher/default_executor.cpp
+++ b/src/launcher/default_executor.cpp
@@ -953,9 +953,9 @@ protected:
forward(taskStatus);
LOG(INFO)
- << "Child container " << container->containerId << " of task '" << taskId
- << "' completed in state " << stringify(taskState)
- << ": " << message.get();
+ << "Child container " << container->containerId << " of task '"
+ << taskId << "' completed in state " << stringify(taskState)
+ << (message.isSome() ? ": " + message.get() : "");
// The default restart policy for a task group is to kill all the
// remaining child containers if one of them terminated with a
