You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/08/24 16:32:32 UTC
[1/2] mesos git commit: Fixed a typo in the comment of
`Subsystem::watch`.
Repository: mesos
Updated Branches:
refs/heads/master f3295c089 -> db4c8a0e9
Fixed a typo in the comment of `Subsystem::watch`.
Review: https://reviews.apache.org/r/51293/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/32145842
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/32145842
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/32145842
Branch: refs/heads/master
Commit: 3214584205f033cab894ac60aac7248328712c81
Parents: f3295c0
Author: haosdent huang <ha...@gmail.com>
Authored: Wed Aug 24 09:32:20 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Aug 24 09:32:20 2016 -0700
----------------------------------------------------------------------
src/slave/containerizer/mesos/isolators/cgroups/subsystem.hpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/32145842/src/slave/containerizer/mesos/isolators/cgroups/subsystem.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/cgroups/subsystem.hpp b/src/slave/containerizer/mesos/isolators/cgroups/subsystem.hpp
index 6dca38c..6594110 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups/subsystem.hpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups/subsystem.hpp
@@ -96,7 +96,8 @@ public:
* Watch the container and report if any resource constraint impacts it.
*
* @param containerId The target containerId.
- * @return Nothing or an error if `recover` fails.
+ * @return The resource limitation that impacts the container or an
+ * error if `watch` fails.
*/
virtual process::Future<mesos::slave::ContainerLimitation> watch(
const ContainerID& containerId);
[2/2] mesos git commit: Removed unnecessary statements in
`CgroupsIsolatorProcess::_watch`.
Posted by ji...@apache.org.
Removed unnecessary statements in `CgroupsIsolatorProcess::_watch`.
Review: https://reviews.apache.org/r/51294/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/db4c8a0e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/db4c8a0e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/db4c8a0e
Branch: refs/heads/master
Commit: db4c8a0e9eaf27f3e2d42a620a5e612863cbf9ea
Parents: 3214584
Author: haosdent huang <ha...@gmail.com>
Authored: Wed Aug 24 09:32:24 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Aug 24 09:32:24 2016 -0700
----------------------------------------------------------------------
src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/db4c8a0e/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp b/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp
index ed9cff2..ae5d49f 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp
@@ -546,13 +546,7 @@ void CgroupsIsolatorProcess::_watch(
CHECK(!future.isPending());
- if (future.isReady()) {
- infos[containerId]->limitation.set(future.get());
- } else if (future.isFailed()) {
- infos[containerId]->limitation.fail(future.failure());
- } else {
- infos[containerId]->limitation.discard();
- }
+ infos[containerId]->limitation.set(future);
}