This is an automated email from the ASF dual-hosted git repository.
mpochatkin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 081c8843a4 IGNITE-22981 Relax IgniteClient close exception (#4226)
081c8843a4 is described below
commit 081c8843a4ddfeaf07107f1ce392dd69f233de26
Author: Vadim Pakhnushev <[email protected]>
AuthorDate: Tue Aug 13 20:43:48 2024 +0300
IGNITE-22981 Relax IgniteClient close exception (#4226)
---
.../org/apache/ignite/client/IgniteClient.java | 3 +++
.../ignite/internal/client/ReliableChannel.java | 20 +++++++++---------
.../ignite/internal/client/TcpIgniteClient.java | 10 +++++++--
.../apache/ignite/client/ClientComputeTest.java | 20 +++++++++---------
.../apache/ignite/client/ClientLoggingTest.java | 2 +-
.../org/apache/ignite/client/ClientTableTest.java | 2 +-
.../apache/ignite/client/ConfigurationTest.java | 8 ++++----
.../org/apache/ignite/client/ConnectionTest.java | 18 ++++++++--------
.../org/apache/ignite/client/HeartbeatTest.java | 2 +-
.../org/apache/ignite/client/MultiClusterTest.java | 3 +--
.../org/apache/ignite/client/ReconnectTest.java | 4 ++--
.../org/apache/ignite/client/RetryPolicyTest.java | 24 +++++++++++-----------
.../org/apache/ignite/client/SchemaUpdateTest.java | 2 +-
.../java/org/apache/ignite/client/TestServer.java | 2 +-
.../benchmarks/ClientHeartbeatBenchmark.java | 2 +-
.../client/benchmarks/ClientPutGetBenchmark.java | 2 +-
.../ignite/internal/compute/ItComputeBaseTest.java | 2 --
.../compute/ItThinClientComputeErrorsTest.java | 2 +-
.../compute/ItThinClientWorkerShutdownTest.java | 2 +-
.../ignite/internal/jdbc/JdbcConnection.java | 6 +-----
.../app/client/ItThinClientAuthenticationTest.java | 2 --
.../app/client/ItThinClientConnectionTest.java | 2 +-
.../app/client/ItThinClientTransactionsTest.java | 2 +-
.../streamer/ItClientDataStreamerTest.java | 2 +-
.../internal/table/ItTablePutGetThinTest.java | 2 +-
.../ItThinClientPartitionManagerTest.java | 2 +-
.../org/apache/ignite/internal/ssl/ItSslTest.java | 8 ++++----
.../sql/api/ItKvKeyColumnPositionTest.java | 2 +-
.../sql/api/ItSqlClientAsynchronousApiTest.java | 2 +-
.../sql/api/ItSqlClientSynchronousApiTest.java | 2 +-
.../sql/engine/ItNotNullConstraintClientTest.java | 2 +-
31 files changed, 82 insertions(+), 82 deletions(-)
diff --git
a/modules/client/src/main/java/org/apache/ignite/client/IgniteClient.java
b/modules/client/src/main/java/org/apache/ignite/client/IgniteClient.java
index 7b3e84c260..4d85fc292f 100644
--- a/modules/client/src/main/java/org/apache/ignite/client/IgniteClient.java
+++ b/modules/client/src/main/java/org/apache/ignite/client/IgniteClient.java
@@ -66,6 +66,9 @@ public interface IgniteClient extends Ignite, AutoCloseable {
return new Builder();
}
+ @Override
+ void close();
+
/** Client builder. */
@SuppressWarnings("PublicInnerClass")
class Builder {
diff --git
a/modules/client/src/main/java/org/apache/ignite/internal/client/ReliableChannel.java
b/modules/client/src/main/java/org/apache/ignite/internal/client/ReliableChannel.java
index 906dd15405..e56a259e7a 100644
---
a/modules/client/src/main/java/org/apache/ignite/internal/client/ReliableChannel.java
+++
b/modules/client/src/main/java/org/apache/ignite/internal/client/ReliableChannel.java
@@ -57,6 +57,7 @@ import org.apache.ignite.client.RetryPolicy;
import org.apache.ignite.client.RetryPolicyContext;
import org.apache.ignite.internal.client.io.ClientConnectionMultiplexer;
import
org.apache.ignite.internal.client.io.netty.NettyClientConnectionMultiplexer;
+import org.apache.ignite.internal.close.ManuallyCloseable;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.thread.NamedThreadFactory;
import org.apache.ignite.internal.util.IgniteUtils;
@@ -148,16 +149,15 @@ public final class ReliableChannel implements
AutoCloseable {
List<ClientChannelHolder> holders = channels;
- IgniteUtils.closeAllManually(
- () -> {
- if (holders != null) {
- for (ClientChannelHolder hld : holders) {
- hld.close();
- }
- }
- },
- connMgr::stop,
- () -> shutdownAndAwaitTermination(streamerFlushExecutor, 10,
TimeUnit.SECONDS));
+ List<ManuallyCloseable> closeables = new ArrayList<>();
+ if (holders != null) {
+ for (ClientChannelHolder hld : holders) {
+ closeables.add(hld::close);
+ }
+ }
+ closeables.add(connMgr::stop);
+ closeables.add(() ->
shutdownAndAwaitTermination(streamerFlushExecutor, 10, TimeUnit.SECONDS));
+ IgniteUtils.closeAllManually(closeables);
}
/**
diff --git
a/modules/client/src/main/java/org/apache/ignite/internal/client/TcpIgniteClient.java
b/modules/client/src/main/java/org/apache/ignite/internal/client/TcpIgniteClient.java
index 22e4062e4c..f43fcf4d16 100644
---
a/modules/client/src/main/java/org/apache/ignite/internal/client/TcpIgniteClient.java
+++
b/modules/client/src/main/java/org/apache/ignite/internal/client/TcpIgniteClient.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.client;
import static org.apache.ignite.internal.util.ViewUtils.sync;
+import static org.apache.ignite.lang.ErrorGroups.Client.CONNECTION_ERR;
import java.util.ArrayList;
import java.util.Collection;
@@ -35,6 +36,7 @@ import org.apache.ignite.internal.client.sql.ClientSql;
import org.apache.ignite.internal.client.table.ClientTables;
import org.apache.ignite.internal.client.tx.ClientTransactions;
import org.apache.ignite.internal.jdbc.proto.ClientMessage;
+import org.apache.ignite.internal.lang.IgniteInternalException;
import org.apache.ignite.internal.manager.ComponentContext;
import org.apache.ignite.internal.marshaller.ReflectionMarshallersProvider;
import org.apache.ignite.internal.metrics.MetricManager;
@@ -212,8 +214,12 @@ public class TcpIgniteClient implements IgniteClient {
/** {@inheritDoc} */
@Override
- public void close() throws Exception {
- ch.close();
+ public void close() {
+ try {
+ ch.close();
+ } catch (Exception e) {
+ throw new IgniteInternalException(CONNECTION_ERR, "Error occurred
while closing the channel", e);
+ }
if (metricManager != null) {
metricManager.stopAsync(new ComponentContext()).join();
diff --git
a/modules/client/src/test/java/org/apache/ignite/client/ClientComputeTest.java
b/modules/client/src/test/java/org/apache/ignite/client/ClientComputeTest.java
index 8421fb9205..1f28a19a52 100644
---
a/modules/client/src/test/java/org/apache/ignite/client/ClientComputeTest.java
+++
b/modules/client/src/test/java/org/apache/ignite/client/ClientComputeTest.java
@@ -114,7 +114,7 @@ public class ClientComputeTest extends
BaseIgniteAbstractTest {
}
@Test
- public void
testClientSendsComputeJobToDefaultNodeWhenDirectConnectionToTargetDoesNotExist()
throws Exception {
+ public void
testClientSendsComputeJobToDefaultNodeWhenDirectConnectionToTargetDoesNotExist()
{
initServers(reqId -> false);
try (var client = getClient(server3)) {
@@ -135,7 +135,7 @@ public class ClientComputeTest extends
BaseIgniteAbstractTest {
}
@Test
- public void testClientRetriesComputeJobOnPrimaryAndDefaultNodes() throws
Exception {
+ public void testClientRetriesComputeJobOnPrimaryAndDefaultNodes() {
initServers(reqId -> reqId % 3 == 0);
try (var client = getClient(server3)) {
@@ -152,7 +152,7 @@ public class ClientComputeTest extends
BaseIgniteAbstractTest {
}
@Test
- public void testExecuteColocated() throws Exception {
+ public void testExecuteColocated() {
initServers(reqId -> false);
try (var client = getClient(server2)) {
@@ -167,7 +167,7 @@ public class ClientComputeTest extends
BaseIgniteAbstractTest {
}
@Test
- public void testExecuteColocatedAsync() throws Exception {
+ public void testExecuteColocatedAsync() {
initServers(reqId -> false);
try (var client = getClient(server2)) {
@@ -196,7 +196,7 @@ public class ClientComputeTest extends
BaseIgniteAbstractTest {
}
@Test
- public void
testExecuteColocatedThrowsTableNotFoundExceptionWhenTableDoesNotExist() throws
Exception {
+ public void
testExecuteColocatedThrowsTableNotFoundExceptionWhenTableDoesNotExist() {
initServers(reqId -> false);
try (var client = getClient(server1)) {
@@ -214,7 +214,7 @@ public class ClientComputeTest extends
BaseIgniteAbstractTest {
@ParameterizedTest
@ValueSource(booleans = {true, false})
- void testExecuteColocatedUpdatesTableCacheOnTableDrop(boolean
forceLoadAssignment) throws Exception {
+ void testExecuteColocatedUpdatesTableCacheOnTableDrop(boolean
forceLoadAssignment) {
String tableName = "drop-me";
initServers(reqId -> false);
@@ -253,7 +253,7 @@ public class ClientComputeTest extends
BaseIgniteAbstractTest {
}
@Test
- void testMapReduceExecute() throws Exception {
+ void testMapReduceExecute() {
initServers(reqId -> false);
try (var client = getClient(server1)) {
@@ -283,7 +283,7 @@ public class ClientComputeTest extends
BaseIgniteAbstractTest {
}
@Test
- void testMapReduceException() throws Exception {
+ void testMapReduceException() {
initServers(reqId -> false);
try (var client = getClient(server1)) {
@@ -300,7 +300,7 @@ public class ClientComputeTest extends
BaseIgniteAbstractTest {
}
@Test
- void testUnitsPropagation() throws Exception {
+ void testUnitsPropagation() {
initServers(reqId -> false);
try (var client = getClient(server1)) {
@@ -320,7 +320,7 @@ public class ClientComputeTest extends
BaseIgniteAbstractTest {
}
@Test
- void testExceptionInJob() throws Exception {
+ void testExceptionInJob() {
initServers(reqId -> false);
try (var client = getClient(server1)) {
diff --git
a/modules/client/src/test/java/org/apache/ignite/client/ClientLoggingTest.java
b/modules/client/src/test/java/org/apache/ignite/client/ClientLoggingTest.java
index 4276d9100f..bcd4f1f8c4 100644
---
a/modules/client/src/test/java/org/apache/ignite/client/ClientLoggingTest.java
+++
b/modules/client/src/test/java/org/apache/ignite/client/ClientLoggingTest.java
@@ -49,7 +49,7 @@ public class ClientLoggingTest extends BaseIgniteAbstractTest
{
}
@Test
- public void loggersSetToDifferentClientsNotInterfereWithEachOther() throws
Exception {
+ public void loggersSetToDifferentClientsNotInterfereWithEachOther() {
FakeIgnite ignite1 = new FakeIgnite();
((FakeIgniteTables) ignite1.tables()).createTable("t");
diff --git
a/modules/client/src/test/java/org/apache/ignite/client/ClientTableTest.java
b/modules/client/src/test/java/org/apache/ignite/client/ClientTableTest.java
index cd050c6e1e..9c3cb5806f 100644
--- a/modules/client/src/test/java/org/apache/ignite/client/ClientTableTest.java
+++ b/modules/client/src/test/java/org/apache/ignite/client/ClientTableTest.java
@@ -110,7 +110,7 @@ public class ClientTableTest extends
AbstractClientTableTest {
}
@Test
- public void testGetReturningTupleWithUnknownSchemaRequestsNewSchema()
throws Exception {
+ public void testGetReturningTupleWithUnknownSchemaRequestsNewSchema() {
var embeddedView = defaultTable().recordView();
try (var client2 = startClient()) {
diff --git
a/modules/client/src/test/java/org/apache/ignite/client/ConfigurationTest.java
b/modules/client/src/test/java/org/apache/ignite/client/ConfigurationTest.java
index f82e7d7095..b76cf8a953 100644
---
a/modules/client/src/test/java/org/apache/ignite/client/ConfigurationTest.java
+++
b/modules/client/src/test/java/org/apache/ignite/client/ConfigurationTest.java
@@ -61,7 +61,7 @@ public class ConfigurationTest extends AbstractClientTest {
}
@Test
- public void testAddressFinderWorksWithoutAddresses() throws Exception {
+ public void testAddressFinderWorksWithoutAddresses() {
String addr = "127.0.0.1:" + serverPort;
IgniteClient.Builder builder = IgniteClient.builder();
@@ -76,7 +76,7 @@ public class ConfigurationTest extends AbstractClientTest {
}
@Test
- public void testClientBuilderPropagatesAllConfigurationValues() throws
Exception {
+ public void testClientBuilderPropagatesAllConfigurationValues() {
String addr = "127.0.0.1:" + serverPort;
IgniteClient.Builder builder = IgniteClient.builder();
@@ -143,7 +143,7 @@ public class ConfigurationTest extends AbstractClientTest {
}
@Test
- public void testDirectAsyncContinuationExecutorUsesNettyThread() throws
Exception {
+ public void testDirectAsyncContinuationExecutorUsesNettyThread() {
IgniteClient.Builder builder = IgniteClient.builder()
.addresses("127.0.0.1:" + serverPort)
.asyncContinuationExecutor(Runnable::run);
@@ -157,7 +157,7 @@ public class ConfigurationTest extends AbstractClientTest {
}
@Test
- public void testCustomAsyncContinuationExecutor() throws Exception {
+ public void testCustomAsyncContinuationExecutor() {
Function<Integer, Integer> responseDelay = x -> 50;
try (var testServer = new TestServer(0, server, x -> false,
responseDelay, "n2", clusterId, null, null)) {
diff --git
a/modules/client/src/test/java/org/apache/ignite/client/ConnectionTest.java
b/modules/client/src/test/java/org/apache/ignite/client/ConnectionTest.java
index c78f625441..eb2a216a12 100644
--- a/modules/client/src/test/java/org/apache/ignite/client/ConnectionTest.java
+++ b/modules/client/src/test/java/org/apache/ignite/client/ConnectionTest.java
@@ -55,12 +55,12 @@ public class ConnectionTest extends AbstractClientTest {
}
@Test
- public void testValidNodeAddresses() throws Exception {
+ public void testValidNodeAddresses() {
testConnection("127.0.0.1:" + serverPort);
}
@Test
- public void testDefaultClientConfig() throws Exception {
+ public void testDefaultClientConfig() {
try (var ignored = new TestServer(0, new FakeIgnite(), null, null,
"abc", clusterId, null, 10800)) {
IgniteClient.builder()
.addresses("localhost")
@@ -82,19 +82,19 @@ public class ConnectionTest extends AbstractClientTest {
}
@Test
- public void testValidInvalidNodeAddressesMix() throws Exception {
+ public void testValidInvalidNodeAddressesMix() {
testConnection("127.0.0.1:47500", "127.0.0.1:10801", "127.0.0.1:" +
serverPort);
}
@Disabled("https://issues.apache.org/jira/browse/IGNITE-15611 . IPv6 is
not enabled by default on some systems.")
@Test
- public void testIpv6NodeAddresses() throws Exception {
+ public void testIpv6NodeAddresses() {
testConnection("[::1]:" + serverPort);
}
@SuppressWarnings("ThrowableNotThrown")
@Test
- public void testNoResponseFromServerWithinConnectTimeoutThrowsException()
throws Exception {
+ public void testNoResponseFromServerWithinConnectTimeoutThrowsException() {
Function<Integer, Integer> responseDelay = x -> 500;
try (var srv = new TestServer(300, new FakeIgnite(), x -> false,
responseDelay, null, UUID.randomUUID(), null, null)) {
@@ -109,7 +109,7 @@ public class ConnectionTest extends AbstractClientTest {
@SuppressWarnings("ThrowableNotThrown")
@Test
- public void
testNoResponseFromServerWithinOperationTimeoutThrowsException() throws
Exception {
+ public void
testNoResponseFromServerWithinOperationTimeoutThrowsException() {
Function<Integer, Integer> responseDelay = x -> x > 2 ? 100 : 0;
try (var srv = new TestServer(300, new FakeIgnite(), x -> false,
responseDelay, null, UUID.randomUUID(), null, null)) {
@@ -130,7 +130,7 @@ public class ConnectionTest extends AbstractClientTest {
/** Verifies that the client handler doesn't handle requests until it is
explicitly enabled. */
@Test
@SuppressWarnings("ThrowableNotThrown")
- public void testDisabledRequestHandling() throws Exception {
+ public void testDisabledRequestHandling() {
String nodeName = "server-2";
FakeIgnite ignite = new FakeIgnite(nodeName);
@@ -190,8 +190,8 @@ public class ConnectionTest extends AbstractClientTest {
}
}
- private static void testConnection(String... addrs) throws Exception {
- IgniteClient c = AbstractClientTest.startClient(addrs);
+ private static void testConnection(String... addrs) {
+ IgniteClient c = startClient(addrs);
c.close();
}
diff --git
a/modules/client/src/test/java/org/apache/ignite/client/HeartbeatTest.java
b/modules/client/src/test/java/org/apache/ignite/client/HeartbeatTest.java
index 3b35b45ca4..448cdcd2a4 100644
--- a/modules/client/src/test/java/org/apache/ignite/client/HeartbeatTest.java
+++ b/modules/client/src/test/java/org/apache/ignite/client/HeartbeatTest.java
@@ -72,7 +72,7 @@ public class HeartbeatTest extends BaseIgniteAbstractTest {
@SuppressWarnings("ThrowableNotThrown")
@Test
- public void testInvalidHeartbeatIntervalThrows() throws Exception {
+ public void testInvalidHeartbeatIntervalThrows() {
try (var srv = new TestServer(300, new FakeIgnite())) {
Builder builder = IgniteClient.builder()
diff --git
a/modules/client/src/test/java/org/apache/ignite/client/MultiClusterTest.java
b/modules/client/src/test/java/org/apache/ignite/client/MultiClusterTest.java
index ff6d78eb7c..43aa287028 100644
---
a/modules/client/src/test/java/org/apache/ignite/client/MultiClusterTest.java
+++
b/modules/client/src/test/java/org/apache/ignite/client/MultiClusterTest.java
@@ -78,8 +78,7 @@ public class MultiClusterTest extends BaseIgniteAbstractTest {
}
@Test
- public void testReconnectToDifferentClusterFails()
- throws Exception {
+ public void testReconnectToDifferentClusterFails() {
int port = server1.port();
Builder builder = IgniteClient.builder()
.addresses("127.0.0.1:" + port);
diff --git
a/modules/client/src/test/java/org/apache/ignite/client/ReconnectTest.java
b/modules/client/src/test/java/org/apache/ignite/client/ReconnectTest.java
index 6ff0c901a9..e159e2255d 100644
--- a/modules/client/src/test/java/org/apache/ignite/client/ReconnectTest.java
+++ b/modules/client/src/test/java/org/apache/ignite/client/ReconnectTest.java
@@ -50,7 +50,7 @@ public class ReconnectTest extends BaseIgniteAbstractTest {
}
@Test
- public void clientReconnectsToAnotherAddressOnNodeFail() throws Exception {
+ public void clientReconnectsToAnotherAddressOnNodeFail() {
FakeIgnite ignite1 = new FakeIgnite();
((FakeIgniteTables) ignite1.tables()).createTable("t");
@@ -75,7 +75,7 @@ public class ReconnectTest extends BaseIgniteAbstractTest {
@Test
@SuppressWarnings("ThrowableNotThrown")
- public void testOperationFailsWhenAllServersFail() throws Exception {
+ public void testOperationFailsWhenAllServersFail() {
FakeIgnite ignite1 = new FakeIgnite();
((FakeIgniteTables) ignite1.tables()).createTable("t");
diff --git
a/modules/client/src/test/java/org/apache/ignite/client/RetryPolicyTest.java
b/modules/client/src/test/java/org/apache/ignite/client/RetryPolicyTest.java
index aaee044ba9..edbb229dbf 100644
--- a/modules/client/src/test/java/org/apache/ignite/client/RetryPolicyTest.java
+++ b/modules/client/src/test/java/org/apache/ignite/client/RetryPolicyTest.java
@@ -60,7 +60,7 @@ public class RetryPolicyTest extends BaseIgniteAbstractTest {
}
@Test
- public void testNoRetryPolicySecondRequestFails() throws Exception {
+ public void testNoRetryPolicySecondRequestFails() {
initServer(reqId -> reqId % 3 == 0);
try (var client = getClient(null)) {
@@ -70,7 +70,7 @@ public class RetryPolicyTest extends BaseIgniteAbstractTest {
}
@Test
- public void testRetryPolicyCompletesOperationWithoutException() throws
Exception {
+ public void testRetryPolicyCompletesOperationWithoutException() {
// Every 3 network message fails, including handshake.
initServer(reqId -> reqId % 4 == 0);
@@ -87,7 +87,7 @@ public class RetryPolicyTest extends BaseIgniteAbstractTest {
}
@Test
- public void testRetryPolicyDoesNotRetryUnrelatedErrors() throws Exception {
+ public void testRetryPolicyDoesNotRetryUnrelatedErrors() {
initServer(reqId -> reqId % 33 == 0);
var plc = new TestRetryPolicy();
@@ -98,7 +98,7 @@ public class RetryPolicyTest extends BaseIgniteAbstractTest {
}
@Test
- public void testRetryPolicyDoesNotRetryTxCommit() throws Exception {
+ public void testRetryPolicyDoesNotRetryTxCommit() {
initServer(reqId -> reqId % 3 == 0);
var plc = new TestRetryPolicy();
@@ -112,7 +112,7 @@ public class RetryPolicyTest extends BaseIgniteAbstractTest
{
}
@Test
- public void testRetryLimitPolicyThrowsOnLimitExceeded() throws Exception {
+ public void testRetryLimitPolicyThrowsOnLimitExceeded() {
initServer(reqId -> reqId % 2 == 0);
var plc = new TestRetryPolicy();
plc.retryLimit(5);
@@ -126,7 +126,7 @@ public class RetryPolicyTest extends BaseIgniteAbstractTest
{
}
@Test
- public void testCustomRetryPolicyIsInvokedWithCorrectContext() throws
Exception {
+ public void testCustomRetryPolicyIsInvokedWithCorrectContext() {
initServer(reqId -> reqId % 2 == 0);
var plc = new TestRetryPolicy();
plc.retryLimit(2);
@@ -146,7 +146,7 @@ public class RetryPolicyTest extends BaseIgniteAbstractTest
{
}
@Test
- public void testTableOperationWithoutTxIsRetried() throws Exception {
+ public void testTableOperationWithoutTxIsRetried() {
initServer(reqId -> reqId % 4 == 0);
var plc = new TestRetryPolicy();
@@ -160,7 +160,7 @@ public class RetryPolicyTest extends BaseIgniteAbstractTest
{
}
@Test
- public void testTableOperationWithTxIsNotRetried() throws Exception {
+ public void testTableOperationWithTxIsNotRetried() {
initServer(reqId -> reqId % 4 == 0);
var plc = new TestRetryPolicy();
@@ -177,7 +177,7 @@ public class RetryPolicyTest extends BaseIgniteAbstractTest
{
}
@Test
- public void testRetryReadPolicyRetriesReadOperations() throws Exception {
+ public void testRetryReadPolicyRetriesReadOperations() {
// Standard requests are:
// 1: Handshake
// 2: SCHEMAS_GET
@@ -198,7 +198,7 @@ public class RetryPolicyTest extends BaseIgniteAbstractTest
{
}
@Test
- public void testRetryReadPolicyDoesNotRetryWriteOperations() throws
Exception {
+ public void testRetryReadPolicyDoesNotRetryWriteOperations() {
initServer(reqId -> reqId % 6 == 0);
try (var client = getClient(new RetryReadPolicy())) {
@@ -247,7 +247,7 @@ public class RetryPolicyTest extends BaseIgniteAbstractTest
{
}
@Test
- public void testDefaultRetryPolicyIsRetryReadPolicyWithLimit() throws
Exception {
+ public void testDefaultRetryPolicyIsRetryReadPolicyWithLimit() {
initServer(reqId -> false);
try (var client = IgniteClient.builder().addresses("127.0.0.1:" +
server.port()).build()) {
@@ -259,7 +259,7 @@ public class RetryPolicyTest extends BaseIgniteAbstractTest
{
}
@Test
- public void testExceptionInRetryPolicyPropagatesToCaller() throws
Exception {
+ public void testExceptionInRetryPolicyPropagatesToCaller() {
initServer(reqId -> reqId % 2 == 0);
var plc = new TestRetryPolicy();
plc.shouldThrow = true;
diff --git
a/modules/client/src/test/java/org/apache/ignite/client/SchemaUpdateTest.java
b/modules/client/src/test/java/org/apache/ignite/client/SchemaUpdateTest.java
index 0ad249ad3d..d455b845d4 100644
---
a/modules/client/src/test/java/org/apache/ignite/client/SchemaUpdateTest.java
+++
b/modules/client/src/test/java/org/apache/ignite/client/SchemaUpdateTest.java
@@ -43,7 +43,7 @@ public class SchemaUpdateTest extends BaseIgniteAbstractTest {
private IgniteClient client;
@AfterEach
- public void tearDown() throws Exception {
+ public void tearDown() {
if (client != null) {
client.close();
}
diff --git
a/modules/client/src/test/java/org/apache/ignite/client/TestServer.java
b/modules/client/src/test/java/org/apache/ignite/client/TestServer.java
index 015621ebd7..182ae7b872 100644
--- a/modules/client/src/test/java/org/apache/ignite/client/TestServer.java
+++ b/modules/client/src/test/java/org/apache/ignite/client/TestServer.java
@@ -320,7 +320,7 @@ public class TestServer implements AutoCloseable {
/** {@inheritDoc} */
@Override
- public void close() throws Exception {
+ public void close() {
assertThat(stopAsync(new ComponentContext(), module,
authenticationManager, bootstrapFactory, cfg), willCompleteSuccessfully());
generator.close();
diff --git
a/modules/client/src/test/java/org/apache/ignite/client/benchmarks/ClientHeartbeatBenchmark.java
b/modules/client/src/test/java/org/apache/ignite/client/benchmarks/ClientHeartbeatBenchmark.java
index 10ab5ddafa..2f2c36b9c5 100644
---
a/modules/client/src/test/java/org/apache/ignite/client/benchmarks/ClientHeartbeatBenchmark.java
+++
b/modules/client/src/test/java/org/apache/ignite/client/benchmarks/ClientHeartbeatBenchmark.java
@@ -85,7 +85,7 @@ public class ClientHeartbeatBenchmark {
* Tear down.
*/
@TearDown
- public void tearDown() throws Exception {
+ public void tearDown() {
client.close();
testServer.close();
}
diff --git
a/modules/client/src/test/java/org/apache/ignite/client/benchmarks/ClientPutGetBenchmark.java
b/modules/client/src/test/java/org/apache/ignite/client/benchmarks/ClientPutGetBenchmark.java
index 677d5b172a..0f053c8c5f 100644
---
a/modules/client/src/test/java/org/apache/ignite/client/benchmarks/ClientPutGetBenchmark.java
+++
b/modules/client/src/test/java/org/apache/ignite/client/benchmarks/ClientPutGetBenchmark.java
@@ -102,7 +102,7 @@ public class ClientPutGetBenchmark {
* Tear down.
*/
@TearDown
- public void tearDown() throws Exception {
+ public void tearDown() {
client.close();
testServer.close();
}
diff --git
a/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeBaseTest.java
b/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeBaseTest.java
index db1b458737..5c9c23bfb3 100644
---
a/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeBaseTest.java
+++
b/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeBaseTest.java
@@ -483,8 +483,6 @@ public abstract class ItComputeBaseTest extends
ClusterPerClassIntegrationTest {
);
assertThat(resultString, equalTo(argumentPojo.getName()));
- } catch (Exception e) {
- throw new RuntimeException(e);
}
}
diff --git
a/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItThinClientComputeErrorsTest.java
b/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItThinClientComputeErrorsTest.java
index 4a2980c41e..d108f0758f 100644
---
a/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItThinClientComputeErrorsTest.java
+++
b/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItThinClientComputeErrorsTest.java
@@ -27,7 +27,7 @@ class ItThinClientComputeErrorsTest extends
ItComputeErrorsBaseTest {
private final Map<String, IgniteClient> clients = new HashMap<>();
@AfterEach
- void cleanup() throws Exception {
+ void cleanup() {
for (IgniteClient igniteClient : clients.values()) {
igniteClient.close();
}
diff --git
a/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItThinClientWorkerShutdownTest.java
b/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItThinClientWorkerShutdownTest.java
index 401a298220..7cab10b71a 100644
---
a/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItThinClientWorkerShutdownTest.java
+++
b/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItThinClientWorkerShutdownTest.java
@@ -28,7 +28,7 @@ class ItThinClientWorkerShutdownTest extends
ItWorkerShutdownTest {
private final Map<String, IgniteClient> clients = new HashMap<>();
@AfterEach
- void cleanup() throws Exception {
+ void cleanup() {
for (IgniteClient igniteClient : clients.values()) {
igniteClient.close();
}
diff --git
a/modules/jdbc/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnection.java
b/modules/jdbc/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnection.java
index fd47071249..b6dc26f0cb 100644
---
a/modules/jdbc/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnection.java
+++
b/modules/jdbc/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnection.java
@@ -432,11 +432,7 @@ public class JdbcConnection implements Connection {
return;
}
- try {
- client.close();
- } catch (Exception e) {
- throw new SQLException(e);
- }
+ client.close();
}
/**
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientAuthenticationTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientAuthenticationTest.java
index 69a5b00306..67ea91572d 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientAuthenticationTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientAuthenticationTest.java
@@ -179,8 +179,6 @@ public class ItThinClientAuthenticationTest extends
ItAbstractThinClientTest {
}).join();
await().until(() -> checkConnection(client),
willThrowWithCauseOrSuppressed(InvalidCredentialsException.class));
- } catch (Exception e) {
- throw new RuntimeException(e);
}
}
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientConnectionTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientConnectionTest.java
index 0c51641d59..8711085459 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientConnectionTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientConnectionTest.java
@@ -50,7 +50,7 @@ public class ItThinClientConnectionTest extends
ItAbstractThinClientTest {
* Check that thin client can connect to any server node and work with
table API.
*/
@Test
- void testThinClientConnectsToServerNodesAndExecutesBasicTableOperations()
throws Exception {
+ void testThinClientConnectsToServerNodesAndExecutesBasicTableOperations() {
for (var addr : getClientAddresses()) {
try (var client = IgniteClient.builder().addresses(addr).build()) {
List<Table> tables = client.tables().tables();
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientTransactionsTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientTransactionsTest.java
index eb40656f57..ff4daf0b10 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientTransactionsTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientTransactionsTest.java
@@ -269,7 +269,7 @@ public class ItThinClientTransactionsTest extends
ItAbstractThinClientTest {
}
@Test
- void testTransactionFromAnotherChannelThrows() throws Exception {
+ void testTransactionFromAnotherChannelThrows() {
Transaction tx = client().transactions().begin();
client().sql().execute(tx, "SELECT 1").close(); // Force lazy tx init.
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/streamer/ItClientDataStreamerTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/streamer/ItClientDataStreamerTest.java
index 81e73f7f70..eca8b713fb 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/streamer/ItClientDataStreamerTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/streamer/ItClientDataStreamerTest.java
@@ -34,7 +34,7 @@ public class ItClientDataStreamerTest extends
ItAbstractDataStreamerTest {
}
@AfterAll
- public static void stopClient() throws Exception {
+ public static void stopClient() {
client.close();
}
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItTablePutGetThinTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItTablePutGetThinTest.java
index a2b1426573..bc325c2811 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItTablePutGetThinTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItTablePutGetThinTest.java
@@ -36,7 +36,7 @@ public class ItTablePutGetThinTest extends
ItTablePutGetEmbeddedTest {
}
@AfterAll
- static void stopClient() throws Exception {
+ static void stopClient() {
client.close();
}
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/partition/ItThinClientPartitionManagerTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/partition/ItThinClientPartitionManagerTest.java
index 8299185dac..7470f4ca3d 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/partition/ItThinClientPartitionManagerTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/partition/ItThinClientPartitionManagerTest.java
@@ -37,7 +37,7 @@ public class ItThinClientPartitionManagerTest extends
ItAbstractPartitionManager
}
@AfterEach
- public void stopClient() throws Exception {
+ public void stopClient() {
client.close();
}
diff --git
a/modules/security/src/integrationTest/java/org/apache/ignite/internal/ssl/ItSslTest.java
b/modules/security/src/integrationTest/java/org/apache/ignite/internal/ssl/ItSslTest.java
index 10438dbcb4..74a748f9f7 100644
---
a/modules/security/src/integrationTest/java/org/apache/ignite/internal/ssl/ItSslTest.java
+++
b/modules/security/src/integrationTest/java/org/apache/ignite/internal/ssl/ItSslTest.java
@@ -117,7 +117,7 @@ public class ItSslTest extends BaseIgniteAbstractTest {
@Test
@DisplayName("Client can connect without ssl")
- void clientCouldConnectWithoutSsl() throws Exception {
+ void clientCouldConnectWithoutSsl() {
try (IgniteClient client =
IgniteClient.builder().addresses("localhost:10800").build()) {
assertThat(client.clusterNodes(), hasSize(2));
}
@@ -236,7 +236,7 @@ public class ItSslTest extends BaseIgniteAbstractTest {
@Test
@DisplayName("Client can connect with SSL configured")
- void clientCanConnectWithSsl() throws Exception {
+ void clientCanConnectWithSsl() {
var sslConfiguration =
SslConfiguration.builder()
.enabled(true)
@@ -311,7 +311,7 @@ public class ItSslTest extends BaseIgniteAbstractTest {
@Test
@DisplayName("Client can connect with SSL configured")
- void clientCanConnectWithSsl() throws Exception {
+ void clientCanConnectWithSsl() {
var sslConfiguration =
SslConfiguration.builder()
.enabled(true)
@@ -473,7 +473,7 @@ public class ItSslTest extends BaseIgniteAbstractTest {
@Test
@DisplayName("Client can connect with SSL and client authentication
configured")
- void clientCanConnectWithSslAndClientAuth() throws Exception {
+ void clientCanConnectWithSslAndClientAuth() {
var sslConfiguration =
SslConfiguration.builder()
.enabled(true)
diff --git
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItKvKeyColumnPositionTest.java
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItKvKeyColumnPositionTest.java
index 089ba83edb..96fc20cfde 100644
---
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItKvKeyColumnPositionTest.java
+++
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItKvKeyColumnPositionTest.java
@@ -123,7 +123,7 @@ public class ItKvKeyColumnPositionTest extends
BaseSqlIntegrationTest {
}
@AfterAll
- public void closeClient() throws Exception {
+ public void closeClient() {
client.close();
}
diff --git
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlClientAsynchronousApiTest.java
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlClientAsynchronousApiTest.java
index ad98d06eda..22564c4121 100644
---
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlClientAsynchronousApiTest.java
+++
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlClientAsynchronousApiTest.java
@@ -36,7 +36,7 @@ public class ItSqlClientAsynchronousApiTest extends
ItSqlAsynchronousApiTest {
}
@AfterAll
- public void stopClient() throws Exception {
+ public void stopClient() {
client.close();
}
diff --git
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlClientSynchronousApiTest.java
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlClientSynchronousApiTest.java
index ca07766cc4..283fb792e6 100644
---
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlClientSynchronousApiTest.java
+++
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlClientSynchronousApiTest.java
@@ -36,7 +36,7 @@ public class ItSqlClientSynchronousApiTest extends
ItSqlSynchronousApiTest {
}
@AfterAll
- public void stopClient() throws Exception {
+ public void stopClient() {
client.close();
}
diff --git
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItNotNullConstraintClientTest.java
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItNotNullConstraintClientTest.java
index 9fe20903a2..1b38c4e809 100644
---
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItNotNullConstraintClientTest.java
+++
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItNotNullConstraintClientTest.java
@@ -37,7 +37,7 @@ public class ItNotNullConstraintClientTest extends
ItNotNullConstraintTest {
}
@AfterEach
- public void stopClient() throws Exception {
+ public void stopClient() {
client.close();
}
