From 81c453c46a74e1327683bd645f2807fae76c70a2 Mon Sep 17 00:00:00 2001 From: nathan Date: Mon, 5 Nov 2007 19:31:27 +0000 Subject: [PATCH] b=13537 fix error message --- lustre/mds/handler.c | 11 +++++------ lustre/mds/mds_fs.c | 1 + lustre/obdfilter/filter.c | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c index b325a50..c49acd5 100644 --- a/lustre/mds/handler.c +++ b/lustre/mds/handler.c @@ -2059,18 +2059,17 @@ static int mds_setup(struct obd_device *obd, obd_count len, void *buf) label = fsfilt_get_label(obd, obd->u.obt.obt_sb); if (obd->obd_recovering) { LCONSOLE_WARN("MDT %s now serving %s (%s%s%s), but will be in " - "recovery until %d %s reconnect, or if no clients" - " reconnect for %d:%.02d; during that time new " - "clients will not be allowed to connect. " + "recovery for at least %d:%.02d, or until %d " + "client%s reconnect. During this time new clients" + " will not be allowed to connect. " "Recovery progress can be monitored by watching " "/proc/fs/lustre/mds/%s/recovery_status.\n", obd->obd_name, lustre_cfg_string(lcfg, 1), label ?: "", label ? "/" : "", str, - obd->obd_recoverable_clients, - (obd->obd_recoverable_clients == 1) ? - "client" : "clients", obd->obd_recovery_timeout / 60, obd->obd_recovery_timeout % 60, + obd->obd_max_recoverable_clients, + (obd->obd_max_recoverable_clients == 1) ? "":"s", obd->obd_name); } else { LCONSOLE_INFO("MDT %s now serving %s (%s%s%s) with recovery " diff --git a/lustre/mds/mds_fs.c b/lustre/mds/mds_fs.c index b5214c2..1b94af2 100644 --- a/lustre/mds/mds_fs.c +++ b/lustre/mds/mds_fs.c @@ -462,6 +462,7 @@ static int mds_init_server_data(struct obd_device *obd, struct file *file) obd->obd_recovering = 1; obd->obd_recovery_start = 0; obd->obd_recovery_end = 0; + obd->obd_recovery_timeout = OBD_RECOVERY_FACTOR * obd_timeout; } mds->mds_mount_count = mount_count + 1; diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c index 07defed..0ee1b37 100644 --- a/lustre/obdfilter/filter.c +++ b/lustre/obdfilter/filter.c @@ -835,6 +835,7 @@ static int filter_init_server_data(struct obd_device *obd, struct file * filp) obd->obd_recovering = 1; obd->obd_recovery_start = 0; obd->obd_recovery_end = 0; + obd->obd_recovery_timeout = OBD_RECOVERY_FACTOR * obd_timeout; } out: @@ -1760,18 +1761,17 @@ int filter_common_setup(struct obd_device *obd, obd_count len, void *buf, if (obd->obd_recovering) { LCONSOLE_WARN("OST %s now serving %s (%s%s%s), but will be in " - "recovery until %d %s reconnect, or if no clients" - " reconnect for %d:%.02d; during that time new " - "clients will not be allowed to connect. " + "recovery for at least %d:%.02d, or until %d " + "client%s reconnect. During this time new clients" + " will not be allowed to connect. " "Recovery progress can be monitored by watching " "/proc/fs/lustre/obdfilter/%s/recovery_status.\n", obd->obd_name, lustre_cfg_string(lcfg, 1), label ?: "", label ? "/" : "", str, - obd->obd_recoverable_clients, - (obd->obd_recoverable_clients == 1) - ? "client" : "clients", obd->obd_recovery_timeout / 60, obd->obd_recovery_timeout % 60, + obd->obd_max_recoverable_clients, + (obd->obd_max_recoverable_clients == 1) ? "":"s", obd->obd_name); } else { LCONSOLE_INFO("OST %s now serving %s (%s%s%s) with recovery " -- 1.8.3.1