[24/50] [abbrv] hadoop git commit: HDFS-7977. NFS couldn't take percentile intervals. Contributed by Brandon Li

2015-03-27 Thread zjshen 
HDFS-7977. NFS couldn't take percentile intervals. Contributed by Brandon Li


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

Branch: refs/heads/YARN-2928
Commit: 41c4dab794b1da8c233cf0c90d959a13de48de13
Parents: bb39451
Author: Brandon Li brando...@apache.org
Authored: Tue Mar 24 10:49:16 2015 -0700
Committer: Zhijie Shen zjs...@apache.org
Committed: Thu Mar 26 23:29:46 2015 -0700

--
 .../org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java |  1 -
 .../org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java   | 13 ++---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt|  2 ++
 .../hadoop-hdfs/src/site/markdown/HdfsNfsGateway.md| 12 
 4 files changed, 20 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/41c4dab7/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
index 09ee579..05cc0b5 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
@@ -72,7 +72,6 @@ public class NfsConfigKeys {
   public static final String NFS_HTTPS_ADDRESS_DEFAULT = 0.0.0.0: + 
NFS_HTTPS_PORT_DEFAULT;
   
   public static final String  NFS_METRICS_PERCENTILES_INTERVALS_KEY = 
nfs.metrics.percentiles.intervals;
-  public static final String  NFS_METRICS_PERCENTILES_INTERVALS_DEFAULT = ;
   
   /*
* HDFS super-user is the user with the same identity as NameNode process

http://git-wip-us.apache.org/repos/asf/hadoop/blob/41c4dab7/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
index d36ea73..880a8a6 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
@@ -90,9 +90,9 @@ public class Nfs3Metrics {
   readNanosQuantiles[i] = registry.newQuantiles(readProcessNanos
   + interval + s, Read process in ns, ops, latency, interval);
   writeNanosQuantiles[i] = registry.newQuantiles(writeProcessNanos
-  + interval + s,  process in ns, ops, latency, interval);
+  + interval + s, Write process in ns, ops, latency, interval);
   commitNanosQuantiles[i] = registry.newQuantiles(commitProcessNanos
-  + interval + s, Read process in ns, ops, latency, interval);
+  + interval + s, Commit process in ns, ops, latency, 
interval);
 }
   }
 
@@ -101,10 +101,9 @@ public class Nfs3Metrics {
 MetricsSystem ms = DefaultMetricsSystem.instance();
 JvmMetrics jm = JvmMetrics.create(gatewayName, sessionId, ms);
 
-// Percentile measurement is [,,,] by default 
-int[] intervals = conf.getInts(conf.get(
-NfsConfigKeys.NFS_METRICS_PERCENTILES_INTERVALS_KEY,
-NfsConfigKeys.NFS_METRICS_PERCENTILES_INTERVALS_DEFAULT));
+// Percentile measurement is [50th,75th,90th,95th,99th] currently 
+int[] intervals = conf
+.getInts(NfsConfigKeys.NFS_METRICS_PERCENTILES_INTERVALS_KEY);
 return ms.register(new Nfs3Metrics(gatewayName, sessionId, intervals, jm));
   }
   
@@ -217,4 +216,4 @@ public class Nfs3Metrics {
 }
   }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hadoop/blob/41c4dab7/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 3725a03..5dae029 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1260,6 +1260,8 @@ Release 2.7.0 - UNRELEASED
 
 HDFS-7961. Trigger full block report after hot swapping disk. (Eddy Xu via 
wang)
 
+HDFS-7977. NFS couldn't take percentile intervals (brandonli)
+
 BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS
 
   HDFS-7720. Quota by Storage Type API, tools

[39/51] [abbrv] hadoop git commit: HDFS-7977. NFS couldn't take percentile intervals. Contributed by Brandon Li

2015-03-25 Thread kasha 
HDFS-7977. NFS couldn't take percentile intervals. Contributed by Brandon Li


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

Branch: refs/heads/YARN-2139
Commit: 570a83ae80faf2076966acf30588733803327844
Parents: 97a7277
Author: Brandon Li brando...@apache.org
Authored: Tue Mar 24 10:49:16 2015 -0700
Committer: Brandon Li brando...@apache.org
Committed: Tue Mar 24 10:49:16 2015 -0700

--
 .../org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java |  1 -
 .../org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java   | 13 ++---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt|  2 ++
 .../hadoop-hdfs/src/site/markdown/HdfsNfsGateway.md| 12 
 4 files changed, 20 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/570a83ae/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
index 09ee579..05cc0b5 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
@@ -72,7 +72,6 @@ public class NfsConfigKeys {
   public static final String NFS_HTTPS_ADDRESS_DEFAULT = 0.0.0.0: + 
NFS_HTTPS_PORT_DEFAULT;
   
   public static final String  NFS_METRICS_PERCENTILES_INTERVALS_KEY = 
nfs.metrics.percentiles.intervals;
-  public static final String  NFS_METRICS_PERCENTILES_INTERVALS_DEFAULT = ;
   
   /*
* HDFS super-user is the user with the same identity as NameNode process

http://git-wip-us.apache.org/repos/asf/hadoop/blob/570a83ae/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
index d36ea73..880a8a6 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
@@ -90,9 +90,9 @@ public class Nfs3Metrics {
   readNanosQuantiles[i] = registry.newQuantiles(readProcessNanos
   + interval + s, Read process in ns, ops, latency, interval);
   writeNanosQuantiles[i] = registry.newQuantiles(writeProcessNanos
-  + interval + s,  process in ns, ops, latency, interval);
+  + interval + s, Write process in ns, ops, latency, interval);
   commitNanosQuantiles[i] = registry.newQuantiles(commitProcessNanos
-  + interval + s, Read process in ns, ops, latency, interval);
+  + interval + s, Commit process in ns, ops, latency, 
interval);
 }
   }
 
@@ -101,10 +101,9 @@ public class Nfs3Metrics {
 MetricsSystem ms = DefaultMetricsSystem.instance();
 JvmMetrics jm = JvmMetrics.create(gatewayName, sessionId, ms);
 
-// Percentile measurement is [,,,] by default 
-int[] intervals = conf.getInts(conf.get(
-NfsConfigKeys.NFS_METRICS_PERCENTILES_INTERVALS_KEY,
-NfsConfigKeys.NFS_METRICS_PERCENTILES_INTERVALS_DEFAULT));
+// Percentile measurement is [50th,75th,90th,95th,99th] currently 
+int[] intervals = conf
+.getInts(NfsConfigKeys.NFS_METRICS_PERCENTILES_INTERVALS_KEY);
 return ms.register(new Nfs3Metrics(gatewayName, sessionId, intervals, jm));
   }
   
@@ -217,4 +216,4 @@ public class Nfs3Metrics {
 }
   }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hadoop/blob/570a83ae/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 3725a03..5dae029 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1260,6 +1260,8 @@ Release 2.7.0 - UNRELEASED
 
 HDFS-7961. Trigger full block report after hot swapping disk. (Eddy Xu via 
wang)
 
+HDFS-7977. NFS couldn't take percentile intervals (brandonli)
+
 BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS
 
   HDFS-7720. Quota by Storage Type API,

hadoop git commit: HDFS-7977. NFS couldn't take percentile intervals. Contributed by Brandon Li

2015-03-24 Thread brandonli 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 cc5922607 - 14d1cccfa


HDFS-7977. NFS couldn't take percentile intervals. Contributed by Brandon Li

(cherry picked from commit 570a83ae80faf2076966acf30588733803327844)
(cherry picked from commit 260dbe96c3d21ea372c728b2cd0f4a6aeb970010)


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

Branch: refs/heads/branch-2.7
Commit: 14d1cccfada2a4023ed70a2f9fdb165f0de2c61d
Parents: cc59226
Author: Brandon Li brando...@apache.org
Authored: Tue Mar 24 10:49:16 2015 -0700
Committer: Brandon Li brando...@apache.org
Committed: Tue Mar 24 10:53:20 2015 -0700

--
 .../org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java |  1 -
 .../org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java   | 13 ++---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt|  2 ++
 .../hadoop-hdfs/src/site/markdown/HdfsNfsGateway.md| 12 
 4 files changed, 20 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/14d1cccf/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
index 09ee579..05cc0b5 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
@@ -72,7 +72,6 @@ public class NfsConfigKeys {
   public static final String NFS_HTTPS_ADDRESS_DEFAULT = 0.0.0.0: + 
NFS_HTTPS_PORT_DEFAULT;
   
   public static final String  NFS_METRICS_PERCENTILES_INTERVALS_KEY = 
nfs.metrics.percentiles.intervals;
-  public static final String  NFS_METRICS_PERCENTILES_INTERVALS_DEFAULT = ;
   
   /*
* HDFS super-user is the user with the same identity as NameNode process

http://git-wip-us.apache.org/repos/asf/hadoop/blob/14d1cccf/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
index d36ea73..880a8a6 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
@@ -90,9 +90,9 @@ public class Nfs3Metrics {
   readNanosQuantiles[i] = registry.newQuantiles(readProcessNanos
   + interval + s, Read process in ns, ops, latency, interval);
   writeNanosQuantiles[i] = registry.newQuantiles(writeProcessNanos
-  + interval + s,  process in ns, ops, latency, interval);
+  + interval + s, Write process in ns, ops, latency, interval);
   commitNanosQuantiles[i] = registry.newQuantiles(commitProcessNanos
-  + interval + s, Read process in ns, ops, latency, interval);
+  + interval + s, Commit process in ns, ops, latency, 
interval);
 }
   }
 
@@ -101,10 +101,9 @@ public class Nfs3Metrics {
 MetricsSystem ms = DefaultMetricsSystem.instance();
 JvmMetrics jm = JvmMetrics.create(gatewayName, sessionId, ms);
 
-// Percentile measurement is [,,,] by default 
-int[] intervals = conf.getInts(conf.get(
-NfsConfigKeys.NFS_METRICS_PERCENTILES_INTERVALS_KEY,
-NfsConfigKeys.NFS_METRICS_PERCENTILES_INTERVALS_DEFAULT));
+// Percentile measurement is [50th,75th,90th,95th,99th] currently 
+int[] intervals = conf
+.getInts(NfsConfigKeys.NFS_METRICS_PERCENTILES_INTERVALS_KEY);
 return ms.register(new Nfs3Metrics(gatewayName, sessionId, intervals, jm));
   }
   
@@ -217,4 +216,4 @@ public class Nfs3Metrics {
 }
   }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hadoop/blob/14d1cccf/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 e4d737f..4dcf9eb 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -927,6 +927,8 @@ Release 2.7.0 - UNRELEASED
 
 HDFS-7961. Trigger full block report

[16/50] [abbrv] hadoop git commit: HDFS-7977. NFS couldn't take percentile intervals. Contributed by Brandon Li

2015-03-24 Thread zhz 
HDFS-7977. NFS couldn't take percentile intervals. Contributed by Brandon Li


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

Branch: refs/heads/HDFS-7285
Commit: 570a83ae80faf2076966acf30588733803327844
Parents: 97a7277
Author: Brandon Li brando...@apache.org
Authored: Tue Mar 24 10:49:16 2015 -0700
Committer: Brandon Li brando...@apache.org
Committed: Tue Mar 24 10:49:16 2015 -0700

--
 .../org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java |  1 -
 .../org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java   | 13 ++---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt|  2 ++
 .../hadoop-hdfs/src/site/markdown/HdfsNfsGateway.md| 12 
 4 files changed, 20 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/570a83ae/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
index 09ee579..05cc0b5 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
@@ -72,7 +72,6 @@ public class NfsConfigKeys {
   public static final String NFS_HTTPS_ADDRESS_DEFAULT = 0.0.0.0: + 
NFS_HTTPS_PORT_DEFAULT;
   
   public static final String  NFS_METRICS_PERCENTILES_INTERVALS_KEY = 
nfs.metrics.percentiles.intervals;
-  public static final String  NFS_METRICS_PERCENTILES_INTERVALS_DEFAULT = ;
   
   /*
* HDFS super-user is the user with the same identity as NameNode process

http://git-wip-us.apache.org/repos/asf/hadoop/blob/570a83ae/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
index d36ea73..880a8a6 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
@@ -90,9 +90,9 @@ public class Nfs3Metrics {
   readNanosQuantiles[i] = registry.newQuantiles(readProcessNanos
   + interval + s, Read process in ns, ops, latency, interval);
   writeNanosQuantiles[i] = registry.newQuantiles(writeProcessNanos
-  + interval + s,  process in ns, ops, latency, interval);
+  + interval + s, Write process in ns, ops, latency, interval);
   commitNanosQuantiles[i] = registry.newQuantiles(commitProcessNanos
-  + interval + s, Read process in ns, ops, latency, interval);
+  + interval + s, Commit process in ns, ops, latency, 
interval);
 }
   }
 
@@ -101,10 +101,9 @@ public class Nfs3Metrics {
 MetricsSystem ms = DefaultMetricsSystem.instance();
 JvmMetrics jm = JvmMetrics.create(gatewayName, sessionId, ms);
 
-// Percentile measurement is [,,,] by default 
-int[] intervals = conf.getInts(conf.get(
-NfsConfigKeys.NFS_METRICS_PERCENTILES_INTERVALS_KEY,
-NfsConfigKeys.NFS_METRICS_PERCENTILES_INTERVALS_DEFAULT));
+// Percentile measurement is [50th,75th,90th,95th,99th] currently 
+int[] intervals = conf
+.getInts(NfsConfigKeys.NFS_METRICS_PERCENTILES_INTERVALS_KEY);
 return ms.register(new Nfs3Metrics(gatewayName, sessionId, intervals, jm));
   }
   
@@ -217,4 +216,4 @@ public class Nfs3Metrics {
 }
   }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hadoop/blob/570a83ae/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 3725a03..5dae029 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1260,6 +1260,8 @@ Release 2.7.0 - UNRELEASED
 
 HDFS-7961. Trigger full block report after hot swapping disk. (Eddy Xu via 
wang)
 
+HDFS-7977. NFS couldn't take percentile intervals (brandonli)
+
 BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS
 
   HDFS-7720. Quota by Storage Type API,

hadoop git commit: HDFS-7977. NFS couldn't take percentile intervals. Contributed by Brandon Li

2015-03-24 Thread brandonli 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 97a7277a2 - 570a83ae8


HDFS-7977. NFS couldn't take percentile intervals. Contributed by Brandon Li


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

Branch: refs/heads/trunk
Commit: 570a83ae80faf2076966acf30588733803327844
Parents: 97a7277
Author: Brandon Li brando...@apache.org
Authored: Tue Mar 24 10:49:16 2015 -0700
Committer: Brandon Li brando...@apache.org
Committed: Tue Mar 24 10:49:16 2015 -0700

--
 .../org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java |  1 -
 .../org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java   | 13 ++---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt|  2 ++
 .../hadoop-hdfs/src/site/markdown/HdfsNfsGateway.md| 12 
 4 files changed, 20 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/570a83ae/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
index 09ee579..05cc0b5 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
@@ -72,7 +72,6 @@ public class NfsConfigKeys {
   public static final String NFS_HTTPS_ADDRESS_DEFAULT = 0.0.0.0: + 
NFS_HTTPS_PORT_DEFAULT;
   
   public static final String  NFS_METRICS_PERCENTILES_INTERVALS_KEY = 
nfs.metrics.percentiles.intervals;
-  public static final String  NFS_METRICS_PERCENTILES_INTERVALS_DEFAULT = ;
   
   /*
* HDFS super-user is the user with the same identity as NameNode process

http://git-wip-us.apache.org/repos/asf/hadoop/blob/570a83ae/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
index d36ea73..880a8a6 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
@@ -90,9 +90,9 @@ public class Nfs3Metrics {
   readNanosQuantiles[i] = registry.newQuantiles(readProcessNanos
   + interval + s, Read process in ns, ops, latency, interval);
   writeNanosQuantiles[i] = registry.newQuantiles(writeProcessNanos
-  + interval + s,  process in ns, ops, latency, interval);
+  + interval + s, Write process in ns, ops, latency, interval);
   commitNanosQuantiles[i] = registry.newQuantiles(commitProcessNanos
-  + interval + s, Read process in ns, ops, latency, interval);
+  + interval + s, Commit process in ns, ops, latency, 
interval);
 }
   }
 
@@ -101,10 +101,9 @@ public class Nfs3Metrics {
 MetricsSystem ms = DefaultMetricsSystem.instance();
 JvmMetrics jm = JvmMetrics.create(gatewayName, sessionId, ms);
 
-// Percentile measurement is [,,,] by default 
-int[] intervals = conf.getInts(conf.get(
-NfsConfigKeys.NFS_METRICS_PERCENTILES_INTERVALS_KEY,
-NfsConfigKeys.NFS_METRICS_PERCENTILES_INTERVALS_DEFAULT));
+// Percentile measurement is [50th,75th,90th,95th,99th] currently 
+int[] intervals = conf
+.getInts(NfsConfigKeys.NFS_METRICS_PERCENTILES_INTERVALS_KEY);
 return ms.register(new Nfs3Metrics(gatewayName, sessionId, intervals, jm));
   }
   
@@ -217,4 +216,4 @@ public class Nfs3Metrics {
 }
   }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hadoop/blob/570a83ae/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 3725a03..5dae029 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1260,6 +1260,8 @@ Release 2.7.0 - UNRELEASED
 
 HDFS-7961. Trigger full block report after hot swapping disk. (Eddy Xu via 
wang)
 
+HDFS-7977. NFS couldn't take percentile intervals (brandonli)
+
 BREAKDOWN OF HDFS-7584

hadoop git commit: HDFS-7977. NFS couldn't take percentile intervals. Contributed by Brandon Li

2015-03-24 Thread brandonli 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 29629020c - 260dbe96c


HDFS-7977. NFS couldn't take percentile intervals. Contributed by Brandon Li

(cherry picked from commit 570a83ae80faf2076966acf30588733803327844)


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

Branch: refs/heads/branch-2
Commit: 260dbe96c3d21ea372c728b2cd0f4a6aeb970010
Parents: 2962902
Author: Brandon Li brando...@apache.org
Authored: Tue Mar 24 10:49:16 2015 -0700
Committer: Brandon Li brando...@apache.org
Committed: Tue Mar 24 10:50:50 2015 -0700

--
 .../org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java |  1 -
 .../org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java   | 13 ++---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt|  2 ++
 .../hadoop-hdfs/src/site/markdown/HdfsNfsGateway.md| 12 
 4 files changed, 20 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/260dbe96/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
index 09ee579..05cc0b5 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfigKeys.java
@@ -72,7 +72,6 @@ public class NfsConfigKeys {
   public static final String NFS_HTTPS_ADDRESS_DEFAULT = 0.0.0.0: + 
NFS_HTTPS_PORT_DEFAULT;
   
   public static final String  NFS_METRICS_PERCENTILES_INTERVALS_KEY = 
nfs.metrics.percentiles.intervals;
-  public static final String  NFS_METRICS_PERCENTILES_INTERVALS_DEFAULT = ;
   
   /*
* HDFS super-user is the user with the same identity as NameNode process

http://git-wip-us.apache.org/repos/asf/hadoop/blob/260dbe96/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
index d36ea73..880a8a6 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Metrics.java
@@ -90,9 +90,9 @@ public class Nfs3Metrics {
   readNanosQuantiles[i] = registry.newQuantiles(readProcessNanos
   + interval + s, Read process in ns, ops, latency, interval);
   writeNanosQuantiles[i] = registry.newQuantiles(writeProcessNanos
-  + interval + s,  process in ns, ops, latency, interval);
+  + interval + s, Write process in ns, ops, latency, interval);
   commitNanosQuantiles[i] = registry.newQuantiles(commitProcessNanos
-  + interval + s, Read process in ns, ops, latency, interval);
+  + interval + s, Commit process in ns, ops, latency, 
interval);
 }
   }
 
@@ -101,10 +101,9 @@ public class Nfs3Metrics {
 MetricsSystem ms = DefaultMetricsSystem.instance();
 JvmMetrics jm = JvmMetrics.create(gatewayName, sessionId, ms);
 
-// Percentile measurement is [,,,] by default 
-int[] intervals = conf.getInts(conf.get(
-NfsConfigKeys.NFS_METRICS_PERCENTILES_INTERVALS_KEY,
-NfsConfigKeys.NFS_METRICS_PERCENTILES_INTERVALS_DEFAULT));
+// Percentile measurement is [50th,75th,90th,95th,99th] currently 
+int[] intervals = conf
+.getInts(NfsConfigKeys.NFS_METRICS_PERCENTILES_INTERVALS_KEY);
 return ms.register(new Nfs3Metrics(gatewayName, sessionId, intervals, jm));
   }
   
@@ -217,4 +216,4 @@ public class Nfs3Metrics {
 }
   }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hadoop/blob/260dbe96/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 19c5529..56a4f3d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -960,6 +960,8 @@ Release 2.7.0 - UNRELEASED
 
 HDFS-7961. Trigger full block report after hot swapping disk. (Eddy Xu via 
wang)
 
+HDFS-7977. NFS