You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2017/11/15 08:13:39 UTC
[15/15] mesos git commit: Updated some isolators' usage of
ExecutorInfo.
Updated some isolators' usage of ExecutorInfo.
These four isolators refered to the ExecutorInfo field of the given
ContainerConfig to determine the total resources to isolate. This
changes these isolators to refer instead to the Resources field of the
given ContainerConfig because the resource amounts should be identical
(enforced by the caller to Containerizer::launch, such as the agent)
and in order to support standalone containers, which specify resources
but no ExecutorInfo.
Review: https://reviews.apache.org/r/63515
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/57334da8
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/57334da8
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/57334da8
Branch: refs/heads/master
Commit: 57334da8f8a9842344a80f2161c3838b1b46d01f
Parents: 38951cf
Author: Joseph Wu <jo...@apache.org>
Authored: Thu Nov 2 04:23:11 2017 -0700
Committer: Joseph Wu <jo...@apache.org>
Committed: Tue Nov 14 17:16:56 2017 -0800
----------------------------------------------------------------------
src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp | 5 +----
src/slave/containerizer/mesos/isolators/gpu/isolator.cpp | 2 +-
.../containerizer/mesos/isolators/network/port_mapping.cpp | 3 +--
src/slave/containerizer/mesos/isolators/xfs/disk.cpp | 2 +-
4 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/57334da8/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 549a455..c0ebc4e 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp
@@ -517,10 +517,7 @@ Future<Option<ContainerLaunchInfo>> CgroupsIsolatorProcess::_prepare(
strings::join(";", errors));
}
- // TODO(haosdent): Here we assume the command executor's resources
- // include the task's resources. Revisit here if this semantics
- // changes.
- return update(containerId, containerConfig.executor_info().resources())
+ return update(containerId, containerConfig.resources())
.then([]() { return Option<ContainerLaunchInfo>::none(); });
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/57334da8/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp b/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
index 25636b5..4d6f640 100644
--- a/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
+++ b/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
@@ -351,7 +351,7 @@ Future<Option<ContainerLaunchInfo>> NvidiaGpuIsolatorProcess::prepare(
}
}
- return update(containerId, containerConfig.executor_info().resources())
+ return update(containerId, containerConfig.resources())
.then(defer(PID<NvidiaGpuIsolatorProcess>(this),
&NvidiaGpuIsolatorProcess::_prepare,
containerConfig));
http://git-wip-us.apache.org/repos/asf/mesos/blob/57334da8/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
index 55672b1..d60052e 100644
--- a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
+++ b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
@@ -2494,8 +2494,7 @@ Future<Option<ContainerLaunchInfo>> PortMappingIsolatorProcess::prepare(
}
const ExecutorInfo& executorInfo = containerConfig.executor_info();
-
- Resources resources(executorInfo.resources());
+ const Resources resources(containerConfig.resources());
IntervalSet<uint16_t> nonEphemeralPorts;
http://git-wip-us.apache.org/repos/asf/mesos/blob/57334da8/src/slave/containerizer/mesos/isolators/xfs/disk.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/xfs/disk.cpp b/src/slave/containerizer/mesos/isolators/xfs/disk.cpp
index 2113f86..8d9f8f8 100644
--- a/src/slave/containerizer/mesos/isolators/xfs/disk.cpp
+++ b/src/slave/containerizer/mesos/isolators/xfs/disk.cpp
@@ -291,7 +291,7 @@ Future<Option<ContainerLaunchInfo>> XfsDiskIsolatorProcess::prepare(
LOG(INFO) << "Assigned project " << stringify(projectId.get()) << " to '"
<< containerConfig.directory() << "'";
- return update(containerId, containerConfig.executor_info().resources())
+ return update(containerId, containerConfig.resources())
.then([]() -> Future<Option<ContainerLaunchInfo>> {
return None();
});