This is an automated email from the ASF dual-hosted git repository.
slfan1989 pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
from d44ac28e326 HADOOP-19278. S3A: Remove option to delete directory
markers (#7052)
add f0ab1e69723 Revert "HDFS-17496. DataNode supports more fine-grained
dataset lock based on…" (#7279)
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/hadoop/hdfs/DFSConfigKeys.java | 4 -
.../hdfs/server/common/DataNodeLockManager.java | 3 +-
.../hdfs/server/datanode/DataSetLockManager.java | 38 +------
.../server/datanode/DataSetSubLockStrategy.java | 36 ------
.../server/datanode/ModDataSetSubLockStrategy.java | 53 ---------
.../datanode/fsdataset/impl/FsDatasetImpl.java | 121 +++++++--------------
.../src/main/resources/hdfs-default.xml | 9 --
.../server/datanode/TestDataSetLockManager.java | 11 --
.../datanode/fsdataset/impl/TestFsDatasetImpl.java | 7 +-
.../hdfs/server/namenode/ha/TestDNFencing.java | 11 +-
10 files changed, 45 insertions(+), 248 deletions(-)
delete mode 100644
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataSetSubLockStrategy.java
delete mode 100644
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ModDataSetSubLockStrategy.java
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
