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

HDFS-10264. Logging improvements in FSImageFormatProtobuf.Saver. (Contributed by Xiaobing Zhou)

This commit is contained in:
Arpit Agarwal 2016-04-19 11:26:30 -07:00
parent 1860b8ceb5
commit a13628fe4a
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatProtobuf.java
View File

@ -18,6 +18,8 @@
package org.apache.hadoop.hdfs.server.namenode; package org.apache.hadoop.hdfs.server.namenode;
import static org.apache.hadoop.util.Time.monotonicNow;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;
import java.io.File; import java.io.File;
@ -38,8 +40,8 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import org.apache.commons.logging.Log; import org.slf4j.Logger;
import org.apache.commons.logging.LogFactory; import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.protocol.proto.ClientNamenodeProtocolProtos.CacheDirectiveInfoProto; import org.apache.hadoop.hdfs.protocol.proto.ClientNamenodeProtocolProtos.CacheDirectiveInfoProto;
@ -74,7 +76,8 @@ import com.google.protobuf.CodedOutputStream;
*/ */
@InterfaceAudience.Private @InterfaceAudience.Private
public final class FSImageFormatProtobuf { public final class FSImageFormatProtobuf {
private static final Log LOG = LogFactory.getLog(FSImageFormatProtobuf.class); private static final Logger LOG = LoggerFactory
.getLogger(FSImageFormatProtobuf.class);
public static final class LoaderContext { public static final class LoaderContext {
private String[] stringTable; private String[] stringTable;
@ -179,7 +182,7 @@ public final class FSImageFormatProtobuf {
try { try {
loadInternal(raFile, fin); loadInternal(raFile, fin);
long end = Time.monotonicNow(); long end = Time.monotonicNow();
LOG.info("Loaded FSImage in " + (end - start) / 1000 + " seconds."); LOG.info("Loaded FSImage in {} seconds.", (end - start) / 1000);
} finally { } finally {
fin.close(); fin.close();
raFile.close(); raFile.close();
@ -285,7 +288,7 @@ public final class FSImageFormatProtobuf {
} }
break; break;
default: default:
LOG.warn("Unrecognized section " + n); LOG.warn("Unrecognized section {}", n);
break; break;
} }
} }
@ -419,7 +422,11 @@ public final class FSImageFormatProtobuf {
FileOutputStream fout = new FileOutputStream(file); FileOutputStream fout = new FileOutputStream(file);
fileChannel = fout.getChannel(); fileChannel = fout.getChannel();
try { try {
LOG.info("Saving image file {} using {}", file, compression);
long startTime = monotonicNow();
saveInternal(fout, compression, file.getAbsolutePath()); saveInternal(fout, compression, file.getAbsolutePath());
LOG.info("Image file {} of size {} bytes saved in {} seconds.", file,
file.length(), (monotonicNow() - startTime) / 1000);
} finally { } finally {
fout.close(); fout.close();
} }