state (If none currently, it creates one or
diff --git a/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index f50411754e9..a07aea87435 100644
--- a/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -259,41 +259,31 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server {
this.activeMasterManager = new ActiveMasterManager(zooKeeper, address, this);
this.zooKeeper.registerListener(activeMasterManager);
stallIfBackupMaster(this.conf, this.activeMasterManager);
- activeMasterManager.blockUntilBecomingActiveMaster();
-
+ this.activeMasterManager.blockUntilBecomingActiveMaster();
// We are either the active master or we were asked to shutdown
-
if (!this.stopped) {
- // We are active master. Finish init and loop until we are closed.
finishInitialization();
loop();
- // Once we break out of here, we are being shutdown
-
- // Stop chores
- stopChores();
-
- // Wait for all the remaining region servers to report in IFF we were
- // running a cluster shutdown AND we were NOT aborting.
- if (!this.abort && this.serverManager.isClusterShutdown()) {
- this.serverManager.letRegionServersShutdown();
- }
- stopServiceThreads();
}
-
- // Handle either a backup or active master being stopped
-
+ } catch (Throwable t) {
+ abort("Unhandled exception. Starting shutdown.", t);
+ } finally {
+ stopChores();
+ // Wait for all the remaining region servers to report in IFF we were
+ // running a cluster shutdown AND we were NOT aborting.
+ if (!this.abort && this.serverManager.isClusterShutdown()) {
+ this.serverManager.letRegionServersShutdown();
+ }
+ stopServiceThreads();
// Stop services started for both backup and active masters
- this.activeMasterManager.stop();
+ if (this.activeMasterManager != null) this.activeMasterManager.stop();
this.catalogTracker.stop();
this.serverManager.stop();
this.assignmentManager.stop();
HConnectionManager.deleteConnection(this.conf, true);
this.zooKeeper.close();
- LOG.info("HMaster main thread exiting");
-
- } catch (Throwable t) {
- abort("Unhandled exception. Starting shutdown.", t);
}
+ LOG.info("HMaster main thread exiting");
}
private void loop() {
@@ -543,7 +533,7 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server {
if (LOG.isDebugEnabled()) {
LOG.debug("Stopping service threads");
}
- this.rpcServer.stop();
+ if (this.rpcServer != null) this.rpcServer.stop();
// Clean up and close up shop
if (this.infoServer != null) {
LOG.info("Stopping infoServer");
@@ -553,7 +543,7 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server {
ex.printStackTrace();
}
}
- this.executorService.shutdown();
+ if (this.executorService != null) this.executorService.shutdown();
}
private static Thread getAndStartBalancerChore(final HMaster master) {
diff --git a/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java b/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java
index 9faf6fdaa18..d4fa82b28e0 100644
--- a/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java
+++ b/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java
@@ -19,8 +19,6 @@
*/
package org.apache.hadoop.hbase.master.handler;
-import java.io.IOException;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.HRegionInfo;
@@ -104,4 +102,4 @@ public class OpenedRegionHandler extends EventHandler implements TotesHRegionInf
LOG.debug("Opened region " + regionInfo.getRegionNameAsString());
}
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java b/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
index c81fd86ce74..837ade10292 100644
--- a/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
+++ b/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
@@ -67,6 +67,10 @@ public class OpenRegionHandler extends EventHandler {
public void process() throws IOException {
final String name = regionInfo.getRegionNameAsString();
LOG.debug("Processing open of " + name);
+ if (this.server.isStopped()) {
+ LOG.info("Server stopping, skipping open of " + name);
+ return;
+ }
final String encodedName = regionInfo.getEncodedName();
// TODO: Previously we would check for root region availability (but only that it
diff --git a/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java b/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java
index f77cf65d291..36841de2bfa 100644
--- a/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java
+++ b/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java
@@ -26,6 +26,7 @@ import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.executor.RegionTransitionData;
import org.apache.hadoop.hbase.executor.EventHandler.EventType;
+import org.apache.zookeeper.AsyncCallback;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.KeeperException.Code;
import org.apache.zookeeper.KeeperException.NoNodeException;
@@ -148,6 +149,36 @@ public class ZKAssign {
}
}
+ /**
+ * Creates an unassigned node in the OFFLINE state for the specified region.
+ * + * Runs asynchronously. Depends on no pre-existing znode. + * + *
Sets a watcher on the unassigned region node. + * + * @param zkw zk reference + * @param region region to be created as offline + * @param serverName server event originates from + * @param cb + * @param ctx + * @throws KeeperException if unexpected zookeeper exception + * @throws KeeperException.NodeExistsException if node already exists + */ + public static void asyncCreateNodeOffline(ZooKeeperWatcher zkw, + HRegionInfo region, String serverName, + final AsyncCallback.StringCallback cb, final Object ctx) + throws KeeperException { + LOG.debug(zkw.prefix("Async create of unassigned node for " + + region.getEncodedName() + " with OFFLINE state")); + RegionTransitionData data = new RegionTransitionData( + EventType.M_ZK_REGION_OFFLINE, region.getRegionName(), serverName); + synchronized(zkw.getNodes()) { + String node = getNodeName(zkw, region.getEncodedName()); + zkw.getNodes().add(node); + ZKUtil.asyncCreate(zkw, node, data.getBytes(), cb, ctx); + } + } + /** * Forces an existing unassigned node to the OFFLINE state for the specified * region. diff --git a/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKServerTool.java b/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKServerTool.java index ae8a8a12dbb..500bd3c146e 100644 --- a/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKServerTool.java +++ b/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKServerTool.java @@ -33,7 +33,7 @@ import org.apache.hadoop.hbase.HBaseConfiguration; public class ZKServerTool { /** * Run the tool. - * @param args Command line arguments. First arg is path to zookeepers file. + * @param args Command line arguments. */ public static void main(String args[]) { Configuration conf = HBaseConfiguration.create(); @@ -51,4 +51,4 @@ public class ZKServerTool { } } } -} +} \ No newline at end of file diff --git a/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java b/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java index 6192facc26c..21a4256271a 100644 --- a/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java +++ b/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java @@ -37,6 +37,7 @@ import org.apache.hadoop.hbase.HServerAddress; import org.apache.hadoop.hbase.HServerInfo; import org.apache.hadoop.hbase.executor.RegionTransitionData; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.zookeeper.AsyncCallback; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.Watcher; @@ -809,6 +810,30 @@ public class ZKUtil { } } + /** + * Async creates the specified node with the specified data. + * + *
Throws an exception if the node already exists. + * + *
The node created is persistent and open access.
+ *
+ * @param zkw zk reference
+ * @param znode path of node to create
+ * @param data data of node to create
+ * @param cb
+ * @param ctx
+ * @return version of node created
+ * @throws KeeperException if unexpected zookeeper exception
+ * @throws KeeperException.NodeExistsException if node already exists
+ */
+ public static void asyncCreate(ZooKeeperWatcher zkw,
+ String znode, byte [] data, final AsyncCallback.StringCallback cb,
+ final Object ctx)
+ throws KeeperException, KeeperException.NodeExistsException {
+ zkw.getZooKeeper().create(znode, data, Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT, cb, ctx);
+ }
+
/**
* Creates the specified node, if the node does not exist. Does not set a
* watch and fails silently if the node already exists.
diff --git a/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperMainServerArg.java b/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperMainServerArg.java
new file mode 100644
index 00000000000..c662a5b8c2f
--- /dev/null
+++ b/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperMainServerArg.java
@@ -0,0 +1,68 @@
+/**
+ * Copyright 2010 The Apache Software Foundation
+ *
+ * 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.zookeeper;
+
+import java.util.Properties;
+import java.util.Map.Entry;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HBaseConfiguration;
+
+/**
+ * Tool for reading a ZooKeeper server from HBase XML configuration producing
+ * the '-server host:port' argument to pass ZooKeeperMain. This program
+ * emits either '-server HOST:PORT" where HOST is one of the zk ensemble
+ * members plus zk client port OR it emits '' if no zk servers found (Yes,
+ * it emits '-server' too).
+ */
+public class ZooKeeperMainServerArg {
+ public String parse(final Configuration c) {
+ // Note that we do not simply grab the property
+ // HConstants.ZOOKEEPER_QUORUM from the HBaseConfiguration because the
+ // user may be using a zoo.cfg file.
+ Properties zkProps = ZKConfig.makeZKProps(c);
+ String host = null;
+ String clientPort = null;
+ for (Entry This class also holds and manages the connection to ZooKeeper. Code to
* deal with connection related events and exceptions are handled here.
*/
-public class ZooKeeperWatcher implements Watcher {
+public class ZooKeeperWatcher implements Watcher, Abortable {
private static final Log LOG = LogFactory.getLog(ZooKeeperWatcher.class);
// Identifiier for this watcher (for logging only). Its made of the prefix
@@ -372,4 +372,9 @@ public class ZooKeeperWatcher implements Watcher {
} catch (InterruptedException e) {
}
}
-}
+
+ @Override
+ public void abort(String why, Throwable e) {
+ this.abortable.abort(why, e);
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperMainServerArg.java b/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperMainServerArg.java
new file mode 100644
index 00000000000..9ec3a772534
--- /dev/null
+++ b/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperMainServerArg.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright 2010 The Apache Software Foundation
+ *
+ * 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.zookeeper;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HBaseConfiguration;
+import org.junit.Test;
+
+
+public class TestZooKeeperMainServerArg {
+ private final ZooKeeperMainServerArg parser = new ZooKeeperMainServerArg();
+
+ @Test public void test() {
+ Configuration c = HBaseConfiguration.create();
+ assertEquals("localhost:" + c.get("hbase.zookeeper.property.clientPort"),
+ parser.parse(c));
+ final String port = "1234";
+ c.set("hbase.zookeeper.property.clientPort", port);
+ c.set("hbase.zookeeper.quorum", "example.com");
+ assertEquals("example.com:" + port, parser.parse(c));
+ c.set("hbase.zookeeper.quorum", "example1.com,example2.com,example3.com");
+ assertTrue(port, parser.parse(c).matches("example[1-3]\\.com:" + port));
+ }
+}
\ No newline at end of file