Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-11201 Addendum restores Procedure#waitForCompleted() which returns void (Jerry He)

This commit is contained in:
Ted Yu 2014-05-29 18:04:38 +00:00
parent 2db8aafe7d
commit cf896d0671
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/Procedure.java
View File

@ -335,6 +335,17 @@ public class Procedure implements Callable<Void>, ForeignExceptionListener {
dataFromFinishedMembers.put(member, dataFromMember); dataFromFinishedMembers.put(member, dataFromMember);
} }
/**
* 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.
* @throws ForeignException
* @throws 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 * 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 * exception is thrown the procedure may or not have run cleanup to trigger the completion latch
@ -343,8 +354,8 @@ public class Procedure implements Callable<Void>, ForeignExceptionListener {
* @throws ForeignException * @throws ForeignException
* @throws InterruptedException * @throws InterruptedException
*/ */
public HashMap<String, byte[]> waitForCompleted() throws ForeignException, InterruptedException { public HashMap<String, byte[]> waitForCompletedWithRet() throws ForeignException, InterruptedException {
waitForLatch(completedLatch, monitor, wakeFrequency, procName + " completed"); waitForCompleted();
return dataFromFinishedMembers; return dataFromFinishedMembers;
} }