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 st...@apache.org on 2014/10/10 21:01:28 UTC
[49/50] [abbrv] git commit: Merge branch 'champlain' of
https://github.com/hortonworks/hadoop-monarch into champlain
Merge branch 'champlain' of https://github.com/hortonworks/hadoop-monarch into champlain
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b774d29a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b774d29a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b774d29a
Branch: refs/heads/champlain
Commit: b774d29ad213d5b547b93d3ce98328c24dc31760
Parents: b7f34c7 5d29917
Author: Eric Hanson <ehans at microsoft dot com>
Authored: Fri Oct 10 10:56:45 2014 -0700
Committer: Eric Hanson <ehans at microsoft dot com>
Committed: Fri Oct 10 10:56:45 2014 -0700
----------------------------------------------------------------------
.gitignore | 2 +
BUILDING.txt | 2 +-
LICENSE.txt | 7 +-
.../authentication/client/AuthenticatedURL.java | 5 +-
hadoop-common-project/hadoop-common/CHANGES.txt | 79 ++
.../dev-support/findbugsExcludeFile.xml | 4 +
hadoop-common-project/hadoop-common/pom.xml | 2 +-
.../hadoop-common/src/main/bin/hadoop | 3 +
.../hadoop-common/src/main/conf/hadoop-env.sh | 11 +-
.../apache/hadoop/conf/ReconfigurableBase.java | 140 ++
.../hadoop/conf/ReconfigurationTaskStatus.java | 70 +
.../apache/hadoop/conf/ReconfigurationUtil.java | 5 +
.../org/apache/hadoop/crypto/CipherSuite.java | 10 -
.../org/apache/hadoop/crypto/CryptoCodec.java | 7 +-
.../hadoop/crypto/CryptoProtocolVersion.java | 90 ++
.../hadoop/crypto/key/JavaKeyStoreProvider.java | 58 +-
.../apache/hadoop/crypto/key/KeyProvider.java | 8 +
.../crypto/key/KeyProviderCryptoExtension.java | 7 +
.../org/apache/hadoop/crypto/key/KeyShell.java | 6 +-
.../crypto/key/kms/KMSClientProvider.java | 63 +-
.../hadoop/crypto/key/kms/ValueQueue.java | 14 +-
.../hadoop/fs/CommonConfigurationKeys.java | 3 +
.../java/org/apache/hadoop/fs/FileContext.java | 3 +-
.../apache/hadoop/fs/FileEncryptionInfo.java | 30 +-
.../java/org/apache/hadoop/fs/FileUtil.java | 6 +-
.../io/compress/snappy/SnappyCompressor.java | 24 +-
.../io/compress/snappy/SnappyDecompressor.java | 26 +-
.../hadoop/io/compress/zlib/ZlibCompressor.java | 24 +-
.../io/compress/zlib/ZlibDecompressor.java | 30 +-
.../java/org/apache/hadoop/net/NetUtils.java | 2 +-
.../org/apache/hadoop/net/NetworkTopology.java | 25 +-
.../hadoop/net/unix/DomainSocketWatcher.java | 17 +-
.../java/org/apache/hadoop/security/User.java | 3 +-
.../hadoop/security/UserGroupInformation.java | 18 +-
.../web/DelegationTokenAuthenticatedURL.java | 12 +-
.../web/DelegationTokenAuthenticator.java | 4 +-
.../apache/hadoop/tracing/SpanReceiverHost.java | 136 +-
.../apache/hadoop/tracing/SpanReceiverInfo.java | 64 +
.../hadoop/tracing/SpanReceiverInfoBuilder.java | 42 +
.../org/apache/hadoop/tracing/TraceAdmin.java | 197 +++
.../hadoop/tracing/TraceAdminProtocol.java | 69 +
.../hadoop/tracing/TraceAdminProtocolPB.java | 38 +
...raceAdminProtocolServerSideTranslatorPB.java | 118 ++
.../tracing/TraceAdminProtocolTranslatorPB.java | 105 ++
.../hadoop/util/ApplicationClassLoader.java | 47 +-
.../org/apache/hadoop/util/ProgramDriver.java | 1 -
.../java/org/apache/hadoop/util/RunJar.java | 4 +-
.../src/org/apache/hadoop/io/compress/lz4/lz4.c | 1243 +++++++++++++-----
.../src/org/apache/hadoop/io/compress/lz4/lz4.h | 296 +++--
.../apache/hadoop/io/compress/lz4/lz4_encoder.h | 258 ----
.../org/apache/hadoop/io/compress/lz4/lz4hc.c | 591 +++++++--
.../org/apache/hadoop/io/compress/lz4/lz4hc.h | 84 +-
.../hadoop/io/compress/lz4/lz4hc_encoder.h | 349 -----
.../src/main/proto/TraceAdmin.proto | 73 +
.../src/main/resources/core-default.xml | 7 +
...he.hadoop.application-classloader.properties | 57 +
.../src/site/apt/FileSystemShell.apt.vm | 55 +-
.../src/site/apt/SecureMode.apt.vm | 70 +-
.../apache/hadoop/conf/TestReconfiguration.java | 157 ++-
.../FailureInjectingJavaKeyStoreProvider.java | 80 ++
.../crypto/key/TestKeyProviderFactory.java | 48 +-
.../java/org/apache/hadoop/fs/TestFileUtil.java | 6 +-
.../hadoop/io/compress/TestCodecPool.java | 87 ++
.../security/TestUserGroupInformation.java | 3 +-
.../java/org/apache/hadoop/util/TestRunJar.java | 2 +-
....apache.hadoop.crypto.key.KeyProviderFactory | 19 +
.../hadoop-kms/src/main/conf/kms-env.sh | 4 +
.../hadoop-kms/src/main/libexec/kms-config.sh | 7 +
.../hadoop-kms/src/main/sbin/kms.sh | 1 +
.../hadoop-kms/src/main/tomcat/server.xml | 1 +
.../hadoop-kms/src/main/tomcat/ssl-server.xml | 2 +-
.../hadoop-kms/src/site/apt/index.apt.vm | 2 +
.../hadoop/crypto/key/kms/server/MiniKMS.java | 20 +-
.../hadoop/crypto/key/kms/server/TestKMS.java | 230 +++-
.../org/apache/hadoop/nfs/nfs3/IdUserGroup.java | 15 +-
hadoop-dist/src/win/scripts/InstallApi.psm1 | 2 +-
hadoop-dist/src/win/scripts/install.ps1 | 23 +-
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 72 +-
hadoop-hdfs-project/hadoop-hdfs/pom.xml | 1 +
.../hadoop-hdfs/src/CMakeLists.txt | 17 +-
.../hadoop-hdfs/src/main/bin/hdfs | 5 +-
.../java/org/apache/hadoop/hdfs/DFSClient.java | 138 +-
.../org/apache/hadoop/hdfs/DFSOutputStream.java | 14 +-
.../java/org/apache/hadoop/hdfs/DFSUtil.java | 25 +-
.../apache/hadoop/hdfs/HDFSPolicyProvider.java | 6 +-
.../hdfs/UnknownCipherSuiteException.java | 11 +-
.../UnknownCryptoProtocolVersionException.java | 38 +
.../hdfs/protocol/ClientDatanodeProtocol.java | 12 +
.../hadoop/hdfs/protocol/ClientProtocol.java | 5 +-
.../hadoop/hdfs/protocol/EncryptionZone.java | 47 +-
...tDatanodeProtocolServerSideTranslatorPB.java | 61 +-
.../ClientDatanodeProtocolTranslatorPB.java | 55 +-
...tNamenodeProtocolServerSideTranslatorPB.java | 9 +-
.../ClientNamenodeProtocolTranslatorPB.java | 13 +-
.../apache/hadoop/hdfs/protocolPB/PBHelper.java | 119 +-
.../server/blockmanagement/BlockManager.java | 13 +-
.../blockmanagement/DatanodeDescriptor.java | 15 +-
.../hadoop/hdfs/server/datanode/DataNode.java | 80 +-
.../server/namenode/EncryptionZoneManager.java | 62 +-
.../hdfs/server/namenode/FSDirectory.java | 147 ++-
.../hdfs/server/namenode/FSEditLogLoader.java | 8 +-
.../hdfs/server/namenode/FSNamesystem.java | 126 +-
.../hdfs/server/namenode/INodesInPath.java | 24 +-
.../hadoop/hdfs/server/namenode/NameNode.java | 8 +-
.../hdfs/server/namenode/NameNodeRpcServer.java | 41 +-
.../hadoop/hdfs/server/namenode/StreamFile.java | 16 +-
.../hdfs/server/protocol/NamenodeProtocols.java | 4 +-
.../org/apache/hadoop/hdfs/tools/DFSAdmin.java | 95 +-
.../src/main/native/fuse-dfs/fuse_trash.c | 7 +-
.../hadoop-hdfs/src/main/native/libhdfs/hdfs.c | 2 +-
.../main/native/libhdfs/test/test_libhdfs_ops.c | 22 +-
.../src/main/native/libhdfs/test/vecsum.c | 33 +-
.../main/native/libhdfs/test_libhdfs_threaded.c | 2 +-
.../src/main/proto/ClientDatanodeProtocol.proto | 30 +
.../src/main/proto/ClientNamenodeProtocol.proto | 2 +-
.../hadoop-hdfs/src/main/proto/encryption.proto | 10 +-
.../hadoop-hdfs/src/main/proto/hdfs.proto | 40 +-
.../src/main/resources/hdfs-default.xml | 49 +
.../src/site/apt/HDFSCommands.apt.vm | 57 +-
.../src/site/apt/HdfsImageViewer.apt.vm | 59 +-
.../src/site/apt/HdfsPermissionsGuide.apt.vm | 13 +-
.../hadoop/hdfs/TestDFSClientRetries.java | 3 +-
.../apache/hadoop/hdfs/TestEncryptionZones.java | 142 +-
.../org/apache/hadoop/hdfs/TestFileAppend3.java | 83 ++
.../java/org/apache/hadoop/hdfs/TestLease.java | 3 +-
.../TestUnderReplicatedBlocks.java | 77 ++
.../namenode/TestNamenodeCapacityReport.java | 4 +-
.../server/namenode/TestSnapshotPathINodes.java | 6 +-
.../hdfs/server/namenode/TestStreamFile.java | 7 +-
.../namenode/ha/TestRetryCacheWithHA.java | 4 +-
.../apache/hadoop/hdfs/tools/TestDFSAdmin.java | 152 +++
.../apache/hadoop/tracing/TestTraceAdmin.java | 90 ++
hadoop-mapreduce-project/CHANGES.txt | 6 +
.../hadoop/mapreduce/v2/util/TestMRApps.java | 4 +-
.../hadoop-mapreduce-client-core/.gitattributes | 1 +
.../hadoop-mapreduce-client-core/pom.xml | 1 +
.../lib/input/TestCombineFileInputFormat.java | 4 -
.../apache/hadoop/mapreduce/v2/TestMRJobs.java | 2 +-
hadoop-project/pom.xml | 5 +
.../hadoop/tools/CopyListingFileStatus.java | 2 +-
.../apache/hadoop/tools/DistCpOptionSwitch.java | 21 +-
.../org/apache/hadoop/tools/DistCpOptions.java | 2 +-
.../apache/hadoop/tools/util/DistCpUtils.java | 58 +-
.../apache/hadoop/tools/TestOptionsParser.java | 2 +-
.../hadoop/tools/mapred/TestCopyMapper.java | 1 +
.../hadoop/tools/util/TestDistCpUtils.java | 1024 +++++++++++++--
.../src/site/markdown/GridMix.md.vm | 818 ++++++++++++
.../hadoop-rumen/src/site/markdown/Rumen.md.vm | 397 ++++++
hadoop-yarn-project/CHANGES.txt | 15 +
.../dev-support/findbugs-exclude.xml | 10 +
.../distributedshell/ApplicationMaster.java | 120 +-
.../applications/distributedshell/Client.java | 75 +-
.../distributedshell/DSConstants.java | 5 +
.../distributedshell/TestDistributedShell.java | 52 +-
.../apache/hadoop/yarn/client/cli/LogsCLI.java | 31 +-
.../client/api/impl/TimelineClientImpl.java | 3 -
.../logaggregation/LogAggregationUtils.java | 5 +
.../yarn/logaggregation/LogCLIHelpers.java | 105 +-
.../yarn/webapp/log/AggregatedLogsBlock.java | 207 +--
.../src/main/resources/yarn-default.xml | 126 ++
.../logaggregation/TestAggregatedLogsBlock.java | 3 -
.../hadoop-yarn/hadoop-yarn-registry/pom.xml | 218 +++
.../apache/hadoop/registry/cli/RegistryCli.java | 445 +++++++
.../hadoop/registry/client/api/BindFlags.java | 41 +
.../registry/client/api/RegistryConstants.java | 286 ++++
.../registry/client/api/RegistryOperations.java | 182 +++
.../client/api/RegistryOperationsFactory.java | 131 ++
.../registry/client/api/package-info.java | 35 +
.../registry/client/binding/JsonSerDeser.java | 327 +++++
.../client/binding/RegistryPathUtils.java | 218 +++
.../client/binding/RegistryTypeUtils.java | 240 ++++
.../registry/client/binding/RegistryUtils.java | 362 +++++
.../registry/client/binding/package-info.java | 22 +
.../AuthenticationFailedException.java | 39 +
.../exceptions/InvalidPathnameException.java | 40 +
.../exceptions/InvalidRecordException.java | 41 +
.../NoChildrenForEphemeralsException.java | 48 +
.../exceptions/NoPathPermissionsException.java | 45 +
.../client/exceptions/NoRecordException.java | 51 +
.../client/exceptions/RegistryIOException.java | 58 +
.../client/exceptions/package-info.java | 33 +
.../client/impl/RegistryOperationsClient.java | 55 +
.../registry/client/impl/package-info.java | 26 +
.../client/impl/zk/BindingInformation.java | 41 +
.../registry/client/impl/zk/CuratorService.java | 769 +++++++++++
.../client/impl/zk/RegistryBindingSource.java | 36 +
.../impl/zk/RegistryInternalConstants.java | 81 ++
.../impl/zk/RegistryOperationsService.java | 155 +++
.../client/impl/zk/RegistrySecurity.java | 996 ++++++++++++++
.../registry/client/impl/zk/ZKPathDumper.java | 133 ++
.../client/impl/zk/ZookeeperConfigOptions.java | 119 ++
.../registry/client/impl/zk/package-info.java | 39 +
.../registry/client/types/AddressTypes.java | 92 ++
.../hadoop/registry/client/types/Endpoint.java | 190 +++
.../registry/client/types/ProtocolTypes.java | 104 ++
.../client/types/RegistryPathStatus.java | 123 ++
.../registry/client/types/ServiceRecord.java | 249 ++++
.../client/types/ServiceRecordHeader.java | 59 +
.../registry/client/types/package-info.java | 41 +
.../client/types/yarn/PersistencePolicies.java | 50 +
.../types/yarn/YarnRegistryAttributes.java | 31 +
.../RMRegistryOperationsService.java | 246 ++++
.../integration/SelectByYarnPersistence.java | 60 +
.../server/integration/package-info.java | 23 +
.../hadoop/registry/server/package-info.java | 27 +
.../server/services/AddingCompositeService.java | 56 +
.../services/DeleteCompletionCallback.java | 58 +
.../server/services/MicroZookeeperService.java | 282 ++++
.../services/MicroZookeeperServiceKeys.java | 69 +
.../server/services/RegistryAdminService.java | 529 ++++++++
.../registry/server/services/package-info.java | 40 +
.../src/main/resources/.keep | 0
.../src/main/tla/yarnregistry.tla | 538 ++++++++
.../hadoop/registry/AbstractRegistryTest.java | 123 ++
.../hadoop/registry/AbstractZKRegistryTest.java | 113 ++
.../hadoop/registry/RegistryTestHelper.java | 401 ++++++
.../client/binding/TestMarshalling.java | 121 ++
.../binding/TestRegistryOperationUtils.java | 47 +
.../client/binding/TestRegistryPathUtils.java | 178 +++
.../client/impl/CuratorEventCatcher.java | 68 +
.../client/impl/TestCuratorService.java | 249 ++++
.../client/impl/TestMicroZookeeperService.java | 60 +
.../integration/TestRegistryRMOperations.java | 369 ++++++
.../integration/TestYarnPolicySelector.java | 65 +
.../operations/TestRegistryOperations.java | 304 +++++
.../secure/AbstractSecureRegistryTest.java | 356 +++++
.../registry/secure/KerberosConfiguration.java | 81 ++
.../secure/TestRegistrySecurityHelper.java | 211 +++
.../registry/secure/TestSecureLogins.java | 214 +++
.../secure/TestSecureRMRegistryOperations.java | 350 +++++
.../registry/secure/TestSecureRegistry.java | 157 +++
.../src/test/resources/log4j.properties | 63 +
...pplicationHistoryManagerOnTimelineStore.java | 20 +
...pplicationHistoryManagerOnTimelineStore.java | 23 +-
.../util/TestCgroupsLCEResourcesHandler.java | 7 +-
.../hadoop-yarn-site/src/site/apt/index.apt.vm | 2 +
.../src/site/markdown/registry/index.md | 28 +
.../site/markdown/registry/registry-security.md | 120 ++
.../registry/using-the-yarn-service-registry.md | 150 +++
.../src/site/markdown/registry/yarn-registry.md | 889 +++++++++++++
hadoop-yarn-project/hadoop-yarn/pom.xml | 1 +
241 files changed, 21519 insertions(+), 2152 deletions(-)
----------------------------------------------------------------------