Skip to content

Commit 7f8c0d8

Browse files
authored
Merge b701f86 into 72525ef
2 parents 72525ef + b701f86 commit 7f8c0d8

File tree

3 files changed

+494
-2
lines changed

3 files changed

+494
-2
lines changed

ydb/core/tablet/tablet_pipe_client_cache.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,13 +183,17 @@ namespace NTabletPipe {
183183
}
184184

185185
private:
186-
void MoveToPool(ui64 tabletId, const TClientCacheEntry& currentClient) {
186+
void MoveToPool(ui64 tabletId, TClientCacheEntry& currentClient) {
187187
TClientCacheEntry* insertedClient;
188188
if (!PoolContainer->Insert(tabletId, currentClient, insertedClient)) {
189189
Y_DEBUG_ABORT_UNLESS(!insertedClient->Client);
190190
*insertedClient = currentClient;
191191
}
192192

193+
// Note: client was moved to pool, make sure it's not closed by
194+
// the eviction callback
195+
currentClient.Client = {};
196+
193197
Container->Erase(tabletId);
194198
}
195199

ydb/core/tx/datashard/datashard_outreadset.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ void TOutReadSets::ResendAll(const TActorContext& ctx) {
178178
}
179179
ui64 seqNo = rs.first;
180180
ui64 target = rs.second.To;
181-
Self->ResendReadSetQueue.Progress(rs.first, ctx);
181+
Self->ResendReadSetQueue.Progress(seqNo, ctx);
182182
pendingPipeTrackerCommands.AttachTablet(seqNo, target);
183183
}
184184
pendingPipeTrackerCommands.Apply(Self->ResendReadSetPipeTracker, ctx);

0 commit comments

Comments
 (0)