HBASE-951 Either shut down master or let it finish cleanup
git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@712203 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
8fd65c9fbf
commit
bf53013be5
|
@ -65,6 +65,7 @@ Release 0.19.0 - Unreleased
|
|||
HBASE-982 Deleting a column in MapReduce fails (Doğacan Güney via Stack)
|
||||
HBASE-984 Fix javadoc warnings
|
||||
HBASE-985 Fix javadoc warnings
|
||||
HBASE-951 Either shut down master or let it finish cleanup
|
||||
|
||||
IMPROVEMENTS
|
||||
HBASE-901 Add a limit to key length, check key and value length on client side
|
||||
|
|
|
@ -885,6 +885,7 @@ public class HMaster extends Thread implements HConstants, HMasterInterface,
|
|||
System.exit(0);
|
||||
}
|
||||
|
||||
@SuppressWarnings("null")
|
||||
protected static void doMain(String [] args,
|
||||
Class<? extends HMaster> masterClass) {
|
||||
|
||||
|
@ -923,11 +924,17 @@ public class HMaster extends Thread implements HConstants, HMasterInterface,
|
|||
}
|
||||
|
||||
if (cmd.equals("stop")) {
|
||||
if (LocalHBaseCluster.isLocal(conf)) {
|
||||
conf = LocalHBaseCluster.doLocal(conf);
|
||||
}
|
||||
HBaseAdmin adm = null;
|
||||
try {
|
||||
adm = new HBaseAdmin(conf);
|
||||
} catch (MasterNotRunningException e) {
|
||||
LOG.error("master is not running");
|
||||
System.exit(0);
|
||||
}
|
||||
try {
|
||||
if (LocalHBaseCluster.isLocal(conf)) {
|
||||
LocalHBaseCluster.doLocal(conf);
|
||||
}
|
||||
HBaseAdmin adm = new HBaseAdmin(conf);
|
||||
adm.shutdown();
|
||||
} catch (Throwable t) {
|
||||
LOG.error( "Can not stop master", t);
|
||||
|
|
Loading…
Reference in New Issue