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 cd...@apache.org on 2008/12/12 20:48:45 UTC
svn commit: r726098 - in /hadoop/core/trunk: CHANGES.txt
src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
src/hdfs/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java
Author: cdouglas
Date: Fri Dec 12 11:48:45 2008
New Revision: 726098
URL: http://svn.apache.org/viewvc?rev=726098&view=rev
Log:
HADOOP-4820. Remove unused method FSNamesystem::deleteInSafeMode. Contributed by Suresh Srinivas.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java
Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=726098&r1=726097&r2=726098&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Fri Dec 12 11:48:45 2008
@@ -369,6 +369,9 @@
HADOOP-4855. Fixed command-specific help messages for refreshServiceAcl in
DFSAdmin and MRAdmin. (acmurthy)
+ HADOOP-4820. Remove unused method FSNamesystem::deleteInSafeMode. (Suresh
+ Srinivas via cdouglas)
+
Release 0.19.1 - Unreleased
IMPROVEMENTS
Modified: hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=726098&r1=726097&r2=726098&view=diff
==============================================================================
--- hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (original)
+++ hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Fri Dec 12 11:48:45 2008
@@ -1622,7 +1622,7 @@
if ((!recursive) && (!dir.isDirEmpty(src))) {
throw new IOException(src + " is non empty");
}
- boolean status = deleteInternal(src, true, true);
+ boolean status = deleteInternal(src, true);
getEditLog().logSync();
if (status && auditLog.isInfoEnabled()) {
logAuditEvent(UserGroupInformation.getCurrentUGI(),
@@ -1633,23 +1633,15 @@
}
/**
- * An internal delete function that does not enforce safe mode
- */
- boolean deleteInSafeMode(String src) throws IOException {
- boolean status = deleteInternal(src, false, false);
- getEditLog().logSync();
- return status;
- }
- /**
* Remove the indicated filename from the namespace. This may
* invalidate some blocks that make up the file.
*/
synchronized boolean deleteInternal(String src,
- boolean enforceSafeMode, boolean enforcePermission) throws IOException {
+ boolean enforcePermission) throws IOException {
if (NameNode.stateChangeLog.isDebugEnabled()) {
NameNode.stateChangeLog.debug("DIR* NameSystem.delete: " + src);
}
- if (enforceSafeMode && isInSafeMode())
+ if (isInSafeMode())
throw new SafeModeException("Cannot delete " + src, safeMode);
if (enforcePermission && isPermissionEnabled) {
checkPermission(src, false, null, FsAction.WRITE, null, FsAction.ALL);
Modified: hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java?rev=726098&r1=726097&r2=726098&view=diff
==============================================================================
--- hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java (original)
+++ hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java Fri Dec 12 11:48:45 2008
@@ -300,7 +300,7 @@
break;
case FIXING_DELETE:
if (!isOpen)
- nn.namesystem.deleteInternal(path, true, false);
+ nn.namesystem.deleteInternal(path, false);
}
}
if (showFiles) {