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:25:05 UTC
[1/2] mesos git commit: Added MESOS-8947 to 1.6.1 CHANGELOG.
Repository: mesos
Updated Branches:
refs/heads/1.6.x a3dbfc31b -> 83eae0c9f
Added MESOS-8947 to 1.6.1 CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/83eae0c9
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/83eae0c9
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/83eae0c9
Branch: refs/heads/1.6.x
Commit: 83eae0c9fab552fe93a8c2393809224c663e0c65
Parents: 2e56d53
Author: Gilbert Song <so...@gmail.com>
Authored: Wed May 23 18:13:38 2018 -0700
Committer: Gilbert Song <so...@gmail.com>
Committed: Wed May 23 18:15:54 2018 -0700
----------------------------------------------------------------------
CHANGELOG | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/83eae0c9/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 0b47bd0..04a7806 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ Release Notes - Mesos - Version 1.6.1 (WIP)
* [MESOS-8786] - CgroupIsolatorProcess accesses subsystem processes directly.
* [MESOS-8904] - Master crash when removing quota.
* [MESOS-8906] - `UriDiskProfileAdaptor` fails to update profile selectors.
+ * [MESOS-8947] - Improve the container preparing logging in IOSwitchboard and volume/secret isolator.
Release Notes - Mesos - Version 1.6.0
[2/2] mesos git commit: Added isolator logs for volume/secret
isolator and container logger.
Posted by gi...@apache.org.
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/2e56d535
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/2e56d535
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/2e56d535
Branch: refs/heads/1.6.x
Commit: 2e56d535b0c146c01455d6c056866596f95a4114
Parents: a3dbfc3
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:15:54 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/2e56d535/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 517d459..5b6e903 100644
--- a/src/slave/containerizer/mesos/io/switchboard.cpp
+++ b/src/slave/containerizer/mesos/io/switchboard.cpp
@@ -307,19 +307,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/2e56d535/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;
});
}