disable retries by default in YDB GRPC channel

disable retry in YDB GRPC channel by default due to grpc/grpc-java#9340
yandex-cloud · Sep 20, 2022 · 49bd266 · 49bd266
1 parent 477eb5d
commit 49bd266
Show file tree

Hide file tree

Showing 23 changed files with 54 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.14.7 ##
+
+* Disabled grpc retry https://github.com/grpc/grpc-java/issues/9340
+
 ## 1.14.6 ##
 
 * SnapshotReadOnly transactions support

diff --git a/README.md b/README.md
@@ -25,17 +25,17 @@ dependencies:
     <dependency>
         <groupId>com.yandex.ydb</groupId>
         <artifactId>ydb-sdk-core</artifactId>
-        <version>1.14.6</version>
+        <version>1.14.7</version>
     </dependency>
     <dependency>
         <groupId>com.yandex.ydb</groupId>
         <artifactId>ydb-sdk-table</artifactId>
-        <version>1.14.6</version>
+        <version>1.14.7</version>
     </dependency>
     <dependency>
         <groupId>com.yandex.ydb</groupId>
         <artifactId>ydb-sdk-auth-iam</artifactId>
-        <version>1.14.6</version>
+        <version>1.14.7</version>
     </dependency>
 </dependencies>
 ```

diff --git a/auth-iam/pom.xml b/auth-iam/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.yandex.ydb</groupId>
         <artifactId>ydb-sdk-parent</artifactId>
-        <version>1.14.6</version>
+        <version>1.14.7</version>
     </parent>
 
     <artifactId>ydb-sdk-auth-iam</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.yandex.ydb</groupId>
         <artifactId>ydb-sdk-parent</artifactId>
-        <version>1.14.6</version>
+        <version>1.14.7</version>
     </parent>
 
     <artifactId>ydb-sdk-core</artifactId>

diff --git a/core/src/main/java/com/yandex/ydb/core/grpc/GrpcTransport.java b/core/src/main/java/com/yandex/ydb/core/grpc/GrpcTransport.java
@@ -38,6 +38,7 @@
 import io.grpc.ClientInterceptor;
 import io.grpc.ClientInterceptors;
 import io.grpc.ConnectivityState;
+import io.grpc.ExperimentalApi;
 import io.grpc.ManagedChannel;
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
@@ -480,6 +481,11 @@ public static final class Builder extends RpcTransportBuilder<GrpcTransport, Bui
         private DiscoveryMode discoveryMode = DiscoveryMode.SYNC;
         private TransportImplType transportImplType = TransportImplType.GRPC_TRANSPORT_IMPL;
         private BalancingSettings balancingSettings;
+        /**
+         * can cause leaks
+         * https://github.com/grpc/grpc-java/issues/9340
+         */
+        private boolean enableRetry = false;
 
         private Builder(@Nullable String endpoint, @Nullable String database, @Nullable List<HostAndPort> hosts) {
             this.endpoint = endpoint;
@@ -583,6 +589,22 @@ public Builder withBalancingSettings(BalancingSettings balancingSettings) {
             return this;
         }
 
+        public boolean isEnableRetry() {
+            return enableRetry;
+        }
+
+        @ExperimentalApi("https://github.com/grpc/grpc-java/issues/9340")
+        public Builder enableRetry() {
+            this.enableRetry = true;
+            return this;
+        }
+
+        @ExperimentalApi("https://github.com/grpc/grpc-java/issues/9340")
+        public Builder disableRetry() {
+            this.enableRetry = false;
+            return this;
+        }
+
         @Override
         public GrpcTransport build() {
             switch (transportImplType) {

diff --git a/core/src/main/java/com/yandex/ydb/core/grpc/impl/grpc/GrpcTransportImpl.java b/core/src/main/java/com/yandex/ydb/core/grpc/impl/grpc/GrpcTransportImpl.java
@@ -153,6 +153,12 @@ private static ManagedChannel createChannel(GrpcTransport.Builder builder, Chann
                 .maxInboundMessageSize(64 << 20) // 64 MiB
                 .withOption(ChannelOption.ALLOCATOR, ByteBufAllocator.DEFAULT);
 
+        if (builder.isEnableRetry()) {
+            channelBuilder.enableRetry();
+        } else {
+            channelBuilder.disableRetry();
+        }
+
         builder.getChannelInitializer().accept(channelBuilder);
         return channelBuilder.build();
     }

diff --git a/core/src/main/resources/version.properties b/core/src/main/resources/version.properties
@@ -1 +1 @@
-version=1.14.6
+version=1.14.7
diff --git a/examples/auth/access_token_credentials/pom.xml b/examples/auth/access_token_credentials/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.yandex.ydb.examples</groupId>
         <artifactId>ydb-sdk-auth-examples</artifactId>
-        <version>1.14.6</version>
+        <version>1.14.7</version>
     </parent>
 
     <artifactId>ydb-java-example-auth-access-token</artifactId>

diff --git a/examples/auth/anonymous_credentials/pom.xml b/examples/auth/anonymous_credentials/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.yandex.ydb.examples</groupId>
         <artifactId>ydb-sdk-auth-examples</artifactId>
-        <version>1.14.6</version>
+        <version>1.14.7</version>
     </parent>
 
     <artifactId>ydb-java-example-auth-anonymous-credentials</artifactId>

diff --git a/examples/auth/environ/pom.xml b/examples/auth/environ/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.yandex.ydb.examples</groupId>
         <artifactId>ydb-sdk-auth-examples</artifactId>
-        <version>1.14.6</version>
+        <version>1.14.7</version>
     </parent>
 
     <artifactId>ydb-java-example-auth-environ</artifactId>

diff --git a/examples/auth/metadata_credentials/pom.xml b/examples/auth/metadata_credentials/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.yandex.ydb.examples</groupId>
         <artifactId>ydb-sdk-auth-examples</artifactId>
-        <version>1.14.6</version>
+        <version>1.14.7</version>
     </parent>
 
     <artifactId>ydb-java-example-auth-metadata-credentials</artifactId>

diff --git a/examples/auth/pom.xml b/examples/auth/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.yandex.ydb.examples</groupId>
         <artifactId>ydb-sdk-examples</artifactId>
-        <version>1.14.6</version>
+        <version>1.14.7</version>
     </parent>
 
     <packaging>pom</packaging>

diff --git a/examples/auth/service_account_credentials/pom.xml b/examples/auth/service_account_credentials/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.yandex.ydb.examples</groupId>
         <artifactId>ydb-sdk-auth-examples</artifactId>
-        <version>1.14.6</version>
+        <version>1.14.7</version>
     </parent>
 
     <artifactId>ydb-java-example-auth-service-account-credentials</artifactId>

diff --git a/examples/basic_example/pom.xml b/examples/basic_example/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.yandex.ydb.examples</groupId>
         <artifactId>ydb-sdk-examples</artifactId>
-        <version>1.14.6</version>
+        <version>1.14.7</version>
     </parent>
 
     <artifactId>ydb-basic-example</artifactId>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>com.yandex.ydb.examples</groupId>
     <artifactId>ydb-sdk-examples</artifactId>
-    <version>1.14.6</version>
+    <version>1.14.7</version>
 
     <packaging>pom</packaging>
 

diff --git a/examples/secondary_index/pom.xml b/examples/secondary_index/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.yandex.ydb.examples</groupId>
         <artifactId>ydb-sdk-examples</artifactId>
-        <version>1.14.6</version>
+        <version>1.14.7</version>
     </parent>
 
     <artifactId>ydb-secondary-index-project</artifactId>

diff --git a/examples/url-shortener-demo/pom.xml b/examples/url-shortener-demo/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.yandex.ydb.examples</groupId>
         <artifactId>ydb-sdk-examples</artifactId>
-        <version>1.14.6</version>
+        <version>1.14.7</version>
     </parent>
 
     <artifactId>url-shortener-demo</artifactId>

diff --git a/examples/ydb-cookbook/pom.xml b/examples/ydb-cookbook/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.yandex.ydb.examples</groupId>
         <artifactId>ydb-sdk-examples</artifactId>
-        <version>1.14.6</version>
+        <version>1.14.7</version>
     </parent>
 
     <artifactId>ydb-cookbook</artifactId>

diff --git a/jdbc/pom.xml b/jdbc/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.yandex.ydb</groupId>
         <artifactId>ydb-sdk-parent</artifactId>
-        <version>1.14.6</version>
+        <version>1.14.7</version>
     </parent>
 
     <artifactId>ydb-sdk-jdbc</artifactId>

diff --git a/jdbc/uberjar/pom.xml b/jdbc/uberjar/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.yandex.ydb</groupId>
         <artifactId>ydb-sdk-parent</artifactId>
-        <version>1.14.6</version>
+        <version>1.14.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
 
     <groupId>com.yandex.ydb</groupId>
     <artifactId>ydb-sdk-parent</artifactId>
-    <version>1.14.6</version>
+    <version>1.14.7</version>
 
     <name>Java SDK for Yandex Datatabase (YDB)</name>
     <description>Java SDK for Yandex Datatabase (YDB)</description>

diff --git a/protobuf-api/pom.xml b/protobuf-api/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.yandex.ydb</groupId>
         <artifactId>ydb-sdk-parent</artifactId>
-        <version>1.14.6</version>
+        <version>1.14.7</version>
     </parent>
 
     <artifactId>ydb-sdk-proto</artifactId>

diff --git a/table/pom.xml b/table/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.yandex.ydb</groupId>
         <artifactId>ydb-sdk-parent</artifactId>
-        <version>1.14.6</version>
+        <version>1.14.7</version>
     </parent>
 
     <artifactId>ydb-sdk-table</artifactId>