From: rread Date: Thu, 29 Jul 2004 20:29:03 +0000 (+0000) Subject: Make recovery on clients less verbose and misleading. X-Git-Tag: v1_7_100~2017 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=169a4f089e9dc5694b0764c987631128b40200f1 Make recovery on clients less verbose and misleading. --- diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c index b54c71f..117b353 100644 --- a/lustre/ptlrpc/import.c +++ b/lustre/ptlrpc/import.c @@ -405,7 +405,7 @@ static int ptlrpc_connect_interpret(struct ptlrpc_request *request, request->rq_repmsg->handle.cookie); imp->imp_remote_handle = request->rq_repmsg->handle; } else { - CERROR("reconnected to %s@%s after partition\n", + CDEBUG(D_HA, "reconnected to %s@%s after partition\n", imp->imp_target_uuid.uuid, imp->imp_connection->c_remote_uuid.uuid); } @@ -427,7 +427,7 @@ static int ptlrpc_connect_interpret(struct ptlrpc_request *request, imp->imp_last_replay_transno = 0; IMPORT_SET_STATE(imp, LUSTRE_IMP_REPLAY); } else { - CWARN("oops! we get evicted from %s\n", imp->imp_target_uuid.uuid); + CDEBUG(D_HA, "oops! we get evicted from %s\n", imp->imp_target_uuid.uuid); imp->imp_remote_handle = request->rq_repmsg->handle; IMPORT_SET_STATE(imp, LUSTRE_IMP_EVICTED); } diff --git a/lustre/ptlrpc/recover.c b/lustre/ptlrpc/recover.c index 6d4af7a..66b1727 100644 --- a/lustre/ptlrpc/recover.c +++ b/lustre/ptlrpc/recover.c @@ -130,16 +130,16 @@ void ptlrpc_initiate_recovery(struct obd_import *imp) LASSERT (obd_lustre_upcall != NULL); if (strcmp(obd_lustre_upcall, "DEFAULT") == 0) { - CDEBUG(D_ERROR, "%s: starting recovery without upcall\n", + CDEBUG(D_HA, "%s: starting recovery without upcall\n", imp->imp_target_uuid.uuid); ptlrpc_connect_import(imp, NULL); } else if (strcmp(obd_lustre_upcall, "NONE") == 0) { - CDEBUG(D_ERROR, "%s: recovery diabled\n", + CDEBUG(D_HA, "%s: recovery disabled\n", imp->imp_target_uuid.uuid); } else { - CDEBUG(D_ERROR, "%s: calling upcall to start recovery\n", + CDEBUG(D_HA, "%s: calling upcall to start recovery\n", imp->imp_target_uuid.uuid); ptlrpc_run_failed_import_upcall(imp); } @@ -374,13 +374,13 @@ static int ptlrpc_recover_import_no_retry(struct obd_import *imp, if (rc) RETURN(rc); - CDEBUG(D_ERROR, "%s: recovery started, waiting\n", + CDEBUG(D_HA, "%s: recovery started, waiting\n", imp->imp_target_uuid.uuid); lwi = LWI_TIMEOUT(MAX(obd_timeout * HZ, 1), NULL, NULL); rc = l_wait_event(imp->imp_recovery_waitq, !ptlrpc_import_in_recovery(imp), &lwi); - CDEBUG(D_ERROR, "%s: recovery finished\n", + CDEBUG(D_HA, "%s: recovery finished\n", imp->imp_target_uuid.uuid); RETURN(rc);