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 vi...@apache.org on 2014/11/17 07:30:47 UTC
[45/45] hadoop git commit: Merge remote-tracking branch
'origin/trunk' into HDFS-EC
Merge remote-tracking branch 'origin/trunk' into HDFS-EC
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/041e97d7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/041e97d7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/041e97d7
Branch: refs/heads/HDFS-EC
Commit: 041e97d79c8fa835e8b08f0c92ef9e67029ed577
Parents: 95b3eba 26d3b7e
Author: Vinayakumar B <vi...@apache.org>
Authored: Mon Nov 17 11:58:47 2014 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Mon Nov 17 11:58:47 2014 +0530
----------------------------------------------------------------------
dev-support/create-release.sh | 6 +
hadoop-common-project/hadoop-common/CHANGES.txt | 29 +-
.../hadoop-common/src/main/bin/hadoop | 2 +-
.../src/main/bin/hadoop-config.cmd | 16 +-
.../hadoop-common/src/main/bin/hadoop-config.sh | 6 +
.../src/main/bin/hadoop-daemons.sh | 19 +-
.../src/main/bin/hadoop-functions.sh | 22 +-
.../hadoop-common/src/main/bin/hadoop.cmd | 10 +-
.../hadoop-common/src/main/bin/slaves.sh | 2 +-
.../hadoop-common/src/main/bin/stop-all.sh | 2 +-
.../hadoop-common/src/main/conf/hadoop-env.sh | 3 +-
.../src/main/docs/releasenotes.html | 54 +-
.../org/apache/hadoop/fs/shell/Command.java | 28 +-
.../apache/hadoop/fs/shell/CommandFactory.java | 1 +
.../org/apache/hadoop/fs/shell/FsCommand.java | 2 +
.../org/apache/hadoop/fs/shell/find/And.java | 84 ++
.../hadoop/fs/shell/find/BaseExpression.java | 302 +++++++
.../apache/hadoop/fs/shell/find/Expression.java | 107 +++
.../hadoop/fs/shell/find/ExpressionFactory.java | 156 ++++
.../hadoop/fs/shell/find/FilterExpression.java | 144 +++
.../org/apache/hadoop/fs/shell/find/Find.java | 444 +++++++++
.../hadoop/fs/shell/find/FindOptions.java | 271 ++++++
.../org/apache/hadoop/fs/shell/find/Name.java | 100 +++
.../org/apache/hadoop/fs/shell/find/Print.java | 76 ++
.../org/apache/hadoop/fs/shell/find/Result.java | 88 ++
.../apache/hadoop/io/compress/CodecPool.java | 54 +-
.../main/java/org/apache/hadoop/ipc/Client.java | 2 +-
.../apache/hadoop/security/SecurityUtil.java | 15 +
.../src/site/apt/CommandsManual.apt.vm | 7 +-
.../src/site/apt/FileSystemShell.apt.vm | 43 +
.../hadoop/fs/shell/find/MockFileSystem.java | 86 ++
.../apache/hadoop/fs/shell/find/TestAnd.java | 263 ++++++
.../fs/shell/find/TestFilterExpression.java | 145 +++
.../apache/hadoop/fs/shell/find/TestFind.java | 900 +++++++++++++++++++
.../apache/hadoop/fs/shell/find/TestHelper.java | 35 +
.../apache/hadoop/fs/shell/find/TestIname.java | 93 ++
.../apache/hadoop/fs/shell/find/TestName.java | 93 ++
.../apache/hadoop/fs/shell/find/TestPrint.java | 56 ++
.../apache/hadoop/fs/shell/find/TestPrint0.java | 56 ++
.../apache/hadoop/fs/shell/find/TestResult.java | 172 ++++
.../hadoop/io/compress/TestCodecPool.java | 47 +-
.../src/test/resources/testConf.xml | 44 +
.../hadoop-kms/src/main/tomcat/ssl-server.xml | 2 +-
.../src/main/tomcat/ssl-server.xml | 2 +-
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 68 +-
.../hadoop-hdfs/src/main/bin/hdfs | 3 +-
.../hadoop-hdfs/src/main/bin/hdfs.cmd | 10 +-
.../org/apache/hadoop/hdfs/DFSOutputStream.java | 61 +-
.../sasl/SaslDataTransferClient.java | 3 +-
.../sasl/SaslDataTransferServer.java | 3 +-
.../server/blockmanagement/BlockIdManager.java | 2 +-
.../server/datanode/SecureDataNodeStarter.java | 3 +-
.../hadoop/hdfs/server/namenode/FSEditLog.java | 2 +
.../hdfs/server/namenode/FSEditLogOp.java | 12 +
.../hdfs/shortcircuit/ShortCircuitCache.java | 4 +-
.../hadoop/hdfs/util/ByteArrayManager.java | 15 +-
.../src/site/apt/HDFSCommands.apt.vm | 8 +-
.../java/org/apache/hadoop/hdfs/TestHFlush.java | 10 +-
.../hdfs/server/namenode/TestEditLog.java | 67 ++
.../hadoop/hdfs/util/TestByteArrayManager.java | 43 +-
.../src/test/resources/testHDFSConf.xml | 223 +++++
hadoop-mapreduce-project/CHANGES.txt | 11 +-
hadoop-mapreduce-project/bin/mapred | 13 +-
hadoop-mapreduce-project/bin/mapred-config.sh | 2 +-
hadoop-mapreduce-project/bin/mapred.cmd | 11 +-
hadoop-mapreduce-project/conf/mapred-env.cmd | 2 +-
.../apache/hadoop/mapred/LineRecordReader.java | 1 +
.../mapreduce/lib/input/LineRecordReader.java | 1 +
.../hadoop/mapreduce/task/reduce/Fetcher.java | 39 +-
.../src/site/apt/MapredCommands.apt.vm | 5 +-
.../hadoop/mapred/TestLineRecordReader.java | 37 +
.../lib/input/TestLineRecordReader.java | 38 +
hadoop-project/src/site/site.xml | 1 +
hadoop-yarn-project/CHANGES.txt | 54 +-
hadoop-yarn-project/hadoop-yarn/bin/yarn | 3 +-
.../hadoop-yarn/bin/yarn-config.sh | 2 +-
hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd | 10 +-
.../hadoop-yarn/conf/yarn-env.cmd | 2 +-
.../hadoop/yarn/api/records/LocalResource.java | 38 +
.../hadoop/yarn/conf/YarnConfiguration.java | 33 +-
.../src/main/proto/yarn_protos.proto | 1 +
.../hadoop/yarn/ContainerLogAppender.java | 7 +-
.../records/impl/pb/LocalResourcePBImpl.java | 20 +
.../yarn/sharedcache/ChecksumSHA256Impl.java | 37 +
.../yarn/sharedcache/SharedCacheChecksum.java | 43 +
.../sharedcache/SharedCacheChecksumFactory.java | 84 ++
.../org/apache/hadoop/yarn/util/FSDownload.java | 5 +-
.../src/main/resources/yarn-default.xml | 30 +-
.../hadoop/yarn/TestContainerLogAppender.java | 46 +
...pplicationHistoryManagerOnTimelineStore.java | 7 +-
.../TestApplicationHistoryClientService.java | 4 +-
.../hadoop/yarn/server/utils/BuilderUtils.java | 10 +-
.../server/nodemanager/ContainerExecutor.java | 52 +-
.../nodemanager/DockerContainerExecutor.java | 794 ++++++++++++++++
.../nodemanager/LinuxContainerExecutor.java | 2 +-
.../yarn/server/nodemanager/NodeManager.java | 2 +-
.../nodemanager/NodeStatusUpdaterImpl.java | 5 +-
.../containermanager/ContainerManagerImpl.java | 13 +
.../container/ContainerImpl.java | 72 +-
.../launcher/ContainerLaunch.java | 36 +-
.../launcher/RecoveredContainerLaunch.java | 20 +-
.../localizer/LocalResourceRequest.java | 11 +
.../localizer/ResourceLocalizationService.java | 6 +-
.../sharedcache/SharedCacheUploadEvent.java | 58 ++
.../sharedcache/SharedCacheUploadEventType.java | 28 +
.../sharedcache/SharedCacheUploadService.java | 126 +++
.../sharedcache/SharedCacheUploader.java | 289 ++++++
.../logaggregation/AppLogAggregatorImpl.java | 7 +-
.../recovery/NMLeveldbStateStoreService.java | 24 +-
.../TestDockerContainerExecutor.java | 213 +++++
.../TestDockerContainerExecutorWithMocks.java | 259 ++++++
.../container/TestContainer.java | 2 +-
.../launcher/TestContainerLaunch.java | 10 +-
.../TestResourceLocalizationService.java | 2 +-
.../TestSharedCacheUploadService.java | 50 ++
.../sharedcache/TestSharedCacheUploader.java | 241 +++++
.../TestNMLeveldbStateStoreService.java | 7 +
.../ApplicationMasterService.java | 1 +
.../server/resourcemanager/RMAppManager.java | 9 +-
.../resourcemanager/recovery/RMStateStore.java | 2 +-
.../server/resourcemanager/rmapp/RMAppImpl.java | 27 +-
.../scheduler/fair/FairScheduler.java | 18 +-
.../server/resourcemanager/TestAppManager.java | 12 +-
.../yarn/server/resourcemanager/TestRM.java | 111 +++
.../rmapp/TestRMAppTransitions.java | 29 +-
.../scheduler/fair/TestFairScheduler.java | 88 +-
.../server/webproxy/WebAppProxyServlet.java | 1 +
.../src/site/apt/DockerContainerExecutor.apt.vm | 200 +++++
.../src/site/apt/YarnCommands.apt.vm | 5 +-
129 files changed, 7782 insertions(+), 273 deletions(-)
----------------------------------------------------------------------