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 bd110a477e HDDS-8621. IOException is never thrown in
SCMRatisServer.getRatisRoles(). (#4710)
bd110a477e is described below
commit bd110a477e5fc339aa3117f8facae06a1d2c7223
Author: Tsz-Wo Nicholas Sze <[email protected]>
AuthorDate: Sun May 14 21:02:35 2023 +0800
HDDS-8621. IOException is never thrown in SCMRatisServer.getRatisRoles().
(#4710)
---
.../java/org/apache/hadoop/hdds/utils/IOUtils.java | 16 ++++++
.../apache/hadoop/hdds/scm/ha/SCMRatisServer.java | 2 +-
.../hadoop/hdds/scm/ha/SCMRatisServerImpl.java | 2 +-
.../hdds/scm/server/SCMClientProtocolServer.java | 2 +-
.../apache/hadoop/hdds/scm/server/SCMMXBean.java | 5 +-
.../hdds/scm/server/StorageContainerManager.java | 2 +-
.../org/apache/hadoop/ozone/MiniOzoneCluster.java | 10 ++++
.../apache/hadoop/ozone/MiniOzoneClusterImpl.java | 8 ++-
.../hadoop/ozone/MiniOzoneHAClusterImpl.java | 3 +-
.../apache/hadoop/ozone/TestMiniOzoneCluster.java | 63 ++++++++++++----------
.../ozone/scm/TestStorageContainerManagerHA.java | 2 +-
11 files changed, 73 insertions(+), 42 deletions(-)
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/IOUtils.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/IOUtils.java
index 9e35d957ab..109f4b3df0 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/IOUtils.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/IOUtils.java
@@ -21,6 +21,8 @@ package org.apache.hadoop.hdds.utils;
import org.slf4j.Logger;
import java.io.Closeable;
+import java.util.Arrays;
+import java.util.Collection;
/**
* Static helper utilities for IO / Closable classes.
@@ -59,6 +61,14 @@ public final class IOUtils {
* Close each argument, catching exceptions and logging them as error.
*/
public static void close(Logger logger, AutoCloseable... closeables) {
+ close(logger, Arrays.asList(closeables));
+ }
+
+ /**
+ * Close each argument, catching exceptions and logging them as error.
+ */
+ public static void close(Logger logger,
+ Collection<AutoCloseable> closeables) {
if (closeables == null) {
return;
}
@@ -82,4 +92,10 @@ public final class IOUtils {
close(null, closeables);
}
+ /**
+ * Close each argument, swallowing exceptions.
+ */
+ public static void closeQuietly(Collection<AutoCloseable> closeables) {
+ close(null, closeables);
+ }
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisServer.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisServer.java
index edf5fe2039..d5de48107e 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisServer.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisServer.java
@@ -51,7 +51,7 @@ public interface SCMRatisServer {
/**
* Returns roles of ratis peers.
*/
- List<String> getRatisRoles() throws IOException;
+ List<String> getRatisRoles();
/**
* Returns NotLeaderException with useful info.
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisServerImpl.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisServerImpl.java
index 230f3067c3..8360a8de37 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisServerImpl.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisServerImpl.java
@@ -248,7 +248,7 @@ public class SCMRatisServerImpl implements SCMRatisServer {
@Override
- public List<String> getRatisRoles() throws IOException {
+ public List<String> getRatisRoles() {
Collection<RaftPeer> peers = division.getGroup().getPeers();
RaftPeer leader = getLeader();
List<String> ratisRoles = new ArrayList<>();
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
index f62697fb7a..0e6aecab18 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
@@ -778,7 +778,7 @@ public class SCMClientProtocolServer implements
}
@Override
- public ScmInfo getScmInfo() throws IOException {
+ public ScmInfo getScmInfo() {
boolean auditSuccess = true;
try {
ScmInfo.Builder builder =
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java
index e03a833b1c..6054e1af07 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
@@ -18,7 +18,6 @@
package org.apache.hadoop.hdds.scm.server;
-import java.io.IOException;
import java.util.Map;
import org.apache.hadoop.hdds.annotation.InterfaceAudience;
@@ -66,7 +65,7 @@ public interface SCMMXBean extends ServiceRuntimeInfo {
String getClusterId();
- String getScmRatisRoles() throws IOException;
+ String getScmRatisRoles();
/**
* Primordial node is the node on which scm init operation is performed.
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
index 7d0fd4bd78..fb5fb74982 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@ -2057,7 +2057,7 @@ public final class StorageContainerManager extends
ServiceRuntimeInfoImpl
}
@Override
- public String getScmRatisRoles() throws IOException {
+ public String getScmRatisRoles() {
final SCMRatisServer server = getScmHAManager().getRatisServer();
return server != null ?
HddsUtils.format(server.getRatisRoles()) : "STANDALONE";
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
index 6fa18adbcc..a23e286aa0 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
@@ -279,6 +279,16 @@ public interface MiniOzoneCluster {
*/
void shutdownHddsDatanodes();
+ String getClusterId();
+
+ default String getName() {
+ return getClass().getSimpleName() + "-" + getClusterId();
+ }
+
+ default String getBaseDir() {
+ return GenericTestUtils.getTempPath(getName());
+ }
+
/**
* Builder class for MiniOzoneCluster.
*/
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
index 27af65c313..604cbdba44 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
@@ -431,7 +431,7 @@ public class MiniOzoneClusterImpl implements
MiniOzoneCluster {
shutdownHddsDatanode(getHddsDatanodeIndex(dn));
}
- public String getClusterId() throws IOException {
+ public String getClusterId() {
return scm.getClientProtocolServer().getScmInfo().getClusterId();
}
@@ -439,10 +439,8 @@ public class MiniOzoneClusterImpl implements
MiniOzoneCluster {
public void shutdown() {
try {
LOG.info("Shutting down the Mini Ozone Cluster");
- IOUtils.closeQuietly(clients.toArray(new AutoCloseable[0]));
- File baseDir = new File(GenericTestUtils.getTempPath(
- MiniOzoneClusterImpl.class.getSimpleName() + "-" +
- getClusterId()));
+ IOUtils.closeQuietly(clients);
+ final File baseDir = new File(getBaseDir());
stop();
FileUtils.deleteDirectory(baseDir);
ContainerCache.getInstance(conf).shutdownCache();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
index a0c0c22e91..3cb2b22447 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
@@ -267,7 +267,8 @@ public class MiniOzoneHAClusterImpl extends
MiniOzoneClusterImpl {
return scm;
}
- public String getClusterId() throws IOException {
+ @Override
+ public String getClusterId() {
return scmhaService.getServices().get(0)
.getClientProtocolServer().getScmInfo().getClusterId();
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java
index b6e43bd7e3..bdc4a4284a 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java
@@ -18,12 +18,6 @@
package org.apache.hadoop.ozone;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-
import org.apache.hadoop.hdds.DFSConfigKeysLegacy;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.client.StandaloneReplicationConfig;
@@ -43,22 +37,27 @@ import
org.apache.hadoop.ozone.container.common.volume.StorageVolume;
import org.apache.hadoop.ozone.container.ozoneimpl.TestOzoneContainer;
import org.apache.hadoop.test.PathUtils;
import org.apache.hadoop.test.TestGenericTestUtils;
+import org.apache.ozone.test.GenericTestUtils;
import org.apache.ozone.test.tag.Flaky;
-
-import static org.apache.hadoop.hdds.protocol.DatanodeDetails.Port;
-import static
org.apache.hadoop.hdds.protocol.MockDatanodeDetails.randomDatanodeDetails;
-import static
org.apache.hadoop.ozone.OzoneConfigKeys.DFS_CONTAINER_RATIS_IPC_RANDOM_PORT;
-
-import org.junit.Assert;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+import static org.apache.hadoop.hdds.protocol.DatanodeDetails.Port;
+import static
org.apache.hadoop.hdds.protocol.MockDatanodeDetails.randomDatanodeDetails;
+import static
org.apache.hadoop.ozone.OzoneConfigKeys.DFS_CONTAINER_RATIS_IPC_RANDOM_PORT;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* Test cases for mini ozone cluster.
*/
@@ -160,18 +159,18 @@ public class TestMiniOzoneCluster {
for (DatanodeStateMachine dsm : stateMachines) {
int readPort = dsm.getContainer().getReadChannel().getIPCPort();
- assertNotEquals("Port number of the service is not updated", 0,
- readPort);
+ assertNotEquals(0, readPort,
+ "Port number of the service is not updated");
- assertTrue("Port of datanode service is conflicted with other server.",
- ports.add(readPort));
+ assertTrue(ports.add(readPort),
+ "Port of datanode service is conflicted with other server.");
int writePort = dsm.getContainer().getWriteChannel().getIPCPort();
- assertNotEquals("Port number of the service is not updated", 0,
- writePort);
- assertTrue("Port of datanode service is conflicted with other server.",
- ports.add(writePort));
+ assertNotEquals(0, writePort,
+ "Port number of the service is not updated");
+ assertTrue(ports.add(writePort),
+ "Port of datanode service is conflicted with other server.");
}
} finally {
@@ -243,7 +242,7 @@ public class TestMiniOzoneCluster {
for (int i = 0; i < 20; i++) {
for (EndpointStateMachine endpoint :
dnStateMachine.getConnectionManager().getValues()) {
- Assert.assertEquals(
+ assertEquals(
EndpointStateMachine.EndPointStates.GETVERSION,
endpoint.getState());
}
@@ -258,7 +257,7 @@ public class TestMiniOzoneCluster {
// DN should be in HEARTBEAT state after registering with the SCM
for (EndpointStateMachine endpoint :
dnStateMachine.getConnectionManager().getValues()) {
- Assert.assertEquals(EndpointStateMachine.EndPointStates.HEARTBEAT,
+ assertEquals(EndpointStateMachine.EndPointStates.HEARTBEAT,
endpoint.getState());
}
}
@@ -278,13 +277,21 @@ public class TestMiniOzoneCluster {
.build();
cluster.waitForClusterToBeReady();
+ final String name = MiniOzoneClusterImpl.class.getSimpleName()
+ + "-" + cluster.getClusterId();
+ assertEquals(name, cluster.getName());
+
+ final String baseDir = GenericTestUtils.getTempPath(name);
+ assertEquals(baseDir, cluster.getBaseDir());
+
+
List<StorageVolume> volumeList = cluster.getHddsDatanodes().get(0)
.getDatanodeStateMachine().getContainer().getVolumeSet()
.getVolumesList();
- Assert.assertEquals(3, volumeList.size());
+ assertEquals(3, volumeList.size());
- volumeList.forEach(storageVolume -> Assert.assertEquals(
+ volumeList.forEach(storageVolume -> assertEquals(
(long) StorageSize.parse(reservedSpace).getValue(),
storageVolume.getVolumeInfo().get().getReservedInBytes()));
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestStorageContainerManagerHA.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestStorageContainerManagerHA.java
index 4424324ea4..942bb6a575 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestStorageContainerManagerHA.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestStorageContainerManagerHA.java
@@ -298,7 +298,7 @@ public class TestStorageContainerManagerHA {
}
@Test
- public void testGetRatisRolesDetail() throws IOException {
+ public void testGetRatisRolesDetail() {
Set<String> resultSet = new HashSet<>();
for (StorageContainerManager scm: cluster.getStorageContainerManagers()) {
resultSet.addAll(scm.getScmHAManager().getRatisServer().getRatisRoles());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
