Author: jing9
Date: Wed Dec 11 02:12:46 2013
New Revision: 1550029
URL: http://svn.apache.org/r1550029
Log:
HDFS-5504. Merge change r1541775 from branch-2.
Modified:
hadoop/common/branches/branch-2.3/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2.3/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
hadoop/common/branches/branch-2.3/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
hadoop/common/branches/branch-2.3/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotDeletion.java
Modified:
hadoop/common/branches/branch-2.3/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1550029&r1=1550028&r2=1550029&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.3/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.3/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Wed Dec 11 02:12:46 2013
@@ -163,6 +163,9 @@ Release 2.3.0 - UNRELEASED
HDFS-5474. Deletesnapshot can make Namenode in safemode on NN restarts.
(Sathish via jing9)
+ HDFS-5504. In HA mode, OP_DELETE_SNAPSHOT is not decrementing the safemode
threshold,
+ leads to NN safemode. (Vinay via jing9)
+
Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2.3/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java?rev=1550029&r1=1550028&r2=1550029&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.3/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
(original)
+++
hadoop/common/branches/branch-2.3/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
Wed Dec 11 02:12:46 2013
@@ -592,7 +592,7 @@ public class FSEditLogLoader {
fsNamesys.getSnapshotManager().deleteSnapshot(
deleteSnapshotOp.snapshotRoot, deleteSnapshotOp.snapshotName,
collectedBlocks, removedINodes);
- fsNamesys.removeBlocks(collectedBlocks);
+ fsNamesys.removeBlocksAndUpdateSafemodeTotal(collectedBlocks);
collectedBlocks.clear();
fsNamesys.dir.removeFromInodeMap(removedINodes);
removedINodes.clear();
Modified:
hadoop/common/branches/branch-2.3/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1550029&r1=1550028&r2=1550029&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.3/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
(original)
+++
hadoop/common/branches/branch-2.3/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Wed Dec 11 02:12:46 2013
@@ -3260,6 +3260,18 @@ public class FSNamesystem implements Nam
return;
}
+ removeBlocksAndUpdateSafemodeTotal(blocks);
+ }
+
+ /**
+ * Removes the blocks from blocksmap and updates the safemode blocks total
+ *
+ * @param blocks
+ * An instance of {@link BlocksMapUpdateInfo} which contains a list
+ * of blocks that need to be removed from blocksMap
+ */
+ void removeBlocksAndUpdateSafemodeTotal(BlocksMapUpdateInfo blocks) {
+ assert hasWriteLock();
// In the case that we are a Standby tailing edits from the
// active while in safe-mode, we need to track the total number
// of blocks and safe blocks in the system.
@@ -3280,9 +3292,9 @@ public class FSNamesystem implements Nam
}
if (trackBlockCounts) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Adjusting safe-mode totals for deletion of " + src + ":" +
- "decreasing safeBlocks by " + numRemovedSafe +
- ", totalBlocks by " + numRemovedComplete);
+ LOG.debug("Adjusting safe-mode totals for deletion."
+ + "decreasing safeBlocks by " + numRemovedSafe
+ + ", totalBlocks by " + numRemovedComplete);
}
adjustSafeModeBlockTotals(-numRemovedSafe, -numRemovedComplete);
}
Modified:
hadoop/common/branches/branch-2.3/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotDeletion.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotDeletion.java?rev=1550029&r1=1550028&r2=1550029&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.3/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotDeletion.java
(original)
+++
hadoop/common/branches/branch-2.3/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotDeletion.java
Wed Dec 11 02:12:46 2013
@@ -38,6 +38,7 @@ import org.apache.hadoop.hdfs.DFSTestUti
import org.apache.hadoop.hdfs.DFSUtil;
import org.apache.hadoop.hdfs.DistributedFileSystem;
import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.MiniDFSNNTopology;
import org.apache.hadoop.hdfs.protocol.HdfsConstants;
import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfo;
import org.apache.hadoop.hdfs.server.blockmanagement.BlockManager;
@@ -47,7 +48,10 @@ import org.apache.hadoop.hdfs.server.nam
import org.apache.hadoop.hdfs.server.namenode.INodeDirectory;
import org.apache.hadoop.hdfs.server.namenode.INodeDirectoryWithQuota;
import org.apache.hadoop.hdfs.server.namenode.INodeFile;
+import org.apache.hadoop.hdfs.server.namenode.NameNode;
+import org.apache.hadoop.hdfs.server.namenode.NameNodeAdapter;
import org.apache.hadoop.hdfs.server.namenode.Quota;
+import org.apache.hadoop.hdfs.server.namenode.ha.HATestUtil;
import
org.apache.hadoop.hdfs.server.namenode.snapshot.INodeDirectoryWithSnapshot.DirectoryDiffList;
import org.apache.hadoop.hdfs.util.ReadOnlyList;
import org.apache.hadoop.io.IOUtils;
@@ -949,4 +953,54 @@ public class TestSnapshotDeletion {
psOut.close();
out.close();
}
+
+ /*
+ * OP_DELETE_SNAPSHOT edits op was not decrementing the safemode threshold on
+ * restart in HA mode. HDFS-5504
+ */
+ @Test(timeout = 60000)
+ public void testHANNRestartAfterSnapshotDeletion() throws Exception {
+ hdfs.close();
+ cluster.shutdown();
+ conf = new Configuration();
+ cluster = new MiniDFSCluster.Builder(conf)
+ .nnTopology(MiniDFSNNTopology.simpleHATopology()).numDataNodes(1)
+ .build();
+ cluster.transitionToActive(0);
+ // stop the standby namenode
+ NameNode snn = cluster.getNameNode(1);
+ snn.stop();
+
+ hdfs = (DistributedFileSystem) HATestUtil
+ .configureFailoverFs(cluster, conf);
+ Path dir = new Path("/dir");
+ Path subDir = new Path(dir, "sub");
+ hdfs.mkdirs(dir);
+ hdfs.allowSnapshot(dir);
+ for (int i = 0; i < 5; i++) {
+ DFSTestUtil.createFile(hdfs, new Path(subDir, "" + i), 100, (short) 1,
+ 1024L);
+ }
+
+ // take snapshot
+ hdfs.createSnapshot(dir, "s0");
+
+ // delete the subdir
+ hdfs.delete(subDir, true);
+
+ // roll the edit log
+ NameNode ann = cluster.getNameNode(0);
+ ann.getRpcServer().rollEditLog();
+
+ hdfs.deleteSnapshot(dir, "s0");
+ // wait for the blocks deletion at namenode
+ Thread.sleep(2000);
+
+ NameNodeAdapter.abortEditLogs(ann);
+ cluster.restartNameNode(0, false);
+ cluster.transitionToActive(0);
+
+ // wait till the cluster becomes active
+ cluster.waitClusterUp();
+ }
}
