diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/Procedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/Procedure.java index 4e58719..05ef141 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/Procedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/Procedure.java @@ -339,12 +339,23 @@ public class Procedure implements Callable, ForeignExceptionListener { * Waits until the entire procedure has globally completed, or has been aborted. If an * exception is thrown the procedure may or not have run cleanup to trigger the completion latch * yet. - * @return data returned from procedure members upon successfully completing subprocedure. * @throws ForeignException * @throws InterruptedException */ - public HashMap waitForCompleted() throws ForeignException, InterruptedException { + public void waitForCompleted() throws ForeignException, InterruptedException { waitForLatch(completedLatch, monitor, wakeFrequency, procName + " completed"); + } + + /** + * Waits until the entire procedure has globally completed, or has been aborted. If an + * exception is thrown the procedure may or not have run cleanup to trigger the completion latch + * yet. + * @return data returned from procedure members upon successfully completing subprocedure. + * @throws ForeignException + * @throws InterruptedException + */ + public HashMap waitForCompletedWithRet() throws ForeignException, InterruptedException { + waitForCompleted(); return dataFromFinishedMembers; }