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

HDFS-13045. RBF: Improve error message returned from subcluster. Contributed by Inigo Goiri.

This commit is contained in:
Wei Yan 2018-04-11 08:37:43 -07:00
parent eefe2a147c
commit 0c93d43f3d
11 changed files with 165 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,11 @@ public class FederationNamespaceInfo extends RemoteLocationContext {
return this.nameserviceId;
}
@Override
public String getSrc() {
return null;
}
/**
* The HDFS cluster id for this namespace.
*

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

@ -388,7 +388,7 @@ public class MountTableResolver
} else {
// Not found, use default location
RemoteLocation remoteLocation =
new RemoteLocation(defaultNameService, path);
new RemoteLocation(defaultNameService, path, path);
List<RemoteLocation> locations =
Collections.singletonList(remoteLocation);
ret = new PathLocation(null, locations);
@ -519,7 +519,7 @@ public class MountTableResolver
newPath += Path.SEPARATOR;
}
newPath += remainingPath;
RemoteLocation remoteLocation = new RemoteLocation(nsId, newPath);
RemoteLocation remoteLocation = new RemoteLocation(nsId, newPath, path);
locations.add(remoteLocation);
}
DestinationOrder order = entry.getDestOrder();

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

@ -20,8 +20,8 @@ package org.apache.hadoop.hdfs.server.federation.resolver;
import org.apache.hadoop.hdfs.server.federation.router.RemoteLocationContext;
/**
* A single in a remote namespace consisting of a nameservice ID
* and a HDFS path.
* A location in a remote namespace consisting of a nameservice ID and a HDFS
* path (destination). It also contains the federated location (source).
*/
public class RemoteLocation extends RemoteLocationContext {
@ -30,16 +30,19 @@ public class RemoteLocation extends RemoteLocationContext {
/** Identifier of the namenode in the namespace for this location. */
private final String namenodeId;
/** Path in the remote location. */
private final String path;
private final String dstPath;
/** Original path in federation. */
private final String srcPath;
/**
* Create a new remote location.
*
* @param nsId
* @param pPath
* @param nsId Destination namespace.
* @param dPath Path in the destination namespace.
* @param sPath Path in the federated level.
*/
public RemoteLocation(String nsId, String pPath) {
this(nsId, null, pPath);
public RemoteLocation(String nsId, String dPath, String sPath) {
this(nsId, null, dPath, sPath);
}
/**
@ -47,12 +50,15 @@ public class RemoteLocation extends RemoteLocationContext {
* namespace.
*
* @param nsId Destination namespace.
* @param pPath Path in the destination namespace.
* @param nnId Destination namenode.
* @param dPath Path in the destination namespace.
* @param sPath Path in the federated level
*/
public RemoteLocation(String nsId, String nnId, String pPath) {
public RemoteLocation(String nsId, String nnId, String dPath, String sPath) {
this.nameserviceId = nsId;
this.namenodeId = nnId;
this.path = pPath;
this.dstPath = dPath;
this.srcPath = sPath;
}
@Override
@ -66,11 +72,16 @@ public class RemoteLocation extends RemoteLocationContext {
@Override
public String getDest() {
return this.path;
return this.dstPath;
}
@Override
public String getSrc() {
return this.srcPath;
}
@Override
public String toString() {
return getNameserviceId() + "->" + this.path;
return getNameserviceId() + "->" + this.dstPath;
}
}

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

@ -39,6 +39,13 @@ public abstract class RemoteLocationContext
*/
public abstract String getDest();
/**
* Original source location.
*
* @return Source path.
*/
public abstract String getSrc();
@Override
public int hashCode() {
return new HashCodeBuilder(17, 31)

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

@ -18,6 +18,7 @@
package org.apache.hadoop.hdfs.server.federation.router;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
@ -62,6 +63,7 @@ import org.apache.hadoop.security.UserGroupInformation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
/**
@ -611,7 +613,7 @@ public class RouterRpcClient {
UserGroupInformation ugi = RouterRpcServer.getRemoteUser();
List<? extends FederationNamenodeContext> nns =
getNamenodesForNameservice(nsId);
RemoteLocationContext loc = new RemoteLocation(nsId, "/");
RemoteLocationContext loc = new RemoteLocation(nsId, "/", "/");
Class<?> proto = method.getProtocol();
Method m = method.getMethod();
Object[] params = method.getParams(loc);
@ -727,8 +729,12 @@ public class RouterRpcClient {
firstResult = result;
}
} catch (IOException ioe) {
// Localize the exception
ioe = processException(ioe, loc);
// Record it and move on
lastThrownException = (IOException) ioe;
lastThrownException = ioe;
if (firstThrownException == null) {
firstThrownException = lastThrownException;
}
@ -756,6 +762,63 @@ public class RouterRpcClient {
return ret;
}
/**
* Exception messages might contain local subcluster paths. This method
* generates a new exception with the proper message.
* @param ioe Original IOException.
* @param loc Location we are processing.
* @return Exception processed for federation.
*/
private IOException processException(
IOException ioe, RemoteLocationContext loc) {
if (ioe instanceof RemoteException) {
RemoteException re = (RemoteException)ioe;
String newMsg = processExceptionMsg(
re.getMessage(), loc.getDest(), loc.getSrc());
RemoteException newException =
new RemoteException(re.getClassName(), newMsg);
newException.setStackTrace(ioe.getStackTrace());
return newException;
}
if (ioe instanceof FileNotFoundException) {
String newMsg = processExceptionMsg(
ioe.getMessage(), loc.getDest(), loc.getSrc());
FileNotFoundException newException = new FileNotFoundException(newMsg);
newException.setStackTrace(ioe.getStackTrace());
return newException;
}
return ioe;
}
/**
* Process a subcluster message and make it federated.
* @param msg Original exception message.
* @param dst Path in federation.
* @param src Path in the subcluster.
* @return Message processed for federation.
*/
@VisibleForTesting
static String processExceptionMsg(
final String msg, final String dst, final String src) {
if (dst.equals(src) || !dst.startsWith("/") || !src.startsWith("/")) {
return msg;
}
String newMsg = msg.replaceFirst(dst, src);
int minLen = Math.min(dst.length(), src.length());
for (int i = 0; newMsg.equals(msg) && i < minLen; i++) {
// Check if we can replace sub folders
String dst1 = dst.substring(0, dst.length() - 1 - i);
String src1 = src.substring(0, src.length() - 1 - i);
newMsg = msg.replaceFirst(dst1, src1);
}
return newMsg;
}
/**
* Checks if a result matches the required result class.
*

2
hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/records/MountTable.java
View File

@ -134,7 +134,7 @@ public abstract class MountTable extends BaseRecord {
for (Entry<String, String> entry : destinations.entrySet()) {
String nsId = entry.getKey();
String path = normalizeFileSystemPath(entry.getValue());
RemoteLocation location = new RemoteLocation(nsId, path);
RemoteLocation location = new RemoteLocation(nsId, path, src);
locations.add(location);
}

2
hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/records/impl/pb/MountTablePBImpl.java
View File

@ -102,7 +102,7 @@ public class MountTablePBImpl extends MountTable implements PBRecord {
for (RemoteLocationProto dest : destList) {
String nsId = dest.getNameserviceId();
String path = dest.getPath();
RemoteLocation loc = new RemoteLocation(nsId, path);
RemoteLocation loc = new RemoteLocation(nsId, path, getSourcePath());
ret.add(loc);
}
return ret;

12
hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/MockResolver.java
View File

@ -80,7 +80,8 @@ public class MockResolver
this.locations.put(mount, locationsList);
}
final RemoteLocation remoteLocation = new RemoteLocation(nsId, location);
final RemoteLocation remoteLocation =
new RemoteLocation(nsId, location, mount);
if (!locationsList.contains(remoteLocation)) {
locationsList.add(remoteLocation);
}
@ -270,10 +271,15 @@ public class MockResolver
for (String key : keys) {
if (path.startsWith(key)) {
for (RemoteLocation location : this.locations.get(key)) {
String finalPath = location.getDest() + path.substring(key.length());
String finalPath = location.getDest();
String extraPath = path.substring(key.length());
if (finalPath.endsWith("/") && extraPath.startsWith("/")) {
extraPath = extraPath.substring(1);
}
finalPath += extraPath;
String nameservice = location.getNameserviceId();
RemoteLocation remoteLocation =
new RemoteLocation(nameservice, finalPath);
new RemoteLocation(nameservice, finalPath, path);
remoteLocations.add(remoteLocation);
}
break;

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

@ -251,7 +251,7 @@ public class TestRouterAdmin {
// Verify starting condition
MountTable entry = getMountTableEntry("/");
assertEquals(
Collections.singletonList(new RemoteLocation("ns0", "/")),
Collections.singletonList(new RemoteLocation("ns0", "/", "/")),
entry.getDestinations());
// Edit the entry for /
@ -264,7 +264,7 @@ public class TestRouterAdmin {
// Verify edited condition
entry = getMountTableEntry("/");
assertEquals(
Collections.singletonList(new RemoteLocation("ns1", "/")),
Collections.singletonList(new RemoteLocation("ns1", "/", "/")),
entry.getDestinations());
}

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

@ -24,6 +24,7 @@ import static org.apache.hadoop.hdfs.server.federation.FederationTestUtils.delet
import static org.apache.hadoop.hdfs.server.federation.FederationTestUtils.getFileStatus;
import static org.apache.hadoop.hdfs.server.federation.FederationTestUtils.verifyFileExists;
import static org.apache.hadoop.hdfs.server.federation.MiniRouterDFSCluster.TEST_STRING;
import static org.apache.hadoop.test.GenericTestUtils.assertExceptionContains;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@ -31,6 +32,7 @@ import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.IOException;
import java.lang.reflect.Method;
@ -1022,6 +1024,52 @@ public class TestRouterRpc {
assertEquals(nnSuccess, routerSuccess);
}
@Test
public void testProxyExceptionMessages() throws IOException {
// Install a mount point to a different path to check
MockResolver resolver =
(MockResolver)router.getRouter().getSubclusterResolver();
String ns0 = cluster.getNameservices().get(0);
resolver.addLocation("/mnt", ns0, "/");
try {
FsPermission permission = new FsPermission("777");
routerProtocol.mkdirs("/mnt/folder0/folder1", permission, false);
fail("mkdirs for non-existing parent folder should have failed");
} catch (IOException ioe) {
assertExceptionContains("/mnt/folder0", ioe,
"Wrong path in exception for mkdirs");
}
try {
FsPermission permission = new FsPermission("777");
routerProtocol.setPermission("/mnt/testfile.txt", permission);
fail("setPermission for non-existing file should have failed");
} catch (IOException ioe) {
assertExceptionContains("/mnt/testfile.txt", ioe,
"Wrong path in exception for setPermission");
}
try {
FsPermission permission = new FsPermission("777");
routerProtocol.mkdirs("/mnt/folder0/folder1", permission, false);
routerProtocol.delete("/mnt/folder0", false);
fail("delete for non-existing file should have failed");
} catch (IOException ioe) {
assertExceptionContains("/mnt/folder0", ioe,
"Wrong path in exception for delete");
}
resolver.cleanRegistrations();
// Check corner cases
assertEquals(
"Parent directory doesn't exist: /ns1/a/a/b",
RouterRpcClient.processExceptionMsg(
"Parent directory doesn't exist: /a/a/b", "/a", "/ns1/a"));
}
@Test
public void testErasureCoding() throws IOException {

4
hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/store/records/TestMountTable.java
View File

@ -50,8 +50,8 @@ public class TestMountTable {
private static final String DST_PATH_1 = "/path/path2";
private static final List<RemoteLocation> DST = new LinkedList<>();
static {
DST.add(new RemoteLocation(DST_NS_0, DST_PATH_0));
DST.add(new RemoteLocation(DST_NS_1, DST_PATH_1));
DST.add(new RemoteLocation(DST_NS_0, DST_PATH_0, SRC));
DST.add(new RemoteLocation(DST_NS_1, DST_PATH_1, SRC));
}
private static final Map<String, String> DST_MAP = new LinkedHashMap<>();
static {