You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2013/12/02 17:57:00 UTC
[06/14] git commit: Updated references in Mesos to use the new Owned.
Updated references in Mesos to use the new Owned.
From: Jie Yu <yu...@gmail.com>
Review: https://reviews.apache.org/r/15839
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/92bbaf8a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/92bbaf8a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/92bbaf8a
Branch: refs/heads/master
Commit: 92bbaf8af27e640f7f9b2c50c0d6e681e6cab5dc
Parents: d1194f6
Author: Benjamin Hindman <be...@gmail.com>
Authored: Sun Dec 1 15:58:39 2013 -0800
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Sun Dec 1 15:58:58 2013 -0800
----------------------------------------------------------------------
src/master/contender.hpp | 4 ++--
src/master/detector.hpp | 4 ++--
src/master/master.cpp | 5 ++---
src/master/master.hpp | 2 +-
src/sched/sched.cpp | 2 +-
src/slave/gc.hpp | 6 +++---
src/slave/http.cpp | 2 ++
src/slave/monitor.cpp | 2 +-
src/slave/reaper.hpp | 5 +++--
src/slave/slave.hpp | 2 +-
src/tests/authentication_tests.cpp | 13 +++++++------
src/tests/cluster.hpp | 22 ++++++++++++----------
src/tests/fault_tolerance_tests.cpp | 17 ++++++++++-------
src/tests/master_contender_detector_tests.cpp | 4 +++-
src/tests/master_tests.cpp | 5 ++++-
src/tests/mesos.hpp | 7 ++++---
src/tests/slave_recovery_tests.cpp | 5 +++--
src/tests/zookeeper_tests.cpp | 17 +++++++++++------
18 files changed, 72 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/92bbaf8a/src/master/contender.hpp
----------------------------------------------------------------------
diff --git a/src/master/contender.hpp b/src/master/contender.hpp
index 50fd4f3..7764edd 100644
--- a/src/master/contender.hpp
+++ b/src/master/contender.hpp
@@ -21,11 +21,11 @@
#include <process/defer.hpp>
#include <process/future.hpp>
+#include <process/owned.hpp>
#include <process/pid.hpp>
#include <stout/lambda.hpp>
#include <stout/nothing.hpp>
-#include <stout/owned.hpp>
#include "zookeeper/contender.hpp"
#include "zookeeper/group.hpp"
@@ -109,7 +109,7 @@ public:
// Creates a contender that uses ZooKeeper to determine (i.e.,
// elect) a leading master.
ZooKeeperMasterContender(const zookeeper::URL& url);
- ZooKeeperMasterContender(Owned<zookeeper::Group> group);
+ ZooKeeperMasterContender(process::Owned<zookeeper::Group> group);
virtual ~ZooKeeperMasterContender();
http://git-wip-us.apache.org/repos/asf/mesos/blob/92bbaf8a/src/master/detector.hpp
----------------------------------------------------------------------
diff --git a/src/master/detector.hpp b/src/master/detector.hpp
index ceb3a3f..6e7a4c4 100644
--- a/src/master/detector.hpp
+++ b/src/master/detector.hpp
@@ -20,9 +20,9 @@
#define __MASTER_DETECTOR_HPP__
#include <process/future.hpp>
+#include <process/owned.hpp>
#include <process/pid.hpp>
-#include <stout/owned.hpp>
#include <stout/result.hpp>
#include <stout/try.hpp>
@@ -112,7 +112,7 @@ public:
// elect) a leading master.
ZooKeeperMasterDetector(const zookeeper::URL& url);
// A constructor overload for testing purposes.
- ZooKeeperMasterDetector(Owned<zookeeper::Group> group);
+ ZooKeeperMasterDetector(process::Owned<zookeeper::Group> group);
virtual ~ZooKeeperMasterDetector();
// MasterDetector implementation.
http://git-wip-us.apache.org/repos/asf/mesos/blob/92bbaf8a/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index f13d2a0..23c2a5f 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -31,7 +31,6 @@
#include <stout/multihashmap.hpp>
#include <stout/nothing.hpp>
#include <stout/os.hpp>
-#include <stout/owned.hpp>
#include <stout/path.hpp>
#include <stout/utils.hpp>
#include <stout/uuid.hpp>
@@ -1841,10 +1840,10 @@ void Master::authenticate(const UPID& from, const UPID& pid)
// Create a promise to capture the entire "authenticating"
// procedure. We'll set this _after_ we finish _authenticate.
- Owned<Promise<Nothing> > promise = new Promise<Nothing>();
+ Owned<Promise<Nothing> > promise(new Promise<Nothing>());
// Create the authenticator.
- Owned<sasl::Authenticator> authenticator = new sasl::Authenticator(from);
+ Owned<sasl::Authenticator> authenticator(new sasl::Authenticator(from));
// Start authentication.
const Future<bool>& future = authenticator->authenticate()
http://git-wip-us.apache.org/repos/asf/mesos/blob/92bbaf8a/src/master/master.hpp
----------------------------------------------------------------------
diff --git a/src/master/master.hpp b/src/master/master.hpp
index 2d5dfaf..a7bf963 100644
--- a/src/master/master.hpp
+++ b/src/master/master.hpp
@@ -30,6 +30,7 @@
#include <mesos/resources.hpp>
#include <process/http.hpp>
+#include <process/owned.hpp>
#include <process/process.hpp>
#include <process/protobuf.hpp>
@@ -38,7 +39,6 @@
#include <stout/hashset.hpp>
#include <stout/multihashmap.hpp>
#include <stout/option.hpp>
-#include <stout/owned.hpp>
#include "common/type_utils.hpp"
http://git-wip-us.apache.org/repos/asf/mesos/blob/92bbaf8a/src/sched/sched.cpp
----------------------------------------------------------------------
diff --git a/src/sched/sched.cpp b/src/sched/sched.cpp
index af57f28..b958435 100644
--- a/src/sched/sched.cpp
+++ b/src/sched/sched.cpp
@@ -38,6 +38,7 @@
#include <process/id.hpp>
#include <process/dispatch.hpp>
#include <process/id.hpp>
+#include <process/owned.hpp>
#include <process/process.hpp>
#include <process/protobuf.hpp>
@@ -48,7 +49,6 @@
#include <stout/hashmap.hpp>
#include <stout/lambda.hpp>
#include <stout/option.hpp>
-#include <stout/owned.hpp>
#include <stout/os.hpp>
#include <stout/stopwatch.hpp>
#include <stout/uuid.hpp>
http://git-wip-us.apache.org/repos/asf/mesos/blob/92bbaf8a/src/slave/gc.hpp
----------------------------------------------------------------------
diff --git a/src/slave/gc.hpp b/src/slave/gc.hpp
index 083aa79..328aa31 100644
--- a/src/slave/gc.hpp
+++ b/src/slave/gc.hpp
@@ -23,6 +23,7 @@
#include <vector>
#include <process/future.hpp>
+#include <process/owned.hpp>
#include <process/process.hpp>
#include <process/timeout.hpp>
#include <process/timer.hpp>
@@ -31,7 +32,6 @@
#include <stout/hashmap.hpp>
#include <stout/multimap.hpp>
#include <stout/nothing.hpp>
-#include <stout/owned.hpp>
#include <stout/try.hpp>
namespace mesos {
@@ -101,7 +101,7 @@ private:
struct PathInfo
{
PathInfo(const std::string& _path,
- Owned<process::Promise<Nothing> > _promise)
+ process::Owned<process::Promise<Nothing> > _promise)
: path(_path), promise(_promise) {}
bool operator == (const PathInfo& that) const
@@ -110,7 +110,7 @@ private:
}
const std::string path;
- const Owned<process::Promise<Nothing> > promise;
+ const process::Owned<process::Promise<Nothing> > promise;
};
// Store all the timeouts and corresponding paths to delete.
http://git-wip-us.apache.org/repos/asf/mesos/blob/92bbaf8a/src/slave/http.cpp
----------------------------------------------------------------------
diff --git a/src/slave/http.cpp b/src/slave/http.cpp
index fbc917b..55a5e7d 100644
--- a/src/slave/http.cpp
+++ b/src/slave/http.cpp
@@ -25,6 +25,7 @@
#include <mesos/resources.hpp>
#include <process/help.hpp>
+#include <process/owned.hpp>
#include <stout/foreach.hpp>
#include <stout/json.hpp>
@@ -45,6 +46,7 @@ namespace slave {
using process::Future;
using process::HELP;
+using process::Owned;
using process::TLDR;
using process::USAGE;
http://git-wip-us.apache.org/repos/asf/mesos/blob/92bbaf8a/src/slave/monitor.cpp
----------------------------------------------------------------------
diff --git a/src/slave/monitor.cpp b/src/slave/monitor.cpp
index dd25855..7201ad7 100644
--- a/src/slave/monitor.cpp
+++ b/src/slave/monitor.cpp
@@ -108,7 +108,7 @@ Future<Nothing> ResourceMonitorProcess::watch(
::statistics->meter(
"monitor",
prefix + CPUS_TIME_SECS,
- new meters::TimeRate(prefix + CPU_USAGE));
+ Owned<meters::Meter>(new meters::TimeRate(prefix + CPU_USAGE)));
// Schedule the resource collection.
delay(interval, self(), &Self::collect, frameworkId, executorId, interval);
http://git-wip-us.apache.org/repos/asf/mesos/blob/92bbaf8a/src/slave/reaper.hpp
----------------------------------------------------------------------
diff --git a/src/slave/reaper.hpp b/src/slave/reaper.hpp
index 4498139..9a31c75 100644
--- a/src/slave/reaper.hpp
+++ b/src/slave/reaper.hpp
@@ -23,11 +23,11 @@
#include <set>
#include <process/future.hpp>
+#include <process/owned.hpp>
#include <process/process.hpp>
#include <stout/multihashmap.hpp>
#include <stout/nothing.hpp>
-#include <stout/owned.hpp>
#include <stout/try.hpp>
namespace mesos {
@@ -80,7 +80,8 @@ protected:
private:
// Mapping from the monitored pid to all promises the pid exit
// status should be sent to.
- multihashmap<pid_t, Owned<process::Promise<Option<int> > > > promises;
+ multihashmap<
+ pid_t, process::Owned<process::Promise<Option<int> > > > promises;
};
http://git-wip-us.apache.org/repos/asf/mesos/blob/92bbaf8a/src/slave/slave.hpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.hpp b/src/slave/slave.hpp
index 6d7c3e8..2d093a3 100644
--- a/src/slave/slave.hpp
+++ b/src/slave/slave.hpp
@@ -31,6 +31,7 @@
#include <process/http.hpp>
#include <process/future.hpp>
+#include <process/owned.hpp>
#include <process/process.hpp>
#include <process/protobuf.hpp>
@@ -41,7 +42,6 @@
#include <stout/multihashmap.hpp>
#include <stout/option.hpp>
#include <stout/os.hpp>
-#include <stout/owned.hpp>
#include <stout/path.hpp>
#include <stout/uuid.hpp>
http://git-wip-us.apache.org/repos/asf/mesos/blob/92bbaf8a/src/tests/authentication_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/authentication_tests.cpp b/src/tests/authentication_tests.cpp
index cc8b7a9..127c5e6 100644
--- a/src/tests/authentication_tests.cpp
+++ b/src/tests/authentication_tests.cpp
@@ -24,6 +24,7 @@
#include <process/dispatch.hpp>
#include <process/gmock.hpp>
+#include <process/owned.hpp>
#include <stout/nothing.hpp>
@@ -277,8 +278,8 @@ TEST_F(AuthenticationTest, MasterFailover)
ASSERT_SOME(master);
MockScheduler sched;
- Owned<StandaloneMasterDetector> detector =
- new StandaloneMasterDetector(master.get());
+ Owned<StandaloneMasterDetector> detector(
+ new StandaloneMasterDetector(master.get()));
TestingMesosSchedulerDriver driver(&sched, detector.get());
// Drop the authenticate message from the scheduler.
@@ -321,8 +322,8 @@ TEST_F(AuthenticationTest, LeaderElection)
ASSERT_SOME(master);
MockScheduler sched;
- Owned<StandaloneMasterDetector> detector =
- new StandaloneMasterDetector(master.get());
+ Owned<StandaloneMasterDetector> detector(
+ new StandaloneMasterDetector(master.get()));
TestingMesosSchedulerDriver driver(&sched, detector.get());
// Drop the AuthenticationStepMessage from authenticator.
@@ -361,8 +362,8 @@ TEST_F(AuthenticationTest, SchedulerFailover)
// Launch the first (i.e., failing) scheduler.
MockScheduler sched1;
- Owned<StandaloneMasterDetector> detector =
- new StandaloneMasterDetector(master.get());
+ Owned<StandaloneMasterDetector> detector(
+ new StandaloneMasterDetector(master.get()));
TestingMesosSchedulerDriver driver1(&sched1, detector.get());
Future<FrameworkID> frameworkId;
http://git-wip-us.apache.org/repos/asf/mesos/blob/92bbaf8a/src/tests/cluster.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cluster.hpp b/src/tests/cluster.hpp
index fa64ed1..065976c 100644
--- a/src/tests/cluster.hpp
+++ b/src/tests/cluster.hpp
@@ -21,6 +21,7 @@
#include <map>
+#include <process/owned.hpp>
#include <process/pid.hpp>
#include <process/process.hpp>
@@ -29,7 +30,6 @@
#include <stout/none.hpp>
#include <stout/nothing.hpp>
#include <stout/option.hpp>
-#include <stout/owned.hpp>
#include <stout/path.hpp>
#include <stout/try.hpp>
@@ -90,7 +90,7 @@ public:
Try<Nothing> stop(const process::PID<master::Master>& pid);
// Returns a new master detector for this instance of masters.
- Owned<MasterDetector> detector();
+ process::Owned<MasterDetector> detector();
private:
// Not copyable, not assignable.
@@ -149,12 +149,12 @@ public:
// Detector. The detector is expected to outlive the launched
// slave (i.e., until it is stopped via Slaves::stop).
Try<process::PID<slave::Slave> > start(
- Owned<MasterDetector> detector,
+ process::Owned<MasterDetector> detector,
const slave::Flags& flags = slave::Flags());
Try<process::PID<slave::Slave> > start(
slave::Isolator* isolator,
- Owned<MasterDetector> detector,
+ process::Owned<MasterDetector> detector,
const slave::Flags& flags = slave::Flags());
// Stops and cleans up a slave at the specified PID. If 'shutdown'
@@ -184,7 +184,7 @@ public:
// Cluster.
slave::Isolator* isolator;
slave::Slave* slave;
- Owned<MasterDetector> detector;
+ process::Owned<MasterDetector> detector;
};
std::map<process::PID<slave::Slave>, Slave> slaves;
@@ -382,15 +382,17 @@ inline Try<Nothing> Cluster::Masters::stop(
}
-inline Owned<MasterDetector> Cluster::Masters::detector()
+inline process::Owned<MasterDetector> Cluster::Masters::detector()
{
if (url.isSome()) {
- return new ZooKeeperMasterDetector(url.get());
+ return process::Owned<MasterDetector>(
+ new ZooKeeperMasterDetector(url.get()));
}
CHECK(masters.size() == 1);
- return new StandaloneMasterDetector(masters.begin()->first);
+ return process::Owned<MasterDetector>(
+ new StandaloneMasterDetector(masters.begin()->first));
}
@@ -448,7 +450,7 @@ inline Try<process::PID<slave::Slave> > Cluster::Slaves::start(
inline Try<process::PID<slave::Slave> > Cluster::Slaves::start(
- Owned<MasterDetector> detector,
+ process::Owned<MasterDetector> detector,
const slave::Flags& flags)
{
return start(new slave::ProcessIsolator(), detector, flags);
@@ -457,7 +459,7 @@ inline Try<process::PID<slave::Slave> > Cluster::Slaves::start(
inline Try<process::PID<slave::Slave> > Cluster::Slaves::start(
slave::Isolator* isolator,
- Owned<MasterDetector> detector,
+ process::Owned<MasterDetector> detector,
const slave::Flags& flags)
{
// TODO(benh): Create a work directory if using the default.
http://git-wip-us.apache.org/repos/asf/mesos/blob/92bbaf8a/src/tests/fault_tolerance_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fault_tolerance_tests.cpp b/src/tests/fault_tolerance_tests.cpp
index f376b88..66ada33 100644
--- a/src/tests/fault_tolerance_tests.cpp
+++ b/src/tests/fault_tolerance_tests.cpp
@@ -30,6 +30,7 @@
#include <process/future.hpp>
#include <process/gmock.hpp>
+#include <process/owned.hpp>
#include <process/pid.hpp>
#include <process/process.hpp>
#include <process/protobuf.hpp>
@@ -60,6 +61,7 @@ using mesos::internal::slave::STATUS_UPDATE_RETRY_INTERVAL_MIN;
using process::Clock;
using process::Future;
using process::Message;
+using process::Owned;
using process::PID;
using process::UPID;
@@ -864,8 +866,8 @@ TEST_F(FaultToleranceTest, FrameworkReregister)
Try<PID<Master> > master = StartMaster();
ASSERT_SOME(master);
- Owned<MasterDetector> slaveDetector =
- new StandaloneMasterDetector(master.get());
+ Owned<MasterDetector> slaveDetector(
+ new StandaloneMasterDetector(master.get()));
Try<PID<Slave> > slave = StartSlave(slaveDetector);
ASSERT_SOME(slave);
@@ -873,8 +875,8 @@ TEST_F(FaultToleranceTest, FrameworkReregister)
// Create a detector for the scheduler driver because we want the
// spurious leading master change to be known by the scheduler
// driver only.
- Owned<MasterDetector> schedDetector =
- new StandaloneMasterDetector(master.get());
+ Owned<MasterDetector> schedDetector(
+ new StandaloneMasterDetector(master.get()));
MockScheduler sched;
TestingMesosSchedulerDriver driver(&sched, schedDetector.get());
@@ -1105,13 +1107,14 @@ TEST_F(FaultToleranceTest, ReregisterFrameworkExitedExecutor)
MockExecutor exec(DEFAULT_EXECUTOR_ID);
TestingIsolator isolator(&exec);
- Owned<MasterDetector> slaveDetector = new StandaloneMasterDetector(master.get());
+ Owned<MasterDetector> slaveDetector(
+ new StandaloneMasterDetector(master.get()));
Try<PID<Slave> > slave = StartSlave(&isolator, slaveDetector);
ASSERT_SOME(slave);
MockScheduler sched;
- Owned<StandaloneMasterDetector> schedDetector =
- new StandaloneMasterDetector(master.get());
+ Owned<StandaloneMasterDetector> schedDetector(
+ new StandaloneMasterDetector(master.get()));
TestingMesosSchedulerDriver driver(&sched, schedDetector.get());
Future<process::Message> frameworkRegisteredMessage =
http://git-wip-us.apache.org/repos/asf/mesos/blob/92bbaf8a/src/tests/master_contender_detector_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_contender_detector_tests.cpp b/src/tests/master_contender_detector_tests.cpp
index 6f268ba..76464ea 100644
--- a/src/tests/master_contender_detector_tests.cpp
+++ b/src/tests/master_contender_detector_tests.cpp
@@ -30,6 +30,7 @@
#include <process/clock.hpp>
#include <process/future.hpp>
+#include <process/owned.hpp>
#include <process/pid.hpp>
#include <process/protobuf.hpp>
@@ -66,6 +67,7 @@ using mesos::internal::slave::Slave;
using process::Clock;
using process::Future;
+using process::Owned;
using process::PID;
using process::UPID;
@@ -99,7 +101,7 @@ TEST_F(MasterContenderDetectorTest, File)
ASSERT_SOME(detector);
- StartSlave(detector.get(), flags);
+ StartSlave(Owned<MasterDetector>(detector.get()), flags);
MockScheduler sched;
MesosSchedulerDriver driver(
http://git-wip-us.apache.org/repos/asf/mesos/blob/92bbaf8a/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index 37ee7a0..d34450b 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -30,6 +30,7 @@
#include <process/clock.hpp>
#include <process/future.hpp>
#include <process/gmock.hpp>
+#include <process/owned.hpp>
#include <process/pid.hpp>
#include <stout/option.hpp>
@@ -61,6 +62,7 @@ using mesos::internal::slave::Slave;
using process::Clock;
using process::Future;
+using process::Owned;
using process::PID;
using std::map;
@@ -983,7 +985,8 @@ TEST_F(MasterTest, MasterLost)
Try<PID<Master> > master = StartMaster();
ASSERT_SOME(master);
- Owned<StandaloneMasterDetector> detector = new StandaloneMasterDetector();
+ Owned<StandaloneMasterDetector> detector(
+ new StandaloneMasterDetector());
detector->appoint(master.get());
Try<PID<Slave> > slave = StartSlave();
http://git-wip-us.apache.org/repos/asf/mesos/blob/92bbaf8a/src/tests/mesos.hpp
----------------------------------------------------------------------
diff --git a/src/tests/mesos.hpp b/src/tests/mesos.hpp
index 3d510b2..b1239a6 100644
--- a/src/tests/mesos.hpp
+++ b/src/tests/mesos.hpp
@@ -29,6 +29,7 @@
#include <process/future.hpp>
#include <process/gmock.hpp>
#include <process/gtest.hpp>
+#include <process/owned.hpp>
#include <process/pid.hpp>
#include <process/process.hpp>
@@ -103,19 +104,19 @@ protected:
// Starts a slave with the specified isolator, detector and flags.
virtual Try<process::PID<slave::Slave> > StartSlave(
slave::Isolator* isolator,
- Owned<MasterDetector> detector,
+ process::Owned<MasterDetector> detector,
const Option<slave::Flags>& flags = None());
// Starts a slave with the specified MasterDetector and flags.
virtual Try<process::PID<slave::Slave> > StartSlave(
- Owned<MasterDetector> detector,
+ process::Owned<MasterDetector> detector,
const Option<slave::Flags>& flags = None());
// Starts a slave with the specified mock executor, MasterDetector
// and flags.
virtual Try<process::PID<slave::Slave> > StartSlave(
MockExecutor* executor,
- Owned<MasterDetector> detector,
+ process::Owned<MasterDetector> detector,
const Option<slave::Flags>& flags = None());
// Stop the specified master.
http://git-wip-us.apache.org/repos/asf/mesos/blob/92bbaf8a/src/tests/slave_recovery_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp
index 3c677e6..250083d 100644
--- a/src/tests/slave_recovery_tests.cpp
+++ b/src/tests/slave_recovery_tests.cpp
@@ -28,6 +28,7 @@
#include <process/dispatch.hpp>
#include <process/gmock.hpp>
+#include <process/owned.hpp>
#include <stout/none.hpp>
#include <stout/numify.hpp>
@@ -2322,8 +2323,8 @@ TYPED_TEST(SlaveRecoveryTest, MasterFailover)
frameworkInfo.CopyFrom(DEFAULT_FRAMEWORK_INFO);
frameworkInfo.set_checkpoint(true);
- Owned<StandaloneMasterDetector> detector =
- new StandaloneMasterDetector(master.get());
+ Owned<StandaloneMasterDetector> detector(
+ new StandaloneMasterDetector(master.get()));
TestingMesosSchedulerDriver driver(
&sched, frameworkInfo, DEFAULT_CREDENTIAL, detector.get());
http://git-wip-us.apache.org/repos/asf/mesos/blob/92bbaf8a/src/tests/zookeeper_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/zookeeper_tests.cpp b/src/tests/zookeeper_tests.cpp
index 0059438..a5fe9e1 100644
--- a/src/tests/zookeeper_tests.cpp
+++ b/src/tests/zookeeper_tests.cpp
@@ -23,9 +23,9 @@
#include <string>
#include <process/gtest.hpp>
+#include <process/owned.hpp>
#include <stout/gtest.hpp>
-#include <stout/owned.hpp>
#include <stout/strings.hpp>
#include "zookeeper/authentication.hpp"
@@ -238,7 +238,8 @@ TEST_F(ZooKeeperTest, LeaderContender)
Seconds timeout(10);
Group group(server->connectString(), timeout, "/test/");
- Owned<LeaderContender> contender = new LeaderContender(&group, "candidate 1");
+ Owned<LeaderContender> contender(
+ new LeaderContender(&group, "candidate 1"));
contender->contend();
// Immediately withdrawing after contending leads to delayed
@@ -248,7 +249,8 @@ TEST_F(ZooKeeperTest, LeaderContender)
EXPECT_TRUE(withdrawn.get());
// Normal workflow.
- contender = new LeaderContender(&group, "candidate 1");
+ contender = Owned<LeaderContender>(
+ new LeaderContender(&group, "candidate 1"));
Future<Future<Nothing> > candidated = contender->contend();
AWAIT_READY(candidated);
@@ -271,7 +273,8 @@ TEST_F(ZooKeeperTest, LeaderContender)
EXPECT_FALSE(withdrawn.get());
// Contend again.
- contender = new LeaderContender(&group, "candidate 1");
+ contender = Owned<LeaderContender>(
+ new LeaderContender(&group, "candidate 1"));
candidated = contender->contend();
session = group.session();
@@ -293,7 +296,8 @@ TEST_F(ZooKeeperTest, LeaderContender)
AWAIT_READY(withdrawn);
// Contend (3) and shutdown the network this time.
- contender = new LeaderContender(&group, "candidate 1");
+ contender = Owned<LeaderContender>(
+ new LeaderContender(&group, "candidate 1"));
candidated = contender->contend();
AWAIT_READY(candidated);
lostCandidacy = candidated.get();
@@ -317,7 +321,8 @@ TEST_F(ZooKeeperTest, LeaderContender)
server->startNetwork();
// Contend again (4).
- contender = new LeaderContender(&group, "candidate 1");
+ contender = Owned<LeaderContender>(
+ new LeaderContender(&group, "candidate 1"));
candidated = contender->contend();
AWAIT_READY(candidated);
}