Skip to content

Commit e43c2fc

Browse files
authored
Debug logs for EvWrite/EvRead (#8653)
1 parent 0674eeb commit e43c2fc

File tree

4 files changed

+51
-10
lines changed

4 files changed

+51
-10
lines changed

ydb/core/kqp/executer_actor/kqp_data_executer.cpp

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -463,10 +463,14 @@ class TKqpDataExecuter : public TKqpExecuterBase<TKqpDataExecuter, EExecType::Da
463463

464464
NYql::TIssues issues;
465465
NYql::IssuesFromMessage(res->Record.GetIssues(), issues);
466-
LOG_D("Got evWrite result, shard: " << shardId << ", status: "
467-
<< NKikimrDataEvents::TEvWriteResult::EStatus_Name(res->Record.GetStatus())
468-
<< ", error: " << issues.ToString());
469466

467+
LOG_D("Recv EvWriteResult from ShardID=" << shardId
468+
<< ", Status=" << NKikimrDataEvents::TEvWriteResult::EStatus_Name(ev->Get()->GetStatus())
469+
<< ", TxId=" << ev->Get()->Record.GetTxId()
470+
<< ", LocksCount= " << ev->Get()->Record.GetTxLocks().size()
471+
<< ", Cookie=" << ev->Cookie
472+
<< ", error=" << issues.ToString());
473+
470474
if (Stats) {
471475
Stats->AddDatashardPrepareStats(std::move(*res->Record.MutableTxStats()));
472476
}
@@ -1129,9 +1133,13 @@ class TKqpDataExecuter : public TKqpExecuterBase<TKqpDataExecuter, EExecType::Da
11291133

11301134
NYql::TIssues issues;
11311135
NYql::IssuesFromMessage(res->Record.GetIssues(), issues);
1132-
LOG_D("Got evWrite result, shard: " << shardId << ", status: "
1133-
<< NKikimrDataEvents::TEvWriteResult::EStatus_Name(res->Record.GetStatus())
1134-
<< ", error: " << issues.ToString());
1136+
1137+
LOG_D("Recv EvWriteResult from ShardID=" << shardId
1138+
<< ", Status=" << NKikimrDataEvents::TEvWriteResult::EStatus_Name(ev->Get()->GetStatus())
1139+
<< ", TxId=" << ev->Get()->Record.GetTxId()
1140+
<< ", LocksCount= " << ev->Get()->Record.GetTxLocks().size()
1141+
<< ", Cookie=" << ev->Cookie
1142+
<< ", error=" << issues.ToString());
11351143

11361144
if (Stats) {
11371145
Stats->AddDatashardStats(std::move(*res->Record.MutableTxStats()));
@@ -1727,6 +1735,23 @@ class TKqpDataExecuter : public TKqpExecuterBase<TKqpDataExecuter, EExecType::Da
17271735

17281736
NDataIntegrity::LogIntegrityTrails("EvWriteTx", Request.UserTraceId, TxId, shardId, TlsActivationContext->AsActorContext());
17291737

1738+
auto shardsToString = [](const auto& shards) {
1739+
TStringBuilder builder;
1740+
for (const auto& shard : shards) {
1741+
builder << shard << " ";
1742+
}
1743+
return builder;
1744+
};
1745+
1746+
LOG_D("Send EvWrite to ShardID=" << shardId
1747+
<< ", TxId=" << evWriteTransaction->Record.GetTxId()
1748+
<< ", TxMode=" << evWriteTransaction->Record.GetTxMode()
1749+
<< ", LockTxId=" << evWriteTransaction->Record.GetLockTxId() << ", LockNodeId=" << evWriteTransaction->Record.GetLockNodeId()
1750+
<< ", LocksOp=" << NKikimrDataEvents::TKqpLocks::ELocksOp_Name(evWriteTransaction->Record.GetLocks().GetOp())
1751+
<< ", SendingShards=" << shardsToString(evWriteTransaction->Record.GetLocks().GetSendingShards())
1752+
<< ", ReceivingShards=" << shardsToString(evWriteTransaction->Record.GetLocks().GetReceivingShards())
1753+
<< ", LocksCount= " << evWriteTransaction->Record.GetLocks().LocksSize());
1754+
17301755
LOG_D("ExecuteEvWriteTransaction traceId.verbosity: " << std::to_string(traceId.GetVerbosity()));
17311756

17321757
Send(MakePipePerNodeCacheID(false), new TEvPipeCache::TEvForward(evWriteTransaction.release(), shardId, true), 0, 0, std::move(traceId));

ydb/core/kqp/runtime/kqp_read_actor.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -856,8 +856,9 @@ class TKqpReadActor : public TActorBootstrapped<TKqpReadActor>, public NYql::NDq
856856
<< ", limit: " << limit
857857
<< ", readId = " << id
858858
<< ", reverse = " << record.GetReverse()
859-
<< " snapshot = (txid=" << Settings->GetSnapshot().GetTxId() << ",step=" << Settings->GetSnapshot().GetStep() << ")"
860-
<< " lockTxId = " << Settings->GetLockTxId());
859+
<< ", snapshot = (txid=" << Settings->GetSnapshot().GetTxId() << ",step=" << Settings->GetSnapshot().GetStep() << ")"
860+
<< ", lockTxId = " << Settings->GetLockTxId()
861+
<< ", lockNodeId = " << Settings->GetLockNodeId());
861862

862863
Counters->CreatedIterators->Inc();
863864
ReadIdByTabletId[state->TabletId].push_back(id);

ydb/core/kqp/runtime/kqp_stream_lookup_actor.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,13 @@ class TKqpStreamLookupActor : public NActors::TActorBootstrapped<TKqpStreamLooku
461461
record.SetMaxBytes(defaultSettings.GetMaxBytes());
462462
record.SetResultFormat(NKikimrDataEvents::FORMAT_CELLVEC);
463463

464+
CA_LOG_D(TStringBuilder() << "Send EvRead (stream lookup) to shardId=" << shardId
465+
<< ", readId = " << record.GetReadId()
466+
<< ", tablePath: " << StreamLookupWorker->GetTablePath()
467+
<< ", snapshot=(txid=" << record.GetSnapshot().GetTxId() << ", step=" << record.GetSnapshot().GetStep() << ")"
468+
<< ", lockTxId=" << record.GetLockTxId()
469+
<< ", lockNodeId=" << record.GetLockNodeId());
470+
464471
Send(MainPipeCacheId, new TEvPipeCache::TEvForward(request.Release(), shardId, true),
465472
IEventHandle::FlagTrackDelivery, 0, LookupActorSpan.GetTraceId());
466473

ydb/core/kqp/runtime/kqp_write_actor.cpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,12 @@ class TKqpDirectWriteActor : public TActorBootstrapped<TKqpDirectWriteActor>, pu
371371
return issues;
372372
};
373373

374+
CA_LOG_D("Recv EvWriteResult from ShardID=" << ev->Get()->Record.GetOrigin()
375+
<< ", Status=" << NKikimrDataEvents::TEvWriteResult::EStatus_Name(ev->Get()->GetStatus())
376+
<< ", TxId=" << ev->Get()->Record.GetTxId()
377+
<< ", LocksCount= " << ev->Get()->Record.GetTxLocks().size()
378+
<< ", Cookie=" << ev->Cookie);
379+
374380
switch (ev->Get()->GetStatus()) {
375381
case NKikimrDataEvents::TEvWriteResult::STATUS_UNSPECIFIED: {
376382
CA_LOG_E("Got UNSPECIFIED for table `"
@@ -616,10 +622,12 @@ class TKqpDirectWriteActor : public TActorBootstrapped<TKqpDirectWriteActor>, pu
616622
ShardedWriteController->GetDataFormat());
617623
}
618624

619-
CA_LOG_D("Send EvWrite to ShardID=" << shardId << ", TxId=" << std::get<ui64>(TxId)
625+
CA_LOG_D("Send EvWrite to ShardID=" << shardId << ", TxId=" << evWrite->Record.GetTxId()
626+
<< ", TxMode=" << evWrite->Record.GetTxMode()
620627
<< ", LockTxId=" << evWrite->Record.GetLockTxId() << ", LockNodeId=" << evWrite->Record.GetLockNodeId()
628+
<< ", LocksCount= " << evWrite->Record.GetLocks().LocksSize()
621629
<< ", Size=" << serializationResult.TotalDataSize << ", Cookie=" << metadata->Cookie
622-
<< ", Operations=" << metadata->OperationsCount << ", IsFinal=" << metadata->IsFinal
630+
<< ", OperationsCount=" << metadata->OperationsCount << ", IsFinal=" << metadata->IsFinal
623631
<< ", Attempts=" << metadata->SendAttempts);
624632
Send(
625633
PipeCacheId,

0 commit comments

Comments
 (0)