Skip to content

Commit 5cb91b2

Browse files
fixes
1 parent 122097c commit 5cb91b2

File tree

5 files changed

+24
-1
lines changed

5 files changed

+24
-1
lines changed

ydb/core/tx/columnshard/columnshard_impl.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,6 +1278,7 @@ class TTxAskPortionChunks: public TTransactionBase<TColumnShard> {
12781278
TBlobGroupSelector selector(Self->Info());
12791279
bool reask = false;
12801280
for (auto&& i : PortionsByPath) {
1281+
AFL_INFO(NKikimrServices::TX_COLUMNSHARD)("event", "TTxAskPortionChunks::Execute")("size", i.second.size())("path_id", i.first);
12811282
for (auto&& p : i.second) {
12821283
{
12831284
auto rowset = db.Table<NColumnShard::Schema::IndexColumnsV2>().Prefix(p->GetPathId(), p->GetPortionId()).Select();
@@ -1298,6 +1299,7 @@ class TTxAskPortionChunks: public TTransactionBase<TColumnShard> {
12981299
}
12991300

13001301
for (auto&& i : PortionsByPath) {
1302+
AFL_INFO(NKikimrServices::TX_COLUMNSHARD)("event", "TTxAskPortionChunks::Execute")("stage", "processing")("size", i.second.size())("path_id", i.first);
13011303
while (i.second.size()) {
13021304
auto p = i.second.back();
13031305
std::vector<NOlap::TColumnChunkLoadContextV1> records;
@@ -1329,8 +1331,11 @@ class TTxAskPortionChunks: public TTransactionBase<TColumnShard> {
13291331
FetchedAccessors.emplace_back(NOlap::TPortionAccessorConstructor::BuildForLoading(p, std::move(records), std::move(indexes)));
13301332
i.second.pop_back();
13311333
}
1334+
AFL_INFO(NKikimrServices::TX_COLUMNSHARD)("event", "TTxAskPortionChunks::Execute")("stage", "finished")("size", i.second.size())(
1335+
"path_id", i.first);
13321336
}
13331337

1338+
AFL_INFO(NKikimrServices::TX_COLUMNSHARD)("event", "TTxAskPortionChunks::Execute")("stage", "finished");
13341339
FetchCallback->OnAccessorsFetched(std::move(FetchedAccessors));
13351340
return true;
13361341
}
@@ -1447,7 +1452,9 @@ void TColumnShard::Enqueue(STFUNC_SIG) {
14471452
switch (ev->GetTypeRewrite()) {
14481453
HFunc(TEvPrivate::TEvTieringModified, Handle);
14491454
HFunc(TEvPrivate::TEvNormalizerResult, Handle);
1455+
HFunc(NOlap::NDataAccessorControl::TEvAskTabletDataAccessors, Handle);
14501456
default:
1457+
AFL_WARN(NKikimrServices::TX_COLUMNSHARD)("event", "unexpected event in enqueue");
14511458
return NTabletFlatExecutor::TTabletExecutedFlat::Enqueue(ev);
14521459
}
14531460
}

ydb/core/tx/columnshard/data_accessor/actor.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ class TActor: public TActorBootstrapped<TActor> {
4848
void Bootstrap();
4949

5050
STFUNC(StateWait) {
51+
const NActors::TLogContextGuard lGuard = NActors::TLogContextBuilder::Build()("self_id", SelfId())("tablet_id", TabletId)("parent", Parent);
5152
switch (ev->GetTypeRewrite()) {
5253
cFunc(NActors::TEvents::TEvPoison::EventType, StartStopping);
5354
hFunc(TEvRegisterController, Handle);

ydb/core/tx/columnshard/data_accessor/manager.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ class TLocalManager: public IDataAccessorsManager {
9696
const std::shared_ptr<IAccessorCallback> AccessorCallback;
9797

9898
virtual void DoAskData(const std::shared_ptr<TDataAccessorsRequest>& request) override {
99+
AFL_INFO(NKikimrServices::TX_COLUMNSHARD)("event", "ask_data")("request", request->DebugString());
99100
for (auto&& i : request->GetPathIds()) {
100101
auto it = Managers.find(i);
101102
if (it == Managers.end()) {

ydb/core/tx/columnshard/data_accessor/request.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,12 @@ class TPathFetchingState {
117117
THashMap<ui64, TPortionDataAccessor> PortionAccessors;
118118

119119
public:
120+
TString DebugString() const {
121+
TStringBuilder sb;
122+
sb << "portions_count=" << Portions.size();
123+
return sb;
124+
}
125+
120126
TPathFetchingState(const ui64 pathId)
121127
: PathId(pathId) {
122128
}
@@ -191,6 +197,15 @@ class TDataAccessorsRequest: public NColumnShard::TMonitoringObjectsCounter<TDat
191197
}
192198

193199
public:
200+
TString DebugString() const {
201+
TStringBuilder sb;
202+
sb << "request_id=" << RequestId << ";";
203+
for (auto&& i : PathIdStatus) {
204+
sb << i.first << "={" << i.second.DebugString() << "};";
205+
}
206+
return sb;
207+
}
208+
194209
TDataAccessorsRequest() = default;
195210

196211
bool HasSubscriber() const {

ydb/core/tx/columnshard/engines/storage/granule/stages.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ bool TGranuleFinishAccessorsLoading::DoExecute(NTabletFlatExecutor::TTransaction
6969
bool TGranuleFinishCommonLoading::DoExecute(NTabletFlatExecutor::TTransactionContext& /*txc*/, const TActorContext& /*ctx*/) {
7070
AFL_VERIFY(!Started);
7171
Started = true;
72-
TMemoryProfileGuard g("TTxInit/LoadColumns/After");
7372
Self->OnAfterPortionsLoad();
7473
return true;
7574
}

0 commit comments

Comments
 (0)