You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2014/05/29 20:04:58 UTC
git commit: HBASE-11201 Addendum restores
Procedure#waitForCompleted() which returns void (Jerry He)
Repository: hbase
Updated Branches:
refs/heads/master 2db8aafe7 -> cf896d067
HBASE-11201 Addendum restores Procedure#waitForCompleted() which returns void (Jerry He)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/cf896d06
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cf896d06
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cf896d06
Branch: refs/heads/master
Commit: cf896d067192328f36a838d73e43f49fe3d689b3
Parents: 2db8aaf
Author: Ted Yu <te...@apache.org>
Authored: Thu May 29 18:04:38 2014 +0000
Committer: Ted Yu <te...@apache.org>
Committed: Thu May 29 18:04:38 2014 +0000
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/procedure/Procedure.java | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/cf896d06/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/Procedure.java
----------------------------------------------------------------------
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<Void>, 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<String, byte[]> 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<String, byte[]> waitForCompletedWithRet() throws ForeignException, InterruptedException {
+ waitForCompleted();
return dataFromFinishedMembers;
}