(hbase) branch branch-2.4 updated: HBASE-28287 MOB HFiles are expired earlier than their reference data (#5599)

[zhangduo]

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

zhangduo pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.4 by this push:
     new 38e61e915b6 HBASE-28287 MOB HFiles are expired earlier than their 
reference data (#5599)
38e61e915b6 is described below

commit 38e61e915b6ea76d6ec8a0c428ce05c272859ccd
Author: liuwenjing17 <154434091+liuwenjin...@users.noreply.github.com>
AuthorDate: Sat Jan 13 17:39:28 2024 +0800

    HBASE-28287 MOB HFiles are expired earlier than their reference data (#5599)
    
    Co-authored-by: liuwenjing3 <liuwenji...@360.cn>
    Signed-off-by: Duo Zhang <zhang...@apache.org>
    (cherry picked from commit 4d2b8f8de668f0b5938c7665c9730133cd48b8da)
---
 hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobUtils.java   | 1 +
 .../java/org/apache/hadoop/hbase/mob/TestExpiredMobFileCleaner.java    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobUtils.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobUtils.java
index be6af9fe572..962c99db851 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobUtils.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobUtils.java
@@ -296,6 +296,7 @@ public final class MobUtils {
     calendar.set(Calendar.HOUR_OF_DAY, 0);
     calendar.set(Calendar.MINUTE, 0);
     calendar.set(Calendar.SECOND, 0);
+    calendar.set(Calendar.MILLISECOND, 0);
 
     Date expireDate = calendar.getTime();
 
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestExpiredMobFileCleaner.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestExpiredMobFileCleaner.java
index bd9a872101a..14c6dd555fc 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestExpiredMobFileCleaner.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestExpiredMobFileCleaner.java
@@ -140,7 +140,8 @@ public class TestExpiredMobFileCleaner {
     assertEquals("Before cleanup without delay 1", 1, firstFiles.length);
     String firstFile = firstFiles[0].getPath().getName();
 
-    ts = System.currentTimeMillis() - 1 * secondsOfDay() * 1000; // 1 day 
before
+    // 1.5 day before
+    ts = (long) (System.currentTimeMillis() - 1.5 * secondsOfDay() * 1000);
     putKVAndFlush(table, row2, dummyData, ts);
     FileStatus[] secondFiles = 
TEST_UTIL.getTestFileSystem().listStatus(mobDirPath);
     // now there are 2 mob files