Author: jimk Date: Mon May 21 15:23:03 2007 New Revision: 540323 URL: http://svn.apache.org/viewvc?view=rev&rev=540323 Log: HADOOP-1404. HBase command-line shutdown failing (Michael Stack)
Modified: lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java Modified: lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt?view=diff&rev=540323&r1=540322&r2=540323 ============================================================================== --- lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt (original) +++ lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt Mon May 21 15:23:03 2007 @@ -5,3 +5,4 @@ 1. HADOOP-1384. HBase omnibus patch. (jimk, Vuk Ercegovac, and Michael Stack) 2. HADOOP-1402. Fix javadoc warnings in hbase contrib. (Michael Stack) + 3. HADOOP-1404. HBase command-line shutdown failing (Michael Stack) Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java?view=diff&rev=540323&r1=540322&r2=540323 ============================================================================== --- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java (original) +++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java Mon May 21 15:23:03 2007 @@ -655,11 +655,18 @@ * things down in an orderly fashion. */ public void shutdown() throws IOException { - closed = true; - synchronized(msgQueue) { - msgQueue.clear(); // Empty the queue - msgQueue.notifyAll(); // Wake main thread - } + TimerTask tt = new TimerTask() { + @Override + public void run() { + closed = true; + synchronized(msgQueue) { + msgQueue.clear(); // Empty the queue + msgQueue.notifyAll(); // Wake main thread + } + } + }; + Timer t = new Timer("Shutdown"); + t.schedule(tt, 10); } //////////////////////////////////////////////////////////////////////////////