big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-15579. RBF: The constructor of PathLocation may got some misunderstanding. Contributed by Janus Chow.

Browse Source
This commit is contained in:
Ayush Saxena 2020-09-20 08:54:25 +05:30
parent 364b958085
commit 8eba922bb3
3 changed files with 28 additions and 2 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/MultipleDestinationMountTableResolver.java
View File

@ -99,8 +99,9 @@ public PathLocation getDestinationForPath(String path) throws IOException {
// Change the order of the name spaces according to the policy
if (firstNamespace != null) {
// This is the entity in the tree, we need to create our own copy
mountTableResult = new PathLocation(mountTableResult, firstNamespace);
// Create our own prioritized copy based on the entity in the tree.
mountTableResult = PathLocation.prioritizeDestination(
mountTableResult, firstNamespace);
LOG.debug("Ordered locations following {} are {}",
order, mountTableResult);
} else {

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

@ -87,12 +87,28 @@ public PathLocation(final PathLocation other) {
* @param other Other path location to copy from.
* @param firstNsId Identifier of the namespace to place first.
*/
@Deprecated
public PathLocation(PathLocation other, String firstNsId) {
this.sourcePath = other.sourcePath;
this.destOrder = other.destOrder;
this.destinations = orderedNamespaces(other.destinations, firstNsId);
}
/**
* Return a path location with the prioritized destinations based on
* the current path location.
*
* @param base The base path location we'd like to prioritize on.
* @param firstNsId Identifier of the namespace to place first.
*/
public static PathLocation prioritizeDestination(
PathLocation base, String firstNsId) {
List<RemoteLocation> prioritizedDestinations = orderedNamespaces(
base.destinations, firstNsId);
return new PathLocation(base.sourcePath, prioritizedDestinations,
base.destOrder);
}
/**
* Prioritize a location/destination by its name space/nameserviceId.
* This destination might be used by other threads, so the source is not

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

@ -360,6 +360,15 @@ public void testRandomResolver() throws IOException {
assertEquals(3, destinations.size());
}
@Test
public void testPrioritizeDestination() throws IOException {
PathLocation dest0 = resolver.getDestinationForPath("/hashall/file0.txt");
assertDest("subcluster0", dest0);
PathLocation prioritizedDest = PathLocation.prioritizeDestination(dest0,
"subcluster1");
assertDest("subcluster1", prioritizedDest);
}
/**
* Test that a path has files distributed across destinations evenly.
* @param path Path to check.