You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ji...@apache.org on 2015/10/30 19:00:40 UTC
[27/30] hadoop git commit: HADOOP-12519. hadoop-azure tests should
avoid creating a metrics configuration fiale in the module root directory.
Contributed by Chris Nauroth.
HADOOP-12519. hadoop-azure tests should avoid creating a metrics configuration fiale in the module root directory. Contributed by Chris Nauroth.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2d10cb8e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2d10cb8e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2d10cb8e
Branch: refs/heads/HDFS-8966
Commit: 2d10cb8e00fd84be26b51f9fba819e3e5b6cdcbf
Parents: e287e7d
Author: cnauroth <cn...@apache.org>
Authored: Wed Oct 28 09:44:10 2015 -0700
Committer: cnauroth <cn...@apache.org>
Committed: Wed Oct 28 09:44:10 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../org/apache/hadoop/fs/azure/AzureBlobStorageTestAccount.java | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2d10cb8e/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 59fedc8..99d4782 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1293,6 +1293,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12178. NPE during handling of SASL setup if problem with SASL
resolver class. (Steve Loughran via zxu)
+ HADOOP-12519. hadoop-azure tests should avoid creating a metrics
+ configuration file in the module root directory. (cnauroth)
+
OPTIMIZATIONS
HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString()
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2d10cb8e/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/AzureBlobStorageTestAccount.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/AzureBlobStorageTestAccount.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/AzureBlobStorageTestAccount.java
index 635c024..628fe7e 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/AzureBlobStorageTestAccount.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/AzureBlobStorageTestAccount.java
@@ -38,6 +38,7 @@ import org.apache.hadoop.metrics2.AbstractMetric;
import org.apache.hadoop.metrics2.MetricsRecord;
import org.apache.hadoop.metrics2.MetricsSink;
import org.apache.hadoop.metrics2.MetricsTag;
+import org.apache.hadoop.metrics2.impl.TestMetricsConfig;
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import com.microsoft.azure.storage.AccessCondition;
@@ -252,7 +253,8 @@ public final class AzureBlobStorageTestAccount {
new org.apache.hadoop.metrics2.impl.ConfigBuilder()
.add("azure-file-system.sink.azuretestcollector.class",
StandardCollector.class.getName())
- .save("hadoop-metrics2-azure-file-system.properties");
+ .save(TestMetricsConfig.getTestFilename(
+ "hadoop-metrics2-azure-file-system.properties"));
metricsConfigSaved = true;
}
}