Merge changes from trunk
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/45d5b132 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/45d5b132 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/45d5b132 Branch: refs/heads/HDFS-6581 Commit: 45d5b132562990d91724c03358096c3a5dd97146 Parents: 3e2a0b5 d9a03e2 Author: Jing Zhao <[email protected]> Authored: Wed Sep 3 15:36:47 2014 -0700 Committer: Jing Zhao <[email protected]> Committed: Wed Sep 3 15:36:47 2014 -0700 ---------------------------------------------------------------------- .gitignore | 1 + LICENSE.txt | 290 ++++++++++++ NOTICE.txt | 2 + README.txt | 31 ++ dev-support/create-release.sh | 24 +- dev-support/test-patch.sh | 26 +- .../main/resources/assemblies/hadoop-src.xml | 8 + hadoop-common-project/hadoop-auth/pom.xml | 10 + .../server/AuthenticationFilter.java | 4 +- .../client/AuthenticatorTestCase.java | 137 +++++- .../client/TestKerberosAuthenticator.java | 58 ++- hadoop-common-project/hadoop-common/CHANGES.txt | 155 ++++--- hadoop-common-project/hadoop-common/LICENSE.txt | 290 ------------ hadoop-common-project/hadoop-common/NOTICE.txt | 2 - hadoop-common-project/hadoop-common/README.txt | 31 -- hadoop-common-project/hadoop-common/pom.xml | 4 + .../hadoop-common/src/main/bin/hadoop | 5 +- .../hadoop-common/src/main/bin/hadoop-config.sh | 5 + .../src/main/bin/hadoop-functions.sh | 64 ++- .../hadoop-common/src/main/bin/rcc | 7 +- .../hadoop/conf/ReconfigurationServlet.java | 2 + .../org/apache/hadoop/crypto/CryptoCodec.java | 19 +- .../org/apache/hadoop/crypto/OpensslCipher.java | 2 + .../hadoop/crypto/key/JavaKeyStoreProvider.java | 1 + .../apache/hadoop/crypto/key/KeyProvider.java | 20 + .../crypto/key/KeyProviderCryptoExtension.java | 51 ++- .../hadoop/crypto/key/KeyProviderExtension.java | 1 + .../apache/hadoop/crypto/key/UserProvider.java | 5 +- .../crypto/key/kms/KMSClientProvider.java | 1 + .../crypto/random/OpensslSecureRandom.java | 3 + .../apache/hadoop/fs/ChecksumFileSystem.java | 8 +- .../java/org/apache/hadoop/fs/ChecksumFs.java | 8 +- .../org/apache/hadoop/fs/FSOutputSummer.java | 107 +++-- .../main/java/org/apache/hadoop/fs/Globber.java | 8 +- .../org/apache/hadoop/fs/shell/Display.java | 12 +- .../org/apache/hadoop/http/HttpServer2.java | 12 + .../org/apache/hadoop/io/nativeio/NativeIO.java | 7 +- .../main/java/org/apache/hadoop/ipc/Client.java | 8 + .../apache/hadoop/ipc/ProtobufRpcEngine.java | 20 +- .../main/java/org/apache/hadoop/ipc/Server.java | 43 +- .../apache/hadoop/ipc/WritableRpcEngine.java | 18 +- .../JniBasedUnixGroupsMappingWithFallback.java | 3 +- .../hadoop/security/alias/UserProvider.java | 5 - .../security/authorize/AccessControlList.java | 12 +- .../web/DelegationTokenAuthenticatedURL.java | 81 +++- .../DelegationTokenAuthenticationHandler.java | 14 +- .../web/DelegationTokenAuthenticator.java | 19 +- .../apache/hadoop/tracing/SpanReceiverHost.java | 153 +++++++ .../org/apache/hadoop/util/DataChecksum.java | 2 + .../org/apache/hadoop/util/NativeCrc32.java | 2 +- .../apache/hadoop/util/PerformanceAdvisory.java | 25 + .../java/org/apache/hadoop/util/ProtoUtil.java | 11 + .../org/apache/hadoop/util/VersionInfo.java | 3 +- .../hadoop-common/src/main/native/README | 7 +- .../src/main/proto/RpcHeader.proto | 13 + .../hadoop-common/src/site/apt/Tracing.apt.vm | 169 +++++++ .../crypto/key/TestCachingKeyProvider.java | 6 + .../hadoop/crypto/key/TestKeyProvider.java | 17 +- ...TestKeyProviderDelegationTokenExtension.java | 13 +- .../apache/hadoop/fs/shell/TestTextCommand.java | 77 +++- ...tionTokenAuthenticationHandlerWithMocks.java | 46 +- .../delegation/web/TestWebDelegationToken.java | 50 +- hadoop-common-project/hadoop-kms/pom.xml | 1 - .../hadoop/crypto/key/kms/server/KMS.java | 27 +- .../hadoop/crypto/key/kms/server/KMSACLs.java | 55 ++- .../hadoop-kms/src/site/apt/index.apt.vm | 88 +++- .../hadoop/crypto/key/kms/server/TestKMS.java | 100 +++- .../crypto/key/kms/server/TestKMSACLs.java | 2 +- .../hadoop/nfs/nfs3/Nfs3FileAttributes.java | 14 +- .../hadoop/nfs/nfs3/request/ACCESS3Request.java | 15 +- .../hadoop/nfs/nfs3/request/COMMIT3Request.java | 23 +- .../hadoop/nfs/nfs3/request/CREATE3Request.java | 18 +- .../hadoop/nfs/nfs3/request/FSINFO3Request.java | 15 +- .../hadoop/nfs/nfs3/request/FSSTAT3Request.java | 15 +- .../nfs/nfs3/request/GETATTR3Request.java | 15 +- .../hadoop/nfs/nfs3/request/LINK3Request.java | 61 +++ .../hadoop/nfs/nfs3/request/LOOKUP3Request.java | 9 +- .../hadoop/nfs/nfs3/request/MKDIR3Request.java | 26 +- .../hadoop/nfs/nfs3/request/MKNOD3Request.java | 89 ++++ .../hadoop/nfs/nfs3/request/NFS3Request.java | 45 ++ .../nfs/nfs3/request/PATHCONF3Request.java | 15 +- .../hadoop/nfs/nfs3/request/READ3Request.java | 9 +- .../nfs/nfs3/request/READDIR3Request.java | 30 +- .../nfs/nfs3/request/READDIRPLUS3Request.java | 33 +- .../nfs/nfs3/request/READLINK3Request.java | 15 +- .../hadoop/nfs/nfs3/request/REMOVE3Request.java | 20 +- .../hadoop/nfs/nfs3/request/RENAME3Request.java | 37 +- .../hadoop/nfs/nfs3/request/RMDIR3Request.java | 20 +- .../nfs/nfs3/request/RequestWithHandle.java | 16 +- .../nfs/nfs3/request/SETATTR3Request.java | 29 +- .../nfs/nfs3/request/SYMLINK3Request.java | 30 +- .../hadoop/nfs/nfs3/request/SetAttr3.java | 9 + .../hadoop/nfs/nfs3/request/WRITE3Request.java | 13 +- .../hadoop/nfs/nfs3/response/LINK3Response.java | 54 +++ .../nfs/nfs3/response/MKNOD3Response.java | 68 +++ hadoop-dist/pom.xml | 3 + hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 1 - .../hadoop/hdfs/nfs/nfs3/OpenFileCtx.java | 6 +- .../hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java | 40 +- .../hdfs/nfs/nfs3/TestRpcProgramNfs3.java | 187 ++++---- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 227 ++++++---- hadoop-hdfs-project/hadoop-hdfs/LICENSE.txt | 271 ----------- hadoop-hdfs-project/hadoop-hdfs/NOTICE.txt | 2 - .../dev-support/findbugsExcludeFile.xml | 9 + hadoop-hdfs-project/hadoop-hdfs/pom.xml | 5 + .../bkjournal/BookKeeperEditLogInputStream.java | 5 + .../hadoop-hdfs/src/main/bin/hdfs | 25 +- .../apache/hadoop/hdfs/BlockReaderFactory.java | 27 +- .../java/org/apache/hadoop/hdfs/DFSClient.java | 19 +- .../org/apache/hadoop/hdfs/DFSConfigKeys.java | 8 + .../hadoop/hdfs/DFSInotifyEventInputStream.java | 220 +++++++++ .../org/apache/hadoop/hdfs/DFSOutputStream.java | 50 +- .../hadoop/hdfs/DistributedFileSystem.java | 9 + .../apache/hadoop/hdfs/client/HdfsAdmin.java | 50 ++ .../org/apache/hadoop/hdfs/inotify/Event.java | 452 +++++++++++++++++++ .../apache/hadoop/hdfs/inotify/EventsList.java | 63 +++ .../hdfs/inotify/MissingEventsException.java | 54 +++ .../hadoop/hdfs/protocol/ClientProtocol.java | 18 + .../datatransfer/ReplaceDatanodeOnFailure.java | 163 +++++-- ...tNamenodeProtocolServerSideTranslatorPB.java | 25 + .../ClientNamenodeProtocolTranslatorPB.java | 25 + .../apache/hadoop/hdfs/protocolPB/PBHelper.java | 245 ++++++++++ .../hdfs/qjournal/client/IPCLoggerChannel.java | 78 +++- .../hadoop/hdfs/qjournal/server/Journal.java | 3 +- .../server/datanode/BlockPoolSliceStorage.java | 23 +- .../hdfs/server/datanode/BlockReceiver.java | 6 +- .../hadoop/hdfs/server/datanode/DataNode.java | 14 +- .../hdfs/server/datanode/DataStorage.java | 27 ++ .../server/datanode/fsdataset/FsDatasetSpi.java | 3 + .../datanode/fsdataset/impl/BlockPoolSlice.java | 2 +- .../impl/FsDatasetAsyncDiskService.java | 18 + .../datanode/fsdataset/impl/FsDatasetImpl.java | 69 +++ .../datanode/fsdataset/impl/FsVolumeList.java | 19 + .../namenode/EditLogBackupInputStream.java | 5 + .../server/namenode/EditLogFileInputStream.java | 5 + .../server/namenode/EditLogInputStream.java | 6 + .../hdfs/server/namenode/FSDirectory.java | 39 +- .../hadoop/hdfs/server/namenode/FSEditLog.java | 67 ++- .../hdfs/server/namenode/FSNamesystem.java | 22 +- .../server/namenode/FileJournalManager.java | 16 +- .../namenode/InotifyFSEditLogOpTranslator.java | 146 ++++++ .../hadoop/hdfs/server/namenode/JournalSet.java | 38 +- .../hadoop/hdfs/server/namenode/NameNode.java | 8 + .../hdfs/server/namenode/NameNodeRpcServer.java | 115 +++++ .../namenode/RedundantEditLogInputStream.java | 5 + .../hdfs/server/namenode/TransferFsImage.java | 5 +- .../hdfs/shortcircuit/DomainSocketFactory.java | 4 +- .../src/main/proto/ClientNamenodeProtocol.proto | 20 + .../hadoop-hdfs/src/main/proto/inotify.proto | 117 +++++ .../src/main/resources/hdfs-default.xml | 32 ++ .../src/site/xdoc/HdfsRollingUpgrade.xml | 2 +- .../org/apache/hadoop/fs/TestGlobPaths.java | 260 +++++++---- .../org/apache/hadoop/hdfs/MiniDFSCluster.java | 22 +- .../hdfs/TestDFSInotifyEventInputStream.java | 430 ++++++++++++++++++ .../org/apache/hadoop/hdfs/TestDFSRename.java | 6 + .../org/apache/hadoop/hdfs/TestFileAppend.java | 4 +- .../org/apache/hadoop/hdfs/TestFileAppend4.java | 2 +- .../hdfs/TestReplaceDatanodeOnFailure.java | 45 +- .../hadoop/hdfs/qjournal/MiniQJMHACluster.java | 6 +- .../hdfs/qjournal/client/TestQJMWithFaults.java | 2 +- .../client/TestQuorumJournalManager.java | 2 +- .../security/token/block/TestBlockToken.java | 2 + .../server/datanode/SimulatedFSDataset.java | 5 + .../server/datanode/TestFsDatasetCache.java | 1 - .../fsdataset/impl/TestFsDatasetImpl.java | 92 +++- .../namenode/TestBlockUnderConstruction.java | 3 + .../server/namenode/TestCacheDirectives.java | 1 - .../namenode/TestDecommissioningStatus.java | 3 + .../hdfs/server/namenode/TestEditLog.java | 4 + .../hdfs/server/namenode/TestStartup.java | 2 +- .../security/TestRefreshUserMappings.java | 12 +- .../org/apache/hadoop/tracing/TestTracing.java | 280 ++++++++++++ hadoop-mapreduce-project/CHANGES.txt | 28 +- hadoop-mapreduce-project/LICENSE.txt | 341 -------------- hadoop-mapreduce-project/NOTICE.txt | 2 - hadoop-mapreduce-project/bin/mapred | 14 +- .../v2/app/commit/CommitterEventHandler.java | 2 +- .../mapreduce/v2/app/rm/RMCommunicator.java | 2 +- .../v2/app/speculate/DefaultSpeculator.java | 8 +- .../org/apache/hadoop/mapred/BackupStore.java | 2 +- .../src/site/markdown/HadoopArchives.md.vm | 12 +- .../test/java/org/apache/hadoop/SleepJob.java | 275 ----------- .../org/apache/hadoop/fs/JHLogAnalyzer.java | 4 +- .../org/apache/hadoop/mapreduce/SleepJob.java | 32 +- .../TestMRAMWithNonNormalizedCapabilities.java | 2 +- .../apache/hadoop/mapreduce/v2/TestMRJobs.java | 4 +- .../v2/TestMRJobsWithHistoryService.java | 2 +- .../mapreduce/v2/TestMRJobsWithProfiler.java | 2 +- hadoop-project/pom.xml | 33 +- hadoop-project/src/site/site.xml | 1 + .../org/apache/hadoop/tools/HadoopArchives.java | 12 +- .../apache/hadoop/tools/TestHadoopArchives.java | 41 ++ .../hadoop-aws/dev-support/findbugs-exclude.xml | 19 + hadoop-tools/hadoop-aws/pom.xml | 116 +++++ .../hadoop/yarn/sls/nodemanager/NodeInfo.java | 27 +- .../yarn/sls/scheduler/RMNodeWrapper.java | 11 - hadoop-tools/pom.xml | 1 + hadoop-yarn-project/CHANGES.txt | 29 ++ hadoop-yarn-project/LICENSE.txt | 341 -------------- hadoop-yarn-project/NOTICE.txt | 17 - hadoop-yarn-project/hadoop-yarn/bin/yarn | 15 +- .../hadoop/yarn/api/records/ResourceOption.java | 2 + .../UpdateNodeResourceResponse.java | 12 +- ..._server_resourcemanager_service_protos.proto | 58 --- .../distributedshell/ApplicationMaster.java | 8 +- .../applications/distributedshell/Client.java | 2 +- .../records/impl/pb/ResourceOptionPBImpl.java | 33 +- .../pb/UpdateNodeResourceResponsePBImpl.java | 2 +- .../ApplicationHistoryServer.java | 5 +- .../TestApplicationHistoryServer.java | 35 +- .../localizer/ResourceLocalizationService.java | 4 +- .../nodemanager/TestNodeManagerResync.java | 2 +- .../server/resourcemanager/AdminService.java | 34 +- .../resourcemanager/ResourceTrackerService.java | 4 +- .../recovery/FileSystemRMStateStore.java | 8 +- .../recovery/ZKRMStateStore.java | 8 +- .../records/ApplicationAttemptStateData.java | 2 +- .../recovery/records/ApplicationStateData.java | 2 +- .../resourcemanager/recovery/records/Epoch.java | 2 +- .../pb/ApplicationAttemptStateDataPBImpl.java | 6 +- .../impl/pb/ApplicationStateDataPBImpl.java | 6 +- .../recovery/records/impl/pb/EpochPBImpl.java | 4 +- .../server/resourcemanager/rmnode/RMNode.java | 12 - .../resourcemanager/rmnode/RMNodeEventType.java | 3 + .../resourcemanager/rmnode/RMNodeImpl.java | 86 +++- .../rmnode/RMNodeResourceUpdateEvent.java | 37 ++ .../scheduler/AbstractYarnScheduler.java | 29 ++ .../scheduler/SchedulerNode.java | 25 +- .../scheduler/SchedulerUtils.java | 37 -- .../scheduler/capacity/CapacityScheduler.java | 26 +- .../event/NodeResourceUpdateSchedulerEvent.java | 43 ++ .../scheduler/event/SchedulerEventType.java | 1 + .../scheduler/fair/AllocationConfiguration.java | 60 ++- .../fair/AllocationFileLoaderService.java | 97 +++- .../scheduler/fair/FSLeafQueue.java | 54 ++- .../scheduler/fair/FSParentQueue.java | 9 + .../resourcemanager/scheduler/fair/FSQueue.java | 54 ++- .../scheduler/fair/FairScheduler.java | 93 ++-- .../scheduler/fair/QueueManager.java | 5 + .../scheduler/fifo/FifoScheduler.java | 12 +- .../security/DelegationTokenRenewer.java | 2 +- .../webapp/FairSchedulerAppsBlock.java | 4 + .../webapp/FairSchedulerPage.java | 31 +- .../resourcemanager/webapp/RMWebServices.java | 2 +- .../webapp/dao/FairSchedulerInfo.java | 15 +- .../webapp/dao/FairSchedulerQueueInfo.java | 34 +- .../yarn_server_resourcemanager_recovery.proto | 60 +++ .../yarn/server/resourcemanager/MockNodes.java | 22 +- .../yarn/server/resourcemanager/MockRM.java | 5 +- .../resourcemanager/TestFifoScheduler.java | 85 ++++ .../resourcemanager/TestRMNodeTransitions.java | 75 ++- .../resourcetracker/TestNMReconnect.java | 19 +- .../capacity/TestCapacityScheduler.java | 107 ++++- .../fair/TestAllocationFileLoaderService.java | 107 ++++- .../scheduler/fair/TestFSLeafQueue.java | 198 ++++++-- .../scheduler/fair/TestFairScheduler.java | 433 +++++++++++++----- .../scheduler/fifo/TestFifoScheduler.java | 24 +- .../webapp/TestRMWebAppFairScheduler.java | 96 +++- .../TestRMWebServicesAppsModification.java | 21 +- .../src/site/apt/FairScheduler.apt.vm | 48 +- 260 files changed, 8188 insertions(+), 3078 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/45d5b132/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/45d5b132/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/45d5b132/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/45d5b132/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/45d5b132/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/ClientProtocol.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/45d5b132/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolServerSideTranslatorPB.java ---------------------------------------------------------------------- diff --cc hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolServerSideTranslatorPB.java index 5d222e8,a162ec5..0314576 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolServerSideTranslatorPB.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolServerSideTranslatorPB.java @@@ -1413,15 -1413,24 +1417,36 @@@ public class ClientNamenodeProtocolServ return VOID_CHECKACCESS_RESPONSE; } + @Override + public SetStoragePolicyResponseProto setStoragePolicy( + RpcController controller, SetStoragePolicyRequestProto request) + throws ServiceException { + try { + server.setStoragePolicy(request.getSrc(), request.getPolicyName()); + } catch (IOException e) { + throw new ServiceException(e); + } + return VOID_SET_STORAGE_POLICY_RESPONSE; + } ++ + public GetCurrentEditLogTxidResponseProto getCurrentEditLogTxid(RpcController controller, + GetCurrentEditLogTxidRequestProto req) throws ServiceException { + try { + return GetCurrentEditLogTxidResponseProto.newBuilder().setTxid( + server.getCurrentEditLogTxid()).build(); + } catch (IOException e) { + throw new ServiceException(e); + } + } + + @Override + public GetEditsFromTxidResponseProto getEditsFromTxid(RpcController controller, + GetEditsFromTxidRequestProto req) throws ServiceException { + try { + return PBHelper.convertEditsResponse(server.getEditsFromTxid( + req.getTxid())); + } catch (IOException e) { + throw new ServiceException(e); + } + } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/45d5b132/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolTranslatorPB.java ---------------------------------------------------------------------- diff --cc hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolTranslatorPB.java index 63af6b0,79c4fcf..4295ce7 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolTranslatorPB.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolTranslatorPB.java @@@ -1434,16 -1435,24 +1438,37 @@@ public class ClientNamenodeProtocolTran } } + @Override + public void setStoragePolicy(String src, String policyName) + throws SnapshotAccessControlException, UnresolvedLinkException, + FileNotFoundException, QuotaExceededException, IOException { + SetStoragePolicyRequestProto req = SetStoragePolicyRequestProto + .newBuilder().setSrc(src).setPolicyName(policyName).build(); + try { + rpcProxy.setStoragePolicy(null, req); + } catch (ServiceException e) { + throw ProtobufHelper.getRemoteException(e); + } + } ++ + public long getCurrentEditLogTxid() throws IOException { + GetCurrentEditLogTxidRequestProto req = GetCurrentEditLogTxidRequestProto + .getDefaultInstance(); + try { + return rpcProxy.getCurrentEditLogTxid(null, req).getTxid(); + } catch (ServiceException e) { + throw ProtobufHelper.getRemoteException(e); + } + } + + @Override + public EventsList getEditsFromTxid(long txid) throws IOException { + GetEditsFromTxidRequestProto req = GetEditsFromTxidRequestProto.newBuilder() + .setTxid(txid).build(); + try { + return PBHelper.convert(rpcProxy.getEditsFromTxid(null, req)); + } catch (ServiceException e) { + throw ProtobufHelper.getRemoteException(e); + } + } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/45d5b132/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java ---------------------------------------------------------------------- diff --cc hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java index 4a882cd,38ba7db..fe6093d --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java @@@ -44,9 -44,10 +44,11 @@@ import org.apache.hadoop.fs.permission. import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.ha.HAServiceProtocol.HAServiceState; import org.apache.hadoop.ha.proto.HAServiceProtocolProtos; +import org.apache.hadoop.hdfs.BlockStoragePolicy; import org.apache.hadoop.hdfs.DFSUtil; import org.apache.hadoop.hdfs.StorageType; + import org.apache.hadoop.hdfs.inotify.Event; + import org.apache.hadoop.hdfs.inotify.EventsList; import org.apache.hadoop.hdfs.protocol.Block; import org.apache.hadoop.hdfs.protocol.CacheDirectiveEntry; import org.apache.hadoop.hdfs.protocol.CacheDirectiveInfo; http://git-wip-us.apache.org/repos/asf/hadoop/blob/45d5b132/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/45d5b132/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/45d5b132/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/45d5b132/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/45d5b132/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/ClientNamenodeProtocol.proto ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/45d5b132/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/45d5b132/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java ----------------------------------------------------------------------
