HBASE-28058 Adjust the order of acquiring the takeSnapshot locks to r…

……esolve the deadlock issue. (apache#5381) Co-authored-by: lvhaiping.lhp <[email protected]> Signed-off-by: Duo Zhang <[email protected]> Signed-off-by: Pankaj Kumar <[email protected]> (cherry picked from commit d43e682)
wchevreuil · Nov 2, 2023 · f6fdda0 · f6fdda0
1 parent 3d0d515
commit f6fdda0
Showing 1 changed file with 3 additions and 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
@@ -670,7 +670,7 @@ public void takeSnapshot(SnapshotDescription snapshot) throws IOException {
     }
   }
 
-  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 synchronized long takeSnapshot(SnapshotDescription snapshot, long nonceGr
     }
   }
 
-  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