Fix transport error on delete session (#56)

Fix transport error on delete session
ydb-platform · Nov 21, 2023 · e5dec2e · e5dec2e
1 parent 84b25c7
commit e5dec2e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+- Fix timeout error on create session
+- Fix transport error on delete session
+
 ## v0.1.4
 - Add exception throwing when results truncated
 - lint: add line feed at file end

diff --git a/src/Ydb.Sdk/src/Services/Table/CreateSession.cs b/src/Ydb.Sdk/src/Services/Table/CreateSession.cs
@@ -57,8 +57,7 @@ public async Task<CreateSessionResponse> CreateSession(CreateSessionSettings? se
                 request: request,
                 settings: settings);
 
-            CreateSessionResult? resultProto;
-            var status = UnpackOperation(response.Data.Operation, out resultProto);
+            var status = UnpackOperation(response.Data.Operation, out CreateSessionResult? resultProto);
 
             CreateSessionResponse.ResultData? result = null;
             if (status.IsSuccess && resultProto != null)

diff --git a/src/Ydb.Sdk/src/Services/Table/Session.cs b/src/Ydb.Sdk/src/Services/Table/Session.cs
@@ -76,10 +76,11 @@ protected virtual void Dispose(bool disposing)
                 _logger.LogTrace($"Closing detached session on dispose: {Id}");
 
                 var client = new TableClient(Driver, new NoPool());
-                _ = client.DeleteSession(Id, new DeleteSessionSettings
+                var task = client.DeleteSession(Id, new DeleteSessionSettings
                 {
                     TransportTimeout = DeleteSessionTimeout
                 });
+                task.Wait();
             }
             else
             {

diff --git a/src/Ydb.Sdk/src/Services/Table/SessionPool.cs b/src/Ydb.Sdk/src/Services/Table/SessionPool.cs
@@ -90,8 +90,7 @@ public async Task<GetSessionResponse> GetSession()
             {
                 var sessionId = _idleSessions.Pop();
 
-                SessionState? sessionState;
-                if (!_sessions.TryGetValue(sessionId, out sessionState))
+                if (!_sessions.TryGetValue(sessionId, out var sessionState))
                 {
                     continue;
                 }
@@ -152,8 +151,7 @@ internal void ReturnSession(string id)
     {
         lock (_lock)
         {
-            SessionState? oldSession;
-            if (_sessions.TryGetValue(id, out oldSession))
+            if (_sessions.TryGetValue(id, out var oldSession))
             {
                 var session = new Session(
                     driver: _driver,
@@ -275,15 +273,20 @@ private void Dispose(bool disposing)
 
             if (disposing)
             {
+                var tasks = new Task[_sessions.Count];
+                var i = 0;
                 foreach (var state in _sessions.Values)
                 {
                     _logger.LogTrace($"Closing session on session pool dispose: {state.Session.Id}");
 
-                    _ = _client.DeleteSession(state.Session.Id, new DeleteSessionSettings
+                    var task = _client.DeleteSession(state.Session.Id, new DeleteSessionSettings
                     {
                         TransportTimeout = Session.DeleteSessionTimeout
                     });
+                    tasks[i++] = task;
                 }
+
+                Task.WaitAll(tasks);
             }
 
             _disposed = true;