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 ae...@apache.org on 2017/09/26 23:21:06 UTC
[33/33] hadoop git commit: Merge branch 'trunk' into HDFS-7240
Merge branch 'trunk' into HDFS-7240
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/GetConf.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7c58cfea
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7c58cfea
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7c58cfea
Branch: refs/heads/HDFS-7240
Commit: 7c58cfea8fead70949f2b93a3ab4208b52c81a7e
Parents: 6bee9f0 0da29cb
Author: Anu Engineer <ae...@apache.org>
Authored: Tue Sep 26 16:20:08 2017 -0700
Committer: Anu Engineer <ae...@apache.org>
Committed: Tue Sep 26 16:20:08 2017 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/conf/Configuration.java | 52 +-
.../crypto/key/kms/KMSClientProvider.java | 7 +-
.../apache/hadoop/ipc/DecayRpcScheduler.java | 9 +-
.../apache/hadoop/ipc/WritableRpcEngine.java | 4 +-
.../java/org/apache/hadoop/log/Log4Json.java | 5 +-
.../hadoop/metrics2/MetricsJsonBuilder.java | 14 +-
.../hadoop/metrics2/impl/MetricsSystemImpl.java | 8 +-
.../web/DelegationTokenAuthenticator.java | 7 +-
.../apache/hadoop/util/HttpExceptionUtils.java | 13 +-
.../org/apache/hadoop/util/ReflectionUtils.java | 4 +-
.../src/site/markdown/Compatibility.md | 10 +-
.../hadoop-common/src/site/markdown/Metrics.md | 18 +
.../apache/hadoop/conf/TestConfiguration.java | 11 +-
.../hadoop/fs/loadGenerator/LoadGenerator.java | 20 +-
.../org/apache/hadoop/mount/MountdBase.java | 14 +-
.../org/apache/hadoop/nfs/nfs3/Nfs3Base.java | 10 +-
.../org/apache/hadoop/hdfs/DFSUtilClient.java | 4 +-
.../apache/hadoop/hdfs/web/JsonUtilClient.java | 38 +
.../hadoop/hdfs/web/WebHdfsFileSystem.java | 17 +
.../hadoop/hdfs/web/resources/GetOpParam.java | 3 +-
.../org/apache/hadoop/hdfs/nfs/nfs3/Nfs3.java | 10 +-
.../apache/hadoop/hdfs/nfs/nfs3/Nfs3Utils.java | 5 +
.../nfs/nfs3/PrivilegedNfsGatewayStarter.java | 7 +-
.../hadoop-hdfs/src/main/bin/start-dfs.sh | 25 +-
.../hadoop-hdfs/src/main/bin/stop-dfs.sh | 27 +-
.../java/org/apache/hadoop/hdfs/DFSUtil.java | 83 +++
.../server/blockmanagement/BlockIdManager.java | 6 +-
.../server/blockmanagement/SlowDiskTracker.java | 9 +-
.../server/blockmanagement/SlowPeerTracker.java | 8 +-
.../hadoop/hdfs/server/datanode/DataNode.java | 8 +-
.../server/datanode/ShortCircuitRegistry.java | 1 +
.../server/datanode/checker/AbstractFuture.java | 1 +
.../erasurecode/ErasureCodingWorker.java | 11 +-
.../erasurecode/StripedReconstructor.java | 8 +-
.../datanode/fsdataset/impl/FsDatasetImpl.java | 5 +-
.../server/diskbalancer/planner/NodePlan.java | 15 +-
.../hdfs/server/namenode/FSNamesystem.java | 159 +++--
.../hdfs/server/namenode/FSNamesystemLock.java | 27 +-
.../hdfs/server/namenode/NameNodeRpcServer.java | 26 +-
.../namenode/metrics/NameNodeMetrics.java | 10 +
.../web/resources/NamenodeWebHdfsMethods.java | 21 +
.../org/apache/hadoop/hdfs/tools/GetConf.java | 31 +-
.../org/apache/hadoop/hdfs/web/JsonUtil.java | 20 +
.../src/site/markdown/HDFSCommands.md | 2 +
.../TestPendingInvalidateBlock.java | 2 +-
.../blockmanagement/TestSlowDiskTracker.java | 6 +-
.../blockmanagement/TestSlowPeerTracker.java | 10 +-
.../hdfs/server/namenode/TestAuditLogger.java | 21 +-
.../namenode/TestAuditLoggerWithCommands.java | 692 ++++++++++++++++++-
.../server/namenode/TestFSNamesystemLock.java | 47 +-
.../server/namenode/TestNameNodeMXBean.java | 9 +-
.../apache/hadoop/hdfs/tools/TestGetConf.java | 175 ++++-
.../apache/hadoop/hdfs/web/TestJsonUtil.java | 16 +-
.../org/apache/hadoop/hdfs/web/TestWebHDFS.java | 134 ++++
.../apache/hadoop/mapreduce/MRJobConfig.java | 2 +-
hadoop-project/pom.xml | 11 +-
.../org/apache/hadoop/fs/s3a/S3AFileSystem.java | 14 +-
.../java/org/apache/hadoop/fs/s3a/S3AUtils.java | 60 +-
.../fs/s3a/s3guard/DynamoDBMetadataStore.java | 104 ++-
.../fs/s3a/s3guard/LocalMetadataStore.java | 25 +-
.../hadoop/fs/s3a/s3guard/MetadataStore.java | 17 +
.../fs/s3a/s3guard/NullMetadataStore.java | 15 +
.../apache/hadoop/fs/s3a/s3guard/S3Guard.java | 17 +-
.../hadoop/fs/s3a/s3guard/S3GuardTool.java | 539 ++++++++++++---
.../site/markdown/tools/hadoop-aws/s3guard.md | 160 ++++-
.../hadoop/fs/s3a/ITestS3AConfiguration.java | 10 +
.../fs/s3a/ITestS3GuardListConsistency.java | 8 +-
.../hadoop/fs/s3a/ITestS3GuardWriteBack.java | 37 +-
.../org/apache/hadoop/fs/s3a/S3ATestUtils.java | 18 -
.../s3guard/AbstractS3GuardToolTestBase.java | 138 +++-
.../s3a/s3guard/ITestS3GuardToolDynamoDB.java | 167 ++++-
.../fs/s3a/s3guard/ITestS3GuardToolLocal.java | 142 +++-
.../hadoop/fs/s3a/s3guard/TestS3GuardCLI.java | 121 ++++
.../api/async/impl/AMRMClientAsyncImpl.java | 6 +-
.../containermanager/ContainerManagerImpl.java | 41 +-
.../container/ContainerEventType.java | 6 +-
.../container/ContainerImpl.java | 175 ++++-
.../container/ContainerState.java | 3 +-
.../container/UpdateContainerTokenEvent.java | 86 +++
.../scheduler/ContainerScheduler.java | 114 ++-
.../UpdateContainerSchedulerEvent.java | 46 +-
.../yarn/server/nodemanager/TestEventFlow.java | 3 +-
.../BaseContainerManagerTest.java | 2 +
.../containermanager/TestContainerManager.java | 229 +++++-
.../container/TestContainer.java | 3 -
.../TestContainerSchedulerQueuing.java | 101 +++
.../server/resourcemanager/rmapp/RMAppImpl.java | 11 +-
.../resourcemanager/MockMemoryRMStateStore.java | 130 ++++
.../yarn/server/resourcemanager/MockRM.java | 2 +-
.../resourcemanager/MockRMMemoryStateStore.java | 32 -
.../resourcemanager/TestApplicationCleanup.java | 4 +-
.../TestContainerResourceUsage.java | 4 +-
.../yarn/server/resourcemanager/TestRMHA.java | 4 +-
.../server/resourcemanager/TestRMRestart.java | 47 +-
.../TestWorkPreservingRMRestart.java | 51 +-
.../applicationsmanager/TestAMRestart.java | 13 +-
.../rmapp/TestRMAppTransitions.java | 199 +++++-
.../capacity/TestCapacityScheduler.java | 56 +-
.../security/TestRMDelegationTokens.java | 6 +-
99 files changed, 4190 insertions(+), 694 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7c58cfea/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7c58cfea/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/GetConf.java
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/GetConf.java
index d2aaf73,aaa1038..b942141
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/GetConf.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/GetConf.java
@@@ -25,7 -26,7 +26,8 @@@ import java.util.Arrays
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Collection;
+ import java.util.Set;
import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.conf.Configuration;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7c58cfea/hadoop-project/pom.xml
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org