You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2017/05/23 22:51:55 UTC
[2/2] mesos git commit: Added 'executor_reregister_timeout' agent
flag to the tests.
Added 'executor_reregister_timeout' agent flag to the tests.
This patch updates the tests to make use of the new
'executor_reregister_timeout' agent flag.
Review: https://reviews.apache.org/r/59461/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/044196ff
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/044196ff
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/044196ff
Branch: refs/heads/master
Commit: 044196ff6d088675ee1773fca7800af89f743051
Parents: 4a5c262
Author: Greg Mann <gr...@mesosphere.io>
Authored: Tue May 23 15:37:34 2017 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Tue May 23 15:37:34 2017 -0700
----------------------------------------------------------------------
src/tests/containerizer/port_mapping_tests.cpp | 4 ++--
src/tests/disk_quota_tests.cpp | 2 +-
src/tests/master_tests.cpp | 4 ++--
src/tests/persistent_volume_tests.cpp | 2 +-
src/tests/slave_recovery_tests.cpp | 26 ++++++++++-----------
src/tests/slave_tests.cpp | 2 +-
6 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/044196ff/src/tests/containerizer/port_mapping_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/port_mapping_tests.cpp b/src/tests/containerizer/port_mapping_tests.cpp
index a528382..d062f2f 100644
--- a/src/tests/containerizer/port_mapping_tests.cpp
+++ b/src/tests/containerizer/port_mapping_tests.cpp
@@ -1962,7 +1962,7 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_RecoverMixedContainers)
AWAIT_READY(_recover1);
Clock::settle(); // Wait for slave to schedule reregister timeout.
- Clock::advance(EXECUTOR_REREGISTER_TIMEOUT);
+ Clock::advance(slaveFlags.executor_reregistration_timeout);
AWAIT_READY(slaveReregisteredMessage1);
@@ -2011,7 +2011,7 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_RecoverMixedContainers)
AWAIT_READY(_recover2);
Clock::settle(); // Wait for slave to schedule reregister timeout.
- Clock::advance(EXECUTOR_REREGISTER_TIMEOUT);
+ Clock::advance(slaveFlags.executor_reregistration_timeout);
AWAIT_READY(slaveReregisteredMessage2);
http://git-wip-us.apache.org/repos/asf/mesos/blob/044196ff/src/tests/disk_quota_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/disk_quota_tests.cpp b/src/tests/disk_quota_tests.cpp
index f758bee..9fe2c86 100644
--- a/src/tests/disk_quota_tests.cpp
+++ b/src/tests/disk_quota_tests.cpp
@@ -701,7 +701,7 @@ TEST_F(DiskQuotaTest, SlaveRecovery)
AWAIT_READY(reregisterExecutorMessage);
// Ensure the slave considers itself recovered.
- Clock::advance(slave::EXECUTOR_REREGISTER_TIMEOUT);
+ Clock::advance(flags.executor_reregistration_timeout);
// NOTE: We resume the clock because we need the reaper to reap the
// 'du' subprocess.
http://git-wip-us.apache.org/repos/asf/mesos/blob/044196ff/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index 754f7bd..1dfe5fd 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -6442,7 +6442,7 @@ TEST_F(MasterTest, AgentRestartNoReregister)
// The agent waits for the executor reregister timeout to expire,
// even if all executors have re-reregistered.
- Clock::advance(slave::EXECUTOR_REREGISTER_TIMEOUT);
+ Clock::advance(agentFlags.executor_reregistration_timeout);
Clock::settle();
// Agent will try to re-register after completing recovery; prevent
@@ -6473,7 +6473,7 @@ TEST_F(MasterTest, AgentRestartNoReregister)
.WillOnce(FutureArg<1>(&unreachableStatus));
Duration elapsedTime =
- masterFlags.agent_ping_timeout + slave::EXECUTOR_REREGISTER_TIMEOUT;
+ masterFlags.agent_ping_timeout + agentFlags.executor_reregistration_timeout;
Duration remainingReregisterTime =
masterFlags.agent_reregister_timeout - elapsedTime;
http://git-wip-us.apache.org/repos/asf/mesos/blob/044196ff/src/tests/persistent_volume_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/persistent_volume_tests.cpp b/src/tests/persistent_volume_tests.cpp
index ef00853..ce716bc 100644
--- a/src/tests/persistent_volume_tests.cpp
+++ b/src/tests/persistent_volume_tests.cpp
@@ -1955,7 +1955,7 @@ TEST_P(PersistentVolumeTest, SlaveRecovery)
Clock::settle();
// Ensure the slave considers itself recovered.
- Clock::advance(slave::EXECUTOR_REREGISTER_TIMEOUT);
+ Clock::advance(slaveFlags.executor_reregistration_timeout);
Clock::resume();
http://git-wip-us.apache.org/repos/asf/mesos/blob/044196ff/src/tests/slave_recovery_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp
index 52e78b6..0aa87f5 100644
--- a/src/tests/slave_recovery_tests.cpp
+++ b/src/tests/slave_recovery_tests.cpp
@@ -889,7 +889,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_RecoverUnregisteredHTTPExecutor)
Clock::settle(); // Wait for slave to schedule reregister timeout.
// Ensure the slave considers itself recovered.
- Clock::advance(EXECUTOR_REREGISTER_TIMEOUT);
+ Clock::advance(flags.executor_reregistration_timeout);
// Now advance time until the reaper reaps the executor.
while (status.isPending()) {
@@ -1001,7 +1001,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverUnregisteredExecutor)
Clock::settle(); // Wait for slave to schedule reregister timeout.
// Ensure the slave considers itself recovered.
- Clock::advance(EXECUTOR_REREGISTER_TIMEOUT);
+ Clock::advance(flags.executor_reregistration_timeout);
// Now advance time until the reaper reaps the executor.
while (status.isPending()) {
@@ -1119,7 +1119,7 @@ TYPED_TEST(SlaveRecoveryTest, KillTaskUnregisteredExecutor)
Clock::settle(); // Wait for the agent to schedule reregister timeout.
// Ensure the agent considers itself recovered.
- Clock::advance(EXECUTOR_REREGISTER_TIMEOUT);
+ Clock::advance(flags.executor_reregistration_timeout);
while(executorTerminated.isPending()) {
Clock::advance(process::MAX_REAP_INTERVAL());
@@ -1256,7 +1256,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverTerminatedHTTPExecutor)
Clock::settle(); // Wait for slave to schedule reregister timeout.
// Ensure the slave considers itself recovered.
- Clock::advance(EXECUTOR_REREGISTER_TIMEOUT);
+ Clock::advance(flags.executor_reregistration_timeout);
// Now advance time until the reaper reaps the executor.
while (status.isPending()) {
@@ -1376,7 +1376,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverTerminatedExecutor)
Clock::settle(); // Wait for slave to schedule reregister timeout.
// Ensure the slave considers itself recovered.
- Clock::advance(EXECUTOR_REREGISTER_TIMEOUT);
+ Clock::advance(flags.executor_reregistration_timeout);
// Now advance time until the reaper reaps the executor.
while (status.isPending()) {
@@ -1493,7 +1493,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_RecoveryTimeout)
AWAIT_READY(_recover);
// Ensure the slave considers itself recovered.
- Clock::advance(EXECUTOR_REREGISTER_TIMEOUT);
+ Clock::advance(flags.executor_reregistration_timeout);
Clock::resume();
// Scheduler should receive the TASK_FAILED update.
@@ -2206,7 +2206,7 @@ TYPED_TEST(SlaveRecoveryTest, KillTask)
AWAIT_READY(reregisterExecutorMessage);
// Ensure the slave considers itself recovered.
- Clock::advance(EXECUTOR_REREGISTER_TIMEOUT);
+ Clock::advance(flags.executor_reregistration_timeout);
Clock::resume();
// Wait for the slave to re-register.
@@ -2497,7 +2497,7 @@ TYPED_TEST(SlaveRecoveryTest, GCExecutor)
Clock::settle(); // Wait for slave to schedule reregister timeout.
// Ensure the slave considers itself recovered.
- Clock::advance(EXECUTOR_REREGISTER_TIMEOUT);
+ Clock::advance(flags.executor_reregistration_timeout);
AWAIT_READY(slaveReregisteredMessage);
@@ -3388,7 +3388,7 @@ TYPED_TEST(SlaveRecoveryTest, SchedulerFailover)
AWAIT_READY(reregisterExecutorMessage);
// Ensure the slave considers itself recovered.
- Clock::advance(EXECUTOR_REREGISTER_TIMEOUT);
+ Clock::advance(flags.executor_reregistration_timeout);
Clock::resume();
// Wait for the slave to re-register.
@@ -3534,7 +3534,7 @@ TYPED_TEST(SlaveRecoveryTest, MasterFailover)
AWAIT_READY(reregisterExecutorMessage);
// Ensure the slave considers itself recovered.
- Clock::advance(EXECUTOR_REREGISTER_TIMEOUT);
+ Clock::advance(flags.executor_reregistration_timeout);
Clock::resume();
// Wait for the slave to re-register.
@@ -3693,7 +3693,7 @@ TYPED_TEST(SlaveRecoveryTest, MultipleFrameworks)
AWAIT_READY(reregisterExecutorMessage2);
// Ensure the slave considers itself recovered.
- Clock::advance(EXECUTOR_REREGISTER_TIMEOUT);
+ Clock::advance(flags.executor_reregistration_timeout);
Clock::resume();
// Wait for the slave to re-register.
@@ -3869,7 +3869,7 @@ TYPED_TEST(SlaveRecoveryTest, MultipleSlaves)
AWAIT_READY(reregisterExecutorMessage2);
// Ensure the slave considers itself recovered.
- Clock::advance(EXECUTOR_REREGISTER_TIMEOUT);
+ Clock::advance(flags1.executor_reregistration_timeout);
Clock::resume();
// Wait for the slaves to re-register.
@@ -3990,7 +3990,7 @@ TYPED_TEST(SlaveRecoveryTest, RestartBeforeContainerizerLaunch)
Clock::settle(); // Wait for slave to schedule reregister timeout.
// Ensure the slave considers itself recovered.
- Clock::advance(EXECUTOR_REREGISTER_TIMEOUT);
+ Clock::advance(flags.executor_reregistration_timeout);
Clock::resume();
// Scheduler should receive the TASK_FAILED update.
http://git-wip-us.apache.org/repos/asf/mesos/blob/044196ff/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index 8f81f77..d124d59 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -5005,7 +5005,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, HTTPSchedulerSlaveRestart)
Clock::settle();
// Ensure the slave considers itself recovered.
- Clock::advance(slave::EXECUTOR_REREGISTER_TIMEOUT);
+ Clock::advance(flags.executor_reregistration_timeout);
Clock::resume();