RntbdServiceEndpoint fix (#14144)

* fix * updated comment as per code review * change log updated * updated changelog * Updated version for release 4.3.2-beta.1 Co-authored-by: Kushagra Thapar <[email protected]>
Azure · Aug 15, 2020 · c76fa78 · c76fa78
1 parent 78b45a8
commit c76fa78
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 10 deletions.
diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
@@ -104,7 +104,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.4.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.3.2-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>

diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
@@ -19,7 +19,7 @@ com.azure:azure-core-serializer-json-gson;1.0.0-beta.3;1.0.0-beta.4
 com.azure:azure-core-serializer-json-jackson;1.0.0-beta.3;1.0.0-beta.4
 com.azure:azure-core-test;1.4.0;1.5.0-beta.1
 com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.6;1.0.0-beta.7
-com.azure:azure-cosmos;4.3.1;4.4.0-beta.1
+com.azure:azure-cosmos;4.3.1;4.3.2-beta.1
 com.azure:azure-cosmos-benchmark;4.0.1-beta.1;4.0.1-beta.1
 com.azure:azure-cosmos-encryption;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-data-appconfiguration;1.1.4;1.2.0-beta.1

diff --git a/sdk/cosmos/azure-cosmos-benchmark/pom.xml b/sdk/cosmos/azure-cosmos-benchmark/pom.xml
@@ -43,7 +43,7 @@ Licensed under the MIT License.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.4.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.3.2-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
 
     <dependency>

diff --git a/sdk/cosmos/azure-cosmos-encryption/pom.xml b/sdk/cosmos/azure-cosmos-encryption/pom.xml
@@ -43,7 +43,7 @@ Licensed under the MIT License.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.4.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.3.2-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
 
     <!-- Added this provided dependency to include necessary annotations used by "reactor-core".

diff --git a/sdk/cosmos/azure-cosmos/CHANGELOG.md b/sdk/cosmos/azure-cosmos/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Release History
 
-## 4.4.0-beta.1 (Unreleased)
-
+## 4.3.2-beta.1 (2020-08-14)
+### Key Bug Fixes
+* Fixed issue in RntbdServiceEndpoint to avoid early closure of an unused TCP connection.
 
 ## 4.3.1 (2020-08-13)
 ### Key Bug Fixes

diff --git a/sdk/cosmos/azure-cosmos/README.md b/sdk/cosmos/azure-cosmos/README.md
@@ -14,7 +14,7 @@ This project provides SDK library in Java for interacting with [SQL API][sql_api
 <dependency>
   <groupId>com.azure</groupId>
   <artifactId>azure-cosmos</artifactId>
-  <version>4.3.1</version>
+  <version>4.3.2-beta.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})

diff --git a/sdk/cosmos/azure-cosmos/pom.xml b/sdk/cosmos/azure-cosmos/pom.xml
@@ -13,7 +13,7 @@ Licensed under the MIT License.
 
   <groupId>com.azure</groupId>
   <artifactId>azure-cosmos</artifactId>
-  <version>4.4.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+  <version>4.3.2-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
   <name>Microsoft Azure SDK for SQL API of Azure Cosmos DB Service</name>
   <description>This Package contains Microsoft Azure Cosmos SDK (with Reactive Extension Reactor support) for Azure Cosmos DB SQL API</description>
   <packaging>jar</packaging>

diff --git a/...n/java/com/azure/cosmos/implementation/directconnectivity/rntbd/RntbdServiceEndpoint.java b/...n/java/com/azure/cosmos/implementation/directconnectivity/rntbd/RntbdServiceEndpoint.java
@@ -89,7 +89,12 @@ private RntbdServiceEndpoint(
         this.channelPool = new RntbdClientChannelPool(this, bootstrap, config);
         this.remoteAddress = bootstrap.config().remoteAddress();
         this.concurrentRequests = new AtomicInteger();
-        this.lastRequestNanoTime = new AtomicLong();
+        // if no request has been sent over this endpoint we want to make sure we don't trigger a connection close
+        // due to elapsedTimeInNanos being negative.
+        // if no request has been sent initially over this endpoint, the below calculation can result in a very big difference
+        // long elapsedTimeInNanos = System.nanoTime() - endpoint.lastRequestNanoTime()
+        // which can cause endpoint to close unnecessary.
+        this.lastRequestNanoTime = new AtomicLong(System.nanoTime());
         this.closed = new AtomicBoolean();
         this.requestTimer = timer;
 

diff --git a/sdk/cosmos/azure-spring-data-cosmos-core/pom.xml b/sdk/cosmos/azure-spring-data-cosmos-core/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.4.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.3.2-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>