You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2016/03/16 14:17:06 UTC

[11/15] mesos git commit: Update test suite to use the reworked MesosTest helpers.

http://git-wip-us.apache.org/repos/asf/mesos/blob/95153931/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index e8c39e7..d34ba0b 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -33,6 +33,7 @@
 #include <process/future.hpp>
 #include <process/gmock.hpp>
 #include <process/http.hpp>
+#include <process/owned.hpp>
 #include <process/pid.hpp>
 
 #include <process/metrics/counter.hpp>
@@ -78,6 +79,7 @@ using mesos::internal::slave::MesosContainerizerProcess;
 
 using process::Clock;
 using process::Future;
+using process::Owned;
 using process::PID;
 using process::Promise;
 
@@ -110,19 +112,19 @@ class MasterTest : public MesosTest {};
 
 TEST_F(MasterTest, TaskRunning)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
-
   TestContainerizer containerizer(&exec);
 
-  Try<PID<Slave>> slave = StartSlave(&containerizer);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), &containerizer);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _))
     .Times(1);
@@ -138,14 +140,18 @@ TEST_F(MasterTest, TaskRunning)
   EXPECT_NE(0u, offers.get().size());
 
   // Ensure the hostname and url are set correctly.
-  EXPECT_EQ(slave.get().address.hostname().get(), offers.get()[0].hostname());
+  EXPECT_EQ(
+      slave.get()->pid.address.hostname().get(),
+      offers.get()[0].hostname());
 
   mesos::URL url;
   url.set_scheme("http");
-  url.mutable_address()->set_ip(stringify(slave.get().address.ip));
-  url.mutable_address()->set_hostname(slave.get().address.hostname().get());
-  url.mutable_address()->set_port(slave.get().address.port);
-  url.set_path("/" + slave.get().id);
+  url.mutable_address()->set_ip(stringify(slave.get()->pid.address.ip));
+  url.mutable_address()->set_hostname(
+      slave.get()->pid.address.hostname().get());
+
+  url.mutable_address()->set_port(slave.get()->pid.address.port);
+  url.set_path("/" + slave.get()->pid.id);
 
   EXPECT_EQ(url, offers.get()[0].url());
 
@@ -186,8 +192,6 @@ TEST_F(MasterTest, TaskRunning)
 
   driver.stop();
   driver.join();
-
-  Shutdown(); // Must shutdown before 'containerizer' gets deallocated.
 }
 
 
@@ -196,21 +200,23 @@ TEST_F(MasterTest, TaskRunning)
 // marked as killed.
 TEST_F(MasterTest, ShutdownFrameworkWhileTaskRunning)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
-
   TestContainerizer containerizer(&exec);
 
   slave::Flags flags = CreateSlaveFlags();
 
-  Try<PID<Slave>> slave = StartSlave(&containerizer, flags);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+
+  Try<Owned<cluster::Slave>> slave =
+    StartSlave(detector.get(), &containerizer, flags);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _))
     .Times(1);
@@ -284,7 +290,7 @@ TEST_F(MasterTest, ShutdownFrameworkWhileTaskRunning)
 
   // Request master state.
   Future<Response> response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "state",
       None(),
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
@@ -302,24 +308,24 @@ TEST_F(MasterTest, ShutdownFrameworkWhileTaskRunning)
       "completed_frameworks[0].completed_tasks[0].state");
 
   ASSERT_SOME_EQ(JSON::String("TASK_KILLED"), state);
-
-  Shutdown();  // Must shutdown before 'containerizer' gets deallocated.
 }
 
 
 TEST_F(MasterTest, KillTask)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
+  TestContainerizer containerizer(&exec);
 
-  Try<PID<Slave>> slave = StartSlave(&exec);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), &containerizer);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _))
     .Times(1);
@@ -375,8 +381,6 @@ TEST_F(MasterTest, KillTask)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -384,17 +388,19 @@ TEST_F(MasterTest, KillTask)
 // TASK_LOST when there are no slaves in transitionary states.
 TEST_F(MasterTest, KillUnknownTask)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
+  TestContainerizer containerizer(&exec);
 
-  Try<PID<Slave>> slave = StartSlave(&exec);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), &containerizer);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _))
     .Times(1);
@@ -450,27 +456,26 @@ TEST_F(MasterTest, KillUnknownTask)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
 TEST_F(MasterTest, KillUnknownTaskSlaveInTransition)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
-  StandaloneMasterDetector detector(master.get());
-
   Future<SlaveRegisteredMessage> slaveRegisteredMessage =
     FUTURE_PROTOBUF(SlaveRegisteredMessage(), _, _);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
+  TestContainerizer containerizer(&exec);
+  StandaloneMasterDetector detector(master.get()->pid);
 
   // Reuse slaveFlags so both StartSlave() use the same work_dir.
   slave::Flags slaveFlags = CreateSlaveFlags();
 
-  Try<PID<Slave>> slave = StartSlave(&exec, slaveFlags);
+  Try<Owned<cluster::Slave>> slave =
+    StartSlave(&detector, &containerizer, slaveFlags);
   ASSERT_SOME(slave);
 
   // Wait for slave registration.
@@ -519,8 +524,9 @@ TEST_F(MasterTest, KillUnknownTaskSlaveInTransition)
     DROP_DISPATCH(_, &Master::_reregisterSlave);
 
   // Stop master and slave.
-  Stop(master.get());
-  Stop(slave.get());
+  master->reset();
+  slave.get()->terminate();
+  slave->reset();
 
   frameworkId = Future<FrameworkID>();
   EXPECT_CALL(sched, registered(&driver, _, _))
@@ -536,12 +542,13 @@ TEST_F(MasterTest, KillUnknownTaskSlaveInTransition)
 
   // Simulate a spurious event (e.g., due to ZooKeeper
   // expiration) at the scheduler.
-  detector.appoint(master.get());
+  detector.appoint(master.get()->pid);
 
   AWAIT_READY(frameworkId);
 
   // Restart slave.
-  slave = StartSlave(&exec, slaveFlags);
+  slave = StartSlave(&detector, &containerizer, slaveFlags);
+  ASSERT_SOME(slave);
 
   // Wait for the slave to start reregistration.
   AWAIT_READY(_reregisterSlave);
@@ -573,24 +580,24 @@ TEST_F(MasterTest, KillUnknownTaskSlaveInTransition)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
 TEST_F(MasterTest, StatusUpdateAck)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
+  TestContainerizer containerizer(&exec);
 
-  Try<PID<Slave>> slave = StartSlave(&exec);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), &containerizer);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _))
     .Times(1);
@@ -619,7 +626,10 @@ TEST_F(MasterTest, StatusUpdateAck)
     .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING));
 
   Future<StatusUpdateAcknowledgementMessage> acknowledgement =
-    FUTURE_PROTOBUF(StatusUpdateAcknowledgementMessage(), _, Eq(slave.get()));
+    FUTURE_PROTOBUF(
+        StatusUpdateAcknowledgementMessage(),
+        _,
+        Eq(slave.get()->pid));
 
   Future<TaskStatus> status;
   EXPECT_CALL(sched, statusUpdate(&driver, _))
@@ -638,30 +648,30 @@ TEST_F(MasterTest, StatusUpdateAck)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
 TEST_F(MasterTest, RecoverResources)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
-
   TestContainerizer containerizer(&exec);
 
   slave::Flags flags = CreateSlaveFlags();
   flags.resources = Option<string>(
       "cpus:2;mem:1024;disk:1024;ports:[1-10, 20-30]");
 
-  Try<PID<Slave>> slave = StartSlave(&containerizer, flags);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+
+  Try<Owned<cluster::Slave>> slave =
+    StartSlave(detector.get(), &containerizer, flags);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _))
     .Times(1);
@@ -757,24 +767,24 @@ TEST_F(MasterTest, RecoverResources)
 
   driver.stop();
   driver.join();
-
-  Shutdown(); // Must shutdown before 'containerizer' gets deallocated.
 }
 
 
 TEST_F(MasterTest, FrameworkMessage)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
+  TestContainerizer containerizer(&exec);
 
-  Try<PID<Slave>> slave = StartSlave(&exec);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), &containerizer);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver schedDriver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&schedDriver, _, _))
     .Times(1);
@@ -836,14 +846,12 @@ TEST_F(MasterTest, FrameworkMessage)
 
   schedDriver.stop();
   schedDriver.join();
-
-  Shutdown();
 }
 
 
 TEST_F(MasterTest, MultipleExecutors)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   ExecutorInfo executor1 = CREATE_EXECUTOR_INFO("executor-1", "exit 1");
@@ -858,12 +866,13 @@ TEST_F(MasterTest, MultipleExecutors)
 
   TestContainerizer containerizer(execs);
 
-  Try<PID<Slave>> slave = StartSlave(&containerizer);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), &containerizer);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _))
     .Times(1);
@@ -941,22 +950,21 @@ TEST_F(MasterTest, MultipleExecutors)
 
   driver.stop();
   driver.join();
-
-  Shutdown(); // Must shutdown before 'containerizer' gets deallocated.
 }
 
 
 TEST_F(MasterTest, MasterInfo)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
-  Try<PID<Slave>> slave = StartSlave();
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   Future<MasterInfo> masterInfo;
   EXPECT_CALL(sched, registered(&driver, _, _))
@@ -968,24 +976,24 @@ TEST_F(MasterTest, MasterInfo)
   driver.start();
 
   AWAIT_READY(masterInfo);
-  EXPECT_EQ(master.get().address.port, masterInfo.get().port());
-  EXPECT_EQ(master.get().address.ip, net::IP(ntohl(masterInfo.get().ip())));
+  EXPECT_EQ(master.get()->pid.address.port, masterInfo.get().port());
+  EXPECT_EQ(
+      master.get()->pid.address.ip,
+      net::IP(ntohl(masterInfo.get().ip())));
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
 TEST_F(MasterTest, MasterInfoOnReElection)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
-  StandaloneMasterDetector detector(master.get());
+  StandaloneMasterDetector detector(master.get()->pid);
 
-  Try<PID<Slave>> slave = StartSlave(&detector);
+  Try<Owned<cluster::Slave>> slave = StartSlave(&detector);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
@@ -1021,13 +1029,16 @@ TEST_F(MasterTest, MasterInfoOnReElection)
 
   // Simulate a spurious event (e.g., due to ZooKeeper
   // expiration) at the scheduler.
-  detector.appoint(master.get());
+  detector.appoint(master.get()->pid);
 
   AWAIT_READY(disconnected);
 
   AWAIT_READY(masterInfo);
-  EXPECT_EQ(master.get().address.port, masterInfo.get().port());
-  EXPECT_EQ(master.get().address.ip, net::IP(ntohl(masterInfo.get().ip())));
+  EXPECT_EQ(master.get()->pid.address.port, masterInfo.get().port());
+  EXPECT_EQ(
+      master.get()->pid.address.ip,
+      net::IP(ntohl(masterInfo.get().ip())));
+
   EXPECT_EQ(MESOS_VERSION, masterInfo.get().version());
 
   // The re-registered framework should get offers.
@@ -1035,8 +1046,6 @@ TEST_F(MasterTest, MasterInfoOnReElection)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -1067,17 +1076,19 @@ TEST_F(WhitelistTest, WhitelistSlave)
   master::Flags flags = CreateMasterFlags();
   flags.whitelist = path;
 
-  Try<PID<Master>> master = StartMaster(flags);
+  Try<Owned<cluster::Master>> master = StartMaster(flags);
   ASSERT_SOME(master);
 
   slave::Flags slaveFlags = CreateSlaveFlags();
   slaveFlags.hostname = hostname.get();
-  Try<PID<Slave>> slave = StartSlave(slaveFlags);
+
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), slaveFlags);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _))
     .Times(1);
@@ -1092,8 +1103,6 @@ TEST_F(WhitelistTest, WhitelistSlave)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -1105,17 +1114,12 @@ TEST_F(HostnameTest, LookupEnabled)
   master::Flags flags = CreateMasterFlags();
   EXPECT_TRUE(flags.hostname_lookup);
 
-  Try<PID<Master>> pid = StartMaster(flags);
-  ASSERT_SOME(pid);
-
-  Option<Master*> master = cluster.find(pid.get());
+  Try<Owned<cluster::Master>> master = StartMaster(flags);
   ASSERT_SOME(master);
 
   EXPECT_EQ(
-      pid.get().address.hostname().get(),
-      master.get()->info().hostname());
-
-  Shutdown();
+      master.get()->pid.address.hostname().get(),
+      master.get()->getMasterInfo().hostname());
 }
 
 
@@ -1127,28 +1131,23 @@ TEST_F(HostnameTest, LookupDisabled)
 
   flags.hostname_lookup = false;
 
-  Try<PID<Master>> pid = StartMaster(flags);
-  ASSERT_SOME(pid);
-
-  Option<Master*> master = cluster.find(pid.get());
+  Try<Owned<cluster::Master>> master = StartMaster(flags);
   ASSERT_SOME(master);
 
   EXPECT_EQ(
-      stringify(pid.get().address.ip),
-      master.get()->info().hostname());
-
-  Shutdown();
+      stringify(master.get()->pid.address.ip),
+      master.get()->getMasterInfo().hostname());
 }
 
 
 TEST_F(MasterTest, MasterLost)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
-  StandaloneMasterDetector detector(master.get());
+  StandaloneMasterDetector detector(master.get()->pid);
 
-  Try<PID<Slave>> slave = StartSlave();
+  Try<Owned<cluster::Slave>> slave = StartSlave(&detector);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
@@ -1178,8 +1177,6 @@ TEST_F(MasterTest, MasterLost)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -1191,7 +1188,7 @@ TEST_F(MasterTest, MasterLost)
 // all slave resources and a single task should be able to run on these.
 TEST_F(MasterTest, LaunchCombinedOfferTest)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
@@ -1205,12 +1202,15 @@ TEST_F(MasterTest, LaunchCombinedOfferTest)
   slave::Flags flags = CreateSlaveFlags();
   flags.resources = Option<string>(stringify(fullSlave));
 
-  Try<PID<Slave>> slave = StartSlave(&containerizer, flags);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+
+  Try<Owned<cluster::Slave>> slave =
+    StartSlave(detector.get(), &containerizer, flags);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-    &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _));
 
@@ -1318,15 +1318,13 @@ TEST_F(MasterTest, LaunchCombinedOfferTest)
 
   driver.stop();
   driver.join();
-
-  Shutdown(); // Must shutdown before 'containerizer' gets deallocated.
 }
 
 
 // Test ensures offers for launchTasks cannot span multiple slaves.
 TEST_F(MasterTest, LaunchAcrossSlavesTest)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
@@ -1339,12 +1337,15 @@ TEST_F(MasterTest, LaunchAcrossSlavesTest)
   slave::Flags flags = CreateSlaveFlags();
   flags.resources = Option<string>(stringify(fullSlave));
 
-  Try<PID<Slave>> slave1 = StartSlave(&containerizer, flags);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+
+  Try<Owned<cluster::Slave>> slave1 =
+    StartSlave(detector.get(), &containerizer, flags);
   ASSERT_SOME(slave1);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-    &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _));
 
@@ -1370,7 +1371,8 @@ TEST_F(MasterTest, LaunchAcrossSlavesTest)
   slave::Flags flags2 = CreateSlaveFlags();
   flags2.resources = Option<string>(stringify(fullSlave));
 
-  Try<PID<Slave>> slave2 = StartSlave(&containerizer, flags2);
+  Try<Owned<cluster::Slave>> slave2 =
+    StartSlave(detector.get(), &containerizer, flags2);
   ASSERT_SOME(slave2);
 
   AWAIT_READY(offers2);
@@ -1423,8 +1425,6 @@ TEST_F(MasterTest, LaunchAcrossSlavesTest)
 
   driver.stop();
   driver.join();
-
-  Shutdown(); // Must shutdown before 'containerizer' gets deallocated.
 }
 
 
@@ -1432,7 +1432,7 @@ TEST_F(MasterTest, LaunchAcrossSlavesTest)
 // for launchTasks.
 TEST_F(MasterTest, LaunchDuplicateOfferTest)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
@@ -1444,12 +1444,15 @@ TEST_F(MasterTest, LaunchDuplicateOfferTest)
   slave::Flags flags = CreateSlaveFlags();
   flags.resources = Option<string>(stringify(fullSlave));
 
-  Try<PID<Slave>> slave = StartSlave(&containerizer, flags);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+
+  Try<Owned<cluster::Slave>> slave =
+    StartSlave(detector.get(), &containerizer, flags);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-    &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _));
 
@@ -1513,8 +1516,6 @@ TEST_F(MasterTest, LaunchDuplicateOfferTest)
 
   driver.stop();
   driver.join();
-
-  Shutdown(); // Must shutdown before 'containerizer' gets deallocated.
 }
 
 
@@ -1522,7 +1523,7 @@ TEST_F(MasterTest, LaunchDuplicateOfferTest)
 // but we need tests that verify that these metrics are updated.
 TEST_F(MasterTest, MetricsInMetricsEndpoint)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   JSON::Object snapshot = Metrics();
@@ -1623,8 +1624,6 @@ TEST_F(MasterTest, MetricsInMetricsEndpoint)
 
   // Allocator Metrics.
   EXPECT_EQ(1u, snapshot.values.count("allocator/event_queue_dispatches"));
-
-  Shutdown();
 }
 
 
@@ -1634,12 +1633,12 @@ TEST_F(MasterTest, MetricsInMetricsEndpoint)
 TEST_F(MasterTest, SlavesEndpointWithoutSlaves)
 {
   // Start up.
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   // Query the master.
   Future<Response> response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "slaves",
       None(),
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
@@ -1657,8 +1656,6 @@ TEST_F(MasterTest, SlavesEndpointWithoutSlaves)
 
   ASSERT_SOME(expected);
   EXPECT_SOME_EQ(expected.get(), parse);
-
-  Shutdown();
 }
 
 
@@ -1668,18 +1665,25 @@ TEST_F(MasterTest, SlavesEndpointWithoutSlaves)
 TEST_F(MasterTest, SlavesEndpointTwoSlaves)
 {
   // Start up the master.
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
+  Owned<MasterDetector> detector = master.get()->createDetector();
+
   // Start a couple of slaves. Their only use is for them to register
   // to the master.
   Future<SlaveRegisteredMessage> slave1RegisteredMessage =
-    FUTURE_PROTOBUF(SlaveRegisteredMessage(), master.get(), _);
-  Try<PID<Slave>> slave1 = StartSlave();
+    FUTURE_PROTOBUF(SlaveRegisteredMessage(), master.get()->pid, _);
+
+  Try<Owned<cluster::Slave>> slave1 = StartSlave(detector.get());
+  ASSERT_SOME(slave1);
 
   Future<SlaveRegisteredMessage> slave2RegisteredMessage =
-    FUTURE_PROTOBUF(SlaveRegisteredMessage(), master.get(), Not(slave1.get()));
-  StartSlave();
+    FUTURE_PROTOBUF(
+        SlaveRegisteredMessage(), master.get()->pid, Not(slave1.get()->pid));
+
+  Try<Owned<cluster::Slave>> slave2 = StartSlave(detector.get());
+  ASSERT_SOME(slave2);
 
   // Wait for the slaves to be registered.
   AWAIT_READY(slave1RegisteredMessage);
@@ -1687,7 +1691,7 @@ TEST_F(MasterTest, SlavesEndpointTwoSlaves)
 
   // Query the master.
   Future<Response> response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "slaves",
       None(),
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
@@ -1704,8 +1708,6 @@ TEST_F(MasterTest, SlavesEndpointTwoSlaves)
   Result<JSON::Array> array = parse.get().find<JSON::Array>("slaves");
   ASSERT_SOME(array);
   EXPECT_EQ(2u, array.get().values.size());
-
-  Shutdown();
 }
 
 
@@ -1717,25 +1719,26 @@ TEST_F(MasterTest, RecoveredSlaveDoesNotReregister)
 {
   // Step 1: Start a master.
   master::Flags masterFlags = CreateMasterFlags();
-  Try<PID<Master>> master = StartMaster(masterFlags);
+  Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
   ASSERT_SOME(master);
 
   // Step 2: Start a slave.
   Future<SlaveRegisteredMessage> slaveRegisteredMessage =
-    FUTURE_PROTOBUF(SlaveRegisteredMessage(), master.get(), _);
+    FUTURE_PROTOBUF(SlaveRegisteredMessage(), master.get()->pid, _);
 
   // Reuse slaveFlags so both StartSlave() use the same work_dir.
   slave::Flags slaveFlags = this->CreateSlaveFlags();
 
-  Try<PID<Slave>> slave = StartSlave(slaveFlags);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), slaveFlags);
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveRegisteredMessage);
 
   // Step 3: Stop the slave while the master is down.
-  this->Stop(master.get());
-
-  this->Stop(slave.get());
+  master->reset();
+  slave.get()->terminate();
+  slave->reset();
 
   // Step 4: Restart the master.
   master = StartMaster(masterFlags);
@@ -1744,7 +1747,7 @@ TEST_F(MasterTest, RecoveredSlaveDoesNotReregister)
   // Step 5: Start a scheduler.
   MockScheduler sched;
   MesosSchedulerDriver driver(
-    &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   Future<Nothing> registered;
   EXPECT_CALL(sched, registered(&driver, _, _))
@@ -1773,17 +1776,16 @@ TEST_F(MasterTest, RecoveredSlaveDoesNotReregister)
 
   // Step 7: Ensure the slave cannot re-register!
   Future<ShutdownMessage> shutdownMessage =
-    FUTURE_PROTOBUF(ShutdownMessage(), master.get(), _);
+    FUTURE_PROTOBUF(ShutdownMessage(), master.get()->pid, _);
 
-  slave = StartSlave(slaveFlags);
+  detector = master.get()->createDetector();
+  slave = StartSlave(detector.get(), slaveFlags);
   ASSERT_SOME(slave);
 
   AWAIT_READY(shutdownMessage);
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -1797,25 +1799,26 @@ TEST_F(MasterTest, NonStrictRegistryWriteOnly)
   master::Flags masterFlags = CreateMasterFlags();
   masterFlags.registry_strict = false;
 
-  Try<PID<Master>> master = StartMaster(masterFlags);
+  Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
   ASSERT_SOME(master);
 
   // Step 2: Start a slave.
   Future<SlaveRegisteredMessage> slaveRegisteredMessage =
-    FUTURE_PROTOBUF(SlaveRegisteredMessage(), master.get(), _);
+    FUTURE_PROTOBUF(SlaveRegisteredMessage(), master.get()->pid, _);
 
   // Reuse slaveFlags so both StartSlave() use the same work_dir.
   slave::Flags slaveFlags = this->CreateSlaveFlags();
 
-  Try<PID<Slave>> slave = StartSlave(slaveFlags);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), slaveFlags);
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveRegisteredMessage);
 
   // Step 3: Stop the slave while the master is down.
-  this->Stop(master.get());
-
-  this->Stop(slave.get());
+  master->reset();
+  slave.get()->terminate();
+  slave->reset();
 
   // Step 4: Restart the master.
   master = StartMaster(masterFlags);
@@ -1824,7 +1827,7 @@ TEST_F(MasterTest, NonStrictRegistryWriteOnly)
   // Step 5: Start a scheduler.
   MockScheduler sched;
   MesosSchedulerDriver driver(
-    &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   Future<Nothing> registered;
   EXPECT_CALL(sched, registered(&driver, _, _))
@@ -1854,17 +1857,16 @@ TEST_F(MasterTest, NonStrictRegistryWriteOnly)
   // Step 7: Now expect the slave to be able to re-register,
   // according to the non-strict semantics.
   Future<SlaveReregisteredMessage> slaveReregisteredMessage =
-    FUTURE_PROTOBUF(SlaveReregisteredMessage(), master.get(), _);
+    FUTURE_PROTOBUF(SlaveReregisteredMessage(), master.get()->pid, _);
 
-  slave = StartSlave(slaveFlags);
+  detector = master.get()->createDetector();
+  slave = StartSlave(detector.get(), slaveFlags);
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveReregisteredMessage);
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -1874,23 +1876,26 @@ TEST_F(MasterTest, RateLimitRecoveredSlaveRemoval)
 {
   // Start a master.
   master::Flags masterFlags = CreateMasterFlags();
-  Try<PID<Master>> master = StartMaster(masterFlags);
+  Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
   ASSERT_SOME(master);
 
   Future<SlaveRegisteredMessage> slaveRegisteredMessage =
-    FUTURE_PROTOBUF(SlaveRegisteredMessage(), master.get(), _);
+    FUTURE_PROTOBUF(SlaveRegisteredMessage(), master.get()->pid, _);
+
+  Owned<MasterDetector> detector = master.get()->createDetector();
 
   // Start a slave.
-  Try<PID<Slave>> slave = StartSlave();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveRegisteredMessage);
 
   // Stop the slave while the master is down.
-  this->Stop(master.get());
-  this->Stop(slave.get());
+  master->reset();
+  slave.get()->terminate();
+  slave->reset();
 
-  shared_ptr<MockRateLimiter> slaveRemovalLimiter(new MockRateLimiter());
+  auto slaveRemovalLimiter = std::make_shared<MockRateLimiter>();
 
   // Return a pending future from the rate limiter.
   Future<Nothing> acquire;
@@ -1907,7 +1912,7 @@ TEST_F(MasterTest, RateLimitRecoveredSlaveRemoval)
   // a framework about slave removal.
   MockScheduler sched;
   MesosSchedulerDriver driver(
-    &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   Future<Nothing> registered;
   EXPECT_CALL(sched, registered(&driver, _, _))
@@ -1938,8 +1943,6 @@ TEST_F(MasterTest, RateLimitRecoveredSlaveRemoval)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -1949,25 +1952,27 @@ TEST_F(MasterTest, CancelRecoveredSlaveRemoval)
 {
   // Start a master.
   master::Flags masterFlags = CreateMasterFlags();
-  Try<PID<Master>> master = StartMaster(masterFlags);
+  Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
   ASSERT_SOME(master);
 
   Future<SlaveRegisteredMessage> slaveRegisteredMessage =
-    FUTURE_PROTOBUF(SlaveRegisteredMessage(), master.get(), _);
+    FUTURE_PROTOBUF(SlaveRegisteredMessage(), master.get()->pid, _);
 
   // Reuse slaveFlags so both StartSlave() use the same work_dir.
   slave::Flags slaveFlags = CreateSlaveFlags();
 
-  Try<PID<Slave>> slave = StartSlave(slaveFlags);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), slaveFlags);
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveRegisteredMessage);
 
   // Stop the slave while the master is down.
-  this->Stop(master.get());
-  this->Stop(slave.get());
+  master->reset();
+  slave.get()->terminate();
+  slave->reset();
 
-  shared_ptr<MockRateLimiter> slaveRemovalLimiter(new MockRateLimiter());
+  auto slaveRemovalLimiter = std::make_shared<MockRateLimiter>();
 
   // Return a pending future from the rate limiter.
   Future<Nothing> acquire;
@@ -1984,7 +1989,7 @@ TEST_F(MasterTest, CancelRecoveredSlaveRemoval)
   // a framework about slave removal.
   MockScheduler sched;
   MesosSchedulerDriver driver(
-    &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   Future<Nothing> registered;
   EXPECT_CALL(sched, registered(&driver, _, _))
@@ -2014,10 +2019,11 @@ TEST_F(MasterTest, CancelRecoveredSlaveRemoval)
     .WillRepeatedly(Return());
 
   Future<SlaveReregisteredMessage> slaveReregisteredMessage =
-    FUTURE_PROTOBUF(SlaveReregisteredMessage(), master.get(), _);
+    FUTURE_PROTOBUF(SlaveReregisteredMessage(), master.get()->pid, _);
 
   // Restart the slave.
-  slave = StartSlave(slaveFlags);
+  detector = master.get()->createDetector();
+  slave = StartSlave(detector.get(), slaveFlags);
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveReregisteredMessage);
@@ -2029,8 +2035,6 @@ TEST_F(MasterTest, CancelRecoveredSlaveRemoval)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -2041,25 +2045,26 @@ TEST_F(MasterTest, RecoveredSlaveReregisters)
 {
   // Step 1: Start a master.
   master::Flags masterFlags = CreateMasterFlags();
-  Try<PID<Master>> master = StartMaster(masterFlags);
+  Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
   ASSERT_SOME(master);
 
   // Step 2: Start a slave.
   Future<SlaveRegisteredMessage> slaveRegisteredMessage =
-    FUTURE_PROTOBUF(SlaveRegisteredMessage(), master.get(), _);
+    FUTURE_PROTOBUF(SlaveRegisteredMessage(), master.get()->pid, _);
 
   // Reuse slaveFlags so both StartSlave() use the same work_dir.
   slave::Flags slaveFlags = this->CreateSlaveFlags();
 
-  Try<PID<Slave>> slave = StartSlave(slaveFlags);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), slaveFlags);
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveRegisteredMessage);
 
   // Step 3: Stop the slave while the master is down.
-  this->Stop(master.get());
-
-  this->Stop(slave.get());
+  master->reset();
+  slave.get()->terminate();
+  slave->reset();
 
   // Step 4: Restart the master.
   master = StartMaster(masterFlags);
@@ -2069,7 +2074,7 @@ TEST_F(MasterTest, RecoveredSlaveReregisters)
   // a framework, were a slave to be lost.
   MockScheduler sched;
   MesosSchedulerDriver driver(
-    &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   Future<Nothing> registered;
   EXPECT_CALL(sched, registered(&driver, _, _))
@@ -2089,9 +2094,10 @@ TEST_F(MasterTest, RecoveredSlaveReregisters)
   AWAIT_READY(registered);
 
   Future<SlaveReregisteredMessage> slaveReregisteredMessage =
-    FUTURE_PROTOBUF(SlaveReregisteredMessage(), master.get(), _);
+    FUTURE_PROTOBUF(SlaveReregisteredMessage(), master.get()->pid, _);
 
-  slave = StartSlave(slaveFlags);
+  detector = master.get()->createDetector();
+  slave = StartSlave(detector.get(), slaveFlags);
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveReregisteredMessage);
@@ -2110,8 +2116,6 @@ TEST_F(MasterTest, RecoveredSlaveReregisters)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -2123,12 +2127,15 @@ class MasterZooKeeperTest : public MesosZooKeeperTest {};
 // master, slave & scheduler all get informed.
 TEST_F(MasterZooKeeperTest, LostZooKeeperCluster)
 {
-  ASSERT_SOME(StartMaster());
+  Try<Owned<cluster::Master>> master = StartMaster();
+  ASSERT_SOME(master);
 
   Future<process::Message> slaveRegisteredMessage =
     FUTURE_MESSAGE(Eq(SlaveRegisteredMessage().GetTypeName()), _, _);
 
-  ASSERT_SOME(StartSlave());
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
+  ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
@@ -2183,8 +2190,6 @@ TEST_F(MasterZooKeeperTest, LostZooKeeperCluster)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -2192,16 +2197,16 @@ TEST_F(MasterZooKeeperTest, LostZooKeeperCluster)
 // is populated correctly, during master initialization.
 TEST_F(MasterZooKeeperTest, MasterInfoAddress)
 {
-  Try<PID<Master>> master_ = StartMaster();
-  ASSERT_SOME(master_);
-
-  auto master = master_.get();
+  Try<Owned<cluster::Master>> master = StartMaster();
+  ASSERT_SOME(master);
 
-  ASSERT_SOME(StartSlave());
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
+  ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master, DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   Future<MasterInfo> masterInfo;
   EXPECT_CALL(sched, registered(&driver, _, _))
@@ -2214,18 +2219,17 @@ TEST_F(MasterZooKeeperTest, MasterInfoAddress)
   AWAIT_READY(masterInfo);
 
   const Address& address = masterInfo.get().address();
-  EXPECT_EQ(stringify(master.address.ip), address.ip());
-  EXPECT_EQ(master.address.port, address.port());
+  EXPECT_EQ(stringify(master.get()->pid.address.ip), address.ip());
+  EXPECT_EQ(master.get()->pid.address.port, address.port());
 
   // Protect from failures on those hosts where
   // hostname cannot be resolved.
-  if (master.address.hostname().isSome()) {
-    ASSERT_EQ(master.address.hostname().get(), address.hostname());
+  if (master.get()->pid.address.hostname().isSome()) {
+    ASSERT_EQ(master.get()->pid.address.hostname().get(), address.hostname());
   }
 
   driver.stop();
   driver.join();
-  Shutdown();
 }
 
 #endif // MESOS_HAS_JAVA
@@ -2238,14 +2242,15 @@ TEST_F(MasterZooKeeperTest, MasterInfoAddress)
 TEST_F(MasterTest, OrphanTasks)
 {
   // Start a master.
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
-  StandaloneMasterDetector detector (master.get());
+  TestContainerizer containerizer(&exec);
+  StandaloneMasterDetector detector(master.get()->pid);
 
   // Start a slave.
-  Try<PID<Slave>> slave = StartSlave(&exec, &detector);
+  Try<Owned<cluster::Slave>> slave = StartSlave(&detector, &containerizer);
   ASSERT_SOME(slave);
 
   // Create a task on the slave.
@@ -2279,7 +2284,7 @@ TEST_F(MasterTest, OrphanTasks)
 
   // Get the master's state.
   Future<Response> response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "state",
       None(),
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
@@ -2315,10 +2320,11 @@ TEST_F(MasterTest, OrphanTasks)
     .Times(1);
 
   // Stop the master.
-  Stop(master.get());
+  PID<Master> originalPid = master.get()->pid;
+  master->reset();
 
   Future<SlaveReregisteredMessage> slaveReregisteredMessage =
-    FUTURE_PROTOBUF(SlaveReregisteredMessage(), master.get(), _);
+    FUTURE_PROTOBUF(SlaveReregisteredMessage(), originalPid, _);
 
   // Drop the subscribe call to delay the framework from
   // re-registration.
@@ -2332,6 +2338,7 @@ TEST_F(MasterTest, OrphanTasks)
   Clock::pause();
 
   // The master failover.
+  master->reset();
   master = StartMaster();
   ASSERT_SOME(master);
 
@@ -2340,14 +2347,14 @@ TEST_F(MasterTest, OrphanTasks)
   Clock::settle();
 
   // Simulate a new master detected event to the slave and the framework.
-  detector.appoint(master.get());
+  detector.appoint(master.get()->pid);
 
   AWAIT_READY(slaveReregisteredMessage);
   AWAIT_READY(subscribeCall);
 
   // Get the master's state.
   response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "state",
       None(),
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
@@ -2384,7 +2391,7 @@ TEST_F(MasterTest, OrphanTasks)
 
   // Get the master's state.
   response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "state",
       None(),
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
@@ -2410,8 +2417,6 @@ TEST_F(MasterTest, OrphanTasks)
   // Cleanup.
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -2419,7 +2424,7 @@ TEST_F(MasterTest, OrphanTasks)
 // resource from offers so that frameworks cannot see it.
 TEST_F(MasterTest, IgnoreEphemeralPortsResource)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   string resourcesWithoutEphemeralPorts =
@@ -2431,12 +2436,13 @@ TEST_F(MasterTest, IgnoreEphemeralPortsResource)
   slave::Flags flags = CreateSlaveFlags();
   flags.resources = resourcesWithEphemeralPorts;
 
-  Try<PID<Slave>> slave = StartSlave(flags);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), flags);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-    &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _));
 
@@ -2455,8 +2461,6 @@ TEST_F(MasterTest, IgnoreEphemeralPortsResource)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -2466,19 +2470,19 @@ TEST_F(MasterTest, MaxExecutorsPerSlave)
   master::Flags flags = CreateMasterFlags();
   flags.max_executors_per_slave = 0;
 
-  Try<PID<Master>> master = StartMaster(flags);
+  Try<Owned<cluster::Master>> master = StartMaster(flags);
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
-
   TestContainerizer containerizer(&exec);
 
-  Try<PID<Slave>> slave = StartSlave(&containerizer);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), &containerizer);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   Future<MasterInfo> masterInfo;
   EXPECT_CALL(sched, registered(&driver, _, _))
@@ -2491,13 +2495,12 @@ TEST_F(MasterTest, MaxExecutorsPerSlave)
   driver.start();
 
   AWAIT_READY(masterInfo);
-  EXPECT_EQ(master.get().address.port, masterInfo.get().port());
-  EXPECT_EQ(master.get().address.ip, net::IP(ntohl(masterInfo.get().ip())));
+  EXPECT_EQ(master.get()->pid.address.port, masterInfo.get().port());
+  EXPECT_EQ(
+      master.get()->pid.address.ip, net::IP(ntohl(masterInfo.get().ip())));
 
   driver.stop();
   driver.join();
-
-  Shutdown(); // Must shutdown before 'containerizer' gets deallocated.
 }
 #endif  // WITH_NETWORK_ISOLATOR
 
@@ -2508,15 +2511,16 @@ TEST_F(MasterTest, OfferTimeout)
 {
   master::Flags masterFlags = MesosTest::CreateMasterFlags();
   masterFlags.offer_timeout = Seconds(30);
-  Try<PID<Master>> master = StartMaster(masterFlags);
+  Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
   ASSERT_SOME(master);
 
-  Try<PID<Slave>> slave = StartSlave();
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-    &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   Future<Nothing> registered;
   EXPECT_CALL(sched, registered(&driver, _, _))
@@ -2561,8 +2565,6 @@ TEST_F(MasterTest, OfferTimeout)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -2571,19 +2573,19 @@ TEST_F(MasterTest, OfferNotRescindedOnceUsed)
 {
   master::Flags masterFlags = MesosTest::CreateMasterFlags();
   masterFlags.offer_timeout = Seconds(30);
-  Try<PID<Master>> master = StartMaster(masterFlags);
+  Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
-
   TestContainerizer containerizer(&exec);
 
-  Try<PID<Slave>> slave = StartSlave(&containerizer);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), &containerizer);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-    &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   Future<Nothing> registered;
   EXPECT_CALL(sched, registered(&driver, _, _))
@@ -2625,8 +2627,6 @@ TEST_F(MasterTest, OfferNotRescindedOnceUsed)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -2635,19 +2635,19 @@ TEST_F(MasterTest, OfferNotRescindedOnceDeclined)
 {
   master::Flags masterFlags = MesosTest::CreateMasterFlags();
   masterFlags.offer_timeout = Seconds(30);
-  Try<PID<Master>> master = StartMaster(masterFlags);
+  Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
-
   TestContainerizer containerizer(&exec);
 
-  Try<PID<Slave>> slave = StartSlave(&containerizer);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), &containerizer);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-    &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   Future<Nothing> registered;
   EXPECT_CALL(sched, registered(&driver, _, _))
@@ -2677,8 +2677,6 @@ TEST_F(MasterTest, OfferNotRescindedOnceDeclined)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -2687,22 +2685,25 @@ TEST_F(MasterTest, OfferNotRescindedOnceDeclined)
 TEST_F(MasterTest, UnacknowledgedTerminalTask)
 {
   master::Flags masterFlags = CreateMasterFlags();
-  Try<PID<Master>> master = StartMaster(masterFlags);
+  Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
-
   TestContainerizer containerizer(&exec);
 
   slave::Flags slaveFlags = CreateSlaveFlags();
   slaveFlags.resources = "cpus:1;mem:64";
-  Try<PID<Slave>> slave = StartSlave(&containerizer, slaveFlags);
+
+  Owned<MasterDetector> detector = master.get()->createDetector();
+
+  Try<Owned<cluster::Slave>> slave =
+    StartSlave(detector.get(), &containerizer, slaveFlags);
   ASSERT_SOME(slave);
 
   // Launch a framework and get a task into a terminal state.
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   Future<FrameworkID> frameworkId;
   EXPECT_CALL(sched, registered(&driver, _, _))
@@ -2722,11 +2723,11 @@ TEST_F(MasterTest, UnacknowledgedTerminalTask)
 
   // Capture the status update message from the slave to the master.
   Future<StatusUpdateMessage> update =
-    FUTURE_PROTOBUF(StatusUpdateMessage(), _, master.get());
+    FUTURE_PROTOBUF(StatusUpdateMessage(), _, master.get()->pid);
 
   // Drop the status updates forwarded to the framework to ensure
   // that the task remains terminal and unacknowledged in the master.
-  DROP_PROTOBUFS(StatusUpdateMessage(), master.get(), _);
+  DROP_PROTOBUFS(StatusUpdateMessage(), master.get()->pid, _);
 
   driver.start();
 
@@ -2756,8 +2757,6 @@ TEST_F(MasterTest, UnacknowledgedTerminalTask)
 
   driver.stop();
   driver.join();
-
-  Shutdown(); // Must shutdown before 'containerizer' gets deallocated.
 }
 
 
@@ -2766,21 +2765,23 @@ TEST_F(MasterTest, UnacknowledgedTerminalTask)
 // latest state set).
 TEST_F(MasterTest, ReleaseResourcesForTerminalTaskWithPendingUpdates)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
-
   TestContainerizer containerizer(&exec);
 
   slave::Flags slaveFlags = CreateSlaveFlags();
   slaveFlags.resources = "cpus:1;mem:64";
-  Try<PID<Slave>> slave = StartSlave(&containerizer, slaveFlags);
+
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave =
+    StartSlave(detector.get(), &containerizer, slaveFlags);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _));
 
@@ -2796,10 +2797,10 @@ TEST_F(MasterTest, ReleaseResourcesForTerminalTaskWithPendingUpdates)
     .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING));
 
   // Drop all the updates from master to scheduler.
-  DROP_PROTOBUFS(StatusUpdateMessage(), master.get(), _);
+  DROP_PROTOBUFS(StatusUpdateMessage(), master.get()->pid, _);
 
   Future<StatusUpdateMessage> statusUpdateMessage =
-    FUTURE_PROTOBUF(StatusUpdateMessage(), _, master.get());
+    FUTURE_PROTOBUF(StatusUpdateMessage(), _, master.get()->pid);
 
   Future<Nothing> ___statusUpdate = FUTURE_DISPATCH(_, &Slave::___statusUpdate);
 
@@ -2840,8 +2841,6 @@ TEST_F(MasterTest, ReleaseResourcesForTerminalTaskWithPendingUpdates)
 
   driver.stop();
   driver.join();
-
-  Shutdown(); // Must shutdown before 'containerizer' gets deallocated.
 }
 
 
@@ -2855,11 +2854,11 @@ TEST_F(MasterTest, StateEndpoint)
   // Capture the start time deterministically.
   Clock::pause();
 
-  Try<PID<Master>> master = StartMaster(flags);
+  Try<Owned<cluster::Master>> master = StartMaster(flags);
   ASSERT_SOME(master);
 
   Future<Response> response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "state",
       None(),
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
@@ -2898,7 +2897,7 @@ TEST_F(MasterTest, StateEndpoint)
   ASSERT_TRUE(state.values["id"].is<JSON::String>());
   EXPECT_NE("", state.values["id"].as<JSON::String>().value);
 
-  EXPECT_EQ(stringify(master.get()), state.values["pid"]);
+  EXPECT_EQ(stringify(master.get()->pid), state.values["pid"]);
   EXPECT_EQ(flags.hostname.get(), state.values["hostname"]);
 
   EXPECT_EQ(0, state.values["activated_slaves"]);
@@ -2940,7 +2939,7 @@ TEST_F(MasterTest, StateEndpoint)
 // currently; add more to this test.
 TEST_F(MasterTest, StateEndpointFrameworkInfo)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
@@ -2957,7 +2956,7 @@ TEST_F(MasterTest, StateEndpointFrameworkInfo)
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, frameworkInfo, master.get(), DEFAULT_CREDENTIAL);
+      &sched, frameworkInfo, master.get()->pid, DEFAULT_CREDENTIAL);
 
   Future<Nothing> registered;
   EXPECT_CALL(sched, registered(&driver, _, _))
@@ -2968,7 +2967,7 @@ TEST_F(MasterTest, StateEndpointFrameworkInfo)
   AWAIT_READY(registered);
 
   Future<Response> response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "state",
       None(),
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
@@ -3013,8 +3012,6 @@ TEST_F(MasterTest, StateEndpointFrameworkInfo)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -3025,17 +3022,19 @@ TEST_F(MasterTest, StateSummaryEndpoint)
   flags.hostname = "localhost";
   flags.cluster = "test-cluster";
 
-  Try<PID<Master>> master = StartMaster(flags);
+  Try<Owned<cluster::Master>> master = StartMaster(flags);
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
+  TestContainerizer containerizer(&exec);
 
-  Try<PID<Slave>> slave = StartSlave(&exec);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), &containerizer);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _))
     .Times(1);
@@ -3090,7 +3089,7 @@ TEST_F(MasterTest, StateSummaryEndpoint)
     .Times(AtMost(1));
 
   Future<Response> response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "state-summary",
       None(),
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
@@ -3119,8 +3118,6 @@ TEST_F(MasterTest, StateSummaryEndpoint)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -3128,19 +3125,19 @@ TEST_F(MasterTest, StateSummaryEndpoint)
 // state endpoint.
 TEST_F(MasterTest, TaskLabels)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
-
   TestContainerizer containerizer(&exec);
 
-  Try<PID<Slave>> slave = StartSlave(&containerizer);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), &containerizer);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _))
     .Times(1);
@@ -3194,7 +3191,7 @@ TEST_F(MasterTest, TaskLabels)
 
   // Verify label key and value in the master's state endpoint.
   Future<Response> response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "state",
       None(),
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
@@ -3227,8 +3224,6 @@ TEST_F(MasterTest, TaskLabels)
 
   driver.stop();
   driver.join();
-
-  Shutdown(); // Must shutdown before 'containerizer' gets deallocated.
 }
 
 
@@ -3236,17 +3231,19 @@ TEST_F(MasterTest, TaskLabels)
 // the master's state endpoint.
 TEST_F(MasterTest, TaskStatusLabels)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
+  TestContainerizer containerizer(&exec);
 
-  Try<PID<Slave>> slave = StartSlave(&exec);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), &containerizer);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _))
     .Times(1);
@@ -3297,7 +3294,7 @@ TEST_F(MasterTest, TaskStatusLabels)
 
   // Verify label key and value in master state endpoint.
   Future<Response> response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "state",
       None(),
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
@@ -3330,8 +3327,6 @@ TEST_F(MasterTest, TaskStatusLabels)
 
   driver.stop();
   driver.join();
-
-  Shutdown(); // Must shutdown before 'containerizer' gets deallocated.
 }
 
 
@@ -3339,17 +3334,19 @@ TEST_F(MasterTest, TaskStatusLabels)
 // master state endpoint.
 TEST_F(MasterTest, TaskStatusContainerStatus)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
+  TestContainerizer containerizer(&exec);
 
-  Try<PID<Slave>> slave = StartSlave(&exec);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), &containerizer);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _))
     .Times(1);
@@ -3381,7 +3378,7 @@ TEST_F(MasterTest, TaskStatusContainerStatus)
 
   AWAIT_READY(status);
 
-  const string slaveIPAddress = stringify(slave.get().address.ip);
+  const string slaveIPAddress = stringify(slave.get()->pid.address.ip);
 
   // Validate that the Slave has passed in its IP address in
   // TaskStatus.container_status.network_infos[0].ip_address.
@@ -3393,7 +3390,7 @@ TEST_F(MasterTest, TaskStatusContainerStatus)
 
   // Now do the same validation with state endpoint.
   Future<Response> response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "state",
       None(),
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
@@ -3455,8 +3452,6 @@ TEST_F(MasterTest, TaskStatusContainerStatus)
 
   driver.stop();
   driver.join();
-
-  Shutdown(); // Must shutdown before 'containerizer' gets deallocated.
 }
 
 
@@ -3466,20 +3461,21 @@ TEST_F(MasterTest, TaskStatusContainerStatus)
 TEST_F(MasterTest, SlaveActiveEndpoint)
 {
   // Start a master.
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   Future<process::Message> slaveRegisteredMessage =
     FUTURE_MESSAGE(Eq(SlaveRegisteredMessage().GetTypeName()), _, _);
 
-  Try<PID<Slave>> slave = StartSlave();
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveRegisteredMessage);
 
   // Verify slave is active.
   Future<Response> response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "state",
       None(),
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
@@ -3500,14 +3496,14 @@ TEST_F(MasterTest, SlaveActiveEndpoint)
 
   // Inject a slave exited event at the master causing the master
   // to mark the slave as disconnected.
-  process::inject::exited(slaveRegisteredMessage.get().to, master.get());
+  process::inject::exited(slaveRegisteredMessage.get().to, master.get()->pid);
 
   // Wait until master deactivates the slave.
   AWAIT_READY(deactivateSlave);
 
   // Verify slave is inactive.
   response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "state",
       None(),
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
@@ -3520,8 +3516,6 @@ TEST_F(MasterTest, SlaveActiveEndpoint)
   status = parse.get().find<JSON::Boolean>("slaves[0].active");
 
   ASSERT_SOME_EQ(JSON::Boolean(false), status);
-
-  Shutdown();
 }
 
 
@@ -3529,19 +3523,19 @@ TEST_F(MasterTest, SlaveActiveEndpoint)
 // master's state endpoint.
 TEST_F(MasterTest, TaskDiscoveryInfo)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
-
   TestContainerizer containerizer(&exec);
 
-  Try<PID<Slave>> slave = StartSlave(&containerizer);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), &containerizer);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _));
 
@@ -3611,7 +3605,7 @@ TEST_F(MasterTest, TaskDiscoveryInfo)
 
   // Verify label key and value in the master's state endpoint.
   Future<Response> response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "state",
       None(),
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
@@ -3707,8 +3701,6 @@ TEST_F(MasterTest, TaskDiscoveryInfo)
 
   driver.stop();
   driver.join();
-
-  Shutdown(); // Must shutdown before 'containerizer' gets deallocated.
 }
 
 
@@ -3719,12 +3711,10 @@ TEST_F(MasterTest, MasterFailoverLongLivedExecutor)
 {
   // Start master and create detector to inform scheduler and slave
   // about newly elected master.
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
-  StandaloneMasterDetector detector (master.get());
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
-
   TestContainerizer containerizer(&exec);
 
   // Compute half of total available resources in order to launch two
@@ -3735,7 +3725,10 @@ TEST_F(MasterTest, MasterFailoverLongLivedExecutor)
   slave::Flags flags = CreateSlaveFlags();
   flags.resources = Option<string>(stringify(fullSlave));
 
-  Try<PID<Slave>> slave = StartSlave(&containerizer, &detector, flags);
+  StandaloneMasterDetector detector(master.get()->pid);
+
+  Try<Owned<cluster::Slave>> slave =
+    StartSlave(&detector, &containerizer, flags);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
@@ -3781,8 +3774,7 @@ TEST_F(MasterTest, MasterFailoverLongLivedExecutor)
   EXPECT_EQ(TASK_RUNNING, status1.get().state());
 
   // Fail over master.
-  Stop(master.get());
-
+  master->reset();
   master = StartMaster();
   ASSERT_SOME(master);
 
@@ -3793,7 +3785,7 @@ TEST_F(MasterTest, MasterFailoverLongLivedExecutor)
     .WillOnce(FutureArg<1>(&offers2))
     .WillRepeatedly(Return()); // Ignore subsequent offers.
 
-  detector.appoint(master.get());
+  detector.appoint(master.get()->pid);
 
   AWAIT_READY(offers2);
   EXPECT_NE(0u, offers2.get().size());
@@ -3819,8 +3811,6 @@ TEST_F(MasterTest, MasterFailoverLongLivedExecutor)
 
   driver.stop();
   driver.join();
-
-  Shutdown(); // Must shutdown before 'containerizer' gets deallocated.
 }
 
 
@@ -3828,19 +3818,20 @@ TEST_F(MasterTest, MasterFailoverLongLivedExecutor)
 // master fails over. Please refer to MESOS-3351 for further details.
 TEST_F(MasterTest, DuplicatedSlaveIdWhenSlaveReregister)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   Future<SlaveRegisteredMessage> slaveRegisteredMessage1 =
       FUTURE_PROTOBUF(SlaveRegisteredMessage(), _, _);
 
-  StandaloneMasterDetector slaveDetector1 (master.get());
-  Try<PID<Slave>> slave1 = StartSlave(&slaveDetector1);
+  StandaloneMasterDetector slaveDetector1(master.get()->pid);
+  Try<Owned<cluster::Slave>> slave1 = StartSlave(&slaveDetector1);
   ASSERT_SOME(slave1);
 
   AWAIT_READY(slaveRegisteredMessage1);
 
-  Stop(master.get());
+  // Fail over master.
+  master->reset();
   master = StartMaster();
   ASSERT_SOME(master);
 
@@ -3849,22 +3840,22 @@ TEST_F(MasterTest, DuplicatedSlaveIdWhenSlaveReregister)
 
   // Start a new slave and make sure it registers before the old slave.
   slave::Flags slaveFlags2 = CreateSlaveFlags();
-  Try<PID<Slave>> slave2 = StartSlave(slaveFlags2);
+  Owned<MasterDetector> slaveDetector2 = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave2 =
+    StartSlave(slaveDetector2.get(), slaveFlags2);
   ASSERT_SOME(slave2);
 
   AWAIT_READY(slaveRegisteredMessage2);
 
   Future<SlaveReregisteredMessage> slaveReregisteredMessage1 =
-      FUTURE_PROTOBUF(SlaveReregisteredMessage(), master.get(), _);
+      FUTURE_PROTOBUF(SlaveReregisteredMessage(), master.get()->pid, _);
 
   // Now let the first slave re-register.
-  slaveDetector1.appoint(master.get());
+  slaveDetector1.appoint(master.get()->pid);
 
   // If both the slaves get the same SlaveID, the re-registration would
   // fail here.
   AWAIT_READY(slaveReregisteredMessage1);
-
-  Shutdown();
 }
 
 
@@ -3873,7 +3864,7 @@ TEST_F(MasterTest, DuplicatedSlaveIdWhenSlaveReregister)
 // in the master's state endpoint.
 TEST_F(MasterTest, FrameworkInfoLabels)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   FrameworkInfo framework = DEFAULT_FRAMEWORK_INFO;
@@ -3885,7 +3876,7 @@ TEST_F(MasterTest, FrameworkInfoLabels)
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, framework, master.get(), DEFAULT_CREDENTIAL);
+      &sched, framework, master.get()->pid, DEFAULT_CREDENTIAL);
 
   Future<Nothing> registered;
   EXPECT_CALL(sched, registered(&driver, _, _))
@@ -3896,7 +3887,7 @@ TEST_F(MasterTest, FrameworkInfoLabels)
   AWAIT_READY(registered);
 
   Future<Response> response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "state",
       None(),
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
@@ -3927,8 +3918,6 @@ TEST_F(MasterTest, FrameworkInfoLabels)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -3942,11 +3931,11 @@ TEST_F(MasterTest, FrameworksEndpointWithoutFrameworks)
   // Capture the start time deterministically.
   Clock::pause();
 
-  Try<PID<Master>> master = StartMaster(flags);
+  Try<Owned<cluster::Master>> master = StartMaster(flags);
   ASSERT_SOME(master);
 
   Future<Response> response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "frameworks",
       None(),
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
@@ -3978,14 +3967,14 @@ TEST_F(MasterTest, FrameworksEndpointWithoutFrameworks)
 
 TEST_F(MasterTest, FrameworksEndpointOneFramework)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   FrameworkInfo framework = DEFAULT_FRAMEWORK_INFO;
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, framework, master.get(), DEFAULT_CREDENTIAL);
+      &sched, framework, master.get()->pid, DEFAULT_CREDENTIAL);
 
   Future<Nothing> registered;
   EXPECT_CALL(sched, registered(&driver, _, _))
@@ -3996,7 +3985,7 @@ TEST_F(MasterTest, FrameworksEndpointOneFramework)
   AWAIT_READY(registered);
 
   Future<Response> response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "frameworks",
       None(),
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
@@ -4013,8 +4002,6 @@ TEST_F(MasterTest, FrameworksEndpointOneFramework)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -4034,16 +4021,20 @@ TEST_F(MasterTest, MaxCompletedFrameworksFlag)
     master::Flags masterFlags = CreateMasterFlags();
     masterFlags.max_completed_frameworks = maxFrameworks;
 
-    Try<PID<Master>> master = StartMaster(masterFlags);
+    Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
     ASSERT_SOME(master);
 
-    Try<PID<Slave>> slave = StartSlave();
+    Owned<MasterDetector> detector = master.get()->createDetector();
+    Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
     ASSERT_SOME(slave);
 
     for (size_t i = 0; i < totalFrameworks; i++) {
       MockScheduler sched;
       MesosSchedulerDriver schedDriver(
-          &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+          &sched,
+          DEFAULT_FRAMEWORK_INFO,
+          master.get()->pid,
+          DEFAULT_CREDENTIAL);
 
       // Ignore any incoming resource offers to the scheduler.
       EXPECT_CALL(sched, resourceOffers(_, _))
@@ -4062,7 +4053,7 @@ TEST_F(MasterTest, MaxCompletedFrameworksFlag)
     }
 
     Future<Response> response = process::http::get(
-        master.get(),
+        master.get()->pid,
         "state",
         None(),
         createBasicAuthHeaders(DEFAULT_CREDENTIAL));
@@ -4078,9 +4069,6 @@ TEST_F(MasterTest, MaxCompletedFrameworksFlag)
       state.values["completed_frameworks"].as<JSON::Array>();
 
     EXPECT_EQ(maxFrameworks, completedFrameworks->values.size());
-
-    Stop(slave.get());
-    Stop(master.get());
   }
 }
 
@@ -4102,18 +4090,21 @@ TEST_F(MasterTest, MaxCompletedTasksPerFrameworkFlag)
     master::Flags masterFlags = CreateMasterFlags();
     masterFlags.max_completed_tasks_per_framework = maxTasksPerFramework;
 
-    Try<PID<Master>> master = StartMaster(masterFlags);
+    Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
     ASSERT_SOME(master);
 
     MockExecutor exec(DEFAULT_EXECUTOR_ID);
+    TestContainerizer containerizer(&exec);
     EXPECT_CALL(exec, registered(_, _, _, _));
 
-    Try<PID<Slave>> slave = StartSlave(&exec);
+    Owned<MasterDetector> detector = master.get()->createDetector();
+    Try<Owned<cluster::Slave>> slave =
+      StartSlave(detector.get(), &containerizer);
     ASSERT_SOME(slave);
 
     MockScheduler sched;
     MesosSchedulerDriver schedDriver(
-        &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+        &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
     Future<Nothing> schedRegistered;
     EXPECT_CALL(sched, registered(_, _, _))
@@ -4160,7 +4151,7 @@ TEST_F(MasterTest, MaxCompletedTasksPerFrameworkFlag)
     schedDriver.join();
 
     Future<Response> response = process::http::get(
-        master.get(),
+        master.get()->pid,
         "state",
         None(),
         createBasicAuthHeaders(DEFAULT_CREDENTIAL));
@@ -4185,9 +4176,6 @@ TEST_F(MasterTest, MaxCompletedTasksPerFrameworkFlag)
       completedFramework.values["completed_tasks"].as<JSON::Array>();
 
     EXPECT_EQ(maxTasksPerFramework, completedTasksPerFramework->values.size());
-
-    Stop(slave.get());
-    Stop(master.get());
   }
 }
 
@@ -4201,7 +4189,7 @@ TEST_F(MasterTest, EndpointsBadAuthentication)
 {
   // Set up a master with authentication required.
   // Note that the default master test flags enable HTTP authentication.
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   // Bad credentials which should fail authentication.
@@ -4212,13 +4200,15 @@ TEST_F(MasterTest, EndpointsBadAuthentication)
   // frameworks endpoint.
   {
     // Get request without authentication.
-    Future<Response> response = process::http::get(master.get(), "frameworks");
+    Future<Response> response = process::http::get(
+        master.get()->pid,
+        "frameworks");
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(Unauthorized({}).status, response);
 
     // Get request with bad authentication.
     response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "frameworks",
       None(),
       createBasicAuthHeaders(badCredential));
@@ -4229,13 +4219,13 @@ TEST_F(MasterTest, EndpointsBadAuthentication)
   // flags endpoint.
   {
     // Get request without authentication.
-    Future<Response> response = process::http::get(master.get(), "flags");
+    Future<Response> response = process::http::get(master.get()->pid, "flags");
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(Unauthorized({}).status, response);
 
     // Get request with bad authentication.
     response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "flags",
       None(),
       createBasicAuthHeaders(badCredential));
@@ -4246,13 +4236,13 @@ TEST_F(MasterTest, EndpointsBadAuthentication)
   // slaves endpoint.
   {
     // Get request without authentication.
-    Future<Response> response = process::http::get(master.get(), "slaves");
+    Future<Response> response = process::http::get(master.get()->pid, "slaves");
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(Unauthorized({}).status, response);
 
     // Get request with bad authentication.
     response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "slaves",
       None(),
       createBasicAuthHeaders(badCredential));
@@ -4263,13 +4253,13 @@ TEST_F(MasterTest, EndpointsBadAuthentication)
   // state endpoint.
   {
     // Get request without authentication.
-    Future<Response> response = process::http::get(master.get(), "state");
+    Future<Response> response = process::http::get(master.get()->pid, "state");
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(Unauthorized({}).status, response);
 
     // Get request with bad authentication.
     response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "state",
       None(),
       createBasicAuthHeaders(badCredential));
@@ -4281,14 +4271,14 @@ TEST_F(MasterTest, EndpointsBadAuthentication)
   {
     // Get request without authentication.
     Future<Response> response = process::http::get(
-        master.get(),
+        master.get()->pid,
         "state-summary");
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(Unauthorized({}).status, response);
 
     // Get request with bad authentication.
     response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "state-summary",
       None(),
       createBasicAuthHeaders(badCredential));
@@ -4299,21 +4289,19 @@ TEST_F(MasterTest, EndpointsBadAuthentication)
   // tasks endpoint.
   {
     // Get request without authentication.
-    Future<Response> response = process::http::get(master.get(), "tasks");
+    Future<Response> response = process::http::get(master.get()->pid, "tasks");
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(Unauthorized({}).status, response);
 
     // Get request with bad authentication.
     response = process::http::get(
-      master.get(),
+      master.get()->pid,
       "tasks",
       None(),
       createBasicAuthHeaders(badCredential));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(Unauthorized({}).status, response);
   }
-
-  Shutdown();
 }
 
 } // namespace tests {

http://git-wip-us.apache.org/repos/asf/mesos/blob/95153931/src/tests/master_validation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_validation_tests.cpp b/src/tests/master_validation_tests.cpp
index c9bc38c..8d0070a 100644
--- a/src/tests/master_validation_tests.cpp
+++ b/src/tests/master_validation_tests.cpp
@@ -28,6 +28,8 @@
 #include <process/clock.hpp>
 #include <process/gmock.hpp>
 #include <process/gtest.hpp>
+#include <process/owned.hpp>
+#include <process/pid.hpp>
 
 #include <stout/gtest.hpp>
 #include <stout/strings.hpp>
@@ -38,6 +40,7 @@
 
 #include "slave/slave.hpp"
 
+#include "tests/containerizer.hpp"
 #include "tests/mesos.hpp"
 
 using namespace mesos::internal::master::validation;
@@ -50,6 +53,7 @@ using mesos::internal::slave::Slave;
 
 using process::Clock;
 using process::Future;
+using process::Owned;
 using process::PID;
 
 using std::vector;
@@ -474,18 +478,19 @@ TEST_F(CreateOperationValidationTest, InsufficientDiskResource)
   masterFlags.acls = acls;
   masterFlags.roles = "role1";
 
-  Try<PID<Master>> master = StartMaster(masterFlags);
+  Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
   ASSERT_SOME(master);
 
   slave::Flags slaveFlags = CreateSlaveFlags();
   slaveFlags.resources = "disk(role1):1024";
 
-  Try<PID<Slave>> slave = StartSlave(slaveFlags);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), slaveFlags);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, frameworkInfo, master.get(), DEFAULT_CREDENTIAL);
+      &sched, frameworkInfo, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _));
 
@@ -539,8 +544,6 @@ TEST_F(CreateOperationValidationTest, InsufficientDiskResource)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -597,15 +600,16 @@ class TaskValidationTest : public MesosTest {};
 
 TEST_F(TaskValidationTest, TaskUsesInvalidFrameworkID)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
-  Try<PID<Slave>> slave = StartSlave();
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _));
 
@@ -631,22 +635,21 @@ TEST_F(TaskValidationTest, TaskUsesInvalidFrameworkID)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
 TEST_F(TaskValidationTest, TaskUsesCommandInfoAndExecutorInfo)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
-  Try<PID<Slave>> slave = StartSlave();
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _));
 
@@ -677,22 +680,21 @@ TEST_F(TaskValidationTest, TaskUsesCommandInfoAndExecutorInfo)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
 TEST_F(TaskValidationTest, TaskUsesNoResources)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
-  Try<PID<Slave>> slave = StartSlave();
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _))
     .Times(1);
@@ -728,22 +730,21 @@ TEST_F(TaskValidationTest, TaskUsesNoResources)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
 TEST_F(TaskValidationTest, TaskUsesMoreResourcesThanOffered)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
-  Try<PID<Slave>> slave = StartSlave();
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _))
     .Times(1);
@@ -786,8 +787,6 @@ TEST_F(TaskValidationTest, TaskUsesMoreResourcesThanOffered)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -795,17 +794,19 @@ TEST_F(TaskValidationTest, TaskUsesMoreResourcesThanOffered)
 // task ID, the second task will get rejected.
 TEST_F(TaskValidationTest, DuplicatedTaskID)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
+  TestContainerizer containerizer(&exec);
 
-  Try<PID<Slave>> slave = StartSlave(&exec);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), &containerizer);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _));
 
@@ -870,8 +871,6 @@ TEST_F(TaskValidationTest, DuplicatedTaskID)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -879,17 +878,19 @@ TEST_F(TaskValidationTest, DuplicatedTaskID)
 // the same executor id but different executor info are rejected.
 TEST_F(TaskValidationTest, ExecutorInfoDiffersOnSameSlave)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
+  TestContainerizer containerizer(&exec);
 
-  Try<PID<Slave>> slave = StartSlave(&exec);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), &containerizer);
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _))
     .Times(1);
@@ -960,8 +961,6 @@ TEST_F(TaskValidationTest, ExecutorInfoDiffersOnSameSlave)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 
@@ -970,12 +969,12 @@ TEST_F(TaskValidationTest, ExecutorInfoDiffersOnSameSlave)
 // allowed.
 TEST_F(TaskValidationTest, ExecutorInfoDiffersOnDifferentSlaves)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   Future<Nothing> registered;
   EXPECT_CALL(sched, registered(&driver, _, _))
@@ -991,8 +990,11 @@ TEST_F(TaskValidationTest, ExecutorInfoDiffersOnDifferentSlaves)
 
   // Start the first slave.
   MockExecutor exec1(DEFAULT_EXECUTOR_ID);
+  TestContainerizer containerizer1(&exec1);
 
-  Try<PID<Slave>> slave1 = StartSlave(&exec1);
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave1 =
+    StartSlave(detector.get(), &containerizer1);
   ASSERT_SOME(slave1);
 
   AWAIT_READY(offers1);
@@ -1028,8 +1030,10 @@ TEST_F(TaskValidationTest, ExecutorInfoDiffersOnDifferentSlaves)
 
   // Now start the second slave.
   MockExecutor exec2(DEFAULT_EXECUTOR_ID);
+  TestContainerizer containerizer2(&exec2);
 
-  Try<PID<Slave>> slave2 = StartSlave(&exec2);
+  Try<Owned<cluster::Slave>> slave2 =
+    StartSlave(detector.get(), &containerizer2);
   ASSERT_SOME(slave2);
 
   AWAIT_READY(offers2);
@@ -1067,8 +1071,6 @@ TEST_F(TaskValidationTest, ExecutorInfoDiffersOnDifferentSlaves)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/95153931/src/tests/metrics_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/metrics_tests.cpp b/src/tests/metrics_tests.cpp
index 419d275..51b4515 100644
--- a/src/tests/metrics_tests.cpp
+++ b/src/tests/metrics_tests.cpp
@@ -18,17 +18,21 @@
 
 #include <process/future.hpp>
 #include <process/http.hpp>
+#include <process/owned.hpp>
 #include <process/pid.hpp>
 
 #include <stout/gtest.hpp>
 #include <stout/try.hpp>
 
 #include "master/master.hpp"
+
 #include "tests/mesos.hpp"
 
 using mesos::internal::master::Master;
 using mesos::internal::slave::Slave;
 
+using process::Owned;
+
 namespace mesos {
 namespace internal {
 namespace tests {
@@ -37,7 +41,7 @@ class MetricsTest : public mesos::internal::tests::MesosTest {};
 
 TEST_F(MetricsTest, Master)
 {
-  Try<process::PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
   // Get the snapshot.
@@ -151,10 +155,11 @@ TEST_F(MetricsTest, Slave)
 {
   // TODO(dhamon): https://issues.apache.org/jira/browse/MESOS-2134 to allow
   // only a Slave to be started.
-  Try<process::PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
-  Try<process::PID<Slave>> slave = StartSlave();
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
   ASSERT_SOME(slave);
 
   // Get the snapshot.

http://git-wip-us.apache.org/repos/asf/mesos/blob/95153931/src/tests/monitor_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/monitor_tests.cpp b/src/tests/monitor_tests.cpp
index 869c9e0..5dcb248 100644
--- a/src/tests/monitor_tests.cpp
+++ b/src/tests/monitor_tests.cpp
@@ -26,6 +26,7 @@
 #include <process/gmock.hpp>
 #include <process/gtest.hpp>
 #include <process/http.hpp>
+#include <process/owned.hpp>
 #include <process/pid.hpp>
 #include <process/process.hpp>
 
@@ -177,15 +178,16 @@ class MonitorIntegrationTest : public MesosTest {};
 // the values returned by the statistics endpoint are as expected.
 TEST_F(MonitorIntegrationTest, RunningExecutor)
 {
-  Try<PID<Master>> master = StartMaster();
+  Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
 
-  Try<PID<Slave>> slave = StartSlave();
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
   ASSERT_SOME(slave);
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
-      &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
 
   EXPECT_CALL(sched, registered(&driver, _, _));
 
@@ -246,8 +248,6 @@ TEST_F(MonitorIntegrationTest, RunningExecutor)
 
   driver.stop();
   driver.join();
-
-  Shutdown();
 }
 
 } // namespace tests {