Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 ef9d46dcb -> d2dad7442


HDFS-7940. Add tracing to DFSClient#setQuotaByStorageType (Rakesh R via Colin 
P. McCabe)

(cherry picked from commit d8846707c58c5c3ec542128df13a82ddc05fb347)
(cherry picked from commit 455d4aa8a12920fccad1bcde715f6fb6d9a63561)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d2dad744
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d2dad744
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d2dad744

Branch: refs/heads/branch-2.7
Commit: d2dad744215fd028405f5b57abcd002915827787
Parents: ef9d46d
Author: Colin Patrick Mccabe <[email protected]>
Authored: Tue Mar 17 10:47:21 2015 -0700
Committer: Colin Patrick Mccabe <[email protected]>
Committed: Tue Mar 17 11:02:05 2015 -0700

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                       | 3 +++
 .../src/main/java/org/apache/hadoop/hdfs/DFSClient.java           | 3 +++
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/d2dad744/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 3f5da9b..2aff3b3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -434,6 +434,9 @@ Release 2.7.0 - UNRELEASED
     HDFS-2605. Remove redundant "Release 0.21.1" section from CHANGES.txt.
     (Allen Wittenauer via shv)
 
+    HDFS-7940. Add tracing to DFSClient#setQuotaByStorageType (Rakesh R via
+    Colin P. McCabe)
+
   OPTIMIZATIONS
 
     HDFS-7454. Reduce memory footprint for AclEntries in NameNode.

http://git-wip-us.apache.org/repos/asf/hadoop/blob/d2dad744/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
----------------------------------------------------------------------
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
index 3336077..658cccf 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
@@ -3088,6 +3088,7 @@ public class DFSClient implements java.io.Closeable, 
RemotePeerFactory,
       throw new IllegalArgumentException("Don't support Quota for storage type 
: "
         + type.toString());
     }
+    TraceScope scope = getPathTraceScope("setQuotaByStorageType", src);
     try {
       namenode.setQuota(src, HdfsConstants.QUOTA_DONT_SET, quota, type);
     } catch (RemoteException re) {
@@ -3096,6 +3097,8 @@ public class DFSClient implements java.io.Closeable, 
RemotePeerFactory,
         QuotaByStorageTypeExceededException.class,
         UnresolvedPathException.class,
         SnapshotAccessControlException.class);
+    } finally {
+      scope.close();
     }
   }
   /**

Reply via email to