Apache/hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-7570. SecondaryNameNode need twice memory when calling reloadFromImageFile. Contributed by zhaoyunjiong.

Browse Source 
(cherry picked from commit 85aec75ce53445e1abf840076d2e10f1e3c6d69b)
(cherry picked from commit 27eecaef10feb49c4160ad289fd301bba6608973)
This commit is contained in:
cnauroth 2015-01-13 16:10:28 -08:00 committed by Vinod Kumar Vavilapalli
parent 33537078a8
commit c3928b3068
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -169,6 +169,9 @@ Release 2.6.1 - UNRELEASED
HDFS-8846. Add a unit test for INotify functionality across a layout
version upgrade (Zhe Zhang via Colin P. McCabe)
HDFS-7470. SecondaryNameNode need twice memory when calling
reloadFromImageFile. (zhaoyunjiong via cnauroth)
Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES

5
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
View File

@ -3811,4 +3811,9 @@ public void shutdown() {
stopReplicationInitializer();
blocksMap.close();
}
public void clear() {
clearQueues();
blocksMap.clear();
}
}

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java
View File

@ -85,9 +85,13 @@ public Iterator<BlockInfo> iterator() {
void close() {
clear();
blocks = null;
}
void clear() {
if (blocks != null) {
blocks.clear();
blocks = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
View File

@ -651,6 +651,7 @@ void clear() {
snapshotManager.clearSnapshottableDirs();
cacheManager.clear();
setImageLoaded(false);
blockManager.clear();
}
@VisibleForTesting