X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmgc%2Fmgc_request.c;h=4d6733e18ccf2b5caa4041474cfa3b40537c384c;hp=2b6fa0641daa3256e4dba951b891be24df0d93ac;hb=a0c531776695cf01eb60534672092250d8f8ab0a;hpb=382454d8bdd09c75b024b081349f9009f8001870;ds=sidebyside diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c index 2b6fa06..4d6733e 100644 --- a/lustre/mgc/mgc_request.c +++ b/lustre/mgc/mgc_request.c @@ -308,7 +308,7 @@ static int mgc_requeue_add(struct config_llog_data *cld, int later) CDEBUG(D_INFO, "log %s: requeue (l=%d r=%d sp=%d st=%x)\n", cld->cld_logname, later, atomic_read(&cld->cld_refcount), cld->cld_stopping, rq_state); - + /* Hold lock for rq_state */ spin_lock(&config_list_lock); cld->cld_lostlock = 1; @@ -1000,6 +1000,11 @@ 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);