Skip to content

HDFS-14761. RBF: MountTableResolver cannot invalidate cache correctly #1334

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

Merged
merged 3 commits into from
Aug 23, 2019
Merged

HDFS-14761. RBF: MountTableResolver cannot invalidate cache correctly #1334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
055ce4b
HDFS-14761. RBF: MountTableResolver cannot invalidate cache correctly
Aug 22, 2019
8ac28b7
Add some comments
Aug 23, 2019
209cc9c
Make highlevel comments as javadoc
Aug 23, 2019
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
3 changes: 2 additions & 1 deletion ...f/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MountTableResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,11 @@ private void invalidateLocationCache(final String path) {
Iterator<Entry<String, PathLocation>> it = entries.iterator();
while (it.hasNext()) {
Entry<String, PathLocation> entry = it.next();
String key = entry.getKey();
PathLocation loc = entry.getValue();
String src = loc.getSourcePath();
if (src != null) {
if (isParentEntry(src, path)) {
if (isParentEntry(key, path)) {
LOG.debug("Removing {}", src);
it.remove();
}
Expand Down
25 changes: 25 additions & 0 deletions ...c/test/java/org/apache/hadoop/hdfs/server/federation/resolver/TestMountTableResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,4 +704,29 @@ public void testLocationCache() throws Exception {
mountTable.removeEntry("/testlocationcache");
mountTable.removeEntry("/anothertestlocationcache");
}

/**
* Test if we add a new entry, the cached locations which are children of it
* should be invalidate
*/
@Test
public void testInvalidateCache() throws Exception {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a comment describing what the case to test is about.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your comments. I have added some comments. Pending jenkins. Please review again.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The high level description should go as a javadoc.
You can add the particular comments inline.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks again. New commit here. Pending jenkins.

// Add the entry 1->/ and ensure cache update correctly
Map<String, String> map1 = getMountTableEntry("1", "/");
MountTable entry1 = MountTable.newInstance("/", map1);
mountTable.addEntry(entry1);
assertEquals("1->/", mountTable.getDestinationForPath("/").toString());
assertEquals("1->/testInvalidateCache/foo", mountTable
.getDestinationForPath("/testInvalidateCache/foo").toString());

// Add the entry 2->/testInvalidateCache and ensure the cached location
// under it is invalidated correctly
Map<String, String> map2 = getMountTableEntry("2", "/testInvalidateCache");
MountTable entry2 = MountTable.newInstance("/testInvalidateCache", map2);
mountTable.addEntry(entry2);
assertEquals("2->/testInvalidateCache",
mountTable.getDestinationForPath("/testInvalidateCache").toString());
assertEquals("2->/testInvalidateCache/foo", mountTable
.getDestinationForPath("/testInvalidateCache/foo").toString());
}
}