Repository: hbase Updated Branches: refs/heads/branch-1.3 65d1af571 -> 6ca86b981
HBASE-17609 Allow for region merging in the UI Signed-off-by: Andrew Purtell <apurt...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6ca86b98 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6ca86b98 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6ca86b98 Branch: refs/heads/branch-1.3 Commit: 6ca86b9815a338ba9fd195cc78ef6c73e673d6ca Parents: 65d1af5 Author: rgidwani <rgidw...@salesforce.com> Authored: Tue Feb 7 11:30:47 2017 -0800 Committer: Andrew Purtell <apurt...@apache.org> Committed: Thu Feb 9 14:21:46 2017 -0800 ---------------------------------------------------------------------- .../resources/hbase-webapps/master/table.jsp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/6ca86b98/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 bec5710..cfe21ec 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp @@ -58,6 +58,8 @@ } String action = request.getParameter("action"); String key = request.getParameter("key"); + String left = request.getParameter("left"); + String right = request.getParameter("right"); %> <!--[if IE]> <!DOCTYPE html> @@ -153,6 +155,11 @@ if ( fqtn != null ) { admin.compact(TableName.valueOf(fqtn)); } %> Compact request accepted. <% + } else if (action.equals("merge")) { + if (left != null && left.length() > 0 && right != null && right.length() > 0) { + admin.mergeRegions(Bytes.toBytesBinary(left), Bytes.toBytesBinary(right), false); + } + %> Merge request accepted. <% } } %> @@ -371,6 +378,19 @@ Actions: other regions. Split requests for noneligible regions will be ignored.</td> </form> </tr> +<tr> + <form method="get"> + <input type="hidden" name="action" value="merge"> + <input type="hidden" name="name" value="<%= fqtn %>"> + <td style="border-style: none; text-align: center"> + <input style="font-size: 12pt; width: 10em" type="submit" value="Merge" class="btn"></td> + <td style="border-style: none" width="5%"> </td> + <td style="border-style: none">Region Key (Required):<input type="text" name="left" size="40"> + Region Key (Required) :<input type="text" name="right" size="40"></td> + <td style="border-style: none">This action will merge two + regions of the table, Merge requests for noneligible regions will be ignored.</td> + </form> +</tr> </table> </center> </p>
