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/11/07 21:49:04 UTC
svn commit: r712259 - in /hadoop/core/branches/branch-0.19: CHANGES.txt
src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
src/hdfs/org/apache/hadoop/hdfs/server/namenode/UpgradeManagerNamenode.java
Author: shv
Date: Fri Nov 7 12:49:03 2008
New Revision: 712259
URL: http://svn.apache.org/viewvc?rev=712259&view=rev
Log:
HADOOP-4610. Merge -r 712246:712247 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
hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/namenode/UpgradeManagerNamenode.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=712259&r1=712258&r2=712259&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Fri Nov 7 12:49:03 2008
@@ -964,11 +964,15 @@
HADOOP-4498. Ensure that JobHistory correctly escapes the job name so that
regex patterns work. (Chris Wensel via acmurthy)
+ HADOOP-4610. Always calculate mis-replicated blocks when safe-mode is
+ turned off. (shv)
+
Release 0.18.3 - Unreleased
BUG FIXES
HADOOP-4499. DFSClient should invoke checksumOk only once. (Raghu Angadi)
+
HADOOP-4597. Calculate mis-replicated blocks when safe-mode is turned
off manually. (shv)
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=712259&r1=712258&r2=712259&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 Fri Nov 7 12:49:03 2008
@@ -3917,8 +3917,7 @@
* Switch to manual safe mode if distributed upgrade is required.<br>
* Check for invalid, under- & over-replicated blocks in the end of startup.
*/
- synchronized void leave(boolean checkForUpgrades,
- boolean checkBlockReplication) {
+ synchronized void leave(boolean checkForUpgrades) {
if(checkForUpgrades) {
// verify whether a distributed upgrade needs to be started
boolean needUpgrade = false;
@@ -3933,9 +3932,8 @@
return;
}
}
- if(checkBlockReplication)
- // verify blocks replications
- processMisReplicatedBlocks();
+ // verify blocks replications
+ processMisReplicatedBlocks();
long timeInSafemode = now() - systemStart;
NameNode.stateChangeLog.info("STATE* Leaving safe mode after "
+ timeInSafemode/1000 + " secs.");
@@ -3997,7 +3995,7 @@
// the threshold is reached
if (!isOn() || // safe mode is off
extension <= 0 || threshold <= 0) { // don't need to wait
- this.leave(true, false); // leave safe mode
+ this.leave(true); // leave safe mode
return;
}
if (reached > 0) { // threshold has already been reached before
@@ -4135,7 +4133,7 @@
}
// leave safe mode and stop the monitor
if(safeMode != null)
- safeMode.leave(true, true);
+ safeMode.leave(true);
smmthread = null;
}
}
@@ -4153,7 +4151,7 @@
checkSuperuserPrivilege();
switch(action) {
case SAFEMODE_LEAVE: // leave safe mode
- leaveSafeMode(false, true);
+ leaveSafeMode(false);
break;
case SAFEMODE_ENTER: // enter safe mode
enterSafeMode();
@@ -4224,9 +4222,7 @@
* Leave safe mode.
* @throws IOException
*/
- synchronized void leaveSafeMode(boolean checkForUpgrades,
- boolean checkBlockReplication
- ) throws IOException {
+ synchronized void leaveSafeMode(boolean checkForUpgrades) throws IOException {
if (!isInSafeMode()) {
NameNode.stateChangeLog.info("STATE* Safe mode is already OFF.");
return;
@@ -4234,7 +4230,7 @@
if(getDistributedUpgradeState())
throw new SafeModeException("Distributed upgrade is in progress",
safeMode);
- safeMode.leave(checkForUpgrades, checkBlockReplication);
+ safeMode.leave(checkForUpgrades);
}
String getSafeModeTip() {
Modified: hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/namenode/UpgradeManagerNamenode.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/namenode/UpgradeManagerNamenode.java?rev=712259&r1=712258&r2=712259&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/namenode/UpgradeManagerNamenode.java (original)
+++ hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/namenode/UpgradeManagerNamenode.java Fri Nov 7 12:49:03 2008
@@ -109,7 +109,7 @@
FSNamesystem.getFSNamesystem().getFSImage().writeAll();
currentUpgrades = null;
broadcastCommand = null;
- FSNamesystem.getFSNamesystem().leaveSafeMode(false, true);
+ FSNamesystem.getFSNamesystem().leaveSafeMode(false);
}
UpgradeStatusReport distributedUpgradeProgress(UpgradeAction action