From: Andrew Elwell <Andrew.Elwell@gmail.com>
Date: Thu, 17 Jun 2021 23:38:40 +0000 (+1000)
Subject: LU-14771 ptlrpc: Rearrange version mismatch message
X-Git-Tag: 2.15.51~195
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=8a35a977b4322db5610d66c22a177256c987c6cd;p=fs%2Flustre-release.git

LU-14771 ptlrpc: Rearrange version mismatch message

Minor change to reposition the client version string on
console warning message, and merge split string to one line

Test-Parameters: trivial
Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Change-Id: I89242cff873028f4f76bafdd5a14f169a98f7875
Reviewed-on: https://review.whamcloud.com/44029
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Patrick Farrell <pfarrell@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index 64412cc..ed1b89b 100644
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -859,15 +859,15 @@ static int ptlrpc_connect_set_flags(struct obd_import *imp,
 		const char *newer = "newer than client. "
 				    "Consider upgrading client";
 
-		LCONSOLE_WARN("Server %s version (%d.%d.%d.%d) "
-			      "is much %s (%s)\n",
+		LCONSOLE_WARN("Client version (%s). Server %s version (%d.%d.%d.%d) is much %s\n",
+			      LUSTRE_VERSION_STRING,
 			      obd2cli_tgt(imp->imp_obd),
 			      OBD_OCD_VERSION_MAJOR(ocd->ocd_version),
 			      OBD_OCD_VERSION_MINOR(ocd->ocd_version),
 			      OBD_OCD_VERSION_PATCH(ocd->ocd_version),
 			      OBD_OCD_VERSION_FIX(ocd->ocd_version),
 			      ocd->ocd_version > LUSTRE_VERSION_CODE ?
-			      newer : older, LUSTRE_VERSION_STRING);
+			      newer : older);
 		warned = true;
 	}