Merge pull request #563 from alex268/release_v2.4.0

Fixed deadlock on sync token updating

Author: alex268

core/src/main/java/tech/ydb/core/grpc/YdbHeaders.java

@@ -22,5 +22,8 @@ public class YdbHeaders {
     public static final Metadata.Key<String> YDB_SERVER_HINTS =
         Metadata.Key.of("x-ydb-server-hints", Metadata.ASCII_STRING_MARSHALLER);
 
+    public static final Metadata.Key<String> AUTH_TICKET =
+        Metadata.Key.of("x-ydb-auth-ticket", Metadata.ASCII_STRING_MARSHALLER);
+
     private YdbHeaders() { }
 }

core/src/main/java/tech/ydb/core/impl/BaseGrpcTransport.java

@@ -222,6 +222,10 @@ private static Status deadlineExpiredStatus(MethodDescriptor<?, ?> method, GrpcR
 
     private Metadata makeMetadataFromSettings(GrpcRequestSettings settings) {
         Metadata metadata = new Metadata();
+        String token = getAuthCallOptions().getToken();
+        if (token != null) {
+            metadata.put(YdbHeaders.AUTH_TICKET, token);
+        }
         if (settings.getTraceId() != null) {
             metadata.put(YdbHeaders.TRACE_ID, settings.getTraceId());
         }

core/src/main/java/tech/ydb/core/impl/auth/AuthCallOptions.java

@@ -44,10 +44,6 @@ public AuthCallOptions(
             authIdentity = null;
         }
 
-        if (authIdentity != null) {
-            options = options.withCallCredentials(new YdbCallCredentials(authIdentity));
-        }
-
         if (builder.getCallExecutor() != null && builder.getCallExecutor() != MoreExecutors.directExecutor()) {
             options = options.withExecutor(builder.getCallExecutor());
         }
@@ -78,6 +74,7 @@ public CallOptions getGrpcCallOptions() {
         if (readTimeoutMillis > 0) {
             return callOptions.withDeadlineAfter(readTimeoutMillis, TimeUnit.MILLISECONDS);
         }
+
         return callOptions;
     }
 }