Skip to content

HDFS-17844. Fix the incorrect collision detection logic that causes nondeterministic behavior of testViewFsMultipleExportPoint() #8009

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

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from
+9 −4
Open

HDFS-17844. Fix the incorrect collision detection logic that causes nondeterministic behavior of testViewFsMultipleExportPoint() #8009

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
2dca4d8
Fixed the race condition in testViewFsMultipleExportPoint
Oct 2, 2025
1c1cdef
Merge branch 'apache:trunk' into fix-flaky
Wang-Benjamin Oct 2, 2025
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
10 changes: 7 additions & 3 deletions ...project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/DFSClientCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,19 @@ private void prepareAddressMap() throws IOException {
// if a unique nnid, add it to the map
if (value == null) {
LOG.info("Added export: {} FileSystem URI: {} with namenodeId: {}",
exportPath, exportPath, namenodeId);
exportPath, exportURI, namenodeId);
namenodeUriMap.put(namenodeId, exportURI);
} else {
// if the nnid already exists, it better be the for the same namenode
} else if (!value.equals(exportURI)) {
// Only throw exception if different URIs have the same namenode ID
String msg = String.format("FS:%s, Namenode ID collision for path:%s "
+ "nnid:%s uri being added:%s existing uri:%s", fs.getScheme(),
exportPath, namenodeId, exportURI, value);
LOG.error(msg);
throw new FileSystemException(msg);
} else {
// Same URI with same namenode ID - this is expected and safe to ignore
LOG.debug("Export path {} resolves to same URI {} as existing entry, skipping",
exportPath, exportURI);
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion ...hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.net.InetSocketAddress;
import java.net.URI;
import java.nio.file.FileSystemException;
import java.util.Objects;

import io.netty.buffer.ByteBuf;
import io.netty.channel.Channel;
Expand Down Expand Up @@ -242,7 +243,7 @@ public static int getNamenodeId(Configuration conf) {
public static int getNamenodeId(Configuration conf, URI namenodeURI) {
InetSocketAddress address =
DFSUtilClient.getNNAddressCheckLogical(conf, namenodeURI);
return address.hashCode();
return Objects.hash(namenodeURI.toString(), address.toString());
}

public static URI getResolvedURI(FileSystem fs, String exportPath)
Expand Down