Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-12519. hadoop-azure tests should avoid creating a metrics configuration fiale in the module root directory. Contributed by Chris Nauroth. 

(cherry picked from commit 2d10cb8e00)
This commit is contained in:
cnauroth 2015-10-28 09:44:10 -07:00
parent 5a7b407929
commit c7f87dc2d0
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -693,6 +693,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12178. NPE during handling of SASL setup if problem with SASL HADOOP-12178. NPE during handling of SASL setup if problem with SASL
resolver class. (Steve Loughran via zxu) 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 OPTIMIZATIONS
HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString() HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString()

4
hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/AzureBlobStorageTestAccount.java
View File

@ -38,6 +38,7 @@ import org.apache.hadoop.metrics2.AbstractMetric;
import org.apache.hadoop.metrics2.MetricsRecord; import org.apache.hadoop.metrics2.MetricsRecord;
import org.apache.hadoop.metrics2.MetricsSink; import org.apache.hadoop.metrics2.MetricsSink;
import org.apache.hadoop.metrics2.MetricsTag; import org.apache.hadoop.metrics2.MetricsTag;
import org.apache.hadoop.metrics2.impl.TestMetricsConfig;
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem; import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import com.microsoft.azure.storage.AccessCondition; import com.microsoft.azure.storage.AccessCondition;
@ -252,7 +253,8 @@ public final class AzureBlobStorageTestAccount {
new org.apache.hadoop.metrics2.impl.ConfigBuilder() new org.apache.hadoop.metrics2.impl.ConfigBuilder()
.add("azure-file-system.sink.azuretestcollector.class", .add("azure-file-system.sink.azuretestcollector.class",
StandardCollector.class.getName()) StandardCollector.class.getName())
.save("hadoop-metrics2-azure-file-system.properties"); .save(TestMetricsConfig.getTestFilename(
"hadoop-metrics2-azure-file-system.properties"));
metricsConfigSaved = true; metricsConfigSaved = true;
} }
} }