git commit: HBASE-12124 Closed region could stay closed if master stops at bad time

2014-10-01 Thread jxiang 
Repository: hbase
Updated Branches:
  refs/heads/branch-1 d8a055e22 - 6851bbc83


HBASE-12124 Closed region could stay closed if master stops at bad time


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

Branch: refs/heads/branch-1
Commit: 6851bbc83d2c399d7b34df2ec2b114a788d24311
Parents: d8a055e
Author: Jimmy Xiang jxi...@cloudera.com
Authored: Tue Sep 30 15:51:20 2014 -0700
Committer: Jimmy Xiang jxi...@cloudera.com
Committed: Wed Oct 1 08:56:29 2014 -0700

--
 .../java/org/apache/hadoop/hbase/master/AssignmentManager.java| 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/6851bbc8/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 da05c15..5a64f3d 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
@@ -2918,6 +2918,9 @@ public class AssignmentManager extends ZooKeeperListener {
 State state = regionState.getState();
 LOG.info(Processing  + regionState);
 switch (state) {
+case CLOSED:
+  invokeAssign(regionState.getRegion());
+  break;
 case PENDING_OPEN:
   retrySendRegionOpen(regionState);
   break;

git commit: HBASE-12124 Closed region could stay closed if master stops at bad time

2014-10-01 Thread jxiang 
Repository: hbase
Updated Branches:
  refs/heads/0.98 e78224bd6 - 42d0b4c56


HBASE-12124 Closed region could stay closed if master stops at bad time


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

Branch: refs/heads/0.98
Commit: 42d0b4c5614499bf3641665c9cf81ee81cb909dd
Parents: e78224b
Author: Jimmy Xiang jxi...@cloudera.com
Authored: Tue Sep 30 15:51:20 2014 -0700
Committer: Jimmy Xiang jxi...@cloudera.com
Committed: Wed Oct 1 08:58:22 2014 -0700

--
 .../java/org/apache/hadoop/hbase/master/AssignmentManager.java| 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/42d0b4c5/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 6ac2050..0f28f7d 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
@@ -2944,6 +2944,9 @@ public class AssignmentManager extends ZooKeeperListener {
 State state = regionState.getState();
 LOG.info(Processing  + regionState);
 switch (state) {
+case CLOSED:
+  invokeAssign(regionState.getRegion());
+  break;
 case PENDING_OPEN:
   retrySendRegionOpen(regionState);
   break;