You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by al...@apache.org on 2016/10/05 16:26:09 UTC
[1/5] mesos git commit: Improved handling of health check failures
within the grace period.
Repository: mesos
Updated Branches:
refs/heads/master b70a22bad -> ac859b4fe
Improved handling of health check failures within the grace period.
The health check library would ignore all failures until after the end
of the grace period.
This behaviour was misleading. With the changes in this commit, once a
health check succeeds for the first time, the grace period rule for
failures is not be applied any more.
Review: https://reviews.apache.org/r/52357/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3eb8b20d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3eb8b20d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3eb8b20d
Branch: refs/heads/master
Commit: 3eb8b20d7994c70ce81180b1ab01c3422426cb90
Parents: b70a22b
Author: Gast�n Kleiman <ga...@mesosphere.com>
Authored: Wed Oct 5 15:49:03 2016 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Wed Oct 5 18:08:35 2016 +0200
----------------------------------------------------------------------
src/health-check/health_checker.cpp | 3 +-
src/tests/health_check_tests.cpp | 81 ++++++++++++++++++++++++++++++++
2 files changed, 83 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/3eb8b20d/src/health-check/health_checker.cpp
----------------------------------------------------------------------
diff --git a/src/health-check/health_checker.cpp b/src/health-check/health_checker.cpp
index ea93132..96ae1a7 100644
--- a/src/health-check/health_checker.cpp
+++ b/src/health-check/health_checker.cpp
@@ -193,7 +193,8 @@ Future<Nothing> HealthCheckerProcess::healthCheck()
void HealthCheckerProcess::failure(const string& message)
{
- if (check.grace_period_seconds() > 0 &&
+ if (initializing &&
+ check.grace_period_seconds() > 0 &&
(Clock::now() - startTime).secs() <= check.grace_period_seconds()) {
LOG(INFO) << "Ignoring failure as health check still in grace period";
reschedule();
http://git-wip-us.apache.org/repos/asf/mesos/blob/3eb8b20d/src/tests/health_check_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/health_check_tests.cpp b/src/tests/health_check_tests.cpp
index f4a63e2..d5656ee 100644
--- a/src/tests/health_check_tests.cpp
+++ b/src/tests/health_check_tests.cpp
@@ -1403,6 +1403,87 @@ TEST_F(HealthCheckTest, DISABLED_HealthyTaskViaHTTPWithoutType)
driver.join();
}
+
+// Tests the transition from healthy to unhealthy within the grace period, to
+// make sure that failures within the grace period aren't ignored if they come
+// after a success.
+TEST_F(HealthCheckTest, HealthyToUnhealthyTransitionWithinGracePeriod)
+{
+ master::Flags masterFlags = CreateMasterFlags();
+ masterFlags.allocation_interval = Milliseconds(50);
+ Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
+ ASSERT_SOME(master);
+
+ Owned<MasterDetector> detector = master.get()->createDetector();
+ Try<Owned<cluster::Slave>> agent = StartSlave(detector.get());
+ ASSERT_SOME(agent);
+
+ MockScheduler sched;
+ MesosSchedulerDriver driver(
+ &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
+
+ EXPECT_CALL(sched, registered(&driver, _, _));
+
+ Future<vector<Offer>> offers;
+ EXPECT_CALL(sched, resourceOffers(&driver, _))
+ .WillOnce(FutureArg<1>(&offers))
+ .WillRepeatedly(Return()); // Ignore subsequent offers.
+
+ driver.start();
+
+ AWAIT_READY(offers);
+ EXPECT_NE(0u, offers.get().size());
+
+ // Create a temporary file.
+ const string tmpPath = path::join(os::getcwd(), "healthyToUnhealthy");
+
+ // This command fails every other invocation.
+ // For all runs i in Nat0, the following case i % 2 applies:
+ //
+ // Case 0:
+ // - Remove the temporary file.
+ //
+ // Case 1:
+ // - Attempt to remove the nonexistent temporary file.
+ // - Create the temporary file.
+ // - Exit with a non-zero status.
+ const string healthCheckCmd =
+ "rm " + tmpPath + " || (touch " + tmpPath + " && exit 1)";
+
+ // Set the grace period to 9999 seconds, so that the healthy -> unhealthy
+ // transition happens during the grace period.
+ vector<TaskInfo> tasks = populateTasks(
+ "sleep 120", healthCheckCmd, offers.get()[0], 9999, 0);
+
+ Future<TaskStatus> statusRunning;
+ Future<TaskStatus> statusHealthy;
+ Future<TaskStatus> statusUnhealthy;
+
+ EXPECT_CALL(sched, statusUpdate(&driver, _))
+ .WillOnce(FutureArg<1>(&statusRunning))
+ .WillOnce(FutureArg<1>(&statusHealthy))
+ .WillOnce(FutureArg<1>(&statusUnhealthy))
+ .WillRepeatedly(Return()); // Ignore subsequent updates.
+
+ driver.launchTasks(offers.get()[0].id(), tasks);
+
+ AWAIT_READY(statusRunning);
+ EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+
+ AWAIT_READY(statusHealthy);
+ EXPECT_EQ(TASK_RUNNING, statusHealthy.get().state());
+ EXPECT_TRUE(statusHealthy.get().has_healthy());
+ EXPECT_TRUE(statusHealthy.get().healthy());
+
+ AWAIT_READY(statusUnhealthy);
+ EXPECT_EQ(TASK_RUNNING, statusUnhealthy.get().state());
+ EXPECT_TRUE(statusUnhealthy.get().has_healthy());
+ EXPECT_FALSE(statusUnhealthy.get().healthy());
+
+ driver.stop();
+ driver.join();
+}
+
} // namespace tests {
} // namespace internal {
} // namespace mesos {
[4/5] mesos git commit: Improved the naming of variables in
HealthCheckTest.HealthStatusChange.
Posted by al...@apache.org.
Improved the naming of variables in HealthCheckTest.HealthStatusChange.
Review: https://reviews.apache.org/r/52433/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/be4e42f0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/be4e42f0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/be4e42f0
Branch: refs/heads/master
Commit: be4e42f0680326c26179174bd5ef1d828733d3e7
Parents: 59f6333
Author: Gast�n Kleiman <ga...@mesosphere.com>
Authored: Wed Oct 5 18:12:26 2016 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Wed Oct 5 18:24:29 2016 +0200
----------------------------------------------------------------------
src/tests/health_check_tests.cpp | 36 ++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/be4e42f0/src/tests/health_check_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/health_check_tests.cpp b/src/tests/health_check_tests.cpp
index 250affd..27889dc 100644
--- a/src/tests/health_check_tests.cpp
+++ b/src/tests/health_check_tests.cpp
@@ -684,30 +684,32 @@ TEST_F(HealthCheckTest, HealthStatusChange)
// - Attempt to remove the nonexistent temporary file.
// - Create the temporary file.
// - Exit with a non-zero status.
- string alt = "rm " + tmpPath + " || (touch " + tmpPath + " && exit 1)";
+ const string healthCheckCmd =
+ "rm " + tmpPath + " || (touch " + tmpPath + " && exit 1)";
vector<TaskInfo> tasks = populateTasks(
- "sleep 120", alt, offers.get()[0], 0, 3);
+ "sleep 120", healthCheckCmd, offers.get()[0], 0, 3);
Future<TaskStatus> statusRunning;
- Future<TaskStatus> statusHealth1;
- Future<TaskStatus> statusHealth2;
- Future<TaskStatus> statusHealth3;
+ Future<TaskStatus> statusHealthy;
+ Future<TaskStatus> statusUnhealthy;
+ Future<TaskStatus> statusHealthyAgain;
EXPECT_CALL(sched, statusUpdate(&driver, _))
.WillOnce(FutureArg<1>(&statusRunning))
- .WillOnce(FutureArg<1>(&statusHealth1))
- .WillOnce(FutureArg<1>(&statusHealth2))
- .WillOnce(FutureArg<1>(&statusHealth3));
+ .WillOnce(FutureArg<1>(&statusHealthy))
+ .WillOnce(FutureArg<1>(&statusUnhealthy))
+ .WillOnce(FutureArg<1>(&statusHealthyAgain))
+ .WillRepeatedly(Return()); // Ignore subsequent updates.
driver.launchTasks(offers.get()[0].id(), tasks);
AWAIT_READY(statusRunning);
EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
- AWAIT_READY(statusHealth1);
- EXPECT_EQ(TASK_RUNNING, statusHealth1.get().state());
- EXPECT_TRUE(statusHealth1.get().healthy());
+ AWAIT_READY(statusHealthy);
+ EXPECT_EQ(TASK_RUNNING, statusHealthy.get().state());
+ EXPECT_TRUE(statusHealthy.get().healthy());
// Verify that task health is exposed in the master's state endpoint.
{
@@ -745,9 +747,9 @@ TEST_F(HealthCheckTest, HealthStatusChange)
EXPECT_SOME_TRUE(find);
}
- AWAIT_READY(statusHealth2);
- EXPECT_EQ(TASK_RUNNING, statusHealth2.get().state());
- EXPECT_FALSE(statusHealth2.get().healthy());
+ AWAIT_READY(statusUnhealthy);
+ EXPECT_EQ(TASK_RUNNING, statusUnhealthy.get().state());
+ EXPECT_FALSE(statusUnhealthy.get().healthy());
// Verify that the task health change is reflected in the master's
// state endpoint.
@@ -787,9 +789,9 @@ TEST_F(HealthCheckTest, HealthStatusChange)
EXPECT_SOME_FALSE(find);
}
- AWAIT_READY(statusHealth3);
- EXPECT_EQ(TASK_RUNNING, statusHealth3.get().state());
- EXPECT_TRUE(statusHealth3.get().healthy());
+ AWAIT_READY(statusHealthyAgain);
+ EXPECT_EQ(TASK_RUNNING, statusHealthyAgain.get().state());
+ EXPECT_TRUE(statusHealthyAgain.get().healthy());
// Verify through master's state endpoint that the task is back to a
// healthy state.
[2/5] mesos git commit: Reduced boilerplate in health check tests.
Posted by al...@apache.org.
Reduced boilerplate in health check tests.
Review: https://reviews.apache.org/r/52431/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4c6ba2a6
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4c6ba2a6
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4c6ba2a6
Branch: refs/heads/master
Commit: 4c6ba2a6429b66d42129e7284528617c70f3e86b
Parents: 3eb8b20
Author: Gast�n Kleiman <ga...@mesosphere.com>
Authored: Wed Oct 5 18:10:00 2016 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Wed Oct 5 18:10:00 2016 +0200
----------------------------------------------------------------------
src/tests/health_check_tests.cpp | 109 +++-------------------------------
1 file changed, 7 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/4c6ba2a6/src/tests/health_check_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/health_check_tests.cpp b/src/tests/health_check_tests.cpp
index d5656ee..2c7a585 100644
--- a/src/tests/health_check_tests.cpp
+++ b/src/tests/health_check_tests.cpp
@@ -235,21 +235,8 @@ TEST_F(HealthCheckTest, HealthyTask)
Try<Owned<cluster::Master>> master = StartMaster();
ASSERT_SOME(master);
- slave::Flags flags = CreateSlaveFlags();
- flags.isolation = "posix/cpu,posix/mem";
-
- Fetcher fetcher;
-
- Try<MesosContainerizer*> _containerizer =
- MesosContainerizer::create(flags, false, &fetcher);
-
- CHECK_SOME(_containerizer);
- Owned<MesosContainerizer> containerizer(_containerizer.get());
-
Owned<MasterDetector> detector = master.get()->createDetector();
-
- Try<Owned<cluster::Slave>> slave =
- StartSlave(detector.get(), containerizer.get());
+ Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
ASSERT_SOME(slave);
MockScheduler sched;
@@ -388,7 +375,6 @@ TEST_F(HealthCheckTest, ROOT_HealthyTaskWithContainerImage)
flags.docker_store_dir = path::join(os::getcwd(), "store");
Owned<MasterDetector> detector = master.get()->createDetector();
-
Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), flags);
ASSERT_SOME(slave);
@@ -522,7 +508,6 @@ TEST_F(HealthCheckTest, ROOT_DOCKER_DockerHealthyTask)
docker);
Owned<MasterDetector> detector = master.get()->createDetector();
-
Try<Owned<cluster::Slave>> slave =
StartSlave(detector.get(), &containerizer, flags);
ASSERT_SOME(slave);
@@ -610,21 +595,8 @@ TEST_F(HealthCheckTest, HealthyTaskNonShell)
Try<Owned<cluster::Master>> master = StartMaster();
ASSERT_SOME(master);
- slave::Flags flags = CreateSlaveFlags();
- flags.isolation = "posix/cpu,posix/mem";
-
- Fetcher fetcher;
-
- Try<MesosContainerizer*> _containerizer =
- MesosContainerizer::create(flags, false, &fetcher);
-
- CHECK_SOME(_containerizer);
- Owned<MesosContainerizer> containerizer(_containerizer.get());
-
Owned<MasterDetector> detector = master.get()->createDetector();
-
- Try<Owned<cluster::Slave>> slave =
- StartSlave(detector.get(), containerizer.get());
+ Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
ASSERT_SOME(slave);
MockScheduler sched;
@@ -679,21 +651,8 @@ TEST_F(HealthCheckTest, HealthStatusChange)
Try<Owned<cluster::Master>> master = StartMaster();
ASSERT_SOME(master);
- slave::Flags flags = CreateSlaveFlags();
- flags.isolation = "posix/cpu,posix/mem";
-
- Fetcher fetcher;
-
- Try<MesosContainerizer*> _containerizer =
- MesosContainerizer::create(flags, false, &fetcher);
-
- CHECK_SOME(_containerizer);
- Owned<MesosContainerizer> containerizer(_containerizer.get());
-
Owned<MasterDetector> detector = master.get()->createDetector();
-
- Try<Owned<cluster::Slave>> slave =
- StartSlave(detector.get(), containerizer.get());
+ Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
ASSERT_SOME(slave);
MockScheduler sched;
@@ -915,7 +874,6 @@ TEST_F(HealthCheckTest, ROOT_DOCKER_DockerHealthStatusChange)
docker);
Owned<MasterDetector> detector = master.get()->createDetector();
-
Try<Owned<cluster::Slave>> slave =
StartSlave(detector.get(), &containerizer, flags);
ASSERT_SOME(slave);
@@ -1034,21 +992,8 @@ TEST_F(HealthCheckTest, ConsecutiveFailures)
Try<Owned<cluster::Master>> master = StartMaster();
ASSERT_SOME(master);
- slave::Flags flags = CreateSlaveFlags();
- flags.isolation = "posix/cpu,posix/mem";
-
- Fetcher fetcher;
-
- Try<MesosContainerizer*> _containerizer =
- MesosContainerizer::create(flags, false, &fetcher);
-
- CHECK_SOME(_containerizer);
- Owned<MesosContainerizer> containerizer(_containerizer.get());
-
Owned<MasterDetector> detector = master.get()->createDetector();
-
- Try<Owned<cluster::Slave>> slave =
- StartSlave(detector.get(), containerizer.get());
+ Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
ASSERT_SOME(slave);
MockScheduler sched;
@@ -1124,21 +1069,8 @@ TEST_F(HealthCheckTest, EnvironmentSetup)
Try<Owned<cluster::Master>> master = StartMaster();
ASSERT_SOME(master);
- slave::Flags flags = CreateSlaveFlags();
- flags.isolation = "posix/cpu,posix/mem";
-
- Fetcher fetcher;
-
- Try<MesosContainerizer*> _containerizer =
- MesosContainerizer::create(flags, false, &fetcher);
-
- CHECK_SOME(_containerizer);
- Owned<MesosContainerizer> containerizer(_containerizer.get());
-
Owned<MasterDetector> detector = master.get()->createDetector();
-
- Try<Owned<cluster::Slave>> slave =
- StartSlave(detector.get(), containerizer.get());
+ Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
ASSERT_SOME(slave);
MockScheduler sched;
@@ -1191,21 +1123,8 @@ TEST_F(HealthCheckTest, DISABLED_GracePeriod)
Try<Owned<cluster::Master>> master = StartMaster();
ASSERT_SOME(master);
- slave::Flags flags = CreateSlaveFlags();
- flags.isolation = "posix/cpu,posix/mem";
-
- Fetcher fetcher;
-
- Try<MesosContainerizer*> _containerizer =
- MesosContainerizer::create(flags, false, &fetcher);
-
- CHECK_SOME(_containerizer);
- Owned<MesosContainerizer> containerizer(_containerizer.get());
-
Owned<MasterDetector> detector = master.get()->createDetector();
-
- Try<Owned<cluster::Slave>> slave =
- StartSlave(detector.get(), containerizer.get());
+ Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
ASSERT_SOME(slave);
MockScheduler sched;
@@ -1264,21 +1183,8 @@ TEST_F(HealthCheckTest, CheckCommandTimeout)
Try<Owned<cluster::Master>> master = StartMaster();
ASSERT_SOME(master);
- slave::Flags flags = CreateSlaveFlags();
- flags.isolation = "posix/cpu,posix/mem";
-
- Fetcher fetcher;
-
- Try<MesosContainerizer*> _containerizer =
- MesosContainerizer::create(flags, false, &fetcher);
-
- CHECK_SOME(_containerizer);
- Owned<MesosContainerizer> containerizer(_containerizer.get());
-
Owned<MasterDetector> detector = master.get()->createDetector();
-
- Try<Owned<cluster::Slave>> slave =
- StartSlave(detector.get(), containerizer.get());
+ Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
ASSERT_SOME(slave);
MockScheduler sched;
@@ -1348,7 +1254,6 @@ TEST_F(HealthCheckTest, DISABLED_HealthyTaskViaHTTPWithoutType)
flags.isolation = "posix/cpu,posix/mem";
Owned<MasterDetector> detector = master.get()->createDetector();
-
Try<Owned<cluster::Slave>> agent = StartSlave(detector.get());
ASSERT_SOME(agent);
[3/5] mesos git commit: Updated and reenabled
'HealthCheckTest.GracePeriod'.
Posted by al...@apache.org.
Updated and reenabled 'HealthCheckTest.GracePeriod'.
This test was disabled in 2014 because it was considered flaky.
The test is now updated and run 1000 times without a single failure.
Review: https://reviews.apache.org/r/52432/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/59f63332
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/59f63332
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/59f63332
Branch: refs/heads/master
Commit: 59f63332aa1d60b7088e1998076ac79467ee712e
Parents: 4c6ba2a
Author: Gast�n Kleiman <ga...@mesosphere.com>
Authored: Wed Oct 5 18:10:52 2016 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Wed Oct 5 18:24:28 2016 +0200
----------------------------------------------------------------------
src/tests/health_check_tests.cpp | 32 +++++++++++++-------------------
1 file changed, 13 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/59f63332/src/tests/health_check_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/health_check_tests.cpp b/src/tests/health_check_tests.cpp
index 2c7a585..250affd 100644
--- a/src/tests/health_check_tests.cpp
+++ b/src/tests/health_check_tests.cpp
@@ -17,7 +17,6 @@
#include <mesos/executor.hpp>
#include <mesos/scheduler.hpp>
-#include <process/clock.hpp>
#include <process/future.hpp>
#include <process/owned.hpp>
#include <process/pid.hpp>
@@ -55,7 +54,6 @@ using mesos::master::detector::MasterDetector;
using mesos::slave::ContainerLogger;
using mesos::slave::ContainerTermination;
-using process::Clock;
using process::Future;
using process::Owned;
using process::PID;
@@ -1117,8 +1115,8 @@ TEST_F(HealthCheckTest, EnvironmentSetup)
}
-// Testing grace period that ignores all failed task failures.
-TEST_F(HealthCheckTest, DISABLED_GracePeriod)
+// Tests that health check failures are ignored during the grace period.
+TEST_F(HealthCheckTest, GracePeriod)
{
Try<Owned<cluster::Master>> master = StartMaster();
ASSERT_SOME(master);
@@ -1144,33 +1142,29 @@ TEST_F(HealthCheckTest, DISABLED_GracePeriod)
AWAIT_READY(offers);
EXPECT_NE(0u, offers.get().size());
+ // The health check for this task will always fail, but the grace period of
+ // 9999 seconds should mask the failures.
vector<TaskInfo> tasks = populateTasks(
- "sleep 120", "exit 1", offers.get()[0], 6);
+ "sleep 2", "false", offers.get()[0], 9999);
Future<TaskStatus> statusRunning;
- Future<TaskStatus> statusHealth;
+ Future<TaskStatus> statusFinished;
EXPECT_CALL(sched, statusUpdate(&driver, _))
.WillOnce(FutureArg<1>(&statusRunning))
- .WillOnce(FutureArg<1>(&statusHealth))
+ .WillOnce(FutureArg<1>(&statusFinished))
.WillRepeatedly(Return());
driver.launchTasks(offers.get()[0].id(), tasks);
- Clock::pause();
- EXPECT_TRUE(statusHealth.isPending());
+ AWAIT_READY(statusRunning);
+ EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+ EXPECT_FALSE(statusRunning.get().has_healthy());
// No task unhealthy update should be called in grace period.
- Clock::advance(Seconds(5));
- EXPECT_TRUE(statusHealth.isPending());
-
- Clock::advance(Seconds(1));
- Clock::settle();
- Clock::resume();
-
- AWAIT_READY(statusHealth);
- EXPECT_EQ(TASK_RUNNING, statusHealth.get().state());
- EXPECT_FALSE(statusHealth.get().healthy());
+ AWAIT_READY(statusFinished);
+ EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
+ EXPECT_FALSE(statusFinished.get().has_healthy());
driver.stop();
driver.join();
[5/5] mesos git commit: Improved handling of tmp file creation in
health check test.
Posted by al...@apache.org.
Improved handling of tmp file creation in health check test.
The tmp file used in the HealthStatusChange test is now created inside
the tmp directory created for the test suite. This ensures that it will
be cleaned up on tear down.
Review: https://reviews.apache.org/r/52434/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ac859b4f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ac859b4f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ac859b4f
Branch: refs/heads/master
Commit: ac859b4fee4bd54d7d8553078593dfcb444d3f31
Parents: be4e42f
Author: Gast�n Kleiman <ga...@mesosphere.com>
Authored: Wed Oct 5 18:13:59 2016 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Wed Oct 5 18:24:29 2016 +0200
----------------------------------------------------------------------
src/tests/health_check_tests.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ac859b4f/src/tests/health_check_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/health_check_tests.cpp b/src/tests/health_check_tests.cpp
index 27889dc..1d1676d 100644
--- a/src/tests/health_check_tests.cpp
+++ b/src/tests/health_check_tests.cpp
@@ -670,7 +670,7 @@ TEST_F(HealthCheckTest, HealthStatusChange)
EXPECT_NE(0u, offers.get().size());
// Create a temporary file.
- Try<string> temporaryPath = os::mktemp();
+ Try<string> temporaryPath = os::mktemp(path::join(os::getcwd(), "XXXXXX"));
ASSERT_SOME(temporaryPath);
string tmpPath = temporaryPath.get();
@@ -831,8 +831,6 @@ TEST_F(HealthCheckTest, HealthStatusChange)
EXPECT_SOME_TRUE(find);
}
- os::rm(tmpPath); // Clean up the temporary file.
-
driver.stop();
driver.join();
}