Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@hbase.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1535479 - in /hbase/trunk/hbase-server/src:
 main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java
Date: Thu, 24 Oct 2013 18:26:43 -0000
To: commits@hbase.apache.org
From: rajeshbabu@apache.org
Message-Id: <20131024182643.970E623889BB@eris.apache.org>

Author: rajeshbabu
Date: Thu Oct 24 18:26:42 2013
New Revision: 1535479

URL: http://svn.apache.org/r1535479
Log:
HBASE-9593 Region server left in online servers list forever if it went down after registering to master and before creating ephemeral node

Added:
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java
Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1535479&r1=1535478&r2=1535479&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Thu Oct 24 18:26:42 2013
@@ -805,6 +805,9 @@ public class HRegionServer implements Cl
     }
 
     try {
+      // Set our ephemeral znode up in zookeeper now we have a name.
+      createMyEphemeralNode();
+
       // Try and register with the Master; tell it we are here.  Break if
       // server is stopped or the clusterup flag is down or hdfs went wacky.
       while (keepLooping()) {
@@ -1187,8 +1190,6 @@ public class HRegionServer implements Cl
         this.conf.set("mapred.task.id", "hb_rs_" +
           this.serverNameFromMasterPOV.toString());
       }
-      // Set our ephemeral znode up in zookeeper now we have a name.
-      createMyEphemeralNode();
 
       // Save it in a file, this will allow to see if we crash
       ZNodeClearer.writeMyEphemeralNodeOnDisk(getMyEphemeralNodePath());

Added: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java?rev=1535479&view=auto
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java (added)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java Thu Oct 24 18:26:42 2013
@@ -0,0 +1,130 @@
+/**
+ *
+ * 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.
+ */
+package org.apache.hadoop.hbase.regionserver;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HBaseConfiguration;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.LargeTests;
+import org.apache.hadoop.hbase.LocalHBaseCluster;
+import org.apache.hadoop.hbase.MiniHBaseCluster;
+import org.apache.hadoop.hbase.ServerName;
+import org.apache.hadoop.hbase.master.HMaster;
+import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair;
+import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupResponse;
+import org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread;
+import org.apache.hadoop.hbase.util.Threads;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+/**
+ * Tests region server termination during startup.
+ */
+@Category(LargeTests.class)
+public class TestRSKilledWhenInitializing {
+  private static final Log LOG = LogFactory.getLog(TestRSKilledWhenInitializing.class);
+
+  private static boolean masterActive = false;
+
+  /**
+   * Test verifies whether a region server is removing from online servers list in master if it went
+   * down after registering with master.
+   * @throws Exception
+   */
+  @Test(timeout = 180000)
+  public void testRSTermnationAfterRegisteringToMasterBeforeCreatingEphemeralNod() throws Exception {
+
+    final int NUM_MASTERS = 1;
+    final int NUM_RS = 1;
+    // Create config to use for this cluster
+    Configuration conf = HBaseConfiguration.create();
+
+    // Start the cluster
+    final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(conf);
+    TEST_UTIL.startMiniDFSCluster(3);
+    TEST_UTIL.startMiniZKCluster();
+    TEST_UTIL.createRootDir();
+    final LocalHBaseCluster cluster =
+        new LocalHBaseCluster(conf, NUM_MASTERS, NUM_RS, HMaster.class, MockedRegionServer.class);
+    final MasterThread master = cluster.getMasters().get(0);
+    master.start();
+    try {
+      long startTime = System.currentTimeMillis();
+      while (!master.getMaster().isActiveMaster()) {
+        try {
+          Thread.sleep(100);
+        } catch (InterruptedException ignored) {
+        }
+        if (System.currentTimeMillis() > startTime + 30000) {
+          throw new RuntimeException("Master not active after 30 seconds");
+        }
+      }
+      masterActive = true;
+      cluster.getRegionServers().get(0).start();
+      Thread.sleep(10000);
+      List<ServerName> onlineServersList =
+          master.getMaster().getServerManager().getOnlineServersList();
+      while (!onlineServersList.isEmpty()) {
+        Thread.sleep(100);
+        onlineServersList = master.getMaster().getServerManager().getOnlineServersList();
+      }
+      assertTrue(onlineServersList.isEmpty());
+      master.getMaster().stop("stopping master");
+      master.join();
+    } finally {
+      masterActive = false;
+      TEST_UTIL.shutdownMiniZKCluster();
+      TEST_UTIL.shutdownMiniDFSCluster();
+      TEST_UTIL.cleanupTestDir();
+    }
+  }
+
+  public static class MockedRegionServer extends MiniHBaseCluster.MiniHBaseClusterRegionServer {
+
+    public MockedRegionServer(Configuration conf) throws IOException, InterruptedException {
+      super(conf);
+    }
+
+    @Override
+    protected void handleReportForDutyResponse(RegionServerStartupResponse c) throws IOException {
+      for (NameStringPair e : c.getMapEntriesList()) {
+        String key = e.getName();
+        // The hostname the master sees us as.
+        if (key.equals(HConstants.KEY_FOR_HOSTNAME_SEEN_BY_MASTER)) {
+          String hostnameFromMasterPOV = e.getValue();
+          assertEquals(super.getRpcServer().getListenerAddress().getHostName(),
+            hostnameFromMasterPOV);
+        }
+      }
+      while (!masterActive) {
+        Threads.sleep(100);
+      }
+      super.kill();
+    }
+  }
+}