Skip to content

Commit 9b45c66

Browse files
ZanderXuxuzq
ZanderXu
authored and
xuzq
committed
HDFS-17387. [FGL] Abstract the configuration locking mode (#6572)
* HDFS-17387. [FGL] Abstract the configurable locking mode
1 parent 8afbfbc commit 9b45c66

File tree

9 files changed

+525
-51
lines changed

9 files changed

+525
-51
lines changed

‎hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
import org.apache.hadoop.hdfs.server.common.HdfsServerConstants;
3030
import org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.RamDiskReplicaLruTracker;
3131
import org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.ReservedSpaceCalculator;
32+
import org.apache.hadoop.hdfs.server.namenode.fgl.FSNLockManager;
33+
import org.apache.hadoop.hdfs.server.namenode.fgl.GlobalFSNamesystemLock;
3234
import org.apache.hadoop.hdfs.web.URLConnectionFactory;
3335
import org.apache.hadoop.http.HttpConfig;
3436

@@ -1068,6 +1070,10 @@ public class DFSConfigKeys extends CommonConfigurationKeys {
10681070
public static final String DFS_NAMENODE_INODE_ATTRIBUTES_PROVIDER_KEY = "dfs.namenode.inode.attributes.provider.class";
10691071
public static final String DFS_NAMENODE_INODE_ATTRIBUTES_PROVIDER_BYPASS_USERS_KEY = "dfs.namenode.inode.attributes.provider.bypass.users";
10701072
public static final String DFS_NAMENODE_INODE_ATTRIBUTES_PROVIDER_BYPASS_USERS_DEFAULT = "";
1073+
public static final String DFS_NAMENODE_LOCK_MODEL_PROVIDER_KEY =
1074+
"dfs.namenode.lock.model.provider.class";
1075+
public static final Class<? extends FSNLockManager> DFS_NAMENODE_LOCK_MODEL_PROVIDER_DEFAULT =
1076+
GlobalFSNamesystemLock.class;
10711077

10721078
public static final String DFS_DATANODE_BP_READY_TIMEOUT_KEY = "dfs.datanode.bp-ready.timeout";
10731079
public static final long DFS_DATANODE_BP_READY_TIMEOUT_DEFAULT = 20;

‎hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java‎

Lines changed: 60 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_BLOCK_SIZE_KEY;
3535
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_AUDIT_LOG_WITH_REMOTE_PORT_DEFAULT;
3636
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_AUDIT_LOG_WITH_REMOTE_PORT_KEY;
37+
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_LOCK_MODEL_PROVIDER_DEFAULT;
38+
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_LOCK_MODEL_PROVIDER_KEY;
3739
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_STORAGE_POLICY_ENABLED_DEFAULT;
3840
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_STORAGE_POLICY_PERMISSIONS_SUPERUSER_ONLY_DEFAULT;
3941
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_STORAGE_POLICY_PERMISSIONS_SUPERUSER_ONLY_KEY;
@@ -96,6 +98,7 @@
9698
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_SNAPSHOT_DIFF_LISTING_LIMIT_DEFAULT;
9799
import static org.apache.hadoop.hdfs.DFSUtil.isParentEntry;
98100

101+
import java.lang.reflect.Constructor;
99102
import java.nio.charset.StandardCharsets;
100103
import java.util.Optional;
101104
import java.util.concurrent.atomic.AtomicLong;
@@ -115,6 +118,8 @@
115118
import org.apache.hadoop.hdfs.protocol.ErasureCodingPolicyInfo;
116119

117120
import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfoStriped;
121+
import org.apache.hadoop.hdfs.server.namenode.fgl.FSNLockManager;
122+
import org.apache.hadoop.hdfs.server.namenode.fgl.FSNamesystemLockMode;
118123
import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
119124
import org.apache.hadoop.hdfs.server.namenode.snapshot.SnapshotDeletionGc;
120125
import org.apache.hadoop.thirdparty.protobuf.ByteString;
@@ -623,7 +628,7 @@ private boolean isFromProxyUser(CallerContext ctx) {
623628
private final int numCommittedAllowed;
624629

625630
/** Lock to protect FSNamesystem. */
626-
private final FSNamesystemLock fsLock;
631+
private final FSNLockManager fsLock;
627632

628633
/**
629634
* Checkpoint lock to protect FSNamesystem modification on standby NNs.
@@ -873,7 +878,10 @@ static FSNamesystem loadFromDisk(Configuration conf) throws IOException {
873878
this.contextFieldSeparator =
874879
conf.get(HADOOP_CALLER_CONTEXT_SEPARATOR_KEY,
875880
HADOOP_CALLER_CONTEXT_SEPARATOR_DEFAULT);
876-
fsLock = new FSNamesystemLock(conf, detailedLockHoldTimeMetrics);
881+
Class<? extends FSNLockManager> lockKlass = conf.getClass(
882+
DFS_NAMENODE_LOCK_MODEL_PROVIDER_KEY, DFS_NAMENODE_LOCK_MODEL_PROVIDER_DEFAULT,
883+
FSNLockManager.class);
884+
fsLock = createLock(lockKlass, conf, detailedLockHoldTimeMetrics);
877885
cpLock = new ReentrantLock();
878886

879887
this.fsImage = fsImage;
@@ -1082,6 +1090,18 @@ static FSNamesystem loadFromDisk(Configuration conf) throws IOException {
10821090
}
10831091
}
10841092

1093+
private <T> T createLock(Class<T> theClass, Configuration conf,
1094+
MutableRatesWithAggregation mutableRatesMetrics) {
1095+
try {
1096+
Constructor<T> meth = theClass.getDeclaredConstructor(
1097+
Configuration.class, MutableRatesWithAggregation.class);
1098+
meth.setAccessible(true);
1099+
return meth.newInstance(conf, mutableRatesMetrics);
1100+
} catch (Exception e) {
1101+
throw new RuntimeException(e);
1102+
}
1103+
}
1104+
10851105
private static void checkForAsyncLogEnabledByOldConfigs(Configuration conf) {
10861106
// dfs.namenode.audit.log.async is no longer in use. Use log4j properties instead.
10871107
if (conf.getBoolean("dfs.namenode.audit.log.async", false)) {
@@ -1793,70 +1813,74 @@ public static List<URI> getSharedEditsDirs(Configuration conf) {
17931813
}
17941814

17951815
@Override
1796-
public void readLock() {
1797-
this.fsLock.readLock();
1798-
}
1799-
1800-
@Override
1801-
public void readLockInterruptibly() throws InterruptedException {
1802-
this.fsLock.readLockInterruptibly();
1816+
public void readLock(FSNamesystemLockMode lockMode) {
1817+
this.fsLock.readLock(lockMode);
18031818
}
18041819

18051820
@Override
1806-
public void readUnlock() {
1807-
this.fsLock.readUnlock();
1821+
public void readLockInterruptibly(FSNamesystemLockMode lockMode) throws InterruptedException {
1822+
this.fsLock.readLockInterruptibly(lockMode);
18081823
}
18091824

18101825
@Override
1811-
public void readUnlock(String opName) {
1812-
this.fsLock.readUnlock(opName);
1826+
public void readUnlock(FSNamesystemLockMode lockMode, String opName) {
1827+
this.fsLock.readUnlock(lockMode, opName);
18131828
}
18141829

18151830
public void readUnlock(String opName,
18161831
Supplier<String> lockReportInfoSupplier) {
1817-
this.fsLock.readUnlock(opName, lockReportInfoSupplier);
1832+
readUnlock(FSNamesystemLockMode.GLOBAL, opName, lockReportInfoSupplier);
18181833
}
18191834

1820-
@Override
1821-
public void writeLock() {
1822-
this.fsLock.writeLock();
1835+
public void readUnlock(FSNamesystemLockMode lockMode, String opName,
1836+
Supplier<String> lockReportInfoSupplier) {
1837+
this.fsLock.readUnlock(lockMode, opName, lockReportInfoSupplier);
18231838
}
18241839

18251840
@Override
1826-
public void writeLockInterruptibly() throws InterruptedException {
1827-
this.fsLock.writeLockInterruptibly();
1841+
public void writeLock(FSNamesystemLockMode lockMode) {
1842+
this.fsLock.writeLock(lockMode);
18281843
}
18291844

18301845
@Override
1831-
public void writeUnlock() {
1832-
this.fsLock.writeUnlock();
1846+
public void writeLockInterruptibly(FSNamesystemLockMode lockMode) throws InterruptedException {
1847+
this.fsLock.writeLockInterruptibly(lockMode);
18331848
}
18341849

18351850
@Override
1836-
public void writeUnlock(String opName) {
1837-
this.fsLock.writeUnlock(opName);
1851+
public void writeUnlock(FSNamesystemLockMode lockMode, String opName) {
1852+
this.fsLock.writeUnlock(lockMode, opName);
18381853
}
18391854

18401855
public void writeUnlock(String opName, boolean suppressWriteLockReport) {
1841-
this.fsLock.writeUnlock(opName, suppressWriteLockReport);
1856+
writeUnlock(FSNamesystemLockMode.GLOBAL, opName, suppressWriteLockReport);
1857+
}
1858+
1859+
public void writeUnlock(FSNamesystemLockMode lockMode, String opName,
1860+
boolean suppressWriteLockReport) {
1861+
this.fsLock.writeUnlock(lockMode, opName, suppressWriteLockReport);
1862+
}
1863+
1864+
public void writeUnlock(String opName, Supplier<String> lockReportInfoSupplier) {
1865+
writeUnlock(FSNamesystemLockMode.GLOBAL, opName, lockReportInfoSupplier);
18421866
}
18431867

1844-
public void writeUnlock(String opName,
1868+
public void writeUnlock(FSNamesystemLockMode lockMode, String opName,
18451869
Supplier<String> lockReportInfoSupplier) {
1846-
this.fsLock.writeUnlock(opName, lockReportInfoSupplier);
1870+
this.fsLock.writeUnlock(lockMode, opName, lockReportInfoSupplier);
18471871
}
18481872

18491873
@Override
1850-
public boolean hasWriteLock() {
1851-
return this.fsLock.isWriteLockedByCurrentThread();
1874+
public boolean hasWriteLock(FSNamesystemLockMode lockMode) {
1875+
return this.fsLock.hasWriteLock(lockMode);
18521876
}
18531877
@Override
1854-
public boolean hasReadLock() {
1855-
return this.fsLock.getReadHoldCount() > 0 || hasWriteLock();
1878+
public boolean hasReadLock(FSNamesystemLockMode lockMode) {
1879+
return this.fsLock.hasReadLock(lockMode);
18561880
}
18571881

18581882
public int getReadHoldCount() {
1859-
return this.fsLock.getReadHoldCount();
1883+
return this.fsLock.getReadHoldCount(FSNamesystemLockMode.GLOBAL);
18601884
}
18611885

18621886
/** Lock the checkpoint lock */
@@ -4952,21 +4976,21 @@ public float getReconstructionQueuesInitProgress() {
49524976
@Metric({"LockQueueLength", "Number of threads waiting to " +
49534977
"acquire FSNameSystemLock"})
49544978
public int getFsLockQueueLength() {
4955-
return fsLock.getQueueLength();
4979+
return fsLock.getQueueLength(FSNamesystemLockMode.FS);
49564980
}
49574981

49584982
@Metric(value = {"ReadLockLongHoldCount", "The number of time " +
49594983
"the read lock has been held for longer than the threshold"},
49604984
type = Metric.Type.COUNTER)
49614985
public long getNumOfReadLockLongHold() {
4962-
return fsLock.getNumOfReadLockLongHold();
4986+
return fsLock.getNumOfReadLockLongHold(FSNamesystemLockMode.FS);
49634987
}
49644988

49654989
@Metric(value = {"WriteLockLongHoldCount", "The number of time " +
49664990
"the write lock has been held for longer than the threshold"},
49674991
type = Metric.Type.COUNTER)
49684992
public long getNumOfWriteLockLongHold() {
4969-
return fsLock.getNumOfWriteLockLongHold();
4993+
return fsLock.getNumOfWriteLockLongHold(FSNamesystemLockMode.FS);
49704994
}
49714995

49724996
int getNumberOfDatanodes(DatanodeReportType type) {
@@ -7129,12 +7153,12 @@ public void setEditLogTailerForTests(EditLogTailer tailer) {
71297153

71307154
@VisibleForTesting
71317155
void setFsLockForTests(ReentrantReadWriteLock lock) {
7132-
this.fsLock.coarseLock = lock;
7156+
this.fsLock.setLockForTests(lock);
71337157
}
71347158

71357159
@VisibleForTesting
71367160
public ReentrantReadWriteLock getFsLockForTests() {
7137-
return fsLock.coarseLock;
7161+
return fsLock.getLockForTests();
71387162
}
71397163

71407164
@VisibleForTesting

‎hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystemLock.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
* {@link MutableRatesWithAggregation}. However since threads are re-used
6565
* between operations this should not generally be an issue.
6666
*/
67-
class FSNamesystemLock {
67+
public class FSNamesystemLock {
6868
@VisibleForTesting
6969
protected ReentrantReadWriteLock coarseLock;
7070

@@ -129,7 +129,7 @@ public Long initialValue() {
129129

130130
private static final String OVERALL_METRIC_NAME = "Overall";
131131

132-
FSNamesystemLock(Configuration conf,
132+
public FSNamesystemLock(Configuration conf,
133133
MutableRatesWithAggregation detailedHoldTimeMetrics) {
134134
this(conf, detailedHoldTimeMetrics, new Timer());
135135
}
@@ -489,6 +489,14 @@ public long getWriteLockReportingThresholdMs() {
489489
return writeLockReportingThresholdMs;
490490
}
491491

492+
public void setLockForTests(ReentrantReadWriteLock lock) {
493+
this.coarseLock = lock;
494+
}
495+
496+
public ReentrantReadWriteLock getLockForTests() {
497+
return this.coarseLock;
498+
}
499+
492500
/**
493501
* Read lock Held Info.
494502
*/

0 commit comments

Comments
 (0)