From 5980117a39122bc214b25eadc89cc5825840c322 Mon Sep 17 00:00:00 2001 From: Naveen Kumar Singh Date: Tue, 21 Dec 2021 12:40:05 -0500 Subject: [PATCH 1/4] mirror of https://github.com/Azure/azure-cosmosdb-java/pull/395 --- .../directconnectivity/RntbdTransportClient.java | 2 +- .../rntbd/RntbdClientChannelPool.java | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/direct-impl/src/main/java/com/microsoft/azure/cosmosdb/internal/directconnectivity/RntbdTransportClient.java b/direct-impl/src/main/java/com/microsoft/azure/cosmosdb/internal/directconnectivity/RntbdTransportClient.java index 7569466c2..63fc78f35 100644 --- a/direct-impl/src/main/java/com/microsoft/azure/cosmosdb/internal/directconnectivity/RntbdTransportClient.java +++ b/direct-impl/src/main/java/com/microsoft/azure/cosmosdb/internal/directconnectivity/RntbdTransportClient.java @@ -245,7 +245,7 @@ private Options() { this.bufferPageSize = 8192; this.connectionTimeout = null; this.idleChannelTimeout = Duration.ZERO; - this.idleEndpointTimeout = Duration.ofSeconds(70L); + this.idleEndpointTimeout = Duration.ofHours(1); this.maxBufferCapacity = 8192 << 10; this.maxChannelsPerEndpoint = 10; this.maxRequestsPerChannel = 30; diff --git a/direct-impl/src/main/java/com/microsoft/azure/cosmosdb/internal/directconnectivity/rntbd/RntbdClientChannelPool.java b/direct-impl/src/main/java/com/microsoft/azure/cosmosdb/internal/directconnectivity/rntbd/RntbdClientChannelPool.java index 74ebe1343..18c71cc1a 100644 --- a/direct-impl/src/main/java/com/microsoft/azure/cosmosdb/internal/directconnectivity/rntbd/RntbdClientChannelPool.java +++ b/direct-impl/src/main/java/com/microsoft/azure/cosmosdb/internal/directconnectivity/rntbd/RntbdClientChannelPool.java @@ -605,10 +605,12 @@ public void operationComplete(Future future) { } private void fail(Throwable cause) { - if (this.acquired) { - this.pool.decrementAndRunTaskQueue(); - } else { - this.pool.runTaskQueue(); + if (!this.pool.isClosed()) { + if (this.acquired) { + this.pool.decrementAndRunTaskQueue(); + } else { + this.pool.runTaskQueue(); + } } this.originalPromise.setFailure(cause); } From 1ffaad0f9fbc7f9c430291c53dc3c2be941b5ca1 Mon Sep 17 00:00:00 2001 From: Naveen Kumar Singh Date: Tue, 21 Dec 2021 16:49:07 -0500 Subject: [PATCH 2/4] need to rerun the ci again after agent upgrade from ububtu 16 to 20 --- .../directconnectivity/rntbd/RntbdClientChannelPool.java | 1 + 1 file changed, 1 insertion(+) diff --git a/direct-impl/src/main/java/com/microsoft/azure/cosmosdb/internal/directconnectivity/rntbd/RntbdClientChannelPool.java b/direct-impl/src/main/java/com/microsoft/azure/cosmosdb/internal/directconnectivity/rntbd/RntbdClientChannelPool.java index 18c71cc1a..c11cabdc1 100644 --- a/direct-impl/src/main/java/com/microsoft/azure/cosmosdb/internal/directconnectivity/rntbd/RntbdClientChannelPool.java +++ b/direct-impl/src/main/java/com/microsoft/azure/cosmosdb/internal/directconnectivity/rntbd/RntbdClientChannelPool.java @@ -612,6 +612,7 @@ private void fail(Throwable cause) { this.pool.runTaskQueue(); } } + this.originalPromise.setFailure(cause); } } From 3a857a85b9a6b3a1de1a9709257e76c8c191183b Mon Sep 17 00:00:00 2001 From: Naveen Kumar Singh Date: Tue, 21 Dec 2021 16:53:21 -0500 Subject: [PATCH 3/4] need to rerun the ci again after agent upgrade from ububtu 16 to 20 --- .../directconnectivity/rntbd/RntbdClientChannelPool.java | 1 - 1 file changed, 1 deletion(-) diff --git a/direct-impl/src/main/java/com/microsoft/azure/cosmosdb/internal/directconnectivity/rntbd/RntbdClientChannelPool.java b/direct-impl/src/main/java/com/microsoft/azure/cosmosdb/internal/directconnectivity/rntbd/RntbdClientChannelPool.java index c11cabdc1..18c71cc1a 100644 --- a/direct-impl/src/main/java/com/microsoft/azure/cosmosdb/internal/directconnectivity/rntbd/RntbdClientChannelPool.java +++ b/direct-impl/src/main/java/com/microsoft/azure/cosmosdb/internal/directconnectivity/rntbd/RntbdClientChannelPool.java @@ -612,7 +612,6 @@ private void fail(Throwable cause) { this.pool.runTaskQueue(); } } - this.originalPromise.setFailure(cause); } } From 139ef8d0fd13d6fd7961fe037dd10dedeaa1e295 Mon Sep 17 00:00:00 2001 From: Naveen Kumar Singh Date: Wed, 22 Dec 2021 09:59:51 -0500 Subject: [PATCH 4/4] adding space to trigger ci which is in struct state --- .../directconnectivity/rntbd/RntbdClientChannelPool.java | 1 + 1 file changed, 1 insertion(+) diff --git a/direct-impl/src/main/java/com/microsoft/azure/cosmosdb/internal/directconnectivity/rntbd/RntbdClientChannelPool.java b/direct-impl/src/main/java/com/microsoft/azure/cosmosdb/internal/directconnectivity/rntbd/RntbdClientChannelPool.java index 18c71cc1a..c11cabdc1 100644 --- a/direct-impl/src/main/java/com/microsoft/azure/cosmosdb/internal/directconnectivity/rntbd/RntbdClientChannelPool.java +++ b/direct-impl/src/main/java/com/microsoft/azure/cosmosdb/internal/directconnectivity/rntbd/RntbdClientChannelPool.java @@ -612,6 +612,7 @@ private void fail(Throwable cause) { this.pool.runTaskQueue(); } } + this.originalPromise.setFailure(cause); } }