Moved "YQ-3192 Fix validate settings fail on start" commit from ydb repo

Author: kardymonds

src/client/topic/impl/read_session.cpp

@@ -242,9 +242,10 @@ void TReadSession::UpdateOffsets(const NTable::TTransaction& tx)
 bool TReadSession::Close(TDuration timeout) {
     LOG_LAZY(Log, TLOG_INFO, GetLogPrefix() << "Closing read session. Close timeout: " << timeout);
     // Log final counters.
-    CountersLogger->Stop();
-    {
-        std::lock_guard guard(Lock);
+    if (CountersLogger) {
+        CountersLogger->Stop();
+    }
+    with_lock(Lock) {
         if (DumpCountersContext) {
             DumpCountersContext->Cancel();
         }
@@ -257,8 +258,7 @@ bool TReadSession::Close(TDuration timeout) {
     };
 
     TDeferredActions<false> deferred;
-    {
-        std::lock_guard guard(Lock);
+    with_lock(Lock) {
         if (Closing || Aborting) {
             return false;
         }
@@ -348,7 +348,9 @@ void TReadSession::AbortImpl(TDeferredActions<false>&) {
         if (DumpCountersContext) {
             DumpCountersContext->Cancel();
         }
-        CbContext->TryGet()->Abort();
+        if (CbContext) {
+            CbContext->TryGet()->Abort();
+        }
     }
 }