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

HDFS-14331. RBF: IOE While Removing Mount Entry. Contributed by Ayush Saxena.

This commit is contained in:
Inigo Goiri 2019-03-04 13:57:48 -08:00 committed by Brahma Reddy Battula
parent 1ce25e702b
commit 6cdf8db55c
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterAdminServer.java
View File

@ -303,8 +303,15 @@ public class RouterAdminServer extends AbstractService
public RemoveMountTableEntryResponse removeMountTableEntry( public RemoveMountTableEntryResponse removeMountTableEntry(
RemoveMountTableEntryRequest request) throws IOException { RemoveMountTableEntryRequest request) throws IOException {
// clear sub-cluster's quota definition // clear sub-cluster's quota definition
synchronizeQuota(request.getSrcPath(), HdfsConstants.QUOTA_RESET, try {
HdfsConstants.QUOTA_RESET); synchronizeQuota(request.getSrcPath(), HdfsConstants.QUOTA_RESET,
HdfsConstants.QUOTA_RESET);
} catch (Exception e) {
// Ignore exception, if any while reseting quota. Specifically to handle
// if the actual destination doesn't exist.
LOG.warn("Unable to clear quota at the destinations for {}: {}",
request.getSrcPath(), e.getMessage());
}
return getMountTableStore().removeMountTableEntry(request); return getMountTableStore().removeMountTableEntry(request);
} }

7
hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterQuota.java
View File

@ -20,6 +20,7 @@ package org.apache.hadoop.hdfs.server.federation.router;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import java.io.IOException; import java.io.IOException;
@ -754,6 +755,12 @@ public class TestRouterQuota {
assertNull(routerQuota); assertNull(routerQuota);
assertEquals(HdfsConstants.QUOTA_RESET, subClusterQuota.getQuota()); assertEquals(HdfsConstants.QUOTA_RESET, subClusterQuota.getQuota());
assertEquals(HdfsConstants.QUOTA_RESET, subClusterQuota.getSpaceQuota()); assertEquals(HdfsConstants.QUOTA_RESET, subClusterQuota.getSpaceQuota());
// Verify removing mount entry with actual destinations not present.
mountTable = MountTable.newInstance("/mount",
Collections.singletonMap("ns0", "/testdir16"));
addMountTable(mountTable);
assertTrue(removeMountTable("/mount"));
} }
@Test @Test