From 07e25c3e8a6050ec097ebade5be1205ef0cc05cd Mon Sep 17 00:00:00 2001 From: bobijam Date: Wed, 29 Jul 2009 02:33:53 +0000 Subject: [PATCH] Branch HEAD b=19854 o=johann i=oleg.drokin (green) i=robert.read Check for conflicting UUID only on initial connect. --- lustre/ldlm/ldlm_lib.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c index bb6e297..b16a4fb 100644 --- a/lustre/ldlm/ldlm_lib.c +++ b/lustre/ldlm/ldlm_lib.c @@ -760,7 +760,9 @@ int target_handle_connect(struct ptlrpc_request *req) export = NULL; rc = 0; } else if (export->exp_connection != NULL && - req->rq_peer.nid != export->exp_connection->c_peer.nid) { + req->rq_peer.nid != export->exp_connection->c_peer.nid && + (lustre_msg_get_op_flags(req->rq_reqmsg) & + MSG_CONNECT_INITIAL)) { /* in mds failover we have static uuid but nid can be * changed*/ CWARN("%s: cookie %s seen on new NID %s when " -- 1.8.3.1