Branch b1_6

b=18304
i=shadow
i=nathan

MSG_CONNECT_INITIAL is not set on the initial MDS->OST connect.
As a conseqence, the patch from bug 18224 is not operational
and the MDS export cannot be reused on the OSTs until it gets
evicted.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 60c67bc..d8a1208 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -82,6 +82,13 @@ Bugzilla   : 18016
 Description: Slow reads beyond 8Tb offsets.
 Details    : Page index integer overflow in ll_read_ahead_page
 
+Severity   : normal
+Bugzilla   : 18304
+Description: Soft lockup on OSS after MDS failover
+Details    : MSG_CONNECT_INITIAL is not set on the initial MDS->OST connect.
+            As a conseqence, the patch from bug 18224 is not operational
+            and the MDS export cannot be reused on the OSTs until it gets
+            evicted.
 
 --------------------------------------------------------------------------
 2009-01-15 Sun Microsystems, Inc.

diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index 9197c6d..32d7503 100644 (file)
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -673,6 +673,8 @@ int ptlrpc_connect_import(struct obd_import *imp, char *new_uuid)
                 spin_lock(&imp->imp_lock);
                 imp->imp_replayable = 1;
                 spin_unlock(&imp->imp_lock);
+                lustre_msg_add_op_flags(request->rq_reqmsg,
+                                        MSG_CONNECT_INITIAL);
         }
 
         DEBUG_REQ(D_RPCTRACE, request, "%sconnect request %d",