Revert "LU-5521 grant: quiet message on grant waiting timeout"

[fs/lustre-release.git] / lustre / osc / osc_cache.c

diff --git a/lustre/osc/osc_cache.c b/lustre/osc/osc_cache.c
index a2779d1..a1f5f8a 100644 (file)
--- a/lustre/osc/osc_cache.c
+++ b/lustre/osc/osc_cache.c
@@ -1470,7 +1470,7 @@ static int osc_enter_cache_try(struct client_obd *cli,
 {
        int rc;
 
-       OSC_DUMP_GRANT(D_CACHE, cli, "need:%d", bytes);
+       OSC_DUMP_GRANT(D_CACHE, cli, "need:%d.\n", bytes);
 
        rc = osc_reserve_grant(cli, bytes);
        if (rc < 0)
@@ -1511,17 +1511,15 @@ static int ocw_granted(struct client_obd *cli, struct osc_cache_waiter *ocw)
 static int osc_enter_cache(const struct lu_env *env, struct client_obd *cli,
                           struct osc_async_page *oap, int bytes)
 {
-       struct osc_object       *osc = oap->oap_obj;
-       struct lov_oinfo        *loi = osc->oo_oinfo;
-       struct osc_cache_waiter  ocw;
-       struct l_wait_info       lwi;
-       int                      rc = -EDQUOT;
+       struct osc_object *osc = oap->oap_obj;
+       struct lov_oinfo  *loi = osc->oo_oinfo;
+       struct osc_cache_waiter ocw;
+       struct l_wait_info lwi = LWI_TIMEOUT_INTR(cfs_time_seconds(600), NULL,
+                                                 LWI_ON_SIGNAL_NOOP, NULL);
+       int rc = -EDQUOT;
        ENTRY;
 
-       lwi = LWI_TIMEOUT_INTR(cfs_time_seconds(AT_OFF ? obd_timeout : at_max),
-                              NULL, LWI_ON_SIGNAL_NOOP, NULL);
-
-       OSC_DUMP_GRANT(D_CACHE, cli, "need:%d", bytes);
+       OSC_DUMP_GRANT(D_CACHE, cli, "need:%d.\n", bytes);
 
        client_obd_list_lock(&cli->cl_loi_list_lock);
 
@@ -1529,16 +1527,12 @@ static int osc_enter_cache(const struct lu_env *env, struct client_obd *cli,
         * of queued writes and create a discontiguous rpc stream */
        if (OBD_FAIL_CHECK(OBD_FAIL_OSC_NO_GRANT) ||
            cli->cl_dirty_max_pages == 0 ||
-           cli->cl_ar.ar_force_sync || loi->loi_ar.ar_force_sync) {
-               OSC_DUMP_GRANT(D_CACHE, cli, "forced sync i/o");
+           cli->cl_ar.ar_force_sync || loi->loi_ar.ar_force_sync)
                GOTO(out, rc = -EDQUOT);
-       }
 
        /* Hopefully normal case - cache space and write credits available */
-       if (osc_enter_cache_try(cli, oap, bytes, 0)) {
-               OSC_DUMP_GRANT(D_CACHE, cli, "granted from cache");
+       if (osc_enter_cache_try(cli, oap, bytes, 0))
                GOTO(out, rc = 0);
-       }
 
        /* We can get here for two reasons: too many dirty pages in cache, or
         * run out of grants. In both cases we should write dirty pages out.
@@ -1563,52 +1557,42 @@ static int osc_enter_cache(const struct lu_env *env, struct client_obd *cli,
 
                client_obd_list_lock(&cli->cl_loi_list_lock);
 
+               /* l_wait_event is interrupted by signal, or timed out */
                if (rc < 0) {
-                       /* l_wait_event is interrupted by signal or timed out */
+                       switch (rc) {
+                       case -ETIMEDOUT:
+                               OSC_DUMP_GRANT(D_ERROR, cli,
+                                               "try to reserve %d.\n", bytes);
+                               osc_extent_tree_dump(D_ERROR, osc);
+                               rc = -EDQUOT;
+                               break;
+                       case -EINTR:
+                               /* Ensures restartability - LU-3581 */
+                               rc = -ERESTARTSYS;
+                               break;
+                       default:
+                               CDEBUG(D_CACHE, "%s: event for cache space @"
+                                      " %p never arrived due to %d\n",
+                                      cli->cl_import->imp_obd->obd_name,
+                                      &ocw, rc);
+                               break;
+                       }
                        list_del_init(&ocw.ocw_entry);
-                       break;
+                       GOTO(out, rc);
                }
+
                LASSERT(list_empty(&ocw.ocw_entry));
                rc = ocw.ocw_rc;
 
                if (rc != -EDQUOT)
-                       break;
-               if (osc_enter_cache_try(cli, oap, bytes, 0)) {
-                       rc = 0;
-                       break;
-               }
-       }
-
-       switch (rc) {
-       case 0:
-               OSC_DUMP_GRANT(D_CACHE, cli, "finally got grant space");
-               break;
-       case -ETIMEDOUT:
-               OSC_DUMP_GRANT(D_CACHE, cli, "timeout, fall back to sync i/o");
-               osc_extent_tree_dump(D_CACHE, osc);
-               /* fall back to synchronous I/O */
-               rc = -EDQUOT;
-               break;
-       case -EINTR:
-               /* Ensures restartability - LU-3581 */
-               OSC_DUMP_GRANT(D_CACHE, cli, "interrupted");
-               rc = -ERESTARTSYS;
-               break;
-       case -EDQUOT:
-               OSC_DUMP_GRANT(D_CACHE, cli, "no grant space, fall back to sync"
-                              " i/o");
-               break;
-       default:
-               CDEBUG(D_CACHE, "%s: event for cache space @ %p never arrived "
-                      "due to %d, fall back to sync i/o\n",
-                      cli->cl_import->imp_obd->obd_name, &ocw, rc);
-               /* fall back to synchronous I/O */
-               rc = -EDQUOT;
-               break;
+                       GOTO(out, rc);
+               if (osc_enter_cache_try(cli, oap, bytes, 0))
+                       GOTO(out, rc = 0);
        }
        EXIT;
 out:
        client_obd_list_unlock(&cli->cl_loi_list_lock);
+       OSC_DUMP_GRANT(D_CACHE, cli, "returned %d.\n", rc);
        RETURN(rc);
 }
 
@@ -1635,8 +1619,10 @@ void osc_wake_cache_waiters(struct client_obd *cli)
                        goto wakeup;
                }
 
-               if (osc_enter_cache_try(cli, ocw->ocw_oap, ocw->ocw_grant, 0))
-                       ocw->ocw_rc = 0;
+               ocw->ocw_rc = 0;
+               if (!osc_enter_cache_try(cli, ocw->ocw_oap, ocw->ocw_grant, 0))
+                       ocw->ocw_rc = -EDQUOT;
+
 wakeup:
                CDEBUG(D_CACHE, "wake up %p for oap %p, avail grant %ld, %d\n",
                       ocw, ocw->ocw_oap, cli->cl_avail_grant, ocw->ocw_rc);