This is an automated email from the ASF dual-hosted git repository. weichiu pushed a change to branch branch-3.2 in repository https://gitbox.apache.org/repos/asf/hadoop.git
from 822c7eee0bc HDFS-16942. Addendum. Send error to datanode if FBR is rejected due to bad lease (#5478). Contributed by Stephen O'Donnell/ add ffbf8068467 HADOOP-18671. Add recoverLease(), setSafeMode(), isFileClosed() as interfaces to hadoop-common (#5553) (#5620) No new revisions were added by this update. Summary of changes: .../apache/hadoop/fs/CommonPathCapabilities.java | 7 ++ .../{RemoteIterator.java => LeaseRecoverable.java} | 32 ++++---- .../main/java/org/apache/hadoop/fs/SafeMode.java | 50 ++++++++++++ .../java/org/apache/hadoop/fs/SafeModeAction.java | 30 +++---- .../src/site/markdown/filesystem/index.md | 4 + .../site/markdown/filesystem/leaserecoverable.md | 52 ++++++++++++ .../src/site/markdown/filesystem/safemode.md | 45 +++++++++++ .../AbstractContractLeaseRecoveryTest.java | 90 +++++++++++++++++++++ .../fs/contract/AbstractContractSafeModeTest.java | 54 +++++++++++++ .../fs/contract/AbstractFSContractTestBase.java | 9 +++ .../apache/hadoop/hdfs/DistributedFileSystem.java | 94 ++++++++++++++++++++-- .../org/apache/hadoop/hdfs/client/HdfsUtils.java | 1 + .../server/federation/router/TestRouterRpc.java | 20 ++--- .../org/apache/hadoop/hdfs/tools/DFSAdmin.java | 3 + ...ete.java => TestHDFSContractLeaseRecovery.java} | 13 +-- ...ractSeek.java => TestHDFSContractSafeMode.java} | 14 ++-- .../apache/hadoop/hdfs/TestBlockStoragePolicy.java | 6 +- .../apache/hadoop/hdfs/TestDFSClientRetries.java | 6 +- .../org/apache/hadoop/hdfs/TestDFSUpgrade.java | 6 +- .../apache/hadoop/hdfs/TestEncryptionZones.java | 16 ++-- .../hadoop/hdfs/TestErasureCodingPolicies.java | 6 +- .../hdfs/TestErasureCodingPolicyWithSnapshot.java | 6 +- .../java/org/apache/hadoop/hdfs/TestGetBlocks.java | 6 +- .../hadoop/hdfs/TestHDFSFileSystemContract.java | 18 +++++ .../org/apache/hadoop/hdfs/TestMiniDFSCluster.java | 4 +- .../org/apache/hadoop/hdfs/TestRollingUpgrade.java | 28 +++---- .../hadoop/hdfs/TestRollingUpgradeDowngrade.java | 6 +- .../hadoop/hdfs/TestRollingUpgradeRollback.java | 10 +-- .../java/org/apache/hadoop/hdfs/TestSafeMode.java | 28 +++---- .../hadoop/hdfs/server/balancer/TestBalancer.java | 5 +- .../datanode/TestDataNodeRollingUpgrade.java | 4 +- .../fsdataset/impl/TestLazyPersistPolicy.java | 6 +- .../hdfs/server/namenode/TestAddStripedBlocks.java | 6 +- .../hdfs/server/namenode/TestCacheDirectives.java | 6 +- .../namenode/TestCheckPointForSecurityTokens.java | 4 +- .../hdfs/server/namenode/TestCheckpoint.java | 1 + .../hadoop/hdfs/server/namenode/TestFSImage.java | 43 +++++----- .../hdfs/server/namenode/TestFSImageWithAcl.java | 11 ++- .../server/namenode/TestFSImageWithSnapshot.java | 30 +++---- .../hdfs/server/namenode/TestFSImageWithXAttr.java | 7 +- .../hdfs/server/namenode/TestFileTruncate.java | 12 +-- .../hdfs/server/namenode/TestLeaseManager.java | 6 +- .../namenode/TestNameNodeRetryCacheMetrics.java | 6 +- .../server/namenode/TestNestedEncryptionZones.java | 6 +- .../server/namenode/TestQuotaByStorageType.java | 5 +- .../hdfs/server/namenode/TestReencryption.java | 18 ++--- .../hdfs/server/namenode/TestSaveNamespace.java | 35 ++++---- .../hdfs/server/namenode/ha/TestHAMetrics.java | 4 +- .../hdfs/server/namenode/ha/TestObserverNode.java | 6 +- .../snapshot/TestRandomOpsWithSnapshots.java | 6 +- .../namenode/snapshot/TestRenameWithSnapshots.java | 14 ++-- .../server/namenode/snapshot/TestSnapshot.java | 6 +- .../namenode/snapshot/TestSnapshotDeletion.java | 26 +++--- .../namenode/snapshot/TestXAttrWithSnapshot.java | 7 +- .../offlineImageViewer/TestOfflineImageViewer.java | 8 +- .../TestOfflineImageViewerForAcl.java | 4 +- .../TestOfflineImageViewerForContentSummary.java | 4 +- .../TestOfflineImageViewerForXAttr.java | 4 +- .../TestOfflineImageViewerWithStripedBlocks.java | 6 +- .../mapreduce/v2/hs/TestHistoryFileManager.java | 20 ++--- ...estHistoryFileManagerInitWithNonRunningDFS.java | 4 +- 61 files changed, 707 insertions(+), 287 deletions(-) copy hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/{RemoteIterator.java => LeaseRecoverable.java} (51%) create mode 100644 hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/SafeMode.java copy hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/main/java/org/apache/hadoop/mapred/nativetask/DataChannel.java => hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/SafeModeAction.java (67%) create mode 100644 hadoop-common-project/hadoop-common/src/site/markdown/filesystem/leaserecoverable.md create mode 100644 hadoop-common-project/hadoop-common/src/site/markdown/filesystem/safemode.md create mode 100644 hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractLeaseRecoveryTest.java create mode 100644 hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractSafeModeTest.java copy hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/{TestHDFSContractDelete.java => TestHDFSContractLeaseRecovery.java} (88%) copy hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/{TestHDFSContractSeek.java => TestHDFSContractSafeMode.java} (88%) --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org