[kudu] branch master updated: [tests] Fix flakiness in log-rolling-itest.cc

[alexey]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 41ff1304b [tests] Fix flakiness in log-rolling-itest.cc
41ff1304b is described below

commit 41ff1304b573acbeb26df948009f6ff24f00b06b
Author: Mahesh Reddy <mre...@cloudera.com>
AuthorDate: Thu May 4 17:45:25 2023 -0400

    [tests] Fix flakiness in log-rolling-itest.cc
    
    The test TestLogCleanupOnStartup within log-rolling-itest.cc
    has been flaky with a 30% failure rate for the last 2+ weeks.
    The timeout within the test was increased from 30 to 60 seconds
    to allow the ExcessLogFileDeleterThread to have enough time to
    properly clean up the log files.
    
    Below are the dist-test stats for a DEBUG build.
    
    Before: 13/100 failed.
    http://dist-test.cloudera.org/job?job_id=mreddy.1683141191.148826
    
    After: 0/100 failed.
    http://dist-test.cloudera.org/job?job_id=mreddy.1683146152.19719
    
    Change-Id: I4d33559fa01c26d8c8b3ad12b8822d2cdd760fae
    Reviewed-on: http://gerrit.cloudera.org:8080/19842
    Tested-by: Kudu Jenkins
    Reviewed-by: Alexey Serbin <ale...@apache.org>
---
 src/kudu/integration-tests/log-rolling-itest.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/kudu/integration-tests/log-rolling-itest.cc 
b/src/kudu/integration-tests/log-rolling-itest.cc
index 4665b9aa9..a66ec14f7 100644
--- a/src/kudu/integration-tests/log-rolling-itest.cc
+++ b/src/kudu/integration-tests/log-rolling-itest.cc
@@ -29,6 +29,7 @@
 #include "kudu/gutil/strings/substitute.h"
 #include "kudu/mini-cluster/external_mini_cluster.h"
 #include "kudu/util/env.h"
+#include "kudu/util/monotime.h"
 #include "kudu/util/status.h"
 #include "kudu/util/test_macros.h"
 #include "kudu/util/test_util.h"
@@ -77,9 +78,10 @@ TEST_F(LogRollingITest, TestLogCleanupOnStartup) {
   ASSERT_OK(cluster.master()->WaitForCatalogManager());
 
   for (int i = 1; i <= 10; i++) {
-    ASSERT_EVENTUALLY([&] () {
+    AssertEventually([&] () {
         ASSERT_EQ(std::min(3, i), CountInfoLogs(cluster.master()->log_dir()));
-    });
+    }, MonoDelta::FromSeconds(60));
+    NO_PENDING_FATALS();
     cluster.master()->Shutdown();
     ASSERT_OK(cluster.master()->Restart());
   }