From 25caaee27ee7c1a8260d830e1c06614fdd84056d Mon Sep 17 00:00:00 2001 From: Sakthi Date: Thu, 31 Jan 2019 16:46:29 -0800 Subject: [PATCH] HBASE-21812: Address ruby static analysis for shell/bin modules [2nd pass] --- bin/draining_servers.rb | 12 ++++++------ bin/get-active-master.rb | 0 bin/hirb.rb | 4 ++-- bin/region_status.rb | 1 + bin/shutdown_regionserver.rb | 10 +++++----- 5 files changed, 14 insertions(+), 13 deletions(-) mode change 100644 => 100755 bin/get-active-master.rb diff --git a/bin/draining_servers.rb b/bin/draining_servers.rb index a8e20f036f41489fa0826c80199c06ec49bba892..7ce828b68d12b807dcaccc204405565a2b769d82 100644 --- a/bin/draining_servers.rb +++ b/bin/draining_servers.rb @@ -51,7 +51,7 @@ optparse.parse! def getServers(admin) serverInfos = admin.getClusterStatus.getServers servers = [] - for server in serverInfos + serverInfos.each do |server| servers << server.getServerName end servers @@ -61,17 +61,17 @@ def getServerNames(hostOrServers, config) ret = [] connection = ConnectionFactory.createConnection(config) - for hostOrServer in hostOrServers + hostOrServers.each do |hostOrServer| # check whether it is already serverName. No need to connect to cluster parts = hostOrServer.split(',') if parts.size == 3 ret << hostOrServer else - admin = connection.getAdmin unless admin + admin ||= connection.getAdmin servers = getServers(admin) hostOrServer = hostOrServer.tr(':', ',') - for server in servers + servers.each do |server| ret << server if server.start_with?(hostOrServer) end end @@ -90,7 +90,7 @@ def addServers(_options, hostOrServers) begin parentZnode = zkw.getZNodePaths.drainingZNode - for server in servers + servers.each do |server| node = ZNodePaths.joinZNode(parentZnode, server) ZKUtil.createAndFailSilent(zkw, node) end @@ -107,7 +107,7 @@ def removeServers(_options, hostOrServers) begin parentZnode = zkw.getZNodePaths.drainingZNode - for server in servers + servers.each do |server| node = ZNodePaths.joinZNode(parentZnode, server) ZKUtil.deleteNodeFailSilent(zkw, node) end diff --git a/bin/get-active-master.rb b/bin/get-active-master.rb old mode 100644 new mode 100755 diff --git a/bin/hirb.rb b/bin/hirb.rb index e857db788fcc12dad5cd5c71d19128efa3c02d69..fcbec7809c9da41270cac6f55b39f31a04c13fba 100644 --- a/bin/hirb.rb +++ b/bin/hirb.rb @@ -82,7 +82,7 @@ log_level = org.apache.log4j.Level::ERROR @shell_debug = false interactive = true _configuration = nil -D_ARG = '-D' +D_ARG = '-D'.freeze while (arg = ARGV.shift) if arg == '-h' || arg == '--help' puts cmdline_help @@ -248,7 +248,7 @@ else # exception unwrapping in shell means we'll have to handle Java exceptions # as a special case in order to format them properly. if exception.is_a? java.lang.Exception - $stderr.puts 'java exception' + warn 'java exception' message = exception.get_message end # Include the 'ERROR' string to try to make transition easier for scripts that diff --git a/bin/region_status.rb b/bin/region_status.rb index abd19ddb07807174cbd08d8f2977f19f71e9bf23..f8c203b3926a0789a832fb2f755cfef12b5a434f 100644 --- a/bin/region_status.rb +++ b/bin/region_status.rb @@ -116,6 +116,7 @@ while iter.hasNext # Gone too far, break break end + region = MetaTableAccessor.getHRegionInfo(result) unless region.isOffline # only include regions that should be online diff --git a/bin/shutdown_regionserver.rb b/bin/shutdown_regionserver.rb index fd1af30c8c31fdb4af0cd951df7c0d1e097b6f67..81facf9c232d1f08fd73ba32a7a8966d00df0698 100644 --- a/bin/shutdown_regionserver.rb +++ b/bin/shutdown_regionserver.rb @@ -28,10 +28,10 @@ java_import org.apache.hadoop.hbase.client.HBaseAdmin java_import org.apache.hadoop.hbase.client.ConnectionFactory def usage(msg = nil) - $stderr.puts 'Usage: shutdown_regionserver.rb ..' - $stderr.puts - $stderr.puts 'Stops the specified regionservers via RPC' - $stderr.puts format('Error: %s', msg) if msg + warn 'Usage: shutdown_regionserver.rb ..' + warn + warn 'Stops the specified regionservers via RPC' + warn format('Error: %s', msg) if msg abort end @@ -45,7 +45,7 @@ config = HBaseConfiguration.create connection = ConnectionFactory.createConnection(config) begin admin = connection.getAdmin -rescue +rescue StandardError abort "Error: Couldn't instantiate HBaseAdmin" end -- 2.17.2 (Apple Git-113)