From 0f1743916be6605fcd8f57993d6ce7d8d06ce12c Mon Sep 17 00:00:00 2001 From: Oleg Drokin Date: Thu, 6 Feb 2020 20:21:43 -0500 Subject: [PATCH] LU-13131 osc: Always send all HP RPCs requests that are resulting from lock cancel activity. Change-Id: I4007167f0f39b0699e977c14bd160f475d8288ad Signed-off-by: Oleg Drokin Reviewed-on: https://review.whamcloud.com/38057 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Wang Shilong --- lustre/osc/osc_cache.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lustre/osc/osc_cache.c b/lustre/osc/osc_cache.c index bf183d4..5a829cd 100644 --- a/lustre/osc/osc_cache.c +++ b/lustre/osc/osc_cache.c @@ -2155,7 +2155,12 @@ __must_hold(&cli->cl_loi_list_lock) OSC_IO_DEBUG(osc, "%lu in flight\n", rpcs_in_flight(cli)); - if (osc_max_rpc_in_flight(cli, osc)) { + /* even if we have reached our max in flight RPCs, we still + * allow all high-priority RPCs through to prevent their + * starvation and leading to server evicting us for not + * writing out pages in a timely manner LU-13131 */ + if (osc_max_rpc_in_flight(cli, osc) && + list_empty(&osc->oo_hp_exts)) { __osc_list_maint(cli, osc); break; } -- 1.8.3.1