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

HDFS-2308. NamenodeProtocol.endCheckpoint is vestigial and can be removed. Contributed by Eli Collins 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1196113 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2011-11-01 16:44:28 +00:00
parent 1112a50ad3
commit 4961441584
3 changed files with 10 additions and 13 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

@ -842,6 +842,9 @@ Release 0.23.0 - 2011-11-01
HDFS-2521. Remove custom checksum headers from data transfer protocol HDFS-2521. Remove custom checksum headers from data transfer protocol
(todd) (todd)
HDFS-2308. NamenodeProtocol.endCheckpoint is vestigial and can be removed.
(eli)
OPTIMIZATIONS OPTIMIZATIONS
HDFS-1458. Improve checkpoint performance by avoiding unnecessary image HDFS-1458. Improve checkpoint performance by avoiding unnecessary image

14
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
View File

@ -998,18 +998,12 @@ public class FSImage implements Closeable {
/** /**
* End checkpoint. * End checkpoint.
* <p> * <p>
* Rename uploaded checkpoint to the new image; * Validate the current storage info with the given signature.
* purge old edits file;
* rename edits.new to edits;
* redirect edit log streams to the new edits;
* update checkpoint time if the remote node is a checkpoint only node.
* *
* @param sig * @param sig to validate the current storage info against
* @param remoteNNRole * @throws IOException if the checkpoint fields are inconsistent
* @throws IOException
*/ */
void endCheckpoint(CheckpointSignature sig, void endCheckpoint(CheckpointSignature sig) throws IOException {
NamenodeRole remoteNNRole) throws IOException {
sig.validateStorageInfo(this); sig.validateStorageInfo(this);
} }

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

@ -3493,15 +3493,15 @@ public class FSNamesystem implements Namesystem, FSClusterStats,
void endCheckpoint(NamenodeRegistration registration, void endCheckpoint(NamenodeRegistration registration,
CheckpointSignature sig) throws IOException { CheckpointSignature sig) throws IOException {
writeLock(); readLock();
try { try {
if (isInSafeMode()) { if (isInSafeMode()) {
throw new SafeModeException("Checkpoint not ended", safeMode); throw new SafeModeException("Checkpoint not ended", safeMode);
} }
LOG.info("End checkpoint for " + registration.getAddress()); LOG.info("End checkpoint for " + registration.getAddress());
getFSImage().endCheckpoint(sig, registration.getRole()); getFSImage().endCheckpoint(sig);
} finally { } finally {
writeUnlock(); readUnlock();
} }
} }