hbase git commit: HBASE-20317 Backport HBASE-20261 "Table page (table.jsp) in Master UI does not show replicaIds for hbase meta table" to branch-1
Repository: hbase
Updated Branches:
refs/heads/branch-1.3 996fd9124 -> 424706ab4
HBASE-20317 Backport HBASE-20261 "Table page (table.jsp) in Master UI does not
show replicaIds for hbase meta table" to branch-1
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/424706ab
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/424706ab
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/424706ab
Branch: refs/heads/branch-1.3
Commit: 424706ab46805422bfff4330ca26ba3b490da7ec
Parents: 996fd91
Author: Toshihiro Suzuki
Authored: Mon Aug 27 12:22:27 2018 +0900
Committer: Toshihiro Suzuki
Committed: Mon Aug 27 14:19:56 2018 +0900
--
.../src/main/resources/hbase-webapps/master/table.jsp | 7 +++
1 file changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/424706ab/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
--
diff --git a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
index efd8ecb..da03aa7 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
@@ -200,6 +200,13 @@ if ( fqtn != null ) {
<%= escapeXml(Bytes.toString(meta.getEndKey())) %>
-
-
+<%
+ if (withReplica) {
+%>
+<%= meta.getReplicaId() %>
+<%
+ }
+%>
<% } %>
<%} %>
hbase git commit: HBASE-20317 Backport HBASE-20261 "Table page (table.jsp) in Master UI does not show replicaIds for hbase meta table" to branch-1
Repository: hbase
Updated Branches:
refs/heads/branch-1.2 c045573f5 -> beb954e0d
HBASE-20317 Backport HBASE-20261 "Table page (table.jsp) in Master UI does not
show replicaIds for hbase meta table" to branch-1
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/beb954e0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/beb954e0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/beb954e0
Branch: refs/heads/branch-1.2
Commit: beb954e0dde3b79a22282a44b26fc326af170a44
Parents: c045573
Author: Toshihiro Suzuki
Authored: Mon Aug 27 12:22:27 2018 +0900
Committer: Toshihiro Suzuki
Committed: Mon Aug 27 14:19:16 2018 +0900
--
.../src/main/resources/hbase-webapps/master/table.jsp | 7 +++
1 file changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/beb954e0/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
--
diff --git a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
index 6c99ba7..cee2416 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
@@ -192,6 +192,13 @@ if ( fqtn != null ) {
<%= escapeXml(Bytes.toString(meta.getEndKey())) %>
-
-
+<%
+ if (withReplica) {
+%>
+<%= meta.getReplicaId() %>
+<%
+ }
+%>
<% } %>
<%} %>
hbase git commit: HBASE-20317 Backport HBASE-20261 "Table page (table.jsp) in Master UI does not show replicaIds for hbase meta table" to branch-1
Repository: hbase
Updated Branches:
refs/heads/branch-1.4 201609882 -> d965436ee
HBASE-20317 Backport HBASE-20261 "Table page (table.jsp) in Master UI does not
show replicaIds for hbase meta table" to branch-1
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d965436e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d965436e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d965436e
Branch: refs/heads/branch-1.4
Commit: d965436ee17d862b7136488daac5d69e6f921220
Parents: 2016098
Author: Toshihiro Suzuki
Authored: Mon Aug 27 11:55:52 2018 +0900
Committer: Toshihiro Suzuki
Committed: Mon Aug 27 11:57:21 2018 +0900
--
.../src/main/resources/hbase-webapps/master/table.jsp | 7 +++
1 file changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/d965436e/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
--
diff --git a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
index 44f0a64..2d77e57 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
@@ -269,6 +269,13 @@ if ( fqtn != null ) {
<%= locality%>
<%= escapeXml(Bytes.toString(meta.getStartKey())) %>
<%= escapeXml(Bytes.toString(meta.getEndKey())) %>
+<%
+ if (withReplica) {
+%>
+<%= meta.getReplicaId() %>
+<%
+ }
+%>
<% } %>
<%} %>
hbase git commit: HBASE-21084 When cloning a snapshot including a split parent region, the split parent region of the cloned table will be online
Repository: hbase
Updated Branches:
refs/heads/branch-2 25e988dd4 -> 2369afd7e
HBASE-21084 When cloning a snapshot including a split parent region, the split
parent region of the cloned table will be online
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2369afd7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2369afd7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2369afd7
Branch: refs/heads/branch-2
Commit: 2369afd7e59282cac9d852254f18b0bc7d7664ea
Parents: 25e988d
Author: Toshihiro Suzuki
Authored: Tue Aug 21 21:38:01 2018 +0900
Committer: Toshihiro Suzuki
Committed: Mon Aug 27 09:58:52 2018 +0900
--
.../procedure/CloneSnapshotProcedure.java | 23 ++-
.../client/TestCloneSnapshotFromClient.java | 72 ++--
2 files changed, 88 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/2369afd7/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java
index 12bda2d..9ba3485 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java
@@ -39,6 +39,8 @@ import
org.apache.hadoop.hbase.errorhandling.ForeignExceptionDispatcher;
import org.apache.hadoop.hbase.master.MasterCoprocessorHost;
import org.apache.hadoop.hbase.master.MasterFileSystem;
import org.apache.hadoop.hbase.master.MetricsSnapshot;
+import org.apache.hadoop.hbase.master.RegionState;
+import org.apache.hadoop.hbase.master.assignment.AssignmentManager;
import
org.apache.hadoop.hbase.master.procedure.CreateTableProcedure.CreateHdfsRegions;
import org.apache.hadoop.hbase.monitoring.MonitoredTask;
import org.apache.hadoop.hbase.monitoring.TaskMonitor;
@@ -149,7 +151,26 @@ public class CloneSnapshotProcedure
break;
case CLONE_SNAPSHOT_ASSIGN_REGIONS:
CreateTableProcedure.setEnablingState(env, getTableName());
-
addChildProcedure(env.getAssignmentManager().createRoundRobinAssignProcedures(newRegions));
+
+ // Separate newRegions to split regions and regions to assign
+ List splitRegions = new ArrayList<>();
+ List regionsToAssign = new ArrayList<>();
+ newRegions.forEach(ri -> {
+if (ri.isOffline() && (ri.isSplit() || ri.isSplitParent())) {
+ splitRegions.add(ri);
+} else {
+ regionsToAssign.add(ri);
+}
+ });
+
+ // For split regions, add them to RegionStates
+ AssignmentManager am = env.getAssignmentManager();
+ splitRegions.forEach(ri ->
+am.getRegionStates().updateRegionState(ri, RegionState.State.SPLIT)
+ );
+
+ addChildProcedure(env.getAssignmentManager()
+.createRoundRobinAssignProcedures(regionsToAssign));
setNextState(CloneSnapshotState.CLONE_SNAPSHOT_UPDATE_DESC_CACHE);
break;
case CLONE_SNAPSHOT_UPDATE_DESC_CACHE:
http://git-wip-us.apache.org/repos/asf/hbase/blob/2369afd7/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java
index f3dd807..157b18f 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java
@@ -17,13 +17,19 @@
*/
package org.apache.hadoop.hbase.client;
+import static org.junit.Assert.assertEquals;
+
import java.io.IOException;
+import java.util.List;
+
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.NamespaceDescriptor;
import org.apache.hadoop.hbase.NamespaceNotFoundException;
import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.master.RegionState;
+import org.apache.hadoop.hbase.master.assignment.RegionStates;
import org.apache.hadoop.hbase.master.snapshot.SnapshotManager;
import org.apache.hadoop.hbase.snapshot.SnapshotDoesNotExistException;
import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils;
@@ -160,7 +166,8
[17/52] [partial] hbase-site git commit: HBASE-21119 update website docs for current 2.0 release
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/27160a1f/2.0/apidocs/org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.html -- diff --git a/2.0/apidocs/org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.html b/2.0/apidocs/org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.html index fa9a37e..bd5483d 100644 --- a/2.0/apidocs/org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.html +++ b/2.0/apidocs/org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.html @@ -4,7 +4,7 @@ -RetriesExhaustedWithDetailsException (Apache HBase 2.0.0-beta-2 API) +RetriesExhaustedWithDetailsException (Apache HBase 2.0.1 API) @@ -12,7 +12,7 @@ -RetryingCallable (Apache HBase 2.0.0-beta-2 API) +RetryingCallable (Apache HBase 2.0.1 API)