You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by cf...@apache.org on 2022/05/03 18:36:58 UTC

[mesos] branch master updated: Revert "Fixed random SlaveRecoveryTest.PingTimeoutDuringRecovery test failure."

This is an automated email from the ASF dual-hosted git repository.

cfnatali pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git


The following commit(s) were added to refs/heads/master by this push:
     new 6f8794a85 Revert "Fixed random SlaveRecoveryTest.PingTimeoutDuringRecovery test failure."
6f8794a85 is described below

commit 6f8794a85cee44ae8402e45747640251c59da6f9
Author: cf-natali <cf...@gmail.com>
AuthorDate: Tue May 3 19:35:49 2022 +0100

    Revert "Fixed random SlaveRecoveryTest.PingTimeoutDuringRecovery test failure."
    
    This reverts commit 57088b11a328355b7f2a53a1b3fba9928a2fde73.
---
 src/tests/slave_recovery_tests.cpp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp
index 41ecd3b6d..398011437 100644
--- a/src/tests/slave_recovery_tests.cpp
+++ b/src/tests/slave_recovery_tests.cpp
@@ -1010,15 +1010,6 @@ TYPED_TEST(SlaveRecoveryTest, PingTimeoutDuringRecovery)
 
   slave.get()->terminate();
 
-  // Make sure that timers started by the previous slave's process expire,
-  // because we reuse the same PID we don't want them to fire while the
-  // new process is running.
-  Clock::pause();
-  Clock::advance(masterFlags.agent_ping_timeout *
-    masterFlags.max_agent_ping_timeouts);
-  Clock::settle();
-  Clock::resume();
-
   Future<ReregisterExecutorMessage> reregisterExecutor =
     FUTURE_PROTOBUF(ReregisterExecutorMessage(), _, _);