You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by gi...@apache.org on 2018/05/24 01:10:45 UTC
mesos git commit: Added isolator logs for volume/secret isolator and
container logger.
Repository: mesos
Updated Branches:
refs/heads/master 3d2a1fd49 -> ef22971c9
Added isolator logs for volume/secret isolator and container logger.
Review: https://reviews.apache.org/r/67241
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ef22971c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ef22971c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ef22971c
Branch: refs/heads/master
Commit: ef22971c913c4e41317301875094443b76759bef
Parents: 3d2a1fd
Author: Gilbert Song <so...@gmail.com>
Authored: Mon May 21 16:42:53 2018 -0700
Committer: Gilbert Song <so...@gmail.com>
Committed: Wed May 23 18:04:08 2018 -0700
----------------------------------------------------------------------
src/slave/containerizer/mesos/io/switchboard.cpp | 10 ++++++++--
src/slave/containerizer/mesos/isolators/volume/secret.cpp | 5 ++++-
2 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ef22971c/src/slave/containerizer/mesos/io/switchboard.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/io/switchboard.cpp b/src/slave/containerizer/mesos/io/switchboard.cpp
index 6d99fb5..17e8745 100644
--- a/src/slave/containerizer/mesos/io/switchboard.cpp
+++ b/src/slave/containerizer/mesos/io/switchboard.cpp
@@ -302,19 +302,25 @@ Future<Option<ContainerLaunchInfo>> IOSwitchboard::_prepare(
const ContainerConfig& containerConfig,
const ContainerIO& loggerIO)
{
+ bool requiresServer = IOSwitchboard::requiresServer(containerConfig);
+
// On windows, we do not yet support running an io switchboard
// server, so we must error out if it is required.
#ifdef __WINDOWS__
- if (IOSwitchboard::requiresServer(containerConfig)) {
+ if (requiresServer) {
return Failure(
"IO Switchboard server is not supported on windows");
}
#endif
+ LOG(INFO) << "Container logger module finished preparing container "
+ << containerId << "; IOSwitchboard server is "
+ << (requiresServer ? "" : "not") << " required";
+
bool hasTTY = containerConfig.has_container_info() &&
containerConfig.container_info().has_tty_info();
- if (!IOSwitchboard::requiresServer(containerConfig)) {
+ if (!requiresServer) {
CHECK(!containerIOs.contains(containerId));
containerIOs[containerId] = loggerIO;
http://git-wip-us.apache.org/repos/asf/mesos/blob/ef22971c/src/slave/containerizer/mesos/isolators/volume/secret.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/volume/secret.cpp b/src/slave/containerizer/mesos/isolators/volume/secret.cpp
index 8071e4e..d1bc7c5 100644
--- a/src/slave/containerizer/mesos/isolators/volume/secret.cpp
+++ b/src/slave/containerizer/mesos/isolators/volume/secret.cpp
@@ -291,7 +291,10 @@ Future<Option<ContainerLaunchInfo>> VolumeSecretIsolatorProcess::prepare(
}
return collect(futures)
- .then([launchInfo]() -> Future<Option<ContainerLaunchInfo>> {
+ .then([launchInfo, containerId](
+ const list<Nothing>& results) -> Future<Option<ContainerLaunchInfo>> {
+ LOG(INFO) << results.size() << " secrets have been resolved for "
+ << "container " << containerId;
return launchInfo;
});
}