(hbase) 01/02: HBASE-28575 Always printing error log when snapshot table (#5880)

[zhangduo]

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

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

commit 39dd97785cb475a3982e2f3a4bb2b0226b3296c2
Author: guluo <lupeng_n...@qq.com>
AuthorDate: Wed May 8 15:31:32 2024 +0800

    HBASE-28575 Always printing error log when snapshot table (#5880)
    
    Signed-off-by: Duo Zhang <zhang...@apache.org>
    (cherry picked from commit 2a7aa0d439d8bb17be2cccc057f3d2ec615f7690)
---
 .../apache/hadoop/hbase/master/snapshot/TakeSnapshotHandler.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/TakeSnapshotHandler.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/TakeSnapshotHandler.java
index 5d7cc0dc422..28ebf710585 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/TakeSnapshotHandler.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/TakeSnapshotHandler.java
@@ -264,11 +264,11 @@ public abstract class TakeSnapshotHandler extends 
EventHandler
       try {
         // if the working dir is still present, the snapshot has failed. it is 
present we delete
         // it.
-        if (!workingDirFs.delete(workingDir, true)) {
-          LOG.error("Couldn't delete snapshot working directory:" + 
workingDir);
+        if (workingDirFs.exists(workingDir) && 
!workingDirFs.delete(workingDir, true)) {
+          LOG.error("Couldn't delete snapshot working directory: {}", 
workingDir);
         }
       } catch (IOException e) {
-        LOG.error("Couldn't delete snapshot working directory:" + workingDir);
+        LOG.error("Couldn't get or delete snapshot working directory: {}", 
workingDir, e);
       }
       if (LOG.isDebugEnabled()) {
         LOG.debug("Table snapshot journal : \n" + status.prettyPrintJournal());