Repository: hadoop Updated Branches: refs/heads/branch-2 2ba41729a -> a47820d72
HDFS-12137. DN dataset lock should be fair. Contributed by Daryn Sharp. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a47820d7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a47820d7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a47820d7 Branch: refs/heads/branch-2 Commit: a47820d72a4c4aba857fd7325fa9ae9a95fe8faa Parents: 2ba4172 Author: Kihwal Lee <[email protected]> Authored: Fri Jul 14 15:45:26 2017 -0500 Committer: Kihwal Lee <[email protected]> Committed: Fri Jul 14 15:45:26 2017 -0500 ---------------------------------------------------------------------- .../hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a47820d7/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java index dee48a0..09071ea 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java @@ -124,6 +124,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.ReentrantLock; /************************************************** * FSDataset manages a set of data blocks. Each block @@ -304,6 +305,7 @@ class FsDatasetImpl implements FsDatasetSpi<FsVolumeImpl> { this.smallBufferSize = DFSUtilClient.getSmallBufferSize(conf); this.datasetLock = new AutoCloseableLock( new InstrumentedLock(getClass().getName(), LOG, + new ReentrantLock(true), conf.getTimeDuration( DFSConfigKeys.DFS_LOCK_SUPPRESS_WARNING_INTERVAL_KEY, DFSConfigKeys.DFS_LOCK_SUPPRESS_WARNING_INTERVAL_DEFAULT, --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
