diff --git a/CHANGELOG.md b/CHANGELOG.md index e3101976..721f88e1 100644 --- 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 index 1ddbc210..312cd568 100644 --- a/README.md +++ b/README.md @@ -25,17 +25,17 @@ dependencies: com.yandex.ydb ydb-sdk-core - 1.14.6 + 1.14.7 com.yandex.ydb ydb-sdk-table - 1.14.6 + 1.14.7 com.yandex.ydb ydb-sdk-auth-iam - 1.14.6 + 1.14.7 ``` diff --git a/auth-iam/pom.xml b/auth-iam/pom.xml index 980de956..9c7fb337 100644 --- a/auth-iam/pom.xml +++ b/auth-iam/pom.xml @@ -8,7 +8,7 @@ com.yandex.ydb ydb-sdk-parent - 1.14.6 + 1.14.7 ydb-sdk-auth-iam diff --git a/core/pom.xml b/core/pom.xml index c024e5b4..5b01d068 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -8,7 +8,7 @@ com.yandex.ydb ydb-sdk-parent - 1.14.6 + 1.14.7 ydb-sdk-core 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 index f2ecc70f..853675c4 100644 --- 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 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 index 3ae1aa8d..9037f2d8 100644 --- 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 index 0fbece78..96fb8a99 100644 --- 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 index 1627da4e..141d2f54 100644 --- a/examples/auth/access_token_credentials/pom.xml +++ b/examples/auth/access_token_credentials/pom.xml @@ -7,7 +7,7 @@ com.yandex.ydb.examples ydb-sdk-auth-examples - 1.14.6 + 1.14.7 ydb-java-example-auth-access-token diff --git a/examples/auth/anonymous_credentials/pom.xml b/examples/auth/anonymous_credentials/pom.xml index 1895ba48..00284425 100644 --- a/examples/auth/anonymous_credentials/pom.xml +++ b/examples/auth/anonymous_credentials/pom.xml @@ -7,7 +7,7 @@ com.yandex.ydb.examples ydb-sdk-auth-examples - 1.14.6 + 1.14.7 ydb-java-example-auth-anonymous-credentials diff --git a/examples/auth/environ/pom.xml b/examples/auth/environ/pom.xml index 20f67970..7845daef 100644 --- a/examples/auth/environ/pom.xml +++ b/examples/auth/environ/pom.xml @@ -7,7 +7,7 @@ com.yandex.ydb.examples ydb-sdk-auth-examples - 1.14.6 + 1.14.7 ydb-java-example-auth-environ diff --git a/examples/auth/metadata_credentials/pom.xml b/examples/auth/metadata_credentials/pom.xml index a8228f66..b6d86276 100644 --- a/examples/auth/metadata_credentials/pom.xml +++ b/examples/auth/metadata_credentials/pom.xml @@ -7,7 +7,7 @@ com.yandex.ydb.examples ydb-sdk-auth-examples - 1.14.6 + 1.14.7 ydb-java-example-auth-metadata-credentials diff --git a/examples/auth/pom.xml b/examples/auth/pom.xml index 0ff5646e..07888ca8 100644 --- a/examples/auth/pom.xml +++ b/examples/auth/pom.xml @@ -8,7 +8,7 @@ com.yandex.ydb.examples ydb-sdk-examples - 1.14.6 + 1.14.7 pom diff --git a/examples/auth/service_account_credentials/pom.xml b/examples/auth/service_account_credentials/pom.xml index a1314299..3ae24584 100644 --- a/examples/auth/service_account_credentials/pom.xml +++ b/examples/auth/service_account_credentials/pom.xml @@ -7,7 +7,7 @@ com.yandex.ydb.examples ydb-sdk-auth-examples - 1.14.6 + 1.14.7 ydb-java-example-auth-service-account-credentials diff --git a/examples/basic_example/pom.xml b/examples/basic_example/pom.xml index 1b379801..fec3eee1 100644 --- a/examples/basic_example/pom.xml +++ b/examples/basic_example/pom.xml @@ -7,7 +7,7 @@ com.yandex.ydb.examples ydb-sdk-examples - 1.14.6 + 1.14.7 ydb-basic-example diff --git a/examples/pom.xml b/examples/pom.xml index 478bb16b..f648ca30 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -7,7 +7,7 @@ com.yandex.ydb.examples ydb-sdk-examples - 1.14.6 + 1.14.7 pom diff --git a/examples/secondary_index/pom.xml b/examples/secondary_index/pom.xml index 67b209d3..97f1a345 100644 --- a/examples/secondary_index/pom.xml +++ b/examples/secondary_index/pom.xml @@ -7,7 +7,7 @@ com.yandex.ydb.examples ydb-sdk-examples - 1.14.6 + 1.14.7 ydb-secondary-index-project diff --git a/examples/url-shortener-demo/pom.xml b/examples/url-shortener-demo/pom.xml index 4a49298d..eaf26174 100644 --- a/examples/url-shortener-demo/pom.xml +++ b/examples/url-shortener-demo/pom.xml @@ -8,7 +8,7 @@ com.yandex.ydb.examples ydb-sdk-examples - 1.14.6 + 1.14.7 url-shortener-demo diff --git a/examples/ydb-cookbook/pom.xml b/examples/ydb-cookbook/pom.xml index 81feab11..2e24de76 100644 --- a/examples/ydb-cookbook/pom.xml +++ b/examples/ydb-cookbook/pom.xml @@ -8,7 +8,7 @@ com.yandex.ydb.examples ydb-sdk-examples - 1.14.6 + 1.14.7 ydb-cookbook diff --git a/jdbc/pom.xml b/jdbc/pom.xml index eef9c9f4..949b6efa 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -8,7 +8,7 @@ com.yandex.ydb ydb-sdk-parent - 1.14.6 + 1.14.7 ydb-sdk-jdbc diff --git a/jdbc/uberjar/pom.xml b/jdbc/uberjar/pom.xml index 5cd70535..18469f8e 100644 --- a/jdbc/uberjar/pom.xml +++ b/jdbc/uberjar/pom.xml @@ -8,7 +8,7 @@ com.yandex.ydb ydb-sdk-parent - 1.14.6 + 1.14.7 ../../pom.xml diff --git a/pom.xml b/pom.xml index 11d1e27f..c43b3d71 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ com.yandex.ydb ydb-sdk-parent - 1.14.6 + 1.14.7 Java SDK for Yandex Datatabase (YDB) Java SDK for Yandex Datatabase (YDB) diff --git a/protobuf-api/pom.xml b/protobuf-api/pom.xml index 389de91f..82d1ecf0 100644 --- a/protobuf-api/pom.xml +++ b/protobuf-api/pom.xml @@ -8,7 +8,7 @@ com.yandex.ydb ydb-sdk-parent - 1.14.6 + 1.14.7 ydb-sdk-proto diff --git a/table/pom.xml b/table/pom.xml index b0acaad9..80e16fe3 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -8,7 +8,7 @@ com.yandex.ydb ydb-sdk-parent - 1.14.6 + 1.14.7 ydb-sdk-table