You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sh...@apache.org on 2008/12/19 02:54:15 UTC
svn commit: r727888 - in /hadoop/core/branches/branch-0.19: CHANGES.txt
src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Author: shv
Date: Thu Dec 18 17:54:14 2008
New Revision: 727888
URL: http://svn.apache.org/viewvc?rev=727888&view=rev
Log:
HADOOP-4904. Merge -r 727873:727874 from trunk to branch 0.19.
Modified:
hadoop/core/branches/branch-0.19/CHANGES.txt
hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Modified: hadoop/core/branches/branch-0.19/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=727888&r1=727887&r2=727888&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Thu Dec 18 17:54:14 2008
@@ -27,7 +27,7 @@
HADOOP-4731. Fix capacity scheduler to correctly remove job on completion
from waiting queue. (Amar Kamat via yhemanth)
- HADOOP-4836. Correct typos in mapred related documentation. (Jordà Polo
+ HADOOP-4836. Correct typos in mapred related documentation. (Jord? Polo
via szetszwo)
HADOOP-4821. Usage description in the Quotas guide documentations are
@@ -1104,6 +1104,8 @@
HADOOP-4840. TestNodeCount sometimes fails with NullPointerException.
(hairong)
+ HADOOP-4904. Fix deadlock while leaving safe mode. (shv)
+
Release 0.18.2 - 2008-11-03
BUG FIXES
Modified: hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=727888&r1=727887&r2=727888&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (original)
+++ hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Thu Dec 18 17:54:14 2008
@@ -4130,8 +4130,13 @@
}
}
// leave safe mode and stop the monitor
- if(safeMode != null)
- safeMode.leave(true);
+ try {
+ leaveSafeMode(true);
+ } catch(SafeModeException es) { // should never happen
+ String msg = "SafeModeMonitor may not run during distributed upgrade.";
+ assert false : msg;
+ throw new RuntimeException(msg, es);
+ }
smmthread = null;
}
}
@@ -4220,7 +4225,7 @@
* Leave safe mode.
* @throws IOException
*/
- synchronized void leaveSafeMode(boolean checkForUpgrades) throws IOException {
+ synchronized void leaveSafeMode(boolean checkForUpgrades) throws SafeModeException {
if (!isInSafeMode()) {
NameNode.stateChangeLog.info("STATE* Safe mode is already OFF.");
return;