LU-6808 ptlrpc: properly set "rq_xid" for 4MB IO

[fs/lustre-release.git] / lustre / ldlm / ldlm_lib.c

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index e31274b..95e566d 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -404,17 +404,17 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg)
         * from OFD after connecting. */
        cli->cl_max_pages_per_rpc = PTLRPC_MAX_BRW_PAGES;
 
-       /* set cl_chunkbits default value to PAGE_CACHE_SHIFT,
+       /* set cl_chunkbits default value to PAGE_SHIFT,
         * it will be updated at OSC connection time. */
-       cli->cl_chunkbits = PAGE_CACHE_SHIFT;
+       cli->cl_chunkbits = PAGE_SHIFT;
 
        if (!strcmp(name, LUSTRE_MDC_NAME)) {
                cli->cl_max_rpcs_in_flight = OBD_MAX_RIF_DEFAULT;
-       } else if (totalram_pages >> (20 - PAGE_CACHE_SHIFT) <= 128 /* MB */) {
+       } else if (totalram_pages >> (20 - PAGE_SHIFT) <= 128 /* MB */) {
                cli->cl_max_rpcs_in_flight = 2;
-       } else if (totalram_pages >> (20 - PAGE_CACHE_SHIFT) <= 256 /* MB */) {
+       } else if (totalram_pages >> (20 - PAGE_SHIFT) <= 256 /* MB */) {
                cli->cl_max_rpcs_in_flight = 3;
-       } else if (totalram_pages >> (20 - PAGE_CACHE_SHIFT) <= 512 /* MB */) {
+       } else if (totalram_pages >> (20 - PAGE_SHIFT) <= 512 /* MB */) {
                cli->cl_max_rpcs_in_flight = 4;
        } else {
                if (osc_on_mdt(obddev->obd_name))
@@ -769,14 +769,36 @@ static int target_handle_reconnect(struct lustre_handle *conn,
        now = cfs_time_current();
        deadline = cfs_timer_deadline(&target->obd_recovery_timer);
        if (cfs_time_before(now, deadline)) {
+               struct target_distribute_txn_data *tdtd =
+                                       class_exp2tgt(exp)->lut_tdtd;
+               int size = 0;
+               int count = 0;
+               char *buf = NULL;
+
                timeout = cfs_duration_sec(cfs_time_sub(deadline, now));
-               LCONSOLE_WARN("%s: Client %s (at %s) reconnecting,"
-                       " waiting for %d clients in recovery for"
-                       " %d:%.02d\n", target->obd_name,
-                       obd_uuid2str(&exp->exp_client_uuid),
-                       obd_export_nid2str(exp),
-                       target->obd_max_recoverable_clients,
-                       timeout / 60, timeout % 60);
+               if (tdtd && tdtd->tdtd_show_update_logs_retrievers)
+                       buf = tdtd->tdtd_show_update_logs_retrievers(
+                               tdtd->tdtd_show_retrievers_cbdata,
+                               &size, &count);
+
+               if (count > 0)
+                       LCONSOLE_WARN("%s: Recovery already passed deadline "
+                                     "%d:%.02d. It is due to DNE recovery "
+                                     "failed/stuck on the %d MDT(s):%s. "
+                                     "Please wait until all MDTs recovered "
+                                     "or abort the recovery by force.\n",
+                                     target->obd_name, timeout / 60,
+                                     timeout % 60, count,
+                                     buf ? buf : "unknown (not enough RAM)");
+               else
+                       LCONSOLE_WARN("%s: Recovery already passed deadline "
+                                     "%d:%.02d. If you do not want to wait "
+                                     "more, please abort the recovery by "
+                                     "force.\n", target->obd_name,
+                                     timeout / 60, timeout % 60);
+
+               if (buf != NULL)
+                       OBD_FREE(buf, size);
        } else {
                timeout = cfs_duration_sec(cfs_time_sub(now, deadline));
                LCONSOLE_WARN("%s: Recovery already passed deadline"
@@ -3152,8 +3174,7 @@ int target_bulk_io(struct obd_export *exp, struct ptlrpc_bulk_desc *desc,
                if (req->rq_bulk_read)
                        rc = sptlrpc_svc_wrap_bulk(req, desc);
 
-               if ((exp->exp_connect_data.ocd_connect_flags &
-                    OBD_CONNECT_BULK_MBITS) != 0)
+               if (OCD_HAS_FLAG(&exp->exp_connect_data, BULK_MBITS))
                        req->rq_mbits = lustre_msg_get_mbits(req->rq_reqmsg);
                else /* old version, bulk matchbits is rq_xid */
                        req->rq_mbits = req->rq_xid;