This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 59560a156d HDDS-8942. Intermittent failure in
ITestOzoneContractCreate#testSyncable (#6821)
59560a156d is described below
commit 59560a156d97b0b57ed77772ded3fcaa6fc8e52a
Author: Chung En Lee <[email protected]>
AuthorDate: Thu Jun 20 21:42:13 2024 +0800
HDDS-8942. Intermittent failure in ITestOzoneContractCreate#testSyncable
(#6821)
---
.../org/apache/hadoop/hdds/scm/XceiverClientGrpc.java | 10 +++++++++-
.../apache/hadoop/hdds/scm/TestXceiverClientGrpc.java | 16 ++++++++--------
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git
a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
index c0596e4a92..02747f53ca 100644
---
a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
+++
b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
@@ -374,9 +374,17 @@ public class XceiverClientGrpc extends XceiverClientSpi {
}
if (blockID != null) {
+ if (request.getCmdType() != ContainerProtos.Type.ReadChunk) {
+ datanodeList = pipeline.getNodes();
+ int getBlockDNLeaderIndex =
datanodeList.indexOf(pipeline.getLeaderNode());
+ if (getBlockDNLeaderIndex > 0) {
+ // Pull the leader DN to the top of the DN list
+ Collections.swap(datanodeList, 0, getBlockDNLeaderIndex);
+ }
+ }
// Check if the DN to which the GetBlock command was sent has been
cached.
DatanodeDetails cachedDN = getBlockDNcache.get(blockID);
- if (cachedDN != null) {
+ if (cachedDN != null && !topologyAwareRead) {
datanodeList = pipeline.getNodes();
int getBlockDNCacheIndex = datanodeList.indexOf(cachedDN);
if (getBlockDNCacheIndex > 0) {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpc.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpc.java
index 99095f55b0..9ef0baf72b 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpc.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpc.java
@@ -88,27 +88,27 @@ public class TestXceiverClientGrpc {
@Test
@Timeout(5)
- public void testRandomFirstNodeIsCommandTarget() throws IOException {
- final ArrayList<DatanodeDetails> allDNs = new ArrayList<>(dns);
+ public void testLeaderNodeIsCommandTarget() throws IOException {
+ final Set<DatanodeDetails> seenDN = new HashSet<>();
conf.setBoolean(
OzoneConfigKeys.OZONE_NETWORK_TOPOLOGY_AWARE_READ_KEY, false);
- // Using a new Xceiver Client, call it repeatedly until all DNs in the
- // pipeline have been the target of the command, indicating it is shuffling
- // the DNs on each call with a new client. This test will timeout if this
- // is not happening.
- while (allDNs.size() > 0) {
+ // Using a new Xceiver Client, make 100 calls and ensure leader node is
used
+ // each time. The logic should always use the leader node, so we can check
+ // only a single DN is ever seen after 100 calls.
+ for (int i = 0; i < 100; i++) {
try (XceiverClientGrpc client = new XceiverClientGrpc(pipeline, conf) {
@Override
public XceiverClientReply sendCommandAsync(
ContainerProtos.ContainerCommandRequestProto request,
DatanodeDetails dn) {
- allDNs.remove(dn);
+ seenDN.add(dn);
return buildValidResponse();
}
}) {
invokeXceiverClientGetBlock(client);
}
}
+ assertEquals(1, seenDN.size());
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
