Repository: mesos Updated Branches: refs/heads/master b416dbe0f -> 814aafab2
Removed containerizer flag logging to prevent leak of sensitive data. Review: https://reviews.apache.org/r/57764/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/814aafab Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/814aafab Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/814aafab Branch: refs/heads/master Commit: 814aafab2e45d15d51ba61f59a0a267e45f85adf Parents: b416dbe Author: Till Toenshoff <[email protected]> Authored: Fri Mar 24 06:05:05 2017 +0100 Committer: Alexander Rukletsov <[email protected]> Committed: Fri Mar 24 06:10:00 2017 +0100 ---------------------------------------------------------------------- src/launcher/posix/executor.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/814aafab/src/launcher/posix/executor.cpp ---------------------------------------------------------------------- diff --git a/src/launcher/posix/executor.cpp b/src/launcher/posix/executor.cpp index 59e7c0c..7c4ef10 100644 --- a/src/launcher/posix/executor.cpp +++ b/src/launcher/posix/executor.cpp @@ -116,11 +116,14 @@ pid_t launchTaskPosix( launchFlags.launch_info = JSON::protobuf(launchInfo); + // TODO(tillt): Consider using a flag allowing / disallowing the + // log output of possibly sensitive data. See MESOS-7292. string commandString = strings::format( - "%s %s %s", + "%s %s <POSSIBLY-SENSITIVE-DATA>", path::join(launcherDir, MESOS_CONTAINERIZER), - MesosContainerizerLaunch::NAME, - stringify(launchFlags)).get(); + MesosContainerizerLaunch::NAME).get(); + + cout << "Running '" << commandString << "'" << endl; // Fork the child using launcher. vector<string> argv(2); @@ -143,8 +146,6 @@ pid_t launchTaskPosix( ABORT("Failed to launch '" + commandString + "': " + s.error()); } - cout << commandString << endl; - return s->pid(); }
