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 52980fec53b HDDS-15996. Flaky TestClientRetryTimeout throws NPE
(#10898)
52980fec53b is described below
commit 52980fec53b68628276ef38d397c45efca35622d
Author: Zita Dombi <[email protected]>
AuthorDate: Fri Jul 31 14:09:51 2026 +0200
HDDS-15996. Flaky TestClientRetryTimeout throws NPE (#10898)
---
.../ozone/client/rpc/TestClientRetryTimeout.java | 46 +++++++++-------------
1 file changed, 18 insertions(+), 28 deletions(-)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestClientRetryTimeout.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestClientRetryTimeout.java
index 1c08b169c8b..4d925936839 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestClientRetryTimeout.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestClientRetryTimeout.java
@@ -26,7 +26,6 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
-import java.io.OutputStream;
import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
@@ -40,9 +39,7 @@
import org.apache.hadoop.hdds.ratis.conf.RatisClientConfig;
import org.apache.hadoop.hdds.scm.OzoneClientConfig;
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
-import org.apache.hadoop.hdds.scm.XceiverClientRatis;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
-import org.apache.hadoop.hdds.scm.storage.RatisBlockOutputStream;
import org.apache.hadoop.hdds.utils.IOUtils;
import org.apache.hadoop.ozone.ClientConfigForTesting;
import org.apache.hadoop.ozone.HddsDatanodeService;
@@ -56,6 +53,7 @@
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.container.TestHelper;
import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
@@ -118,6 +116,7 @@ public class TestClientRetryTimeout {
private ObjectStore objectStore;
private String volumeName;
private String bucketName;
+ private OzoneOutputStream key;
@BeforeAll
public void init() throws Exception {
@@ -190,6 +189,12 @@ public void init() throws Exception {
objectStore.getVolume(volumeName).createBucket(bucketName);
}
+ @AfterEach
+ public void closeKey() {
+ IOUtils.closeQuietly(key);
+ key = null;
+ }
+
@AfterAll
public void shutdown() {
IOUtils.closeQuietly(client);
@@ -209,7 +214,7 @@ public void shutdown() {
@Order(1)
public void testWriteToDeadPipelineFailsFast() throws Exception {
String keyName = getKeyName();
- OzoneOutputStream key = createKey(keyName);
+ key = createKey(keyName);
// Write initial data to establish the pipeline connection
byte[] data = generateData(FLUSH_SIZE);
@@ -219,13 +224,8 @@ public void testWriteToDeadPipelineFailsFast() throws
Exception {
// Get the pipeline for this key
KeyOutputStream keyOutputStream =
assertInstanceOf(KeyOutputStream.class, key.getOutputStream());
- OutputStream stream = keyOutputStream.getStreamEntries().get(0)
- .getOutputStream();
- RatisBlockOutputStream blockOutputStream =
- assertInstanceOf(RatisBlockOutputStream.class, stream);
- XceiverClientRatis ratisClient =
- (XceiverClientRatis) blockOutputStream.getXceiverClient();
- Pipeline pipeline = ratisClient.getPipeline();
+ Pipeline pipeline =
+ keyOutputStream.getLocationInfoList().get(0).getPipeline();
List<DatanodeDetails> nodes = pipeline.getNodes();
LOG.info("Shutting down ALL datanodes in pipeline: {}", pipeline.getId());
@@ -281,7 +281,7 @@ public void testWriteToDeadPipelineFailsFast() throws
Exception {
@Order(2)
public void testWatchForCommitWithDeadFollowersFailsFast() throws Exception {
String keyName = getKeyName();
- OzoneOutputStream key = createKey(keyName);
+ key = createKey(keyName);
// Write initial data to establish the pipeline
byte[] data = generateData(FLUSH_SIZE);
@@ -291,13 +291,8 @@ public void testWatchForCommitWithDeadFollowersFailsFast()
throws Exception {
// Get the pipeline and identify leader vs followers
KeyOutputStream keyOutputStream =
assertInstanceOf(KeyOutputStream.class, key.getOutputStream());
- OutputStream stream = keyOutputStream.getStreamEntries().get(0)
- .getOutputStream();
- RatisBlockOutputStream blockOutputStream =
- assertInstanceOf(RatisBlockOutputStream.class, stream);
- XceiverClientRatis ratisClient =
- (XceiverClientRatis) blockOutputStream.getXceiverClient();
- Pipeline pipeline = ratisClient.getPipeline();
+ Pipeline pipeline =
+ keyOutputStream.getLocationInfoList().get(0).getPipeline();
// Find and shut down exactly ONE follower (keep leader + 1 follower
// alive so majority exists for write, but ALL_COMMITTED will fail)
@@ -362,7 +357,7 @@ public void testWatchForCommitWithDeadFollowersFailsFast()
throws Exception {
@Order(3)
public void testWriteWithLeaderFailureFailsFast() throws Exception {
String keyName = getKeyName();
- OzoneOutputStream key = createKey(keyName);
+ key = createKey(keyName);
// Write initial data
byte[] data = generateData(FLUSH_SIZE);
@@ -372,13 +367,8 @@ public void testWriteWithLeaderFailureFailsFast() throws
Exception {
// Get the pipeline and find the leader
KeyOutputStream keyOutputStream =
assertInstanceOf(KeyOutputStream.class, key.getOutputStream());
- OutputStream stream = keyOutputStream.getStreamEntries().get(0)
- .getOutputStream();
- RatisBlockOutputStream blockOutputStream =
- assertInstanceOf(RatisBlockOutputStream.class, stream);
- XceiverClientRatis ratisClient =
- (XceiverClientRatis) blockOutputStream.getXceiverClient();
- Pipeline pipeline = ratisClient.getPipeline();
+ Pipeline pipeline =
+ keyOutputStream.getLocationInfoList().get(0).getPipeline();
// Find and kill the leader
HddsDatanodeService leader = null;
@@ -437,7 +427,7 @@ public void testWriteWithLeaderFailureFailsFast() throws
Exception {
public void testEndToEndWriteWithAllDatanodesDownFailsFast()
throws Exception {
String keyName = getKeyName();
- OzoneOutputStream key = createKey(keyName);
+ key = createKey(keyName);
// Write initial data to establish a pipeline
byte[] data = generateData(FLUSH_SIZE);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
