Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
46a42e5
)
LU-11269 ptlrpc: do not expose transient IDLE state
49/37649/2
author
Alex Zhuravlev
<bzzz@whamcloud.com>
Mon, 10 Feb 2020 21:06:07 +0000
(
00:06
+0300)
committer
Oleg Drokin
<green@whamcloud.com>
Tue, 10 Mar 2020 17:05:57 +0000
(17:05 +0000)
to avoid cases when anyone sending an RPC observes the connection
in this state while it's going to reconnect right away.
Lustre-change: https://review.whamcloud.com/37523
Lustre-commit:
ea8d2ecc783fbaff12c581935ac426b9b8567031
Signed-off-by: Alex Zhuravlev <bzzz@whamcloud.com>
Change-Id: I9ca89051c4176fe321262f8b2f52969c382e401e
Reviewed-by: Mike Pershin <mpershin@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/37649
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lustre/ptlrpc/import.c
patch
|
blob
|
history
diff --git
a/lustre/ptlrpc/import.c
b/lustre/ptlrpc/import.c
index
4ccab0a
..
0e51a7e
100644
(file)
--- a/
lustre/ptlrpc/import.c
+++ b/
lustre/ptlrpc/import.c
@@
-1759,7
+1759,6
@@
static int ptlrpc_disconnect_idle_interpret(const struct lu_env *env,
imp->imp_state != LUSTRE_IMP_CLOSED) {
LASSERTF(imp->imp_state == LUSTRE_IMP_CONNECTING,
"%s\n", ptlrpc_import_state_name(imp->imp_state));
- imp->imp_state = LUSTRE_IMP_IDLE;
memset(&imp->imp_remote_handle, 0,
sizeof(imp->imp_remote_handle));
/* take our DISCONNECT into account */
@@
-1769,6
+1768,9
@@
static int ptlrpc_disconnect_idle_interpret(const struct lu_env *env,
import_set_state_nolock(imp, LUSTRE_IMP_NEW);
ptlrpc_reset_reqs_generation(imp);
connect = 1;
+ } else {
+ /* do not expose transient IDLE state */
+ import_set_state_nolock(imp, LUSTRE_IMP_IDLE);
}
}