You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by nn...@apache.org on 2015/09/17 23:58:28 UTC
mesos git commit: Minor clean ups in container id for kill message
patch.
Repository: mesos
Updated Branches:
refs/heads/master 3d8ea3a74 -> 9b3c8610b
Minor clean ups in container id for kill message patch.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9b3c8610
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9b3c8610
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9b3c8610
Branch: refs/heads/master
Commit: 9b3c8610b685e4e1f9c2ad55cc44953ebc51c7ef
Parents: 3d8ea3a
Author: Niklas Q. Nielsen <ni...@mesosphere.io>
Authored: Thu Sep 17 14:57:33 2015 -0700
Committer: Niklas Q. Nielsen <ni...@mesosphere.io>
Committed: Thu Sep 17 14:57:33 2015 -0700
----------------------------------------------------------------------
include/mesos/mesos.proto | 2 +-
src/slave/slave.cpp | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/9b3c8610/include/mesos/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto
index c8bbf67..c9b310d 100644
--- a/include/mesos/mesos.proto
+++ b/include/mesos/mesos.proto
@@ -817,7 +817,7 @@ message ResourceUsage {
// cannot provide resource usage.
optional ResourceStatistics statistics = 3;
- // The container id for the executor specified in the executor_info field
+ // The container id for the executor specified in the executor_info field.
required ContainerID container_id = 4;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/9b3c8610/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index 5aaa12a..ad710d7 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -4392,11 +4392,11 @@ void Slave::_qosCorrections(const Future<list<QoSCorrection>>& future)
continue;
}
- const ContainerID& containerId =
+ const ContainerID containerId =
kill.has_container_id() ? kill.container_id() : executor->containerId;
if (containerId != executor->containerId) {
LOG(WARNING) << "Ignoring QoS correction KILL on container '"
- << containerId << "' in executor '"
+ << containerId << "' for executor '"
<< executorId << "' of framework " << frameworkId
<< ": container cannot be found";
continue;
@@ -4406,7 +4406,7 @@ void Slave::_qosCorrections(const Future<list<QoSCorrection>>& future)
case Executor::REGISTERING:
case Executor::RUNNING: {
LOG(INFO) << "Killing container '" << containerId
- << "' in executor '" << executorId
+ << "' for executor '" << executorId
<< "' of framework " << frameworkId
<< " as QoS correction";