}
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 for at least %d:%.02d, or until %d "
- "client%s reconnect%s. \n",
- obd->obd_name, lustre_cfg_string(lcfg, 1),
- label ?: "", label ? "/" : "", str,
+ LCONSOLE_INFO("%s: Now serving %s on %s with recovery %s\n",
+ obd->obd_name, label ?: str, lsi->lsi_lmd->lmd_dev,
+ obd->obd_replayable ? "enabled" : "disabled");
+
+ if (obd->obd_recovering)
+ LCONSOLE_WARN("%s: Will be in recovery for at least %d:%.02d, "
+ "or until %d client%s reconnect%s\n",
+ obd->obd_name,
obd->obd_recovery_timeout / 60,
obd->obd_recovery_timeout % 60,
obd->obd_recoverable_clients,
- (obd->obd_recoverable_clients == 1) ? "":"s",
- (obd->obd_recoverable_clients == 1) ? "s":"");
- } else {
- LCONSOLE_INFO("MDT %s now serving %s (%s%s%s) with recovery "
- "%s\n", obd->obd_name, lustre_cfg_string(lcfg, 1),
- label ?: "", label ? "/" : "", str,
- obd->obd_replayable ? "enabled" : "disabled");
- }
+ obd->obd_recoverable_clients == 1 ? "" : "s",
+ obd->obd_recoverable_clients == 1 ? "s": "");
/* Reduce the initial timeout on an MDS because it doesn't need such
* a long timeout as an OST does. Adaptive timeouts will adjust this
if (rc)
GOTO(out_mnt, rc);
- LCONSOLE_WARN("Server %s on device %s has started\n",
- ((lsi->lsi_lmd->lmd_flags & LMD_FLG_NOSVC) &&
- (IS_MDT(lsi->lsi_ldd))) ? "MGS" : lsi->lsi_ldd->ldd_svname,
- lsi->lsi_lmd->lmd_dev);
-
RETURN(0);
out_mnt:
/* We jump here in case of failure while starting targets or MGS.
}
label = fsfilt_get_label(obd, obd->u.obt.obt_sb);
-
- if (obd->obd_recovering) {
- LCONSOLE_WARN("OST %s now serving %s (%s%s%s), but will be in "
- "recovery for at least %d:%.02d, or until %d "
- "client%s reconnect%s.\n",
- obd->obd_name, lustre_cfg_string(lcfg, 1),
- label ?: "", label ? "/" : "", str,
+ LCONSOLE_INFO("%s: Now serving %s %s%s with recovery %s\n",
+ obd->obd_name, label ?: str, lmi ? "on " : "",
+ lmi ? s2lsi(lmi->lmi_sb)->lsi_lmd->lmd_dev : "",
+ obd->obd_replayable ? "enabled" : "disabled");
+
+ if (obd->obd_recovering)
+ LCONSOLE_WARN("%s: Will be in recovery for at least %d:%.02d, "
+ "or until %d client%s reconnect%s\n",
+ obd->obd_name,
obd->obd_recovery_timeout / 60,
obd->obd_recovery_timeout % 60,
obd->obd_recoverable_clients,
- obd->obd_recoverable_clients == 1 ? "":"s",
- obd->obd_recoverable_clients == 1 ? "s":"");
- } else {
- LCONSOLE_INFO("OST %s now serving %s (%s%s%s) with recovery "
- "%s\n", obd->obd_name, lustre_cfg_string(lcfg, 1),
- label ?: "", label ? "/" : "", str,
- obd->obd_replayable ? "enabled" : "disabled");
- }
+ obd->obd_recoverable_clients == 1 ? "" : "s",
+ obd->obd_recoverable_clients == 1 ? "s": "");
RETURN(0);