From c77a03421943139eb8b0dc57abdb5830c99b3946 Mon Sep 17 00:00:00 2001
From: proller <proller@github.com>
Date: Tue, 4 Feb 2025 13:40:56 +0100
Subject: [PATCH] testme

---
 cloud/filestore/apps/client/lib/create_session.cpp          | 2 +-
 cloud/filestore/apps/client/lib/destroy_session.cpp         | 2 +-
 cloud/filestore/apps/client/lib/forced_compaction.cpp       | 2 +-
 cloud/filestore/libs/diagnostics/profile_log.cpp            | 6 ++++--
 cloud/filestore/tools/testing/loadtest/lib/request_data.cpp | 1 +
 .../filestore/tools/testing/loadtest/lib/request_index.cpp  | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/cloud/filestore/apps/client/lib/create_session.cpp b/cloud/filestore/apps/client/lib/create_session.cpp
index 6e6bd95dc40..63323ac9960 100644
--- a/cloud/filestore/apps/client/lib/create_session.cpp
+++ b/cloud/filestore/apps/client/lib/create_session.cpp
@@ -50,7 +50,7 @@ class TCreateSessionCommand final
         request->MutableHeaders()->SetClientId(ClientId);
         request->MutableHeaders()->SetSessionSeqNo(SeqNo);
 
-        TCallContextPtr ctx = MakeIntrusive<TCallContext>();
+        TCallContextPtr ctx = MakeIntrusive<TCallContext>(FileSystemId);
         auto response = WaitFor(Client->CreateSession(ctx, std::move(request)));
         CheckResponse(response);
         Print(response, JsonOutput);
diff --git a/cloud/filestore/apps/client/lib/destroy_session.cpp b/cloud/filestore/apps/client/lib/destroy_session.cpp
index 9106744e9b2..5ed69251421 100644
--- a/cloud/filestore/apps/client/lib/destroy_session.cpp
+++ b/cloud/filestore/apps/client/lib/destroy_session.cpp
@@ -50,7 +50,7 @@ class TDestroySessionCommand final
         request->MutableHeaders()->SetClientId(ClientId);
         request->MutableHeaders()->SetSessionSeqNo(SeqNo);
 
-        TCallContextPtr ctx = MakeIntrusive<TCallContext>();
+        TCallContextPtr ctx = MakeIntrusive<TCallContext>(FileSystemId);
         auto response = WaitFor(Client->DestroySession(ctx, std::move(request)));
         CheckResponse(response);
         Print(response, JsonOutput);
diff --git a/cloud/filestore/apps/client/lib/forced_compaction.cpp b/cloud/filestore/apps/client/lib/forced_compaction.cpp
index 34612715cd8..7db01e0b8bb 100644
--- a/cloud/filestore/apps/client/lib/forced_compaction.cpp
+++ b/cloud/filestore/apps/client/lib/forced_compaction.cpp
@@ -38,7 +38,7 @@ class TForcedCompactionCommand final
         STORAGE_DEBUG("Sending ExecuteAction request");
         const auto requestId = GetRequestId(*request);
         auto result = WaitFor(Client->ExecuteAction(
-            MakeIntrusive<TCallContext>(requestId),
+            MakeIntrusive<TCallContext>(FileSystemId, requestId),
             std::move(request)));
 
         STORAGE_DEBUG("Received ExecuteAction response");
diff --git a/cloud/filestore/libs/diagnostics/profile_log.cpp b/cloud/filestore/libs/diagnostics/profile_log.cpp
index c880705bf16..cf09cd79bab 100644
--- a/cloud/filestore/libs/diagnostics/profile_log.cpp
+++ b/cloud/filestore/libs/diagnostics/profile_log.cpp
@@ -76,15 +76,17 @@ void TProfileLog::Stop()
 
 void TProfileLog::Write(TRecord record)
 {
-    // TODO(proller): Remove debug after bug fix 
-    //STORAGE_VERIFY_DEBUG_C(record.FileSystemId.empty(), "", "", "Missing filesystem id in profile log");
     static bool reported = false;
     if (!reported && record.FileSystemId.empty()) {
         reported = true;
+DUMP("profile log write without fs", record.Request.ShortDebugString().Quote());
         Cerr << "Profile log record without filesystem id. Trace:\n";
         PrintBackTrace();
     }
 
+    // TODO(proller): Remove debug after bug fix 
+    STORAGE_VERIFY_DEBUG_C(!record.FileSystemId.empty(), "", record.FileSystemId, "Missing filesystem id in profile log");
+ 
     Records.Enqueue(std::move(record));
 }
 
diff --git a/cloud/filestore/tools/testing/loadtest/lib/request_data.cpp b/cloud/filestore/tools/testing/loadtest/lib/request_data.cpp
index 9141cc9c7df..383ba2cdb25 100644
--- a/cloud/filestore/tools/testing/loadtest/lib/request_data.cpp
+++ b/cloud/filestore/tools/testing/loadtest/lib/request_data.cpp
@@ -597,6 +597,7 @@ class TDataRequestGenerator final
     TIntrusivePtr<TCallContext> CreateCallContext()
     {
         return MakeIntrusive<TCallContext>(
+            FileSystemId,
             LastRequestId.fetch_add(1, std::memory_order_relaxed));
     }
 
diff --git a/cloud/filestore/tools/testing/loadtest/lib/request_index.cpp b/cloud/filestore/tools/testing/loadtest/lib/request_index.cpp
index ecd569f0bde..eead13ce7a9 100644
--- a/cloud/filestore/tools/testing/loadtest/lib/request_index.cpp
+++ b/cloud/filestore/tools/testing/loadtest/lib/request_index.cpp
@@ -653,7 +653,7 @@ class TIndexRequestGenerator final
 
     TIntrusivePtr<TCallContext> CreateCallContext()
     {
-        return MakeIntrusive<TCallContext>(AtomicIncrement(LastRequestId));
+        return MakeIntrusive<TCallContext>(FileSystemId, AtomicIncrement(LastRequestId));
     }
 };