big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-10752. Several log refactoring/improvement suggestion in HDFS. Contributed by Hanisha Koneru.

Browse Source
This commit is contained in:
Arpit Agarwal 2016-10-19 17:20:07 -07:00
parent e9c4616b5e
commit b4564103e4
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtxCache.java
View File

@ -69,7 +69,7 @@ Entry<FileHandle, OpenFileCtx> getEntryToEvict() {
Iterator<Entry<FileHandle, OpenFileCtx>> it = openFileMap.entrySet() Iterator<Entry<FileHandle, OpenFileCtx>> it = openFileMap.entrySet()
.iterator(); .iterator();
if (LOG.isTraceEnabled()) { if (LOG.isTraceEnabled()) {
LOG.trace("openFileMap size:" + openFileMap.size()); LOG.trace("openFileMap size:" + size());
} }
Entry<FileHandle, OpenFileCtx> idlest = null; Entry<FileHandle, OpenFileCtx> idlest = null;
@ -117,10 +117,10 @@ Entry<FileHandle, OpenFileCtx> getEntryToEvict() {
boolean put(FileHandle h, OpenFileCtx context) { boolean put(FileHandle h, OpenFileCtx context) {
OpenFileCtx toEvict = null; OpenFileCtx toEvict = null;
synchronized (this) { synchronized (this) {
Preconditions.checkState(openFileMap.size() <= this.maxStreams, Preconditions.checkState(size() <= this.maxStreams,
"stream cache size " + openFileMap.size() "stream cache size " + size() + " is larger than maximum" + this
+ " is larger than maximum" + this.maxStreams); .maxStreams);
if (openFileMap.size() == this.maxStreams) { if (size() == this.maxStreams) {
Entry<FileHandle, OpenFileCtx> pairs = getEntryToEvict(); Entry<FileHandle, OpenFileCtx> pairs = getEntryToEvict();
if (pairs ==null) { if (pairs ==null) {
return false; return false;
@ -149,7 +149,7 @@ void scan(long streamTimeout) {
Iterator<Entry<FileHandle, OpenFileCtx>> it = openFileMap.entrySet() Iterator<Entry<FileHandle, OpenFileCtx>> it = openFileMap.entrySet()
.iterator(); .iterator();
if (LOG.isTraceEnabled()) { if (LOG.isTraceEnabled()) {
LOG.trace("openFileMap size:" + openFileMap.size()); LOG.trace("openFileMap size:" + size());
} }
while (it.hasNext()) { while (it.hasNext()) {
@ -168,7 +168,7 @@ void scan(long streamTimeout) {
openFileMap.remove(handle); openFileMap.remove(handle);
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
LOG.debug("After remove stream " + handle.getFileId() LOG.debug("After remove stream " + handle.getFileId()
+ ", the stream number:" + openFileMap.size()); + ", the stream number:" + size());
} }
ctxToRemove.add(ctx2); ctxToRemove.add(ctx2);
} }
@ -201,7 +201,7 @@ void cleanAll() {
Iterator<Entry<FileHandle, OpenFileCtx>> it = openFileMap.entrySet() Iterator<Entry<FileHandle, OpenFileCtx>> it = openFileMap.entrySet()
.iterator(); .iterator();
if (LOG.isTraceEnabled()) { if (LOG.isTraceEnabled()) {
LOG.trace("openFileMap size:" + openFileMap.size()); LOG.trace("openFileMap size:" + size());
} }
while (it.hasNext()) { while (it.hasNext()) {

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CorruptReplicasMap.java
View File

@ -84,12 +84,12 @@ void addToCorruptReplicasMap(Block blk, DatanodeDescriptor dn,
if (!nodes.keySet().contains(dn)) { if (!nodes.keySet().contains(dn)) {
NameNode.blockStateChangeLog.debug( NameNode.blockStateChangeLog.debug(
"BLOCK NameSystem.addToCorruptReplicasMap: {} added as corrupt on " "BLOCK NameSystem.addToCorruptReplicasMap: {} added as corrupt on "
+ "{} by {} {}", blk.getBlockName(), dn, Server.getRemoteIp(), + "{} by {} {}", blk, dn, Server.getRemoteIp(),
reasonText); reasonText);
} else { } else {
NameNode.blockStateChangeLog.debug( NameNode.blockStateChangeLog.debug(
"BLOCK NameSystem.addToCorruptReplicasMap: duplicate requested for" + "BLOCK NameSystem.addToCorruptReplicasMap: duplicate requested for" +
" {} to add as corrupt on {} by {} {}", blk.getBlockName(), dn, " {} to add as corrupt on {} by {} {}", blk, dn,
Server.getRemoteIp(), reasonText); Server.getRemoteIp(), reasonText);
} }
// Add the node or update the reason. // Add the node or update the reason.

10
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
View File

@ -666,7 +666,7 @@ NamenodeRegistration getRegistration() {
NamenodeRegistration setRegistration() { NamenodeRegistration setRegistration() {
nodeRegistration = new NamenodeRegistration( nodeRegistration = new NamenodeRegistration(
NetUtils.getHostPortString(rpcServer.getRpcAddress()), NetUtils.getHostPortString(getNameNodeAddress()),
NetUtils.getHostPortString(getHttpAddress()), NetUtils.getHostPortString(getHttpAddress()),
getFSImage().getStorage(), getRole()); getFSImage().getStorage(), getRole());
return nodeRegistration; return nodeRegistration;
@ -729,7 +729,7 @@ protected void initialize(Configuration conf) throws IOException {
// This is expected for MiniDFSCluster. Set it now using // This is expected for MiniDFSCluster. Set it now using
// the RPC server's bind address. // the RPC server's bind address.
clientNamenodeAddress = clientNamenodeAddress =
NetUtils.getHostPortString(rpcServer.getRpcAddress()); NetUtils.getHostPortString(getNameNodeAddress());
LOG.info("Clients are to use " + clientNamenodeAddress + " to access" LOG.info("Clients are to use " + clientNamenodeAddress + " to access"
+ " this namenode/service."); + " this namenode/service.");
} }
@ -816,7 +816,7 @@ private void startCommonServices(Configuration conf) throws IOException {
LOG.warn("ServicePlugin " + p + " could not be started", t); LOG.warn("ServicePlugin " + p + " could not be started", t);
} }
} }
LOG.info(getRole() + " RPC up at: " + rpcServer.getRpcAddress()); LOG.info(getRole() + " RPC up at: " + getNameNodeAddress());
if (rpcServer.getServiceRpcAddress() != null) { if (rpcServer.getServiceRpcAddress() != null) {
LOG.info(getRole() + " service RPC up at: " LOG.info(getRole() + " service RPC up at: "
+ rpcServer.getServiceRpcAddress()); + rpcServer.getServiceRpcAddress());
@ -1047,7 +1047,7 @@ public InetSocketAddress getNameNodeAddress() {
* @return NameNode RPC address in "host:port" string form * @return NameNode RPC address in "host:port" string form
*/ */
public String getNameNodeAddressHostPortString() { public String getNameNodeAddressHostPortString() {
return NetUtils.getHostPortString(rpcServer.getRpcAddress()); return NetUtils.getHostPortString(getNameNodeAddress());
} }
/** /**
@ -1056,7 +1056,7 @@ public String getNameNodeAddressHostPortString() {
*/ */
public InetSocketAddress getServiceRpcAddress() { public InetSocketAddress getServiceRpcAddress() {
final InetSocketAddress serviceAddr = rpcServer.getServiceRpcAddress(); final InetSocketAddress serviceAddr = rpcServer.getServiceRpcAddress();
return serviceAddr == null ? rpcServer.getRpcAddress() : serviceAddr; return serviceAddr == null ? getNameNodeAddress() : serviceAddr;
} }
/** /**