12
12
#include < yt/yt/core/concurrency/thread_pool_poller.h>
13
13
14
14
#include < yt/yt/core/misc/finally.h>
15
- #include < yt/yt/core/misc/memory_usage_tracker.h>
16
15
#include < yt/yt/core/misc/public.h>
17
16
18
17
#include < yt/yt/core/ytree/convert.h>
@@ -63,15 +62,13 @@ class TServer
63
62
IPollerPtr poller,
64
63
IPollerPtr acceptor,
65
64
IInvokerPtr invoker,
66
- IMemoryUsageTrackerPtr memoryUsageTracker,
67
65
IRequestPathMatcherPtr requestPathMatcher,
68
66
bool ownPoller = false )
69
67
: Config_(std::move(config))
70
68
, Listener_(std::move(listener))
71
69
, Poller_(std::move(poller))
72
70
, Acceptor_(std::move(acceptor))
73
71
, Invoker_(std::move(invoker))
74
- , MemoryUsageTracker_(std::move(memoryUsageTracker))
75
72
, OwnPoller_(ownPoller)
76
73
, RequestPathMatcher_(std::move(requestPathMatcher))
77
74
{ }
@@ -126,7 +123,6 @@ class TServer
126
123
const IPollerPtr Poller_;
127
124
const IPollerPtr Acceptor_;
128
125
const IInvokerPtr Invoker_;
129
- const IMemoryUsageTrackerPtr MemoryUsageTracker_;
130
126
const bool OwnPoller_ = false ;
131
127
132
128
IRequestPathMatcherPtr RequestPathMatcher_;
@@ -224,15 +220,6 @@ class TServer
224
220
225
221
SetRequestId (response, request->GetRequestId ());
226
222
227
- if (MemoryUsageTracker_ && MemoryUsageTracker_->IsExceeded ()) {
228
- // We use Unavailable code here, as it is already retryable in all clients.
229
- THROW_ERROR_EXCEPTION (
230
- NRpc::EErrorCode::Unavailable,
231
- " Request is dropped due to high memory pressure" )
232
- << TErrorAttribute (" total_memory_limit" , MemoryUsageTracker_->GetLimit ())
233
- << TErrorAttribute (" memory_usage" , MemoryUsageTracker_->GetUsed ());
234
- }
235
-
236
223
handler->HandleRequest (request, response);
237
224
238
225
NTracing::FlushCurrentTraceContextElapsedTime ();
@@ -394,7 +381,6 @@ IServerPtr CreateServer(
394
381
IPollerPtr poller,
395
382
IPollerPtr acceptor,
396
383
IInvokerPtr invoker,
397
- IMemoryUsageTrackerPtr memoryUsageTracker,
398
384
bool ownPoller)
399
385
{
400
386
auto handlers = New<TRequestPathMatcher>();
@@ -404,7 +390,6 @@ IServerPtr CreateServer(
404
390
std::move (poller),
405
391
std::move (acceptor),
406
392
std::move (invoker),
407
- std::move (memoryUsageTracker),
408
393
std::move (handlers),
409
394
ownPoller);
410
395
}
@@ -414,7 +399,6 @@ IServerPtr CreateServer(
414
399
IPollerPtr poller,
415
400
IPollerPtr acceptor,
416
401
IInvokerPtr invoker,
417
- IMemoryUsageTrackerPtr memoryUsageTracker,
418
402
bool ownPoller)
419
403
{
420
404
auto address = TNetworkAddress::CreateIPv6Any (config->Port );
@@ -427,7 +411,6 @@ IServerPtr CreateServer(
427
411
std::move (poller),
428
412
std::move (acceptor),
429
413
std::move (invoker),
430
- std::move (memoryUsageTracker),
431
414
ownPoller);
432
415
} catch (const std::exception& ex) {
433
416
if (i + 1 == config->BindRetryCount ) {
@@ -457,16 +440,14 @@ IServerPtr CreateServer(
457
440
std::move (poller),
458
441
std::move (acceptor),
459
442
std::move (invoker),
460
- /* memoryUsageTracker*/ GetNullMemoryUsageTracker (),
461
443
/* ownPoller*/ false );
462
444
}
463
445
464
446
IServerPtr CreateServer (
465
447
TServerConfigPtr config,
466
448
IListenerPtr listener,
467
449
IPollerPtr poller,
468
- IPollerPtr acceptor,
469
- IMemoryUsageTrackerPtr memoryUsageTracker)
450
+ IPollerPtr acceptor)
470
451
{
471
452
auto invoker = poller->GetInvoker ();
472
453
return CreateServer (
@@ -475,23 +456,20 @@ IServerPtr CreateServer(
475
456
std::move (poller),
476
457
std::move (acceptor),
477
458
std::move (invoker),
478
- std::move (memoryUsageTracker),
479
459
/* ownPoller*/ false );
480
460
}
481
461
482
462
IServerPtr CreateServer (
483
463
TServerConfigPtr config,
484
464
IPollerPtr poller,
485
- IPollerPtr acceptor,
486
- IMemoryUsageTrackerPtr memoryUsageTracker)
465
+ IPollerPtr acceptor)
487
466
{
488
467
auto invoker = poller->GetInvoker ();
489
468
return CreateServer (
490
469
std::move (config),
491
470
std::move (poller),
492
471
std::move (acceptor),
493
472
std::move (invoker),
494
- std::move (memoryUsageTracker),
495
473
/* ownPoller*/ false );
496
474
}
497
475
@@ -521,7 +499,6 @@ IServerPtr CreateServer(TServerConfigPtr config, int pollerThreadCount)
521
499
std::move (poller),
522
500
std::move (acceptor),
523
501
std::move (invoker),
524
- /* memoryUsageTracker*/ GetNullMemoryUsageTracker (),
525
502
/* ownPoller*/ true );
526
503
}
527
504
@@ -536,7 +513,6 @@ IServerPtr CreateServer(
536
513
std::move (poller),
537
514
std::move (acceptor),
538
515
std::move (invoker),
539
- /* memoryUsageTracker*/ GetNullMemoryUsageTracker (),
540
516
/* ownPoller*/ false );
541
517
}
542
518
0 commit comments