Revert some of the CERROR->CDEBUG changes in recovery.

diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index dfd42c5..38d1502 100644 (file)
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -446,7 +446,7 @@ static int expired_request(void *data)
         struct ptlrpc_request *req = data;
 
         ENTRY;
-        CDEBUG(D_HA, "req xid "LPD64" op %d: timeout on conn to %s:%d\n",
+        CERROR("req xid "LPD64" op %d: timeout on conn to %s:%d\n",
                (unsigned long long)req->rq_xid, req->rq_reqmsg->opc,
                req->rq_connection->c_remote_uuid,
                req->rq_import->imp_client->cli_request_portal);
@@ -526,7 +526,7 @@ int ptlrpc_queue_wait(struct ptlrpc_request *req)
                 if (rc)
                         RETURN(rc);
                 
-                CDEBUG(D_HA, "process %d resumed\n", current->pid);
+                CERROR("process %d resumed\n", current->pid);
         }
  resend:
         req->rq_timeout = obd_timeout;

diff --git a/lustre/ptlrpc/recovd.c b/lustre/ptlrpc/recovd.c
index 3a5806a..7afd983 100644 (file)
--- a/lustre/ptlrpc/recovd.c
+++ b/lustre/ptlrpc/recovd.c
@@ -62,7 +62,7 @@ void recovd_conn_fail(struct ptlrpc_connection *conn)
                 return;
         }
                 
-        CDEBUG(D_HA, "connection %p to %s failed\n", conn, conn->c_remote_uuid);
+        CERROR("connection %p to %s failed\n", conn, conn->c_remote_uuid);
         list_del(&rd->rd_managed_chain);
         list_add_tail(&rd->rd_managed_chain, &recovd->recovd_troubled_items);
         rd->rd_phase = RD_TROUBLED;
@@ -140,9 +140,9 @@ static int recovd_handle_event(struct recovd_obd *recovd)
 
         spin_lock(&recovd->recovd_lock);
 
-        CDEBUG(D_HA, "managed: \n");
+        CERROR("managed: \n");
         dump_connection_list(&recovd->recovd_managed_items);
-        CDEBUG(D_HA, "troubled: \n");
+        CERROR("troubled: \n");
         dump_connection_list(&recovd->recovd_troubled_items);
 
         /*
@@ -175,7 +175,7 @@ static int recovd_handle_event(struct recovd_obd *recovd)
                                 rc = -EINVAL;
                                 break;
                         }
-                        CDEBUG(D_HA, "starting recovery for rd %p (conn %p)\n",
+                        CERROR("starting recovery for rd %p (conn %p)\n",
                                rd, class_rd2conn(rd));
                         rd->rd_phase = RD_PREPARING;
                         

diff --git a/lustre/ptlrpc/recover.c b/lustre/ptlrpc/recover.c
index ef91aad..d2e9f47 100644 (file)
--- a/lustre/ptlrpc/recover.c
+++ b/lustre/ptlrpc/recover.c
@@ -73,7 +73,7 @@ int ll_reconnect(struct ptlrpc_connection *conn)
                 old_hdl = imp->imp_handle;
                 imp->imp_handle.addr = request->rq_repmsg->addr;
                 imp->imp_handle.cookie = request->rq_repmsg->cookie;
-                CDEBUG(D_HA, "reconnected to %s@%s (%Lx/%Lx, was %Lx/%Lx)!\n",
+                CERROR("reconnected to %s@%s (%Lx/%Lx, was %Lx/%Lx)!\n",
                        cli->cl_target_uuid, conn->c_remote_uuid,
                        imp->imp_handle.addr, imp->imp_handle.cookie,
                        old_hdl.addr, old_hdl.cookie);
@@ -112,7 +112,7 @@ static int ll_recover_upcall(struct ptlrpc_connection *conn)
                        obd_recovery_upcall, rc);
                 CERROR("Check /proc/sys/lustre/recovery_upcall?\n");
         } else {
-                CDEBUG(D_HA, "Invoked upcall %s for connection %s\n",
+                CERROR("Invoked upcall %s for connection %s\n",
                        argv[0], argv[1]);
         }
         RETURN(rc);
@@ -221,7 +221,7 @@ static int ll_recover_reconnect(struct ptlrpc_connection *conn)
 
 static int ll_retry_recovery(struct ptlrpc_connection *conn)
 {
-        CDEBUG(D_HA, "Recovery has failed on conn %p\n", conn);
+        CERROR("Recovery has failed on conn %p\n", conn);
 #if 0
         /* XXX use a timer, sideshow bob */
         recovd_conn_fail(conn);