[LU-7185] restore flags on ptlrpc_connect_import failure to prevent LBUG

• Type: Bug
• Resolution: Fixed
• Priority: Major
• Fix Version/s: Lustre 2.9.0
• Affects Version/s: Lustre 2.9.0
• Labels: SSK kerberos patch
• Severity: 3
• Assignee: John Hammond
• Reporter: Jeremy Filizetti

Description

Commit 1fc013f90175d1e50d7a22b404ad6abd31a43e38 in LU-5319 failed to restore the original flags ptlrpc_connect_import failure. Handle this gracefully so the system doesn't LBUG.

I'll submit a patch to gerrit when I get a chance to fix my keys. In the mean time the diff is here for reference.

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index 2203acb..b68d331 100644
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -570,6 +570,8 @@ int client_connect_import(const struct lu_env *env,
 
         rc = ptlrpc_connect_import(imp);
         if (rc != 0) {
+               if (data && is_mdc)
+                       data->ocd_connect_flags &= ~OBD_CONNECT_MULTIMODRPCS;
                 LASSERT (imp->imp_state == LUSTRE_IMP_DISCON);
                 GOTO(out_ldlm, rc);
         }

Issue Links

• is duplicated by: LU-7452 (obd_class.h:815:obd_connect()) ASSERTION( (!(data != ((void *)0)) || ((data->ocd_connect_flags & ocf) == data->ocd_connect_flags)) ) failed
• is related to: LU-5319 Support multiple slots per client in last_rcvd file
• is related to: LU-3289 IU Shared Secret Key authentication and encryption