svn commit: r1496583 - in /hbase/branches/0.89-fb: bin/rolling_restart_v2 src/main/java/org/apache/hadoop/hbase/util/RollingRestart.java

[li...@apache.org]

Author: liyin
Date: Tue Jun 25 18:51:44 2013
New Revision: 1496583

URL: http://svn.apache.org/r1496583
Log:
[HBASE-8500] Minor change in the script to skip restart verification if we are told to just drain and stop or clear the regionserver from blacklist

Author: rshroff

Summary:
As above +
1. In case we were told to only drain and stop, then don't clear the
regionserver from the blacklist.

Test Plan: Tested on devcluster

Reviewers: manukranthk, aaiyer

Reviewed By: aaiyer

CC: hbase-eng@

Differential Revision: https://phabricator.fb.com/D854263

Modified:
    hbase/branches/0.89-fb/bin/rolling_restart_v2
    hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/util/RollingRestart.java

Modified: hbase/branches/0.89-fb/bin/rolling_restart_v2
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/bin/rolling_restart_v2?rev=1496583&r1=1496582&r2=1496583&view=diff
==============================================================================
--- hbase/branches/0.89-fb/bin/rolling_restart_v2 (original)
+++ hbase/branches/0.89-fb/bin/rolling_restart_v2 Tue Jun 25 18:51:44 2013
@@ -15,7 +15,8 @@ Logger.getLogger("org.apache.zookeeper")
 Logger.getLogger("org.apache.hadoop.hbase").setLevel(Level.INFO);
 
 def restartRegionServer(HBaseAdmin admin, HServerInfo regionserver,
-    Configuration conf, String rollingRestartArgs, String logsFolder) {
+    Configuration conf, String rollingRestartArgs, String logsFolder,
+    boolean verifyRSRestart) {
   long startCode = regionserver.getStartCode()/1000;
   String host = regionserver.getHostname();
 
@@ -39,6 +40,11 @@ def restartRegionServer(HBaseAdmin admin
   proc.waitForOrKill(30 * 60 * 1000)
 
   ostream.close();
+
+  if (!verifyRSRestart) {
+    return;
+  }
+
   long newStartCode = admin.getConnection().
     getHRegionConnection(regionserver.getServerAddress()).getHServerInfo().getStartCode()/1000;
 
@@ -86,6 +92,7 @@ CommandLine cmd = parser.parse(options, 
 String rollingRestartArgs = "";
 String logsFolder = "/tmp";
 hosts = null;
+boolean verifyRSRestart = true;
 
 if (cmd.hasOption('r')) {
   rollingRestartArgs += " -r " + cmd.getOptionValue('r');
@@ -103,13 +110,15 @@ if (cmd.hasOption('g')) {
   rollingRestartArgs += " -g " + cmd.getOptionValue('g');
 }
 if (cmd.hasOption('c')) {
-  rollingRestartArgs += " -c " + cmd.getOptionValue('c');
+  verifyRSRestart = false;
+  rollingRestartArgs += " -c ";
 }
 if (cmd.hasOption('h')) {
-  rollingRestartArgs += " -h " + cmd.getOptionValue('h');
+  rollingRestartArgs += " -h ";
 }
 if (cmd.hasOption('o')) {
-  rollingRestartArgs += " -o " + cmd.getOptionValue('o');
+  verifyRSRestart = false;
+  rollingRestartArgs += " -o ";
 }
 if (cmd.hasOption('f')) {
   logsFolder = cmd.getOptionValue('f');
@@ -137,7 +146,7 @@ if (hosts != null) {
     try {
       HServerInfo host = 
         admin.getConnection().getHRegionConnection(serverAddr).getHServerInfo();
-      restartRegionServer(admin, host, conf, rollingRestartArgs, logsFolder);
+      restartRegionServer(admin, host, conf, rollingRestartArgs, logsFolder, verifyRSRestart);
     } catch (Exception e) {
       e.printStackTrace();
       println "\nERROR: "+ server + " Failed.";
@@ -148,7 +157,7 @@ if (hosts != null) {
 
   for (host in admin.getClusterStatus().getServerInfo()) { 
     try {
-      restartRegionServer(admin, host, conf, rollingRestartArgs, logsFolder);
+      restartRegionServer(admin, host, conf, rollingRestartArgs, logsFolder, verifyRSRestart);
     } catch (Exception e) {
       e.printStackTrace();
       println "\nERROR: "+ host + " Failed.";

Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/util/RollingRestart.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/util/RollingRestart.java?rev=1496583&r1=1496582&r2=1496583&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/util/RollingRestart.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/util/RollingRestart.java Tue Jun 25 18:51:44 2013
@@ -484,11 +484,6 @@ public class RollingRestart {
     boolean useHadoopCtl = true;
     boolean drainAndStopOnly = false;
 
-    if (cmd.hasOption("c")) {
-      RollingRestart.clearAll();
-      return;
-    }
-
     if (!cmd.hasOption("s")) {
       HelpFormatter formatter = new HelpFormatter();
       formatter.printHelp("RollingRestart", options, true);
@@ -539,6 +534,11 @@ public class RollingRestart {
     Logger.getLogger("org.apache.zookeeper").setLevel(Level.ERROR);
     Logger.getLogger("org.apache.hadoop.hbase").setLevel(Level.INFO);
 
+    if (cmd.hasOption("c")) {
+      rr.clear();
+      return;
+    }
+
     try  {
       rr.setup();
       rr.drainServer();
@@ -572,7 +572,9 @@ public class RollingRestart {
          default:
        }
     } finally {
-      rr.clear();
+      if (!drainAndStopOnly) {
+        rr.clear();
+      }
     }
   }
 }