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/25 05:23:48 UTC
[4/4] mesos git commit: Replaced raw pointers in MesosContainerizer
with Owned pointers.
Replaced raw pointers in MesosContainerizer with Owned pointers.
Review: https://reviews.apache.org/r/51388
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/203a0803
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/203a0803
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/203a0803
Branch: refs/heads/master
Commit: 203a0803cf1fb24e45fe261922cd6cdbfe842e4c
Parents: 2f019d8
Author: Jie Yu <yu...@gmail.com>
Authored: Wed Aug 24 10:21:36 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Aug 24 22:23:38 2016 -0700
----------------------------------------------------------------------
src/slave/containerizer/mesos/containerizer.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/203a0803/src/slave/containerizer/mesos/containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp
index 8a8985a..17657e9 100644
--- a/src/slave/containerizer/mesos/containerizer.cpp
+++ b/src/slave/containerizer/mesos/containerizer.cpp
@@ -691,7 +691,7 @@ Future<Nothing> MesosContainerizerProcess::__recover(
foreach (const ContainerState& run, recovered) {
const ContainerID& containerId = run.container_id();
- Container* container = new Container();
+ Owned<Container> container(new Container());
Future<Option<int>> status = process::reap(run.pid());
status.onAny(defer(self(), &Self::reaped, containerId));
@@ -702,7 +702,7 @@ Future<Nothing> MesosContainerizerProcess::__recover(
// containers should be running after recover.
container->state = RUNNING;
- containers_[containerId] = Owned<Container>(container);
+ containers_[containerId] = container;
foreach (const Owned<Isolator>& isolator, isolators) {
isolator->watch(containerId)
@@ -870,7 +870,7 @@ Future<bool> MesosContainerizerProcess::launch(
const SlaveID& slaveId,
bool checkpoint)
{
- Container* container = new Container();
+ Owned<Container> container(new Container());
container->state = PROVISIONING;
container->config = containerConfig;
container->resources = containerConfig.resources();
@@ -881,7 +881,7 @@ Future<bool> MesosContainerizerProcess::launch(
// be ready, which it never will. See MESOS-4878.
container->launchInfos = list<Option<ContainerLaunchInfo>>();
- containers_.put(containerId, Owned<Container>(container));
+ containers_.put(containerId, container);
// We'll first provision the image for the container, and
// then provision the images specified in `volumes` using
@@ -1581,7 +1581,7 @@ void MesosContainerizerProcess::destroy(
return;
}
- Container* container = containers_[containerId].get();
+ const Owned<Container>& container = containers_[containerId];
if (container->state == DESTROYING) {
VLOG(1) << "Destroy has already been initiated for " << containerId;
@@ -1731,7 +1731,7 @@ void MesosContainerizerProcess::____destroy(
CHECK_READY(cleanups);
CHECK(containers_.contains(containerId));
- Container* container = containers_[containerId].get();
+ const Owned<Container>& container = containers_[containerId];
// Check cleanup succeeded for all isolators. If not, we'll fail the
// container termination and remove the 'destroying' flag but leave
@@ -1769,7 +1769,7 @@ void MesosContainerizerProcess::_____destroy(
{
CHECK(containers_.contains(containerId));
- Container* container = containers_[containerId].get();
+ const Owned<Container>& container = containers_[containerId];
if (!destroy.isReady()) {
container->promise.fail(