Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HDFS-17692. [FGL] fix bug in getContentSummary method #7233

Open
wants to merge 2 commits into
base: HDFS-17384
Choose a base branch
from
Open

HDFS-17692. [FGL] fix bug in getContentSummary method #7233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
170b0b8
HDFS-17691. [FGL] Move FSNamesystemLockMode to org.apache.hadoop.hdfs…
ZanderXu Dec 18, 2024
89d6934
HDFS-17692. [FGL] fix bug in getContentSummary method
ZanderXu Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterRpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,13 @@
import org.apache.hadoop.hdfs.server.namenode.INodeDirectory;
import org.apache.hadoop.hdfs.server.namenode.NameNode;
import org.apache.hadoop.hdfs.server.namenode.NameNodeAdapter;
import org.apache.hadoop.hdfs.server.namenode.fgl.FSNamesystemLockMode;
import org.apache.hadoop.hdfs.server.namenode.snapshot.SnapshotTestHelper;
import org.apache.hadoop.hdfs.server.protocol.BlocksWithLocations;
import org.apache.hadoop.hdfs.server.protocol.BlocksWithLocations.BlockWithLocations;
import org.apache.hadoop.hdfs.server.protocol.DatanodeStorageReport;
import org.apache.hadoop.hdfs.server.protocol.NamenodeProtocol;
import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo;
import org.apache.hadoop.hdfs.util.RwLockMode;
import org.apache.hadoop.io.EnumSetWritable;
import org.apache.hadoop.io.erasurecode.ECSchema;
import org.apache.hadoop.io.erasurecode.ErasureCodeConstants;
Expand Down Expand Up @@ -1699,10 +1699,10 @@ public void testGetReplicatedBlockStats() throws Exception {
// mark a replica as corrupt
LocatedBlock block = NameNodeAdapter
.getBlockLocations(nameNode, testFile, 0, 1024).get(0);
namesystem.writeLock(FSNamesystemLockMode.BM);
namesystem.writeLock(RwLockMode.BM);
bm.findAndMarkBlockAsCorrupt(block.getBlock(), block.getLocations()[0],
"STORAGE_ID", "TEST");
namesystem.writeUnlock(FSNamesystemLockMode.BM, "findAndMarkBlockAsCorrupt");
namesystem.writeUnlock(RwLockMode.BM, "findAndMarkBlockAsCorrupt");
BlockManagerTestUtil.updateState(bm);
DFSTestUtil.waitCorruptReplicas(fileSystem, namesystem,
new Path(testFile), block.getBlock(), 1);
Expand Down
10 changes: 5 additions & 5 deletions ...n/java/org/apache/hadoop/hdfs/security/token/delegation/DelegationTokenSecretManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import java.util.List;
import java.util.Map.Entry;

import org.apache.hadoop.hdfs.server.namenode.fgl.FSNamesystemLockMode;
import org.apache.hadoop.util.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -41,6 +40,7 @@
import org.apache.hadoop.hdfs.server.namenode.startupprogress.StartupProgress.Counter;
import org.apache.hadoop.hdfs.server.namenode.startupprogress.Step;
import org.apache.hadoop.hdfs.server.namenode.startupprogress.StepType;
import org.apache.hadoop.hdfs.util.RwLockMode;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.ipc.RetriableException;
import org.apache.hadoop.ipc.StandbyException;
Expand Down Expand Up @@ -373,7 +373,7 @@ protected void logUpdateMasterKey(DelegationKey key)
// closes the edit log files. Doing this inside the
// fsn lock will prevent being interrupted when stopping
// the secret manager.
namesystem.readLockInterruptibly(FSNamesystemLockMode.FS);
namesystem.readLockInterruptibly(RwLockMode.FS);
try {
// this monitor isn't necessary if stopped while holding write lock
// but for safety, guard against a stop with read lock.
Expand All @@ -384,7 +384,7 @@ protected void logUpdateMasterKey(DelegationKey key)
namesystem.logUpdateMasterKey(key);
}
} finally {
namesystem.readUnlock(FSNamesystemLockMode.FS, "logUpdateMasterKey");
namesystem.readUnlock(RwLockMode.FS, "logUpdateMasterKey");
}
} catch (InterruptedException ie) {
// AbstractDelegationTokenManager may crash if an exception is thrown.
Expand All @@ -402,7 +402,7 @@ protected void logExpireToken(final DelegationTokenIdentifier dtId)
// closes the edit log files. Doing this inside the
// fsn lock will prevent being interrupted when stopping
// the secret manager.
namesystem.readLockInterruptibly(FSNamesystemLockMode.FS);
namesystem.readLockInterruptibly(RwLockMode.FS);
try {
// this monitor isn't necessary if stopped while holding write lock
// but for safety, guard against a stop with read lock.
Expand All @@ -413,7 +413,7 @@ protected void logExpireToken(final DelegationTokenIdentifier dtId)
namesystem.logExpireDelegationToken(dtId);
}
} finally {
namesystem.readUnlock(FSNamesystemLockMode.FS, "logExpireToken");
namesystem.readUnlock(RwLockMode.FS, "logExpireToken");
}
} catch (InterruptedException ie) {
// AbstractDelegationTokenManager may crash if an exception is thrown.
Expand Down
Loading
Loading