(kudu) branch branch-1.18.x updated: [tserver] KUDU-3638 follow-up

[alexey]

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

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


The following commit(s) were added to refs/heads/branch-1.18.x by this push:
     new 93adb548b [tserver] KUDU-3638 follow-up
93adb548b is described below

commit 93adb548b5470d8efe5ec2c631613942ba44b4b1
Author: Alexey Serbin <ale...@apache.org>
AuthorDate: Wed Jan 15 11:49:39 2025 -0800

    [tserver] KUDU-3638 follow-up
    
    This patch fixes a typo/mistake in prior changelist [1].
    The Heartbeater::Thread::last_tombstoned_report_time_ field has to be
    updated only after sending out reports on tombstoned tablet replicas,
    otherwise the logic of sending such reports each
    --tserver_send_tombstoned_tablets_report_inteval_secs interval isn't
    working.
    
    This is a follow-up to [1].
    
    [1] https://github.com/apache/kudu/commit/0ddaac556
    
    Change-Id: I9c5993952c284ab45ff20f88284033a0866281af
    Reviewed-on: http://gerrit.cloudera.org:8080/22354
    Tested-by: Alexey Serbin <ale...@apache.org>
    Reviewed-by: Abhishek Chennaka <achenn...@cloudera.com>
    (cherry picked from commit f41a8bd17e7196a4e9bdcf06d7034d7995fe411d)
    Reviewed-on: http://gerrit.cloudera.org:8080/22359
---
 src/kudu/tserver/heartbeater.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/kudu/tserver/heartbeater.cc b/src/kudu/tserver/heartbeater.cc
index 0d8ed4c0a..5a671daf6 100644
--- a/src/kudu/tserver/heartbeater.cc
+++ b/src/kudu/tserver/heartbeater.cc
@@ -521,7 +521,9 @@ Status Heartbeater::Thread::DoHeartbeat(MasterErrorPB* 
error,
         (now - last_tombstoned_report_time_).ToSeconds() >= 
tombstoned_report_interval;
     GenerateIncrementalTabletReport(req.mutable_tablet_report(), 
include_tombstoned);
     // Update the timestamp of last report on tombstoned tablet replicas.
-    last_tombstoned_report_time_ = now;
+    if (include_tombstoned) {
+      last_tombstoned_report_time_ = now;
+    }
   }
 
   req.set_num_live_tablets(server_->tablet_manager()->GetNumLiveTablets());