Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-3925 Make Shell's -d and debug cmd behave the same 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1402923 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2012-10-28 01:37:04 +00:00
parent f4923b98a6
commit 094e8d4420
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/hirb.rb
View File

@ -20,8 +20,6 @@
# and hbase commands and then loads jirb. Outputs a banner that tells user # and hbase commands and then loads jirb. Outputs a banner that tells user
# where to find help, shell version, and loads up a custom hirb. # where to find help, shell version, and loads up a custom hirb.
# TODO: Add 'debug' support (client-side logs show in shell). Add it as
# command-line option and as command.
# TODO: Interrupt a table creation or a connection to a bad master. Currently # TODO: Interrupt a table creation or a connection to a bad master. Currently
# has to time out. Below we've set down the retries for rpc and hbase but # has to time out. Below we've set down the retries for rpc and hbase but
# still can be annoying (And there seem to be times when we'll retry for # still can be annoying (And there seem to be times when we'll retry for
@ -61,6 +59,7 @@ found = []
format = 'console' format = 'console'
script2run = nil script2run = nil
log_level = org.apache.log4j.Level::ERROR log_level = org.apache.log4j.Level::ERROR
@shell_debug = false
for arg in ARGV for arg in ARGV
if arg =~ /^--format=(.+)/i if arg =~ /^--format=(.+)/i
format = $1 format = $1
@ -78,6 +77,7 @@ for arg in ARGV
elsif arg == '-d' || arg == '--debug' elsif arg == '-d' || arg == '--debug'
log_level = org.apache.log4j.Level::DEBUG log_level = org.apache.log4j.Level::DEBUG
$fullBackTrace = true $fullBackTrace = true
@shell_debug = true
puts "Setting DEBUG log level..." puts "Setting DEBUG log level..."
else else
# Presume it a script. Save it off for running later below # Presume it a script. Save it off for running later below
@ -130,18 +130,22 @@ end
# Debugging method # Debugging method
def debug def debug
if @shell.debug if @shell_debug
@shell.debug = false @shell_debug = false
conf.back_trace_limit = 0 conf.back_trace_limit = 0
log_level = org.apache.log4j.Level::ERROR
else else
@shell.debug = true @shell_debug = true
conf.back_trace_limit = 100 conf.back_trace_limit = 100
log_level = org.apache.log4j.Level::DEBUG
end end
org.apache.log4j.Logger.getLogger("org.apache.zookeeper").setLevel(log_level)
org.apache.log4j.Logger.getLogger("org.apache.hadoop.hbase").setLevel(log_level)
debug? debug?
end end
def debug? def debug?
puts "Debug mode is #{@shell.debug ? 'ON' : 'OFF'}\n\n" puts "Debug mode is #{@shell_debug ? 'ON' : 'OFF'}\n\n"
nil nil
end end