From eeec4dc72abf4c540146a81c5419828520b80fa4 Mon Sep 17 00:00:00 2001 From: Tsz-wo Sze Date: Wed, 18 Apr 2012 03:25:08 +0000 Subject: [PATCH] HDFS-3294. Fix code indentation in NamenodeWebHdfsMethods and DatanodeWebHdfsMethods. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1327365 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 + .../web/resources/DatanodeWebHdfsMethods.java | 56 ++++++-- .../web/resources/NamenodeWebHdfsMethods.java | 133 +++++++++++++----- 3 files changed, 146 insertions(+), 46 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index b13218a19af..955c7b97b10 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -382,6 +382,9 @@ Release 2.0.0 - UNRELEASED HDFS-3279. Move the FSEditLog constructor with @VisibleForTesting to TestEditLog. (Arpit Gupta via szetszwo) + HDFS-3294. Fix code indentation in NamenodeWebHdfsMethods and + DatanodeWebHdfsMethods. (szetszwo) + OPTIMIZATIONS HDFS-3024. Improve performance of stringification in addStoredBlock (todd) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/resources/DatanodeWebHdfsMethods.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/resources/DatanodeWebHdfsMethods.java index 44ef5273386..05f92383465 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/resources/DatanodeWebHdfsMethods.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/resources/DatanodeWebHdfsMethods.java @@ -178,8 +178,25 @@ public class DatanodeWebHdfsMethods { return ugi.doAs(new PrivilegedExceptionAction() { @Override public Response run() throws IOException, URISyntaxException { + return put(in, ugi, delegation, nnRpcAddr, path.getAbsolutePath(), op, + permission, overwrite, bufferSize, replication, blockSize); + } + }); + } - final String fullpath = path.getAbsolutePath(); + private Response put( + final InputStream in, + final UserGroupInformation ugi, + final DelegationParam delegation, + final InetSocketAddress nnRpcAddr, + final String fullpath, + final PutOpParam op, + final PermissionParam permission, + final OverwriteParam overwrite, + final BufferSizeParam bufferSize, + final ReplicationParam replication, + final BlockSizeParam blockSize + ) throws IOException, URISyntaxException { final DataNode datanode = (DataNode)context.getAttribute("datanode"); switch(op.getValue()) { @@ -214,8 +231,6 @@ public class DatanodeWebHdfsMethods { default: throw new UnsupportedOperationException(op + " is not supported"); } - } - }); } /** Handle HTTP POST request for the root for the root. */ @@ -265,8 +280,21 @@ public class DatanodeWebHdfsMethods { return ugi.doAs(new PrivilegedExceptionAction() { @Override public Response run() throws IOException { + return post(in, ugi, delegation, nnRpcAddr, path.getAbsolutePath(), op, + bufferSize); + } + }); + } - final String fullpath = path.getAbsolutePath(); + private Response post( + final InputStream in, + final UserGroupInformation ugi, + final DelegationParam delegation, + final InetSocketAddress nnRpcAddr, + final String fullpath, + final PostOpParam op, + final BufferSizeParam bufferSize + ) throws IOException { final DataNode datanode = (DataNode)context.getAttribute("datanode"); switch(op.getValue()) { @@ -292,8 +320,6 @@ public class DatanodeWebHdfsMethods { default: throw new UnsupportedOperationException(op + " is not supported"); } - } - }); } /** Handle HTTP GET request for the root. */ @@ -348,8 +374,22 @@ public class DatanodeWebHdfsMethods { return ugi.doAs(new PrivilegedExceptionAction() { @Override public Response run() throws IOException { + return get(ugi, delegation, nnRpcAddr, path.getAbsolutePath(), op, + offset, length, bufferSize); + } + }); + } - final String fullpath = path.getAbsolutePath(); + private Response get( + final UserGroupInformation ugi, + final DelegationParam delegation, + final InetSocketAddress nnRpcAddr, + final String fullpath, + final GetOpParam op, + final OffsetParam offset, + final LengthParam length, + final BufferSizeParam bufferSize + ) throws IOException { final DataNode datanode = (DataNode)context.getAttribute("datanode"); final Configuration conf = new Configuration(datanode.getConf()); @@ -412,7 +452,5 @@ public class DatanodeWebHdfsMethods { default: throw new UnsupportedOperationException(op + " is not supported"); } - } - }); } } diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java index 0115ee27579..0127e959be8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java @@ -314,8 +314,40 @@ public class NamenodeWebHdfsMethods { public Response run() throws IOException, URISyntaxException { REMOTE_ADDRESS.set(request.getRemoteAddr()); try { + return put(ugi, delegation, username, doAsUser, + path.getAbsolutePath(), op, destination, owner, group, + permission, overwrite, bufferSize, replication, blockSize, + modificationTime, accessTime, renameOptions, createParent, + delegationTokenArgument); + } finally { + REMOTE_ADDRESS.set(null); + } + } + }); + } + + private Response put( + final UserGroupInformation ugi, + final DelegationParam delegation, + final UserParam username, + final DoAsParam doAsUser, + final String fullpath, + final PutOpParam op, + final DestinationParam destination, + final OwnerParam owner, + final GroupParam group, + final PermissionParam permission, + final OverwriteParam overwrite, + final BufferSizeParam bufferSize, + final ReplicationParam replication, + final BlockSizeParam blockSize, + final ModificationTimeParam modificationTime, + final AccessTimeParam accessTime, + final RenameOptionSetParam renameOptions, + final CreateParentParam createParent, + final TokenArgumentParam delegationTokenArgument + ) throws IOException, URISyntaxException { - final String fullpath = path.getAbsolutePath(); final Configuration conf = (Configuration)context.getAttribute(JspHelper.CURRENT_CONF); final NameNode namenode = (NameNode)context.getAttribute("name.node"); final NamenodeProtocols np = namenode.getRpcServer(); @@ -396,12 +428,6 @@ public class NamenodeWebHdfsMethods { default: throw new UnsupportedOperationException(op + " is not supported"); } - - } finally { - REMOTE_ADDRESS.set(null); - } - } - }); } /** Handle HTTP POST request for the root. */ @@ -452,8 +478,24 @@ public class NamenodeWebHdfsMethods { public Response run() throws IOException, URISyntaxException { REMOTE_ADDRESS.set(request.getRemoteAddr()); try { + return post(ugi, delegation, username, doAsUser, + path.getAbsolutePath(), op, bufferSize); + } finally { + REMOTE_ADDRESS.set(null); + } + } + }); + } - final String fullpath = path.getAbsolutePath(); + private Response post( + final UserGroupInformation ugi, + final DelegationParam delegation, + final UserParam username, + final DoAsParam doAsUser, + final String fullpath, + final PostOpParam op, + final BufferSizeParam bufferSize + ) throws IOException, URISyntaxException { final NameNode namenode = (NameNode)context.getAttribute("name.node"); switch(op.getValue()) { @@ -466,12 +508,6 @@ public class NamenodeWebHdfsMethods { default: throw new UnsupportedOperationException(op + " is not supported"); } - - } finally { - REMOTE_ADDRESS.set(null); - } - } - }); } /** Handle HTTP GET request for the root. */ @@ -534,9 +570,28 @@ public class NamenodeWebHdfsMethods { public Response run() throws IOException, URISyntaxException { REMOTE_ADDRESS.set(request.getRemoteAddr()); try { + return get(ugi, delegation, username, doAsUser, + path.getAbsolutePath(), op, offset, length, renewer, bufferSize); + } finally { + REMOTE_ADDRESS.set(null); + } + } + }); + } + private Response get( + final UserGroupInformation ugi, + final DelegationParam delegation, + final UserParam username, + final DoAsParam doAsUser, + final String fullpath, + final GetOpParam op, + final OffsetParam offset, + final LengthParam length, + final RenewerParam renewer, + final BufferSizeParam bufferSize + ) throws IOException, URISyntaxException { final NameNode namenode = (NameNode)context.getAttribute("name.node"); - final String fullpath = path.getAbsolutePath(); final NamenodeProtocols np = namenode.getRpcServer(); switch(op.getValue()) { @@ -613,13 +668,7 @@ public class NamenodeWebHdfsMethods { } default: throw new UnsupportedOperationException(op + " is not supported"); - } - - } finally { - REMOTE_ADDRESS.set(null); - } - } - }); + } } private static DirectoryListing getDirectoryListing(final NamenodeProtocols np, @@ -712,25 +761,35 @@ public class NamenodeWebHdfsMethods { public Response run() throws IOException { REMOTE_ADDRESS.set(request.getRemoteAddr()); try { - - final NameNode namenode = (NameNode)context.getAttribute("name.node"); - final String fullpath = path.getAbsolutePath(); - - switch(op.getValue()) { - case DELETE: - { - final boolean b = namenode.getRpcServer().delete(fullpath, recursive.getValue()); - final String js = JsonUtil.toJsonString("boolean", b); - return Response.ok(js).type(MediaType.APPLICATION_JSON).build(); - } - default: - throw new UnsupportedOperationException(op + " is not supported"); - } - + return delete(ugi, delegation, username, doAsUser, + path.getAbsolutePath(), op, recursive); } finally { REMOTE_ADDRESS.set(null); } } }); } + + private Response delete( + final UserGroupInformation ugi, + final DelegationParam delegation, + final UserParam username, + final DoAsParam doAsUser, + final String fullpath, + final DeleteOpParam op, + final RecursiveParam recursive + ) throws IOException { + final NameNode namenode = (NameNode)context.getAttribute("name.node"); + + switch(op.getValue()) { + case DELETE: + { + final boolean b = namenode.getRpcServer().delete(fullpath, recursive.getValue()); + final String js = JsonUtil.toJsonString("boolean", b); + return Response.ok(js).type(MediaType.APPLICATION_JSON).build(); + } + default: + throw new UnsupportedOperationException(op + " is not supported"); + } + } }