Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1389631

[PATCH 15/15] staging: lustre: ptlrpc: quiet warning for 2.1/2.5 connections

Show all headers | View raw

From: Andreas Dilger <andreas.dilger@intel.com>

The Lustre 2.5.4 client will print a warning about connections with
2.1.3 servers, yet they are still supposed to be interoperable.
Increase the window of warning to be up to Lustre 2.5.50, since we
do not intend to allow interoperability between 2.1 and 2.6 systems.
This was from the time when major releases like Lustre 1.4 and 1.8
were many years apart would have no chance for interoperation.

Only print this message once per client, to avoid flooding the console
for connections to many servers or frequent network reconnections.
Server versions should all be nearly the same in any case.

Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2528
Reviewed-on: http://review.whamcloud.com/7916
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
---
 drivers/staging/lustre/lustre/ptlrpc/import.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/lustre/lustre/ptlrpc/import.c b/drivers/staging/lustre/lustre/ptlrpc/import.c
index bf7b9d2..a4f7544 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/import.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/import.c
@@ -1001,6 +1001,8 @@ finish:
 			return 0;
 		}
 	} else {
+		static bool warned;
+
 		spin_lock(&imp->imp_lock);
 		list_del(&imp->imp_conn_current->oic_item);
 		list_add(&imp->imp_conn_current->oic_item, &imp->imp_conn_list);
@@ -1020,7 +1022,7 @@ finish:
 			goto out;
 		}
 
-		if ((ocd->ocd_connect_flags & OBD_CONNECT_VERSION) &&
+		if (!warned && (ocd->ocd_connect_flags & OBD_CONNECT_VERSION) &&
 		    (ocd->ocd_version > LUSTRE_VERSION_CODE +
 					LUSTRE_VERSION_OFFSET_WARN ||
 		     ocd->ocd_version < LUSTRE_VERSION_CODE -
@@ -1028,10 +1030,8 @@ finish:
 			/* Sigh, some compilers do not like #ifdef in the middle
 			 * of macro arguments
 			 */
-			const char *older = "older. Consider upgrading server or downgrading client"
-				;
-			const char *newer = "newer than client version. Consider upgrading client"
-					    ;
+			const char *older = "older than client. Consider upgrading server";
+			const char *newer = "newer than client. Consider recompiling application";
 
 			LCONSOLE_WARN("Server %s version (%d.%d.%d.%d) is much %s (%s)\n",
 				      obd2cli_tgt(imp->imp_obd),
@@ -1041,6 +1041,7 @@ finish:
 				      OBD_OCD_VERSION_FIX(ocd->ocd_version),
 				      ocd->ocd_version > LUSTRE_VERSION_CODE ?
 				      newer : older, LUSTRE_VERSION_STRING);
+			warned = true;
 		}
 
 #if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 2, 50, 0)
-- 
1.7.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/15] patches missing from lustre 2.5.51 James Simmons <jsimmons@infradead.org> - 2016-04-28 00:30 +0200
  [PATCH 06/15] staging: lustre: ldlm: clean up l_flags James Simmons <jsimmons@infradead.org> - 2016-04-28 00:30 +0200
  [PATCH 13/15] staging: lustre: osc: Track number of "unstable" pages per osc James Simmons <jsimmons@infradead.org> - 2016-04-28 00:30 +0200
  [PATCH 15/15] staging: lustre: ptlrpc: quiet warning for 2.1/2.5 connections James Simmons <jsimmons@infradead.org> - 2016-04-28 00:30 +0200
  [PATCH 07/15] staging: lustre: ldlm: remove code wireshark handling James Simmons <jsimmons@infradead.org> - 2016-04-28 00:30 +0200
  [PATCH 05/15] staging: lustre: ldlm: use accessor macros for l_flags James Simmons <jsimmons@infradead.org> - 2016-04-28 00:30 +0200
    Re: [PATCH 05/15] staging: lustre: ldlm: use accessor macros for  l_flags Bruce Korb <bruce.korb@gmail.com> - 2016-04-28 01:00 +0200
      Re: [PATCH 05/15] staging: lustre: ldlm: use accessor macros for  l_flags Dan Carpenter <dan.carpenter@oracle.com> - 2016-04-28 10:30 +0200
  [PATCH 14/15] staging: lustre: osc: Use SOFT_SYNC to urge server commit James Simmons <jsimmons@infradead.org> - 2016-04-28 00:30 +0200
  [PATCH 04/15] staging: lustre: lmv: kernel crash due to misconfigured MDT James Simmons <jsimmons@infradead.org> - 2016-04-28 00:30 +0200
  [PATCH 01/15] staging: lustre: llite: reset writeback index in ll_writepages James Simmons <jsimmons@infradead.org> - 2016-04-28 00:30 +0200
  [PATCH 02/15] staging: lustre: llite: NFS reexport issue James Simmons <jsimmons@infradead.org> - 2016-04-28 00:30 +0200
  [PATCH 09/15] staging: lustre: llite: Replace printing of i_ino with ll_inode2fid() James Simmons <jsimmons@infradead.org> - 2016-04-28 00:30 +0200

csiph-web