Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

HDFS-14761. RBF: MountTableResolver cannot invalidate cache correctly
This commit is contained in:
Wang Yuxuan 2019-08-24 01:46:39 +08:00 committed by Inigo Goiri
parent 20064b69a8
commit 894e2300d6
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MountTableResolver.java
View File

@ -257,10 +257,11 @@ public class MountTableResolver
Iterator<Entry<String, PathLocation>> it = entries.iterator(); Iterator<Entry<String, PathLocation>> it = entries.iterator();
while (it.hasNext()) { while (it.hasNext()) {
Entry<String, PathLocation> entry = it.next(); Entry<String, PathLocation> entry = it.next();
String key = entry.getKey();
PathLocation loc = entry.getValue(); PathLocation loc = entry.getValue();
String src = loc.getSourcePath(); String src = loc.getSourcePath();
if (src != null) { if (src != null) {
if (isParentEntry(src, path)) { if (isParentEntry(key, path)) {
LOG.debug("Removing {}", src); LOG.debug("Removing {}", src);
it.remove(); it.remove();
} }

25
hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/resolver/TestMountTableResolver.java
View File

@ -704,4 +704,29 @@ public class TestMountTableResolver {
mountTable.removeEntry("/testlocationcache"); mountTable.removeEntry("/testlocationcache");
mountTable.removeEntry("/anothertestlocationcache"); 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 {
// 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());
}
} }