(hbase) branch branch-2.5 updated: HBASE-30252 `hbase snapshot info` display inaccurate snapshot TTL information messages (#8411)

[lupeng]

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

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


The following commit(s) were added to refs/heads/branch-2.5 by this push:
     new 09026846e78 HBASE-30252 `hbase snapshot info` display inaccurate 
snapshot TTL information messages (#8411)
09026846e78 is described below

commit 09026846e788b7e7ed5392aa1a1cb213ec9f9d52
Author: Peng Lu <lup...@apache.org>
AuthorDate: Sun Jun 28 16:27:53 2026 +0800

    HBASE-30252 `hbase snapshot info` display inaccurate snapshot TTL 
information messages (#8411)
    
    Signed-off-by: Xiao Liu <liuxia...@apache.org>
    Signed-off-by: Dávid Paksy <pak...@apache.org>
---
 .../apache/hadoop/hbase/snapshot/SnapshotInfo.java | 47 ++++++++++++++++------
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotInfo.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotInfo.java
index 0a57aeb4c02..707519ddd46 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotInfo.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotInfo.java
@@ -17,6 +17,8 @@
  */
 package org.apache.hadoop.hbase.snapshot;
 
+import static org.apache.hadoop.hbase.HConstants.DEFAULT_SNAPSHOT_TTL;
+
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URI;
@@ -71,6 +73,10 @@ import 
org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.Snapshot
 public final class SnapshotInfo extends AbstractHBaseTool {
   private static final Logger LOG = 
LoggerFactory.getLogger(SnapshotInfo.class);
 
+  private static final String EXPIRED_LABEL = "Yes";
+  private static final String NOT_EXPIRED_LABEL = "No";
+  private static final String TTL_FOREVER = "FOREVER";
+
   static final class Options {
     static final Option SNAPSHOT =
       new Option(null, "snapshot", true, "The name of the snapshot to be 
detailed.");
@@ -391,11 +397,18 @@ public final class SnapshotInfo extends AbstractHBaseTool 
{
     // List Available Snapshots
     if (listSnapshots) {
       SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-      System.out.printf("%-20s | %-20s | %-20s | %s%n", "SNAPSHOT", "CREATION 
TIME", "TTL IN SEC",
-        "TABLE NAME");
-      for (SnapshotDescription desc : getSnapshotList(conf)) {
-        System.out.printf("%-20s | %20s | %20s | %s%n", desc.getName(),
-          df.format(new Date(desc.getCreationTime())), desc.getTtl(), 
desc.getTableNameAsString());
+      List<SnapshotDescription> snapshotDescriptions = getSnapshotList(conf);
+      System.out.printf("%-20s | %-20s | %-20s | %-20s | %s%n", "SNAPSHOT", 
"CREATION TIME",
+        "TTL(Sec)", "EXPIRED", "TABLE NAME");
+      long currentTime = System.currentTimeMillis();
+      for (SnapshotDescription desc : snapshotDescriptions) {
+        String ttlInfo =
+          desc.getTtl() == DEFAULT_SNAPSHOT_TTL ? TTL_FOREVER : 
String.valueOf(desc.getTtl());
+        String expired = 
SnapshotDescriptionUtils.isExpiredSnapshot(desc.getTtl(),
+          desc.getCreationTime(), currentTime) ? EXPIRED_LABEL : 
NOT_EXPIRED_LABEL;
+        System.out.printf("%-20s | %20s | %20s | %20s | %s%n", desc.getName(),
+          df.format(new Date(desc.getCreationTime())), ttlInfo, expired,
+          desc.getTableNameAsString());
       }
       return 0;
     }
@@ -443,15 +456,23 @@ public final class SnapshotInfo extends AbstractHBaseTool 
{
   private void printInfo() {
     SnapshotProtos.SnapshotDescription snapshotDesc = 
snapshotManifest.getSnapshotDescription();
     SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+    String ttlInfo = snapshotDesc.getTtl() == DEFAULT_SNAPSHOT_TTL
+      ? TTL_FOREVER
+      : String.valueOf(snapshotDesc.getTtl());
+    String expired = 
SnapshotDescriptionUtils.isExpiredSnapshot(snapshotDesc.getTtl(),
+      snapshotDesc.getCreationTime(), System.currentTimeMillis())
+        ? EXPIRED_LABEL
+        : NOT_EXPIRED_LABEL;
     System.out.println("Snapshot Info");
-    System.out.println("----------------------------------------");
-    System.out.println("   Name: " + snapshotDesc.getName());
-    System.out.println("   Type: " + snapshotDesc.getType());
-    System.out.println("  Table: " + snapshotDesc.getTable());
-    System.out.println(" Format: " + snapshotDesc.getVersion());
-    System.out.println("Created: " + df.format(new 
Date(snapshotDesc.getCreationTime())));
-    System.out.println("    Ttl: " + snapshotDesc.getTtl());
-    System.out.println("  Owner: " + snapshotDesc.getOwner());
+    System.out.println("-----------------------------------------");
+    System.out.println("    Name: " + snapshotDesc.getName());
+    System.out.println("    Type: " + snapshotDesc.getType());
+    System.out.println("   Table: " + snapshotDesc.getTable());
+    System.out.println("  Format: " + snapshotDesc.getVersion());
+    System.out.println(" Created: " + df.format(new 
Date(snapshotDesc.getCreationTime())));
+    System.out.println("Ttl(Sec): " + ttlInfo);
+    System.out.println(" Expired: " + expired);
+    System.out.println("   Owner: " + snapshotDesc.getOwner());
     System.out.println();
   }