Skip to content

Commit 07e7130

Browse files
authored
max timeout for FastRead (#15520) (#16164)
1 parent 78e52e1 commit 07e7130

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

ydb/core/tx/columnshard/blob_cache.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ class TBlobCache: public TActorBootstrapped<TBlobCache> {
9292
static constexpr i64 MAX_IN_FLIGHT_BYTES = 250ll << 20;
9393
static constexpr i64 MAX_REQUEST_BYTES = 8ll << 20;
9494
static constexpr TDuration DEFAULT_READ_DEADLINE = TDuration::Seconds(30);
95-
static constexpr TDuration FAST_READ_DEADLINE = TDuration::Seconds(10);
9695

9796
TLRUCache<TBlobRange, TString> Cache;
9897
/// List of cached ranges by blob id.
@@ -358,12 +357,11 @@ class TBlobCache: public TActorBootstrapped<TBlobCache> {
358357
}
359358

360359
static TInstant ReadDeadline(TReadItem::EReadVariant variant) {
361-
if (variant == TReadItem::EReadVariant::FAST) {
362-
return TAppData::TimeProvider->Now() + FAST_READ_DEADLINE;
363-
} else if (variant == TReadItem::EReadVariant::DEFAULT) {
360+
if (variant == TReadItem::EReadVariant::DEFAULT) {
364361
return TAppData::TimeProvider->Now() + DEFAULT_READ_DEADLINE;
365362
}
366-
return TInstant::Max(); // EReadVariant::DEFAULT_NO_DEADLINE
363+
// We want to wait for data anyway in this case. This behaviour is similar to datashard
364+
return TInstant::Max(); // EReadVariant::DEFAULT_NO_DEADLINE || EReadVariant::FAST
367365
}
368366

369367
void MakeReadRequests(const TActorContext& ctx) {

0 commit comments

Comments
 (0)