From 70e4c365621b07cf877974735119faddb5d74289 Mon Sep 17 00:00:00 2001 From: tappro Date: Tue, 2 Dec 2008 20:10:22 +0000 Subject: [PATCH] - update server boot epoch if recovery is not needed too b:17765 i:adilger,shadow --- lustre/obdfilter/filter.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c index 9099b23..b6c9faed 100644 --- a/lustre/obdfilter/filter.c +++ b/lustre/obdfilter/filter.c @@ -1002,8 +1002,11 @@ static int filter_init_server_data(struct obd_device *obd, struct file * filp) /* b13079: this should be set to desired value for ost */ obd->obd_recovery_max_time = OBD_RECOVERY_MAX_TIME; #endif + } else { + LASSERT(!obd->obd_recovering); + /* VBR: update boot epoch after recovery */ + filter_update_last_epoch(obd); } - out: filter->fo_mount_count = mount_count + 1; fsd->lsd_mount_count = cpu_to_le64(filter->fo_mount_count); @@ -1918,10 +1921,6 @@ int filter_common_setup(struct obd_device *obd, obd_count len, void *buf, obd->obd_lvfs_ctxt.fs = get_ds(); obd->obd_lvfs_ctxt.cb_ops = filter_lvfs_ops; - rc = filter_prep(obd); - if (rc) - GOTO(err_ops, rc); - filter->fo_destroy_in_progress = 0; sema_init(&filter->fo_create_lock, 1); spin_lock_init(&filter->fo_translock); @@ -1935,6 +1934,10 @@ int filter_common_setup(struct obd_device *obd, obd_count len, void *buf, filter->fo_fmd_max_num = FILTER_FMD_MAX_NUM_DEFAULT; filter->fo_fmd_max_age = FILTER_FMD_MAX_AGE_DEFAULT; + rc = filter_prep(obd); + if (rc) + GOTO(err_ops, rc); + sprintf(ns_name, "filter-%s", obd->obd_uuid.uuid); obd->obd_namespace = ldlm_namespace_new(obd, ns_name, LDLM_NAMESPACE_SERVER, LDLM_NAMESPACE_GREEDY); -- 1.8.3.1