From 0aa055cfaf6c459ec8158557ddb49f0817039f18 Mon Sep 17 00:00:00 2001 From: nathan Date: Wed, 23 May 2007 22:42:10 +0000 Subject: [PATCH] Branch b1_6 b=11691 i=adilger i=scjody deactivate 1.6 mgc to stop reconnect attempts with 1.4 servers --- lustre/include/obd_class.h | 1 - lustre/llite/llite_lib.c | 4 +++- lustre/mgc/mgc_request.c | 7 +------ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h index ac668cf..d796405 100644 --- a/lustre/include/obd_class.h +++ b/lustre/include/obd_class.h @@ -100,7 +100,6 @@ void class_decref(struct obd_device *obd); #define CFG_F_SKIP 0x04 /* We should ignore this cfg command */ #define CFG_F_COMPAT146 0x08 /* Allow old-style logs */ #define CFG_F_EXCLUDE 0x10 /* OST exclusion list */ -#define CFG_F_SERVER146 0x20 /* Using old server */ /* Passed as data param to class_config_parse_llog */ struct config_llog_instance { diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index 70ac748..503a6a7 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -934,7 +934,9 @@ int ll_fill_super(struct super_block *sb) memcpy(lsi->lsi_lmd->lmd_profile, oldname, strlen(oldname) + 1); profilenm = get_profile_name(sb); - cfg.cfg_flags |= CFG_F_SERVER146; + /* Don't ever try to recover the MGS */ + rc = ptlrpc_set_import_active( + lsi->lsi_mgc->u.cli.cl_import, 0); } OBD_FREE(oldname, oldnamelen); } diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c index 4b8fd76..8756885 100644 --- a/lustre/mgc/mgc_request.c +++ b/lustre/mgc/mgc_request.c @@ -147,7 +147,7 @@ static struct config_llog_data *config_log_find(char *logname, } spin_unlock(&config_list_lock); - CERROR("can't get log %s\n", logid); + CDEBUG(D_CONFIG, "can't get log %s\n", logid); RETURN(ERR_PTR(-ENOENT)); out_found: atomic_inc(&cld->cld_refcount); @@ -1033,11 +1033,6 @@ static int mgc_process_log(struct obd_device *mgc, if (cld->cld_stopping) RETURN(0); - if (cld->cld_cfg.cfg_flags & CFG_F_SERVER146) - /* If we started from an old MDT, don't bother trying to - get log updates from the MGS */ - RETURN(0); - OBD_FAIL_TIMEOUT(OBD_FAIL_MGC_PROCESS_LOG, 20); lsi = s2lsi(cld->cld_cfg.cfg_sb); -- 1.8.3.1