Skip to content

Commit ebfe3cd

Browse files
ulya-sidorinaulya-sidorina
authored
log(kqp): downgrade data integrity log level (#8543)
1 parent 6313a44 commit ebfe3cd

File tree

3 files changed

+34
-30
lines changed

3 files changed

+34
-30
lines changed

‎ydb/core/grpc_services/grpc_integrity_trails.h

+14-14
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ inline void LogIntegrityTrails(const TMaybe<TString>& traceId, const Ydb::Table:
2121
return ss.Str();
2222
};
2323

24-
LOG_DEBUG_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, request));
24+
LOG_TRACE_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, request));
2525
}
2626

2727
inline void LogIntegrityTrails(const TMaybe<TString>& traceId, const Ydb::Table::ExecuteDataQueryRequest& request, NKqp::TEvKqp::TEvQueryResponse::TPtr& response, const TActorContext& ctx) {
@@ -43,7 +43,7 @@ inline void LogIntegrityTrails(const TMaybe<TString>& traceId, const Ydb::Table:
4343
return ss.Str();
4444
};
4545

46-
LOG_DEBUG_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, request, response));
46+
LOG_TRACE_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, request, response));
4747
}
4848

4949
// BeginTransaction
@@ -58,7 +58,7 @@ inline void LogIntegrityTrails(const TMaybe<TString>& traceId, const Ydb::Table:
5858
return ss.Str();
5959
};
6060

61-
LOG_DEBUG_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, request));
61+
LOG_TRACE_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, request));
6262
}
6363

6464
inline void LogIntegrityTrails(const TMaybe<TString>& traceId, const Ydb::Table::BeginTransactionRequest& request, NKqp::TEvKqp::TEvQueryResponse::TPtr& response, const TActorContext& ctx) {
@@ -78,7 +78,7 @@ inline void LogIntegrityTrails(const TMaybe<TString>& traceId, const Ydb::Table:
7878
return ss.Str();
7979
};
8080

81-
LOG_DEBUG_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, response));
81+
LOG_TRACE_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, response));
8282
}
8383

8484
// CommitTransaction
@@ -93,7 +93,7 @@ inline void LogIntegrityTrails(const TMaybe<TString>& traceId, const Ydb::Table:
9393
return ss.Str();
9494
};
9595

96-
LOG_DEBUG_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, request));
96+
LOG_TRACE_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, request));
9797
}
9898

9999
inline void LogIntegrityTrails(const TMaybe<TString>& traceId, const Ydb::Table::CommitTransactionRequest& request, NKqp::TEvKqp::TEvQueryResponse::TPtr& response, const TActorContext& ctx) {
@@ -111,7 +111,7 @@ inline void LogIntegrityTrails(const TMaybe<TString>& traceId, const Ydb::Table:
111111
return ss.Str();
112112
};
113113

114-
LOG_DEBUG_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, request, response));
114+
LOG_TRACE_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, request, response));
115115
}
116116

117117
// RollbackTransaction
@@ -126,7 +126,7 @@ inline void LogIntegrityTrails(const TMaybe<TString>& traceId, const Ydb::Table:
126126
return ss.Str();
127127
};
128128

129-
LOG_DEBUG_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, request));
129+
LOG_TRACE_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, request));
130130
}
131131

132132
inline void LogIntegrityTrails(const TMaybe<TString>& traceId, const Ydb::Table::RollbackTransactionRequest& request, NKqp::TEvKqp::TEvQueryResponse::TPtr& response, const TActorContext& ctx) {
@@ -144,7 +144,7 @@ inline void LogIntegrityTrails(const TMaybe<TString>& traceId, const Ydb::Table:
144144
return ss.Str();
145145
};
146146

147-
LOG_DEBUG_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, request, response));
147+
LOG_TRACE_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, request, response));
148148
}
149149

150150
// ExecuteYqlScript/StreamExecuteYqlScript
@@ -159,7 +159,7 @@ inline void LogIntegrityTrails(const TMaybe<TString>& traceId, const Ydb::Script
159159
return ss.Str();
160160
};
161161

162-
LOG_DEBUG_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId));
162+
LOG_TRACE_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId));
163163
}
164164

165165
inline void LogIntegrityTrails(const TMaybe<TString>& traceId, const Ydb::Scripting::ExecuteYqlRequest& request, NKqp::TEvKqp::TEvQueryResponse::TPtr& response, const TActorContext& ctx) {
@@ -178,7 +178,7 @@ inline void LogIntegrityTrails(const TMaybe<TString>& traceId, const Ydb::Script
178178
return ss.Str();
179179
};
180180

181-
LOG_DEBUG_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, response));
181+
LOG_TRACE_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, response));
182182
}
183183

184184
// ExecuteQuery
@@ -197,7 +197,7 @@ inline void LogIntegrityTrails(const TMaybe<TString>& traceId, const Ydb::Query:
197197
return ss.Str();
198198
};
199199

200-
LOG_DEBUG_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, request));
200+
LOG_TRACE_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, request));
201201
}
202202

203203
inline void LogIntegrityTrails(const TMaybe<TString>& traceId, const Ydb::Query::ExecuteQueryRequest& request, NKqp::TEvKqp::TEvQueryResponse::TPtr& response, const TActorContext& ctx) {
@@ -223,7 +223,7 @@ inline void LogIntegrityTrails(const TMaybe<TString>& traceId, const Ydb::Query:
223223
return ss.Str();
224224
};
225225

226-
LOG_DEBUG_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, request, response));
226+
LOG_TRACE_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, request, response));
227227
}
228228

229229
// ExecuteSrcipt
@@ -240,7 +240,7 @@ inline void LogIntegrityTrails(const TMaybe<TString>& traceId, const Ydb::Query:
240240
return ss.Str();
241241
};
242242

243-
LOG_DEBUG_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId));
243+
LOG_TRACE_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId));
244244
}
245245

246246
inline void LogIntegrityTrails(const TMaybe<TString>& traceId, const Ydb::Query::ExecuteScriptRequest& request, const NKqp::TEvKqp::TEvScriptResponse::TPtr& response, const TActorContext& ctx) {
@@ -258,7 +258,7 @@ inline void LogIntegrityTrails(const TMaybe<TString>& traceId, const Ydb::Query:
258258
return ss.Str();
259259
};
260260

261-
LOG_DEBUG_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, response));
261+
LOG_TRACE_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, response));
262262
}
263263

264264
}

‎ydb/core/kqp/common/kqp_data_integrity_trails.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ inline void LogIntegrityTrails(const NKqp::TEvKqp::TEvQueryRequest::TPtr& reques
5252
return ss.Str();
5353
};
5454

55-
LOG_INFO_S(ctx, NKikimrServices::DATA_INTEGRITY, log(request));
55+
LOG_DEBUG_S(ctx, NKikimrServices::DATA_INTEGRITY, log(request));
5656
}
5757

5858
inline void LogIntegrityTrails(const TString& traceId, NKikimrKqp::EQueryAction action, NKikimrKqp::EQueryType type, const std::unique_ptr<NKqp::TEvKqp::TEvQueryResponse>& response, const TActorContext& ctx) {
@@ -75,7 +75,7 @@ inline void LogIntegrityTrails(const TString& traceId, NKikimrKqp::EQueryAction
7575
return ss.Str();
7676
};
7777

78-
LOG_INFO_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, response));
78+
LOG_DEBUG_S(ctx, NKikimrServices::DATA_INTEGRITY, log(traceId, response));
7979
}
8080

8181
// DataExecuter
@@ -95,7 +95,7 @@ inline void LogIntegrityTrails(const TString& txType, const TString& traceId, ui
9595
return ss.Str();
9696
};
9797

98-
LOG_NOTICE_S(ctx, NKikimrServices::DATA_INTEGRITY, log(txType, traceId, txId, shardId));
98+
LOG_INFO_S(ctx, NKikimrServices::DATA_INTEGRITY, log(txType, traceId, txId, shardId));
9999
}
100100

101101
}

‎ydb/core/kqp/ut/data_integrity/kqp_data_integrity_trails_ut.cpp

+17-13
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,16 @@ namespace {
1717
}
1818

1919
Y_UNIT_TEST_SUITE(KqpDataIntegrityTrails) {
20-
Y_UNIT_TEST(Upsert) {
20+
Y_UNIT_TEST_TWIN(Upsert, LogEnabled) {
2121
TKikimrSettings serverSettings;
2222
TStringStream ss;
2323
serverSettings.LogStream = &ss;
2424
TKikimrRunner kikimr(serverSettings);
25-
kikimr.GetTestServer().GetRuntime()->SetLogPriority(NKikimrServices::DATA_INTEGRITY, NLog::PRI_DEBUG);
25+
26+
if (LogEnabled) {
27+
kikimr.GetTestServer().GetRuntime()->SetLogPriority(NKikimrServices::DATA_INTEGRITY, NLog::PRI_TRACE);
28+
}
29+
2630
auto db = kikimr.GetTableClient();
2731
auto session = db.CreateSession().GetValueSync().GetSession();
2832

@@ -37,11 +41,11 @@ Y_UNIT_TEST_SUITE(KqpDataIntegrityTrails) {
3741
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
3842

3943
// check executer logs
40-
UNIT_ASSERT_VALUES_EQUAL(CountSubstr(ss.Str(), "DATA_INTEGRITY NOTICE: Component: Executer"), 1);
44+
UNIT_ASSERT_VALUES_EQUAL(CountSubstr(ss.Str(), "DATA_INTEGRITY INFO: Component: Executer"), LogEnabled ? 1 : 0);
4145
// check session actor logs
42-
UNIT_ASSERT_VALUES_EQUAL(CountSubstr(ss.Str(), "DATA_INTEGRITY INFO: Component: SessionActor"), 2);
46+
UNIT_ASSERT_VALUES_EQUAL(CountSubstr(ss.Str(), "DATA_INTEGRITY DEBUG: Component: SessionActor"), LogEnabled ? 2 : 0);
4347
// check grpc logs
44-
UNIT_ASSERT_VALUES_EQUAL(CountSubstr(ss.Str(), "DATA_INTEGRITY DEBUG: Component: Grpc"), 2);
48+
UNIT_ASSERT_VALUES_EQUAL(CountSubstr(ss.Str(), "DATA_INTEGRITY TRACE: Component: Grpc"), LogEnabled ? 2 : 0);
4549
// TODO: check datashard logs
4650
}
4751

@@ -50,7 +54,7 @@ Y_UNIT_TEST_SUITE(KqpDataIntegrityTrails) {
5054
TStringStream ss;
5155
serverSettings.LogStream = &ss;
5256
TKikimrRunner kikimr(serverSettings);
53-
kikimr.GetTestServer().GetRuntime()->SetLogPriority(NKikimrServices::DATA_INTEGRITY, NLog::PRI_DEBUG);
57+
kikimr.GetTestServer().GetRuntime()->SetLogPriority(NKikimrServices::DATA_INTEGRITY, NLog::PRI_TRACE);
5458
auto db = kikimr.GetTableClient();
5559
auto session = db.CreateSession().GetValueSync().GetSession();
5660

@@ -66,11 +70,11 @@ Y_UNIT_TEST_SUITE(KqpDataIntegrityTrails) {
6670
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
6771

6872
// check executer logs
69-
UNIT_ASSERT_VALUES_EQUAL(CountSubstr(ss.Str(), "DATA_INTEGRITY NOTICE: Component: Executer"), 0);
73+
UNIT_ASSERT_VALUES_EQUAL(CountSubstr(ss.Str(), "DATA_INTEGRITY INFO: Component: Executer"), 0);
7074
// check session actor logs
71-
UNIT_ASSERT_VALUES_EQUAL(CountSubstr(ss.Str(), "DATA_INTEGRITY INFO: Component: SessionActor"), 0);
75+
UNIT_ASSERT_VALUES_EQUAL(CountSubstr(ss.Str(), "DATA_INTEGRITY DEBUG: Component: SessionActor"), 0);
7276
// check grpc logs
73-
UNIT_ASSERT_VALUES_EQUAL(CountSubstr(ss.Str(), "DATA_INTEGRITY DEBUG: Component: Grpc"), 0);
77+
UNIT_ASSERT_VALUES_EQUAL(CountSubstr(ss.Str(), "DATA_INTEGRITY TRACE: Component: Grpc"), 0);
7478
// TODO: check datashard logs
7579
}
7680

@@ -79,7 +83,7 @@ Y_UNIT_TEST_SUITE(KqpDataIntegrityTrails) {
7983
TStringStream ss;
8084
serverSettings.LogStream = &ss;
8185
TKikimrRunner kikimr(serverSettings);
82-
kikimr.GetTestServer().GetRuntime()->SetLogPriority(NKikimrServices::DATA_INTEGRITY, NLog::PRI_DEBUG);
86+
kikimr.GetTestServer().GetRuntime()->SetLogPriority(NKikimrServices::DATA_INTEGRITY, NLog::PRI_TRACE);
8387
auto db = kikimr.GetTableClient();
8488
auto session = db.CreateSession().GetValueSync().GetSession();
8589

@@ -91,11 +95,11 @@ Y_UNIT_TEST_SUITE(KqpDataIntegrityTrails) {
9195
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
9296

9397
// check executer logs (should be empty, because executer logs only modification operations)
94-
UNIT_ASSERT_VALUES_EQUAL(CountSubstr(ss.Str(), "DATA_INTEGRITY NOTICE: Component: Executer"), 0);
98+
UNIT_ASSERT_VALUES_EQUAL(CountSubstr(ss.Str(), "DATA_INTEGRITY INFO: Component: Executer"), 0);
9599
// check session actor logs
96-
UNIT_ASSERT_VALUES_EQUAL(CountSubstr(ss.Str(), "DATA_INTEGRITY INFO: Component: SessionActor"), 2);
100+
UNIT_ASSERT_VALUES_EQUAL(CountSubstr(ss.Str(), "DATA_INTEGRITY DEBUG: Component: SessionActor"), 2);
97101
// check grpc logs
98-
UNIT_ASSERT_VALUES_EQUAL(CountSubstr(ss.Str(), "DATA_INTEGRITY DEBUG: Component: Grpc"), 2);
102+
UNIT_ASSERT_VALUES_EQUAL(CountSubstr(ss.Str(), "DATA_INTEGRITY TRACE: Component: Grpc"), 2);
99103
// TODO: check datashard logs
100104
}
101105
}

0 commit comments

Comments
 (0)