d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try harder in cfiscsi_offline(). This is believed to be the workaround

Browse Source 
for the "ctld hanging on reload" problem observed in same cases under
high load.  I'm not 100% sure it's _the_ fix, as the issue is rather hard
to reproduce, but it was tested as part of a larger path and the problem
disappeared.  It certainly shouldn't break anything.

Now, technically, it shouldn't be needed.  Quoting mav@, "After
ct->ct_online == 0 there should be no new sessions attached to the target.
And if you see some problems abbout it, it may either mean that there are
some races where single cfiscsi_session_terminate(cs) call may be lost,
or as a guess while this thread was sleeping target was reenabbled and
redisabled again".  Should such race be discovered and properly fixed
in the future, than this and the followup two commits can be backed out.

PR:		220175
Reported by:	Eugene M. Zheganin <emz at norma.perm.ru>
Tested by:	Eugene M. Zheganin <emz at norma.perm.ru>
Discussed with:	mav
Approved by:	re (gjb)
MFC after:	2 weeks
Sponsored by:	playkey.net
This commit is contained in:
Edward Tomasz Napierala 2018-09-01 16:16:40 +00:00
parent bf466ddcff
commit d783154e46
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/cam/ctl/ctl_frontend_iscsi.c
View File

@ -1447,11 +1447,11 @@ cfiscsi_offline(void *arg)
ct->ct_online = 0; ct->ct_online = 0;
online = --softc->online; online = --softc->online;
TAILQ_FOREACH(cs, &softc->sessions, cs_next) {
if (cs->cs_target == ct)
cfiscsi_session_terminate(cs);
}
do { do {
TAILQ_FOREACH(cs, &softc->sessions, cs_next) {
if (cs->cs_target == ct)
cfiscsi_session_terminate(cs);
}
TAILQ_FOREACH(cs, &softc->sessions, cs_next) { TAILQ_FOREACH(cs, &softc->sessions, cs_next) {
if (cs->cs_target == ct) if (cs->cs_target == ct)
break; break;