Move profile log events (#2360)

#1733 Move cloud/filestore/libs/storage/tablet/profile_log_events.h -> cloud/filestore/libs/storage/tablet/model/profile_log_events.h for reduce deps size in tools
ydb-platform · Oct 31, 2024 · 11aab3b · 11aab3b
1 parent 943affa
commit 11aab3b
Show file tree

Hide file tree

Showing 30 changed files with 28 additions and 32 deletions.
diff --git a/...ibs/storage/tablet/profile_log_events.cpp → ...orage/tablet/model/profile_log_events.cpp b/...ibs/storage/tablet/profile_log_events.cpp → ...orage/tablet/model/profile_log_events.cpp
diff --git a/.../libs/storage/tablet/profile_log_events.h → ...storage/tablet/model/profile_log_events.h b/.../libs/storage/tablet/profile_log_events.h → ...storage/tablet/model/profile_log_events.h
diff --git a/.../storage/tablet/profile_log_events_ut.cpp → ...ge/tablet/model/profile_log_events_ut.cpp b/.../storage/tablet/profile_log_events_ut.cpp → ...ge/tablet/model/profile_log_events_ut.cpp
diff --git a/cloud/filestore/libs/storage/tablet/model/ut/ya.make b/cloud/filestore/libs/storage/tablet/model/ut/ya.make
@@ -15,6 +15,7 @@ SRCS(
     node_index_cache_ut.cpp
     node_session_stat_ut.cpp
     operation_ut.cpp
+    profile_log_events_ut.cpp
     range_locks_ut.cpp
     read_ahead_ut.cpp
     sparse_segment_ut.cpp

diff --git a/cloud/filestore/libs/storage/tablet/model/ya.make b/cloud/filestore/libs/storage/tablet/model/ya.make
@@ -28,6 +28,7 @@ SRCS(
     node_index_cache.cpp
     node_session_stat.cpp
     operation.cpp
+    profile_log_events.cpp
     range_locks.cpp
     read_ahead.cpp
     sparse_segment.cpp
@@ -38,6 +39,7 @@ SRCS(
 )
 
 PEERDIR(
+    cloud/filestore/libs/diagnostics/events
     cloud/filestore/libs/storage/api
     cloud/filestore/libs/storage/model
     cloud/filestore/private/api/protos

diff --git a/cloud/filestore/libs/storage/tablet/tablet_actor_addblob.cpp b/cloud/filestore/libs/storage/tablet/tablet_actor_addblob.cpp
@@ -1,9 +1,8 @@
 #include "tablet_actor.h"
 
-#include "profile_log_events.h"
-
 #include <cloud/filestore/libs/diagnostics/critical_events.h>
 #include <cloud/filestore/libs/storage/tablet/model/group_by.h>
+#include <cloud/filestore/libs/storage/tablet/model/profile_log_events.h>
 
 #include <util/generic/set.h>
 

diff --git a/cloud/filestore/libs/storage/tablet/tablet_actor_cleanup.cpp b/cloud/filestore/libs/storage/tablet/tablet_actor_cleanup.cpp
@@ -1,6 +1,6 @@
 #include "tablet_actor.h"
 
-#include "profile_log_events.h"
+#include <cloud/filestore/libs/storage/tablet/model/profile_log_events.h>
 
 namespace NCloud::NFileStore::NStorage {
 

diff --git a/cloud/filestore/libs/storage/tablet/tablet_actor_collectgarbage.cpp b/cloud/filestore/libs/storage/tablet/tablet_actor_collectgarbage.cpp
@@ -1,8 +1,7 @@
 #include "tablet_actor.h"
 
-#include "profile_log_events.h"
-
 #include <cloud/filestore/libs/diagnostics/critical_events.h>
+#include <cloud/filestore/libs/storage/tablet/model/profile_log_events.h>
 
 #include <cloud/storage/core/libs/tablet/blob_id.h>
 #include <cloud/storage/core/libs/tablet/gc_logic.h>

diff --git a/cloud/filestore/libs/storage/tablet/tablet_actor_deletegarbage.cpp b/cloud/filestore/libs/storage/tablet/tablet_actor_deletegarbage.cpp
@@ -1,6 +1,6 @@
 #include "tablet_actor.h"
 
-#include "profile_log_events.h"
+#include <cloud/filestore/libs/diagnostics/profile_log_events.h>
 
 namespace NCloud::NFileStore::NStorage {
 

diff --git a/cloud/filestore/libs/storage/tablet/tablet_actor_flush.cpp b/cloud/filestore/libs/storage/tablet/tablet_actor_flush.cpp
@@ -1,8 +1,7 @@
 #include "tablet_actor.h"
 
-#include "profile_log_events.h"
-
 #include <cloud/filestore/libs/storage/tablet/model/blob_builder.h>
+#include <cloud/filestore/libs/storage/tablet/model/profile_log_events.h>
 
 #include <contrib/ydb/library/actors/core/actor_bootstrapped.h>
 

diff --git a/cloud/filestore/libs/storage/tablet/tablet_actor_flush_bytes.cpp b/cloud/filestore/libs/storage/tablet/tablet_actor_flush_bytes.cpp
@@ -1,9 +1,8 @@
 #include "tablet_actor.h"
 
-#include "profile_log_events.h"
-
 #include <cloud/filestore/libs/storage/model/block_buffer.h>
 #include <cloud/filestore/libs/storage/tablet/model/blob_builder.h>
+#include <cloud/filestore/libs/storage/tablet/model/profile_log_events.h>
 
 #include <contrib/ydb/library/actors/core/actor_bootstrapped.h>
 

diff --git a/cloud/filestore/libs/storage/tablet/tablet_actor_readblob.cpp b/cloud/filestore/libs/storage/tablet/tablet_actor_readblob.cpp
@@ -1,10 +1,10 @@
 #include "tablet_actor.h"
 
 #include "helpers.h"
-#include "profile_log_events.h"
 
-#include <contrib/ydb/core/base/blobstorage.h>
+#include <cloud/filestore/libs/storage/tablet/model/profile_log_events.h>
 
+#include <contrib/ydb/core/base/blobstorage.h>
 #include <contrib/ydb/library/actors/core/actor_bootstrapped.h>
 
 #include <util/stream/str.h>

diff --git a/cloud/filestore/libs/storage/tablet/tablet_actor_truncate.cpp b/cloud/filestore/libs/storage/tablet/tablet_actor_truncate.cpp
@@ -1,8 +1,7 @@
 #include "tablet_actor.h"
 
-#include "profile_log_events.h"
-
 #include <cloud/filestore/libs/storage/tablet/model/group_by.h>
+#include <cloud/filestore/libs/storage/tablet/model/profile_log_events.h>
 
 #include <util/generic/set.h>
 

diff --git a/cloud/filestore/libs/storage/tablet/tablet_actor_writeblob.cpp b/cloud/filestore/libs/storage/tablet/tablet_actor_writeblob.cpp
@@ -1,9 +1,9 @@
 #include "tablet_actor.h"
 
 #include "helpers.h"
-#include "profile_log_events.h"
 
 #include <cloud/filestore/libs/diagnostics/critical_events.h>
+#include <cloud/filestore/libs/storage/tablet/model/profile_log_events.h>
 
 #include <contrib/ydb/core/base/blobstorage.h>
 

diff --git a/cloud/filestore/libs/storage/tablet/tablet_actor_zerorange.cpp b/cloud/filestore/libs/storage/tablet/tablet_actor_zerorange.cpp
@@ -1,6 +1,6 @@
 #include "tablet_actor.h"
 
-#include "profile_log_events.h"
+#include <cloud/filestore/libs/diagnostics/profile_log_events.h>
 
 namespace NCloud::NFileStore::NStorage {
 

diff --git a/cloud/filestore/libs/storage/tablet/tablet_state_data.cpp b/cloud/filestore/libs/storage/tablet/tablet_state_data.cpp
@@ -1,9 +1,8 @@
 #include "tablet_state_impl.h"
 
-#include "profile_log_events.h"
-
 #include <cloud/filestore/libs/storage/model/utils.h>
 #include <cloud/filestore/libs/storage/tablet/model/block.h>
+#include <cloud/filestore/libs/storage/tablet/model/profile_log_events.h>
 #include <cloud/filestore/libs/storage/tablet/model/split_range.h>
 
 #include <util/generic/guid.h>

diff --git a/cloud/filestore/libs/storage/tablet/tablet_tx.h b/cloud/filestore/libs/storage/tablet/tablet_tx.h
@@ -2,7 +2,6 @@
 
 #include "public.h"
 
-#include "profile_log_events.h"
 #include "tablet_database.h"
 #include "tablet_private.h"
 #include "tablet_state_cache.h"
@@ -15,6 +14,7 @@
 #include <cloud/filestore/libs/storage/model/public.h>
 #include <cloud/filestore/libs/storage/model/range.h>
 #include <cloud/filestore/libs/storage/tablet/model/block.h>
+#include <cloud/filestore/libs/storage/tablet/model/profile_log_events.h>
 #include <cloud/filestore/libs/storage/tablet/model/range_locks.h>
 #include <cloud/filestore/libs/storage/tablet/protos/tablet.pb.h>
 

diff --git a/cloud/filestore/libs/storage/tablet/ut/ya.make b/cloud/filestore/libs/storage/tablet/ut/ya.make
@@ -4,7 +4,6 @@ INCLUDE(${ARCADIA_ROOT}/cloud/filestore/tests/recipes/medium.inc)
 
 SRCS(
     helpers_ut.cpp
-    profile_log_events_ut.cpp
     rebase_logic_ut.cpp
     subsessions_ut.cpp
     tablet_database_ut.cpp

diff --git a/cloud/filestore/libs/storage/tablet/ya.make b/cloud/filestore/libs/storage/tablet/ya.make
@@ -6,7 +6,6 @@ GENERATE_ENUM_SERIALIZATION(session.h)
 SRCS(
     checkpoint.cpp
     helpers.cpp
-    profile_log_events.cpp
     rebase_logic.cpp
     session.cpp
     shard_request_actor.cpp

diff --git a/cloud/filestore/tools/analytics/libs/event-log/dump.cpp b/cloud/filestore/tools/analytics/libs/event-log/dump.cpp
@@ -4,8 +4,8 @@
 
 #include <cloud/filestore/libs/diagnostics/events/profile_events.ev.pb.h>
 #include <cloud/filestore/libs/diagnostics/profile_log_events.h>
-#include <cloud/filestore/libs/storage/tablet/profile_log_events.h>
 #include <cloud/filestore/libs/service/request.h>
+#include <cloud/filestore/libs/storage/tablet/model/profile_log_events.h>
 
 #include <cloud/storage/core/libs/common/error.h>
 

diff --git a/cloud/filestore/tools/analytics/libs/event-log/dump_ut.cpp b/cloud/filestore/tools/analytics/libs/event-log/dump_ut.cpp
@@ -3,7 +3,7 @@
 #include <cloud/filestore/libs/diagnostics/events/profile_events.ev.pb.h>
 #include <cloud/filestore/libs/diagnostics/profile_log_events.h>
 #include <cloud/filestore/libs/service/request.h>
-#include <cloud/filestore/libs/storage/tablet/profile_log_events.h>
+#include <cloud/filestore/libs/storage/tablet/model/profile_log_events.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 

diff --git a/cloud/filestore/tools/analytics/libs/event-log/request_filter.cpp b/cloud/filestore/tools/analytics/libs/event-log/request_filter.cpp
@@ -3,7 +3,7 @@
 #include <cloud/filestore/libs/diagnostics/events/profile_events.ev.pb.h>
 #include <cloud/filestore/libs/service/request.h>
 #include <cloud/filestore/libs/storage/model/range.h>
-#include <cloud/filestore/libs/storage/tablet/profile_log_events.h>
+#include <cloud/filestore/libs/storage/tablet/model/profile_log_events.h>
 
 namespace NCloud::NFileStore {
 

diff --git a/cloud/filestore/tools/analytics/libs/event-log/request_filter_ut.cpp b/cloud/filestore/tools/analytics/libs/event-log/request_filter_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <cloud/filestore/libs/diagnostics/events/profile_events.ev.pb.h>
 #include <cloud/filestore/libs/service/request.h>
-#include <cloud/filestore/libs/storage/tablet/profile_log_events.h>
+#include <cloud/filestore/libs/storage/tablet/model/profile_log_events.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 

diff --git a/cloud/filestore/tools/analytics/libs/event-log/request_printer.cpp b/cloud/filestore/tools/analytics/libs/event-log/request_printer.cpp
@@ -3,7 +3,7 @@
 #include <cloud/filestore/libs/diagnostics/events/profile_events.ev.pb.h>
 #include <cloud/filestore/libs/diagnostics/profile_log_events.h>
 #include <cloud/filestore/libs/service/request.h>
-#include <cloud/filestore/libs/storage/tablet/profile_log_events.h>
+#include <cloud/filestore/libs/storage/tablet/model/profile_log_events.h>
 #include <cloud/filestore/public/api/protos/locks.pb.h>
 
 #include <cloud/storage/core/libs/tablet/model/partial_blob_id.h>

diff --git a/cloud/filestore/tools/analytics/libs/event-log/request_printer_ut.cpp b/cloud/filestore/tools/analytics/libs/event-log/request_printer_ut.cpp
@@ -3,7 +3,7 @@
 #include <cloud/filestore/libs/diagnostics/events/profile_events.ev.pb.h>
 #include <cloud/filestore/libs/diagnostics/profile_log_events.h>
 #include <cloud/filestore/libs/service/request.h>
-#include <cloud/filestore/libs/storage/tablet/profile_log_events.h>
+#include <cloud/filestore/libs/storage/tablet/model/profile_log_events.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 

diff --git a/cloud/filestore/tools/analytics/libs/event-log/ya.make b/cloud/filestore/tools/analytics/libs/event-log/ya.make
@@ -7,10 +7,11 @@ SRCS(
 )
 
 PEERDIR(
+    cloud/filestore/libs/diagnostics
     cloud/filestore/libs/diagnostics/events
     cloud/filestore/libs/service
     cloud/filestore/libs/storage/model
-    cloud/filestore/libs/storage/tablet
+    cloud/filestore/libs/storage/tablet/model
 
     cloud/storage/core/libs/common
 )

diff --git a/cloud/filestore/tools/analytics/profile_tool/README.md b/cloud/filestore/tools/analytics/profile_tool/README.md
@@ -6,7 +6,7 @@ Profile log fills in three places:
 
 * On client-side (vhost) [public API](https://github.com/ydb-platform/nbs/blob/main/cloud/filestore/libs/service/request.h) requests are partially filled [on request forwarding](https://github.com/ydb-platform/nbs/blob/main/cloud/filestore/libs/storage/service/service_actor_forward.cpp) in service actor and [on request completion](https://github.com/ydb-platform/nbs/blob/main/cloud/filestore/libs/storage/service/service_actor_complete.cpp). It will be dumped to profile-log [on in-flight request completion](https://github.com/ydb-platform/nbs/blob/main/cloud/filestore/libs/storage/service/service_state.cpp). Only significant requests with filled additional fields will be dumped. This profile log can be found in ```/var/log/nfs/vhost-server.log``` on hosts.
 
-* In tablet [private API](https://github.com/ydb-platform/nbs/blob/main/cloud/filestore/libs/storage/tablet/profile_log_events.h) requests are filled in several places. You can try to grep ```InitProfileLogRequestInfo``` and ```FinalizeProfileLogRequestInfo``` in ```cloud/filestore/libs/storage/tablet/*``` and find all the places. This profile log will be dumped to ```/var/log/nfs/nfs-profile.log``` on nfs-control svms.
+* In tablet [private API](https://github.com/ydb-platform/nbs/blob/main/cloud/filestore/libs/storage/tablet/model/profile_log_events.h) requests are filled in several places. You can try to grep ```InitProfileLogRequestInfo``` and ```FinalizeProfileLogRequestInfo``` in ```cloud/filestore/libs/storage/tablet/*``` and find all the places. This profile log will be dumped to ```/var/log/nfs/nfs-profile.log``` on nfs-control svms.
 
 
 ## Common options

diff --git a/cloud/filestore/tools/analytics/profile_tool/lib/dump_events.cpp b/cloud/filestore/tools/analytics/profile_tool/lib/dump_events.cpp
@@ -5,7 +5,7 @@
 
 #include <cloud/filestore/libs/diagnostics/events/profile_events.ev.pb.h>
 #include <cloud/filestore/libs/service/request.h>
-#include <cloud/filestore/libs/storage/tablet/profile_log_events.h>
+#include <cloud/filestore/libs/storage/tablet/model/profile_log_events.h>
 #include <cloud/filestore/tools/analytics/libs/event-log/dump.h>
 #include <cloud/filestore/tools/analytics/libs/event-log/request_filter.h>
 

diff --git a/cloud/filestore/tools/analytics/profile_tool/lib/find_bytes_access.cpp b/cloud/filestore/tools/analytics/profile_tool/lib/find_bytes_access.cpp
@@ -5,7 +5,7 @@
 
 #include <cloud/filestore/libs/diagnostics/events/profile_events.ev.pb.h>
 #include <cloud/filestore/libs/service/request.h>
-#include <cloud/filestore/libs/storage/tablet/profile_log_events.h>
+#include <cloud/filestore/libs/storage/tablet/model/profile_log_events.h>
 #include <cloud/filestore/tools/analytics/libs/event-log/dump.h>
 #include <cloud/filestore/tools/analytics/libs/event-log/request_filter.h>
 

diff --git a/cloud/filestore/tools/analytics/profile_tool/lib/mask.cpp b/cloud/filestore/tools/analytics/profile_tool/lib/mask.cpp
@@ -4,7 +4,7 @@
 
 #include "command.h"
 
-#include <cloud/filestore/libs/storage/tablet/profile_log_events.h>
+#include <cloud/filestore/libs/storage/tablet/model/profile_log_events.h>
 #include <cloud/filestore/tools/analytics/libs/event-log/dump.h>
 #include <cloud/filestore/tools/analytics/libs/event-log/request_filter.h>
 #include <cloud/filestore/tools/analytics/profile_tool/lib/common_filter_params.h>