hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject hbase git commit: HBASE-13463 Quota needs to be updated only in case of successful region merge
Date Thu, 16 Apr 2015 18:09:16 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 a778c38ab -> 8ce7f905d


HBASE-13463 Quota needs to be updated only in case of successful region merge


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8ce7f905
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8ce7f905
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8ce7f905

Branch: refs/heads/branch-1
Commit: 8ce7f905d25087e2dde5d9d8cbceaf477b1e1db3
Parents: a778c38
Author: tedyu <yuzhihong@gmail.com>
Authored: Thu Apr 16 11:08:54 2015 -0700
Committer: tedyu <yuzhihong@gmail.com>
Committed: Thu Apr 16 11:08:54 2015 -0700

----------------------------------------------------------------------
 .../apache/hadoop/hbase/master/AssignmentManager.java   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/8ce7f905/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
index 2b7b917..bf9b207 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
@@ -4236,15 +4236,17 @@ public class AssignmentManager extends ZooKeeperListener {
     case READY_TO_MERGE:
     case MERGE_PONR:
     case MERGED:
-      try {
-        regionStateListener.onRegionMerged(hri);
-      } catch (IOException exp) {
-        errorMsg = StringUtils.stringifyException(exp);
-      }
     case MERGE_REVERTED:
       errorMsg = onRegionMerge(serverName, code, hri,
         HRegionInfo.convert(transition.getRegionInfo(1)),
         HRegionInfo.convert(transition.getRegionInfo(2)));
+      if (code == TransitionCode.MERGED && org.apache.commons.lang.StringUtils.isEmpty(errorMsg))
{
+        try {
+          regionStateListener.onRegionMerged(hri);
+        } catch (IOException exp) {
+          errorMsg = StringUtils.stringifyException(exp);
+        }
+      }
       break;
 
     default:


Mime
View raw message