You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2023/02/10 22:02:20 UTC
[hadoop] branch branch-3.3.5 updated: HDFS-18324. Fix race condition in closing IPC connections. (#5371)
This is an automated email from the ASF dual-hosted git repository.
omalley pushed a commit to branch branch-3.3.5
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3.5 by this push:
new 0834b8f7143 HDFS-18324. Fix race condition in closing IPC connections. (#5371)
0834b8f7143 is described below
commit 0834b8f714330e231d10cfbb0f1a79e79316b086
Author: Owen O'Malley <oo...@linkedin.com>
AuthorDate: Fri Feb 10 09:51:03 2023 -0800
HDFS-18324. Fix race condition in closing IPC connections. (#5371)
---
.../src/main/java/org/apache/hadoop/ipc/Client.java | 9 ++++++++-
.../src/test/java/org/apache/hadoop/ipc/TestIPC.java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
index 16f799bddcf..3597e49b966 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
@@ -1181,7 +1181,14 @@ public class Client implements AutoCloseable {
final ResponseBuffer buf = new ResponseBuffer();
header.writeDelimitedTo(buf);
RpcWritable.wrap(call.rpcRequest).writeTo(buf);
- rpcRequestQueue.put(Pair.of(call, buf));
+ // Wait for the message to be sent. We offer with timeout to
+ // prevent a race condition between checking the shouldCloseConnection
+ // and the stopping of the polling thread
+ while (!shouldCloseConnection.get()) {
+ if (rpcRequestQueue.offer(Pair.of(call, buf), 1, TimeUnit.SECONDS)) {
+ break;
+ }
+ }
}
/* Receive a response.
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
index b9afa31b448..c32f7414495 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
@@ -1338,7 +1338,7 @@ public class TestIPC {
/**
* Test the retry count while used in a retry proxy.
*/
- @Test(timeout=60000)
+ @Test(timeout=100000)
public void testRetryProxy() throws IOException {
final Client client = new Client(LongWritable.class, conf);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org