-
Notifications
You must be signed in to change notification settings - Fork 9k
HDFS-17595. [ARR] ErasureCoding supports asynchronous rpc. #6983
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.
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? 8000 Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
f6c2b64
HDFS-17595. [ARR] ErasureCoding supports asynchronous rpc.
hfutatzhanghb 60bc890
remove comments and fix checkstyle.
hfutatzhanghb 8af0bbf
fix checkstyle.
hfutatzhanghb 746d3f2
add UT.
hfutatzhanghb d633f04
fix checkstyles.
hfutatzhanghb 87979c5
fix checkstyle indent
hfutatzhanghb f9edfec
trigger yetus.
hfutatzhanghb 6486684
fix extra line
hfutatzhanghb File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
180 changes: 180 additions & 0 deletions
180
...rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/AsyncErasureCoding.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,180 @@ | ||
/** | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.hadoop.hdfs.server.federation.router; | ||
|
||
import org.apache.hadoop.hdfs.protocol.AddErasureCodingPolicyResponse; | ||
import org.apache.hadoop.hdfs.protocol.ECBlockGroupStats; | ||
import org.apache.hadoop.hdfs.protocol.ECTopologyVerifierResult; | ||
import org.apache.hadoop.hdfs.protocol.ErasureCodingPolicy; | ||
import org.apache.hadoop.hdfs.protocol.ErasureCodingPolicyInfo; | ||
import org.apache.hadoop.hdfs.server.federation.resolver.ActiveNamenodeResolver; | ||
import org.apache.hadoop.hdfs.server.federation.resolver.FederationNamespaceInfo; | ||
import org.apache.hadoop.hdfs.server.federation.resolver.RemoteLocation; | ||
import org.apache.hadoop.hdfs.server.federation.router.async.ApplyFunction; | ||
import org.apache.hadoop.hdfs.server.namenode.NameNode; | ||
|
||
import java.io.IOException; | ||
import java.util.Collection; | ||
import java.util.HashMap; | ||
import java.util.List; | ||
import java.util.Map; | ||
import java.util.Set; | ||
|
||
import static org.apache.hadoop.hdfs.server.federation.router.RouterRpcServer.merge; | ||
import static org.apache.hadoop.hdfs.server.federation.router.async.AsyncUtil.asyncApply; | ||
import static org.apache.hadoop.hdfs.server.federation.router.async.AsyncUtil.asyncReturn; | ||
|
||
public class AsyncErasureCoding extends ErasureCoding { | ||
/** RPC server to receive client calls. */ | ||
private final RouterRpcServer rpcServer; | ||
/** RPC clients to connect to the Namenodes. */ | ||
private final RouterRpcClient rpcClient; | ||
/** Interface to identify the active NN for a nameservice or blockpool ID. */ | ||
private final ActiveNamenodeResolver namenodeResolver; | ||
|
||
public AsyncErasureCoding(RouterRpcServer server) { | ||
super(server); | ||
this.rpcServer = server; | ||
this.rpcClient = this.rpcServer.getRPCClient(); | ||
this.namenodeResolver = this.rpcClient.getNamenodeResolver(); | ||
} | ||
|
||
public ErasureCodingPolicyInfo[] getErasureCodingPolicies() | ||
throws IOException { | ||
rpcServer.checkOperation(NameNode.OperationCategory.READ); | ||
|
||
RemoteMethod method = new RemoteMethod("getErasureCodingPolicies"); | ||
Set<FederationNamespaceInfo> nss = namenodeResolver.getNamespaces(); | ||
|
||
rpcClient.invokeConcurrent( | ||
nss, method, true, false, ErasureCodingPolicyInfo[].class); | ||
asyncApply( | ||
(ApplyFunction<Map<FederationNamespaceInfo, ErasureCodingPolicyInfo[]>, | ||
ErasureCodingPolicyInfo[]>) ret -> merge(ret, ErasureCodingPolicyInfo.class)); | ||
|
||
return asyncReturn(ErasureCodingPolicyInfo[].class); | ||
} | ||
|
||
@Override | ||
public Map<String, String> getErasureCodingCodecs() throws IOException { | ||
rpcServer.checkOperation(NameNode.OperationCategory.READ); | ||
|
||
RemoteMethod method = new RemoteMethod("getErasureCodingCodecs"); | ||
Set<FederationNamespaceInfo> nss = namenodeResolver.getNamespaces(); | ||
|
||
rpcClient.invokeConcurrent( | ||
nss, method, true, false, Map.class); | ||
|
||
asyncApply((ApplyFunction<Map<FederationNamespaceInfo, | ||
Map<String, String>>, Map<String, String>>) retCodecs -> { | ||
Map<String, String> ret = new HashMap<>(); | ||
Object obj = retCodecs; | ||
@SuppressWarnings("unchecked") | ||
Map<FederationNamespaceInfo, Map<String, String>> results = | ||
(Map<FederationNamespaceInfo, Map<String, String>>)obj; | ||
Collection<Map<String, String>> allCodecs = results.values(); | ||
for (Map<String, String> codecs : allCodecs) { | ||
ret.putAll(codecs); | ||
} | ||
return ret; | ||
}); | ||
|
||
return asyncReturn(Map.class); | ||
} | ||
|
||
@Override | ||
public AddErasureCodingPolicyResponse[] addErasureCodingPolicies( | ||
ErasureCodingPolicy[] policies) throws IOException { | ||
rpcServer.checkOperation(NameNode.OperationCategory.WRITE); | ||
|
||
RemoteMethod method = new RemoteMethod("addErasureCodingPolicies", | ||
new Class<?>[] {ErasureCodingPolicy[].class}, new Object[] {policies}); | ||
Set<FederationNamespaceInfo> nss = namenodeResolver.getNamespaces(); | ||
|
||
rpcClient.invokeConcurrent( | ||
nss, method, true, false, AddErasureCodingPolicyResponse[].class); | ||
|
||
asyncApply( | ||
(ApplyFunction<Map<FederationNamespaceInfo, AddErasureCodingPolicyResponse[]>, | ||
AddErasureCodingPolicyResponse[]>) ret -> { | ||
return merge(ret, AddErasureCodingPolicyResponse.class); | ||
}); | ||
return asyncReturn(AddErasureCodingPolicyResponse[].class); | ||
} | ||
|
||
@Override | ||
public ErasureCodingPolicy getErasureCodingPolicy(String src) | ||
throws IOException { | ||
rpcServer.checkOperation(NameNode.OperationCategory.READ); | ||
|
||
final List<RemoteLocation> locations = | ||
rpcServer.getLocationsForPath(src, false, false); | ||
RemoteMethod remoteMethod = new RemoteMethod("getErasureCodingPolicy", | ||
new Class<?>[] {String.class}, new RemoteParam()); | ||
rpcClient.invokeSequential( | ||
locations, remoteMethod, null, null); | ||
|
||
asyncApply(ret -> { | ||
return (ErasureCodingPolicy) ret; | ||
}); | ||
|
||
return asyncReturn(ErasureCodingPolicy.class); | ||
} | ||
|
||
@Override | ||
public ECTopologyVerifierResult getECTopologyResultForPolicies( | ||
String[] policyNames) throws IOException { | ||
RemoteMethod method = new RemoteMethod("getECTopologyResultForPolicies", | ||
new Class<?>[] {String[].class}, new Object[] {policyNames}); | ||
Set<FederationNamespaceInfo> nss = namenodeResolver.getNamespaces(); | ||
if (nss.isEmpty()) { | ||
throw new IOException("No namespace availaible."); | ||
} | ||
|
||
rpcClient.invokeConcurrent(nss, method, true, false, | ||
ECTopologyVerifierResult.class); | ||
asyncApply((ApplyFunction<Map<FederationNamespaceInfo, ECTopologyVerifierResult>, | ||
ECTopologyVerifierResult>) ret -> { | ||
for (Map.Entry<FederationNamespaceInfo, ECTopologyVerifierResult> entry : | ||
ret.entrySet()) { | ||
if (!entry.getValue().isSupported()) { | ||
return entry.getValue(); | ||
} | ||
} | ||
// If no negative result, return the result from the first namespace. | ||
return ret.get(nss.iterator().next()); | ||
}); | ||
return asyncReturn(ECTopologyVerifierResult.class); | ||
} | ||
|
||
@Override | ||
public ECBlockGroupStats getECBlockGroupStats() throws IOException { | ||
rpcServer.checkOperation(NameNode.OperationCategory.READ); | ||
|
||
RemoteMethod method = new RemoteMethod("getECBlockGroupStats"); | ||
Set<FederationNamespaceInfo> nss = namenodeResolver.getNamespaces(); | ||
rpcClient.invokeConcurrent( | ||
nss, method, true, false, ECBlockGroupStats.class); | ||
|
||
asyncApply((ApplyFunction<Map<FederationNamespaceInfo, ECBlockGroupStats>, | ||
ECBlockGroupStats>) allStats -> { | ||
return ECBlockGroupStats.merge(allStats.values()); | ||
}); | ||
return asyncReturn(ECBlockGroupStats.class); | ||
} | ||
} |
204 changes: 204 additions & 0 deletions
204
...st/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterAsyncErasureCoding.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,204 @@ | ||
/** | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.hadoop.hdfs.server.federation.router; | ||
|
||
|
||
import org.apache.hadoop.conf.Configuration; | ||
import org.apache.hadoop.fs.FSDataOutputStream; | ||
import org.apache.hadoop.fs.FileSystem; | ||
import org.apache.hadoop.fs.Path; | ||
import org.apache.hadoop.fs.permission.FsPermission; | ||
import org.apache.hadoop.hdfs.StripedFileTestUtil; | ||
import org.apache.hadoop.hdfs.protocol.AddErasureCodingPolicyResponse; | ||
import org.apache.hadoop.hdfs.protocol.ECTopologyVerifierResult; | ||
import org.apache.hadoop.hdfs.protocol.ErasureCodingPolicy; | ||
import org.apache.hadoop.hdfs.protocol.ErasureCodingPolicyInfo; | ||
import org.apache.hadoop.hdfs.protocol.HdfsFileStatus; | ||
import org.apache.hadoop.hdfs.server.federation.MiniRouterDFSCluster; | ||
import org.apache.hadoop.hdfs.server.federation.MockResolver; | ||
import org.apache.hadoop.hdfs.server.federation.RouterConfigBuilder; | ||
import org.apache.hadoop.io.erasurecode.ECSchema; | ||
import org.apache.hadoop.ipc.CallerContext; | ||
import org.junit.After; | ||
import org.junit.AfterClass; | ||
import org.junit.Before; | ||
import org.junit.BeforeClass; | ||
import org.junit.Test; | ||
import org.mockito.Mockito; | ||
|
||
import java.io.IOException; | ||
import java.util.Map; | ||
import java.util.concurrent.TimeUnit; | ||
|
||
import static org.apache.hadoop.hdfs.server.federation.FederationTestUtils.NAMENODES; | ||
import static org.apache.hadoop.hdfs.server.federation.MiniRouterDFSCluster.DEFAULT_HEARTBEAT_INTERVAL_MS; | ||
import static org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.DFS_ROUTER_RPC_ASYNC_HANDLER_COUNT; | ||
import static org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.DFS_ROUTER_RPC_ASYNC_RESPONDER_COUNT; | ||
import static org.apache.hadoop.hdfs.server.federation.router.async.AsyncUtil.syncReturn; | ||
import static org.junit.Assert.assertArrayEquals; | ||
import static org.junit.Assert.assertEquals; | ||
import static org.junit.Assert.assertNotNull; | ||
import static org.junit.Assert.assertTrue; | ||
|
||
public class TestRouterAsyncErasureCoding { | ||
private static Configuration routerConf; | ||
/** Federated HDFS cluster. */ | ||
private static MiniRouterDFSCluster cluster; | ||
private static String ns0; | ||
|
||
/** Random Router for this federated cluster. */ | ||
private MiniRouterDFSCluster.RouterContext router; | ||
private FileSystem routerFs; | ||
private RouterRpcServer routerRpcServer; | ||
private AsyncErasureCoding asyncErasureCoding; | ||
|
||
private final String testfilePath = "/testdir/testAsyncErasureCoding.file"; | ||
|
||
@BeforeClass | ||
public static void setUpCluster() throws Exception { | ||
cluster = new MiniRouterDFSCluster(true, 1, 2, | ||
DEFAULT_HEARTBEAT_INTERVAL_MS, 1000); | ||
cluster.setNumDatanodesPerNameservice(3); | ||
cluster.setRacks( | ||
new String[] {"/rack1", "/rack2", "/rack3"}); | ||
cluster.startCluster(); | ||
|
||
// Making one Namenode active per nameservice | ||
if (cluster.isHighAvailability()) { | ||
for (String ns : cluster.getNameservices()) { | ||
cluster.switchToActive(ns, NAMENODES[0]); | ||
cluster.switchToStandby(ns, NAMENODES[1]); | ||
} | ||
} | ||
// Start routers with only an RPC service | ||
routerConf = new RouterConfigBuilder() | ||
.rpc() | ||
.build(); | ||
|
||
// Reduce the number of RPC clients threads to overload the Router easy | ||
routerConf.setInt(RBFConfigKeys.DFS_ROUTER_CLIENT_THREADS_SIZE, 1); | ||
routerConf.setInt(DFS_ROUTER_RPC_ASYNC_HANDLER_COUNT, 1); | ||
routerConf.setInt(DFS_ROUTER_RPC_ASYNC_RESPONDER_COUNT, 1); | ||
// We decrease the DN cache times to make the test faster | ||
routerConf.setTimeDuration( | ||
RBFConfigKeys.DN_REPORT_CACHE_EXPIRE, 1, TimeUnit.SECONDS); | ||
cluster.addRouterOverrides(routerConf); | ||
// Start routers with only an RPC service | ||
cluster.startRouters(); | ||
|
||
// Register and verify all NNs with all routers | ||
cluster.registerNamenodes(); | ||
cluster.waitNamenodeRegistration(); | ||
cluster.waitActiveNamespaces(); | ||
ns0 = cluster.getNameservices().get(0); | ||
} | ||
|
||
@AfterClass | ||
public static void shutdownCluster() throws Exception { | ||
if (cluster != null) { | ||
cluster.shutdown(); | ||
} | ||
} | ||
|
||
@Before | ||
public void setUp() throws IOException { | ||
router = cluster.getRandomRouter(); | ||
routerFs = router.getFileSystem(); | ||
routerRpcServer = router.getRouterRpcServer(); | ||
routerRpcServer.initAsyncThreadPool(); | ||
RouterAsyncRpcClient asyncRpcClient = new RouterAsyncRpcClient( | ||
routerConf, router.getRouter(), routerRpcServer.getNamenodeResolver(), | ||
routerRpcServer.getRPCMonitor(), | ||
routerRpcServer.getRouterStateIdContext()); | ||
RouterRpcServer spy = Mockito.spy(routerRpcServer); | ||
Mockito.when(spy.getRPCClient()).thenReturn(asyncRpcClient); | ||
asyncErasureCoding = new AsyncErasureCoding(spy); | ||
|
||
// Create mock locations | ||
MockResolver resolver = (MockResolver) router.getRouter().getSubclusterResolver(); | ||
resolver.addLocation("/", ns0, "/"); | ||
FsPermission permission = new FsPermission("705"); | ||
routerFs.mkdirs(new Path("/testdir"), permission); | ||
FSDataOutputStream fsDataOutputStream = routerFs.create( | ||
new Path(testfilePath), true); | ||
fsDataOutputStream.write(new byte[1024]); | ||
fsDataOutputStream.close(); | ||
} | ||
|
||
@After | ||
public void tearDown() throws IOException { | ||
// clear client context | ||
CallerContext.setCurrent(null); | ||
boolean delete = routerFs.delete(new Path("/testdir")); | ||
assertTrue(delete); | ||
if (routerFs != null) { | ||
routerFs.close(); | ||
} | ||
} | ||
|
||
@Test | ||
public void testRouterAsyncErasureCoding() throws Exception { | ||
String ecPolicyName = StripedFileTestUtil.getDefaultECPolicy().getName(); | ||
HdfsFileStatus fileInfo = cluster.getNamenodes().get(0).getClient().getFileInfo(testfilePath); | ||
assertNotNull(fileInfo); | ||
|
||
asyncErasureCoding.setErasureCodingPolicy("/testdir", ecPolicyName); | ||
syncReturn(null); | ||
|
||
asyncErasureCoding.getErasureCodingPolicy("/testdir"); | ||
ErasureCodingPolicy ecPolicy = syncReturn(ErasureCodingPolicy.class); | ||
assertEquals(StripedFileTestUtil.getDefaultECPolicy().getName(), ecPolicy.getName()); | ||
|
||
asyncErasureCoding.getErasureCodingPolicies(); | ||
ErasureCodingPolicyInfo[] erasureCodingPolicies = syncReturn(ErasureCodingPolicyInfo[].class); | ||
int numECPolicies = erasureCodingPolicies.length; | ||
ErasureCodingPolicyInfo[] erasureCodingPoliciesFromNameNode = | ||
cluster.getNamenodes().get(0).getClient().getErasureCodingPolicies(); | ||
|
||
assertArrayEquals(erasureCodingPoliciesFromNameNode, erasureCodingPolicies); | ||
|
||
asyncErasureCoding.getErasureCodingCodecs(); | ||
Map<String, String> erasureCodingCodecs = syncReturn(Map.class); | ||
Map<String, String> erasureCodingCodecsFromNameNode = | ||
cluster.getNamenodes().get(0).getClient().getErasureCodingCodecs(); | ||
|
||
assertEquals(erasureCodingCodecs, erasureCodingCodecsFromNameNode); | ||
|
||
// RS-12-4-1024k | ||
final ECSchema schema = new ECSchema("rs", 12, 4); | ||
ErasureCodingPolicy erasureCodingPolicy = new ErasureCodingPolicy(schema, 1024 * 1024); | ||
asyncErasureCoding.addErasureCodingPolicies(new ErasureCodingPolicy[]{erasureCodingPolicy}); | ||
AddErasureCodingPolicyResponse[] response = syncReturn(AddErasureCodingPolicyResponse[].class); | ||
assertEquals(response[0].isSucceed(), true); | ||
|
||
asyncErasureCoding.getErasureCodingPolicies(); | ||
ErasureCodingPolicyInfo[] erasureCodingPolicies2 = syncReturn(ErasureCodingPolicyInfo[].class); | ||
int numNewECPolicies = erasureCodingPolicies2.length; | ||
assertEquals(numECPolicies + 1, numNewECPolicies); | ||
|
||
asyncErasureCoding.getECTopologyResultForPolicies( | ||
new String[]{"RS-6-3-1024k", "RS-12-4-1024k"}); | ||
ECTopologyVerifierResult ecTResultForPolicies = syncReturn(ECTopologyVerifierResult.class); | ||
assertEquals(false, ecTResultForPolicies.isSupported()); | ||
|
||
asyncErasureCoding.getECTopologyResultForPolicies( | ||
new String[]{"XOR-2-1-1024k"}); | ||
ECTopologyVerifierResult ecTResultForPolicies2 = syncReturn(ECTopologyVerifierResult.class); | ||
assertEquals(true, ecTResultForPolicies2.isSupported()); | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some other interface such as
removeErasureCodingPolicy
do not need to override with async?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, such interface do not need to refactor. They can work well in both sync and async mode.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi, @Hexiaoqiao because we used option 2, removeErasureCodingPolicy does not need to thenApply the request result, so the caller can directly obtain the CompletableFuture object from the thread variable.here's an explanation:


There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Got it. Thanks.