You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by sy...@apache.org on 2016/01/06 04:23:57 UTC
[1/2] hbase git commit: HBASE-14487 Procedure V2 - shell command to
list all procedures (Stephen Yuan Jiang)
Repository: hbase
Updated Branches:
refs/heads/branch-1.2 6d25e1119 -> 1b5d9e58b
HBASE-14487 Procedure V2 - shell command to list all procedures (Stephen Yuan Jiang)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a8f668c0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a8f668c0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a8f668c0
Branch: refs/heads/branch-1.2
Commit: a8f668c0a5bc9de30387423e468be73f21416dd3
Parents: 6d25e11
Author: Stephen Yuan Jiang <sy...@gmail.com>
Authored: Thu Sep 24 20:42:55 2015 -0700
Committer: Stephen Yuan Jiang <sy...@gmail.com>
Committed: Tue Jan 5 17:47:33 2016 -0800
----------------------------------------------------------------------
hbase-shell/src/main/ruby/hbase/admin.rb | 5 +++
hbase-shell/src/main/ruby/shell.rb | 8 ++++
.../main/ruby/shell/commands/list_procedures.rb | 46 ++++++++++++++++++++
3 files changed, 59 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a8f668c0/hbase-shell/src/main/ruby/hbase/admin.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/hbase/admin.rb b/hbase-shell/src/main/ruby/hbase/admin.rb
index 4e75ec4..fd835c2 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -1040,5 +1040,10 @@ module Hbase
def get_security_capabilities
@admin.getSecurityCapabilities
end
+
+ # List all procedures
+ def list_procedures()
+ @admin.listProcedures()
+ end
end
end
http://git-wip-us.apache.org/repos/asf/hbase/blob/a8f668c0/hbase-shell/src/main/ruby/shell.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/shell.rb b/hbase-shell/src/main/ruby/shell.rb
index 06e4c72..49c5772 100644
--- a/hbase-shell/src/main/ruby/shell.rb
+++ b/hbase-shell/src/main/ruby/shell.rb
@@ -404,6 +404,14 @@ Shell.load_command_group(
)
Shell.load_command_group(
+ 'procedures',
+ :full_name => 'PROCEDURES MANAGEMENT',
+ :commands => %w[
+ list_procedures
+ ]
+)
+
+Shell.load_command_group(
'visibility labels',
:full_name => 'VISIBILITY LABEL TOOLS',
:comment => "NOTE: Above commands are only applicable if running with the VisibilityController coprocessor",
http://git-wip-us.apache.org/repos/asf/hbase/blob/a8f668c0/hbase-shell/src/main/ruby/shell/commands/list_procedures.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/shell/commands/list_procedures.rb b/hbase-shell/src/main/ruby/shell/commands/list_procedures.rb
new file mode 100644
index 0000000..f407547
--- /dev/null
+++ b/hbase-shell/src/main/ruby/shell/commands/list_procedures.rb
@@ -0,0 +1,46 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Shell
+ module Commands
+ class ListProcedures < Command
+ def help
+ return <<-EOF
+List all procedures in hbase. Examples:
+
+ hbase> list_procedures
+EOF
+ end
+
+ def command()
+ now = Time.now
+ formatter.header([ "Id", "Name", "State", "Start_Time", "Last_Update" ])
+
+ list = admin.list_procedures()
+ list.each do |proc|
+ start_time = Time.at(proc.getStartTime / 1000).to_s
+ last_update = Time.at(proc.getLastUpdate / 1000).to_s
+ formatter.row([ proc.getProcId, proc.getProcName, proc.getProcState, start_time, last_update ])
+ end
+
+ formatter.footer(now, list.size)
+ end
+ end
+ end
+end
[2/2] hbase git commit: HBASE-14488 Procedure V2 - shell command to
abort a procedure (Stephen Yuan jiang
Posted by sy...@apache.org.
HBASE-14488 Procedure V2 - shell command to abort a procedure (Stephen Yuan jiang
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1b5d9e58
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1b5d9e58
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1b5d9e58
Branch: refs/heads/branch-1.2
Commit: 1b5d9e58b747cd8a26f1c8ee7e400c07b905b918
Parents: a8f668c
Author: Stephen Yuan Jiang <sy...@gmail.com>
Authored: Mon Sep 28 18:53:56 2015 -0700
Committer: Stephen Yuan Jiang <sy...@gmail.com>
Committed: Tue Jan 5 17:49:16 2016 -0800
----------------------------------------------------------------------
hbase-shell/src/main/ruby/hbase/admin.rb | 9 ++++
hbase-shell/src/main/ruby/shell.rb | 1 +
.../main/ruby/shell/commands/abort_procedure.rb | 51 ++++++++++++++++++++
3 files changed, 61 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/1b5d9e58/hbase-shell/src/main/ruby/hbase/admin.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/hbase/admin.rb b/hbase-shell/src/main/ruby/hbase/admin.rb
index fd835c2..d406758 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -1041,6 +1041,15 @@ module Hbase
@admin.getSecurityCapabilities
end
+ # Abort a procedure
+ def abort_procedure?(proc_id, may_interrupt_if_running=nil)
+ if may_interrupt_if_running.nil?
+ @admin.abortProcedure(proc_id, true)
+ else
+ @admin.abortProcedure(proc_id, may_interrupt_if_running)
+ end
+ end
+
# List all procedures
def list_procedures()
@admin.listProcedures()
http://git-wip-us.apache.org/repos/asf/hbase/blob/1b5d9e58/hbase-shell/src/main/ruby/shell.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/shell.rb b/hbase-shell/src/main/ruby/shell.rb
index 49c5772..dcbe6e6 100644
--- a/hbase-shell/src/main/ruby/shell.rb
+++ b/hbase-shell/src/main/ruby/shell.rb
@@ -407,6 +407,7 @@ Shell.load_command_group(
'procedures',
:full_name => 'PROCEDURES MANAGEMENT',
:commands => %w[
+ abort_procedure
list_procedures
]
)
http://git-wip-us.apache.org/repos/asf/hbase/blob/1b5d9e58/hbase-shell/src/main/ruby/shell/commands/abort_procedure.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/shell/commands/abort_procedure.rb b/hbase-shell/src/main/ruby/shell/commands/abort_procedure.rb
new file mode 100644
index 0000000..6f77ab7
--- /dev/null
+++ b/hbase-shell/src/main/ruby/shell/commands/abort_procedure.rb
@@ -0,0 +1,51 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Shell
+ module Commands
+ class AbortProcedure < Command
+ def help
+ return <<-EOF
+Given a procedure Id (and optional boolean may_interrupt_if_running parameter,
+default is true), abort a procedure in hbase. Use with caution. Some procedures
+might not be abortable. For experts only.
+
+If this command is accepted and the procedure is in the process of aborting,
+it will return true; if the procedure could not be aborted (eg. procedure
+does not exist, or procedure already completed or abort will cause corruption),
+this command will return false.
+
+Examples:
+
+ hbase> abort_procedure proc_id
+ hbase> abort_procedure proc_id, true
+ hbase> abort_procedure proc_id, false
+EOF
+ end
+
+ def command(proc_id, may_interrupt_if_running=nil)
+ format_simple_command do
+ formatter.row([
+ admin.abort_procedure?(proc_id, may_interrupt_if_running).to_s
+ ])
+ end
+ end
+ end
+ end
+end
\ No newline at end of file