[hbase] branch branch-2 updated: HBASE-28058 Adjust the order of acquiring the takeSnapshot locks to r…esolve the deadlock issue. (#5381)

[zhangduo]

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

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


The following commit(s) were added to refs/heads/branch-2 by this push:
     new 9a1de1473a3 HBASE-28058 Adjust the order of acquiring the takeSnapshot 
locks to r…esolve the deadlock issue. (#5381)
9a1de1473a3 is described below

commit 9a1de1473a32baa03611622b0f74d0a1cfa7981e
Author: hiping-tech <58875741+hiping-t...@users.noreply.github.com>
AuthorDate: Wed Sep 13 18:28:42 2023 +0800

    HBASE-28058 Adjust the order of acquiring the takeSnapshot locks to 
r…esolve the deadlock issue. (#5381)
    
    Co-authored-by: lvhaiping.lhp <lvhaiping....@alibaba-inc.com>
    Signed-off-by: Duo Zhang <zhang...@apache.org>
    Signed-off-by: Pankaj Kumar <pankajku...@apache.org>
    (cherry picked from commit d43e6820c092e1e4a52e8fd1c2d601017b1240c9)
---
 .../org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java
index fdb7dac00bb..49ac4ca118e 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java
@@ -670,7 +670,7 @@ public class SnapshotManager extends MasterProcedureManager 
implements Stoppable
     }
   }
 
-  public synchronized long takeSnapshot(SnapshotDescription snapshot, long 
nonceGroup, long nonce)
+  public long takeSnapshot(SnapshotDescription snapshot, long nonceGroup, long 
nonce)
     throws IOException {
     this.takingSnapshotLock.readLock().lock();
     try {
@@ -680,8 +680,8 @@ public class SnapshotManager extends MasterProcedureManager 
implements Stoppable
     }
   }
 
-  private long submitSnapshotProcedure(SnapshotDescription snapshot, long 
nonceGroup, long nonce)
-    throws IOException {
+  private synchronized long submitSnapshotProcedure(SnapshotDescription 
snapshot, long nonceGroup,
+    long nonce) throws IOException {
     return MasterProcedureUtil
       .submitProcedure(new MasterProcedureUtil.NonceProcedureRunnable(master, 
nonceGroup, nonce) {
         @Override