Merge trunk into HDFS-7240
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/78bd1b2a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/78bd1b2a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/78bd1b2a Branch: refs/heads/HDFS-7240 Commit: 78bd1b2ab25357c38f77943b092b8ad54c89cd9c Parents: 05d7a83 f343d91 Author: Arpit Agarwal <a...@apache.org> Authored: Wed May 4 10:01:39 2016 -0700 Committer: Arpit Agarwal <a...@apache.org> Committed: Wed May 4 10:01:39 2016 -0700 ---------------------------------------------------------------------- dev-support/verify-xml.sh | 150 ++++++ .../main/resources/assemblies/hadoop-tools.xml | 7 + .../src/main/conf/hadoop-metrics.properties | 75 --- .../org/apache/hadoop/http/HttpServer2.java | 4 - .../apache/hadoop/metrics/ContextFactory.java | 214 -------- .../apache/hadoop/metrics/MetricsContext.java | 125 ----- .../apache/hadoop/metrics/MetricsException.java | 49 -- .../apache/hadoop/metrics/MetricsRecord.java | 254 ---------- .../apache/hadoop/metrics/MetricsServlet.java | 188 ------- .../org/apache/hadoop/metrics/MetricsUtil.java | 104 ---- .../java/org/apache/hadoop/metrics/Updater.java | 41 -- .../org/apache/hadoop/metrics/file/package.html | 43 -- .../hadoop/metrics/ganglia/GangliaContext.java | 276 ----------- .../metrics/ganglia/GangliaContext31.java | 147 ------ .../apache/hadoop/metrics/ganglia/package.html | 80 --- .../apache/hadoop/metrics/jvm/EventCounter.java | 36 -- .../apache/hadoop/metrics/jvm/JvmMetrics.java | 203 -------- .../apache/hadoop/metrics/jvm/package-info.java | 22 - .../java/org/apache/hadoop/metrics/package.html | 159 ------ .../metrics/spi/AbstractMetricsContext.java | 494 ------------------- .../hadoop/metrics/spi/CompositeContext.java | 206 -------- .../apache/hadoop/metrics/spi/MetricValue.java | 58 --- .../hadoop/metrics/spi/MetricsRecordImpl.java | 304 ------------ .../metrics/spi/NoEmitMetricsContext.java | 61 --- .../apache/hadoop/metrics/spi/NullContext.java | 74 --- .../spi/NullContextWithUpdateThread.java | 82 --- .../apache/hadoop/metrics/spi/OutputRecord.java | 93 ---- .../org/apache/hadoop/metrics/spi/Util.java | 68 --- .../org/apache/hadoop/metrics/spi/package.html | 36 -- .../apache/hadoop/metrics/util/MBeanUtil.java | 92 ---- .../apache/hadoop/metrics/util/MetricsBase.java | 51 -- .../metrics/util/MetricsDynamicMBeanBase.java | 229 --------- .../hadoop/metrics/util/MetricsIntValue.java | 106 ---- .../hadoop/metrics/util/MetricsLongValue.java | 93 ---- .../hadoop/metrics/util/MetricsRegistry.java | 90 ---- .../metrics/util/MetricsTimeVaryingInt.java | 129 ----- .../metrics/util/MetricsTimeVaryingLong.java | 125 ----- .../metrics/util/MetricsTimeVaryingRate.java | 198 -------- .../hadoop/metrics/util/package-info.java | 22 - .../java/org/apache/hadoop/util/RunJar.java | 89 ++-- .../org/apache/hadoop/util/SysInfoWindows.java | 2 +- .../conf/TestConfigurationFieldsBase.java | 255 ++++++++++ .../org/apache/hadoop/http/TestHttpServer.java | 10 +- .../hadoop/metrics/TestMetricsServlet.java | 112 ----- .../metrics/ganglia/TestGangliaContext.java | 84 ---- .../hadoop/metrics/spi/TestOutputRecord.java | 39 -- .../java/org/apache/hadoop/util/TestRunJar.java | 62 +-- .../hadoop/hdfs/DistributedFileSystem.java | 3 + .../hadoop-hdfs-native-client/pom.xml | 2 +- .../datanode/fsdataset/impl/FsVolumeImpl.java | 6 +- .../src/main/resources/hdfs-default.xml | 5 + .../apache/hadoop/hdfs/TestEncryptionZones.java | 38 ++ .../fsdataset/impl/TestFsVolumeList.java | 36 +- .../apache/hadoop/mapred/LocalJobRunner.java | 2 +- .../hadoop/mapred/LocalJobRunnerMetrics.java | 94 ++-- .../hadoop/mapreduce/task/reduce/Shuffle.java | 2 +- .../task/reduce/ShuffleClientMetrics.java | 91 ++-- .../yarn/util/ProcfsBasedProcessTree.java | 19 +- .../yarn/util/TestProcfsBasedProcessTree.java | 39 +- .../server/resourcemanager/ClientRMService.java | 6 +- .../server/resourcemanager/RMAuditLogger.java | 47 +- .../scheduler/AbstractYarnScheduler.java | 4 +- .../scheduler/common/fica/FiCaSchedulerApp.java | 6 +- .../scheduler/fair/FSAppAttempt.java | 6 +- .../resourcemanager/TestRMAuditLogger.java | 44 +- .../webapp/TestRMWebServicesNodes.java | 256 +++++----- .../yarn/server/timeline/EntityCacheItem.java | 24 +- .../timeline/EntityGroupFSTimelineStore.java | 22 +- .../EntityGroupFSTimelineStoreMetrics.java | 160 ++++++ .../hadoop/yarn/server/timeline/LogInfo.java | 5 +- .../TestEntityGroupFSTimelineStore.java | 22 + 71 files changed, 1108 insertions(+), 5272 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
