LU-10795 quota: fix wrong skipping of reintegration

[fs/lustre-release.git] / lustre / quota / qsd_lib.c

diff --git a/lustre/quota/qsd_lib.c b/lustre/quota/qsd_lib.c
index 1bf6533..ffaa77a 100644 (file)
--- a/lustre/quota/qsd_lib.c
+++ b/lustre/quota/qsd_lib.c
@@ -85,6 +85,8 @@ static int qsd_state_seq_show(struct seq_file *m, void *data)
                strcat(enabled, "u");
        if (qsd_type_enabled(qsd, GRPQUOTA))
                strcat(enabled, "g");
+       if (qsd_type_enabled(qsd, PRJQUOTA))
+               strncat(enabled, "p", 1);
        if (strlen(enabled) == 0)
                strcat(enabled, "none");
 
@@ -103,18 +105,24 @@ static int qsd_state_seq_show(struct seq_file *m, void *data)
                        strcat(enabled, "u");
                if (qsd->qsd_type_array[GRPQUOTA]->qqi_acct_obj != NULL)
                        strcat(enabled, "g");
+               if (qsd->qsd_type_array[PRJQUOTA]->qqi_acct_obj != NULL)
+                       strncat(enabled, "p", 1);
                if (strlen(enabled) == 0)
                        strcat(enabled, "none");
                seq_printf(m, "space acct:     %s\n"
                           "user uptodate:  glb[%d],slv[%d],reint[%d]\n"
-                          "group uptodate: glb[%d],slv[%d],reint[%d]\n",
+                          "group uptodate: glb[%d],slv[%d],reint[%d]\n"
+                          "project uptodate: glb[%d],slv[%d],reint[%d]\n",
                           enabled,
                           qsd->qsd_type_array[USRQUOTA]->qqi_glb_uptodate,
                           qsd->qsd_type_array[USRQUOTA]->qqi_slv_uptodate,
                           qsd->qsd_type_array[USRQUOTA]->qqi_reint,
                           qsd->qsd_type_array[GRPQUOTA]->qqi_glb_uptodate,
                           qsd->qsd_type_array[GRPQUOTA]->qqi_slv_uptodate,
-                          qsd->qsd_type_array[GRPQUOTA]->qqi_reint);
+                          qsd->qsd_type_array[GRPQUOTA]->qqi_reint,
+                          qsd->qsd_type_array[PRJQUOTA]->qqi_glb_uptodate,
+                          qsd->qsd_type_array[PRJQUOTA]->qqi_slv_uptodate,
+                          qsd->qsd_type_array[PRJQUOTA]->qqi_reint);
        }
        return 0;
 }
@@ -132,6 +140,8 @@ static int qsd_enabled_seq_show(struct seq_file *m, void *data)
                strcat(enabled, "u");
        if (qsd_type_enabled(qsd, GRPQUOTA))
                strcat(enabled, "g");
+       if (qsd_type_enabled(qsd, PRJQUOTA))
+               strncat(enabled, "p", 1);
        if (strlen(enabled) == 0)
                strcat(enabled, "none");
 
@@ -345,6 +355,8 @@ static void qsd_qtype_fini(const struct lu_env *env, struct qsd_instance *qsd,
 
 static const char *qtype2acct_name(int qtype)
 {
+       static char unknown[24];
+
        switch (qtype) {
        case USRQUOTA:
                return "acct_user";
@@ -354,12 +366,14 @@ static const char *qtype2acct_name(int qtype)
                return "acct_project";
        }
 
-       LASSERTF(0, "invalid quota type: %d", qtype);
-       return NULL;
+       snprintf(unknown, sizeof(unknown), "acct_unknown_%u", qtype);
+       return unknown;
 }
 
 static const char *qtype2glb_name(int qtype)
 {
+       static char unknown[24];
+
        switch (qtype) {
        case USRQUOTA:
                return "limit_user";
@@ -369,8 +383,8 @@ static const char *qtype2glb_name(int qtype)
                return "limit_project";
        }
 
-       LASSERTF(0, "invalid quota type: %d", qtype);
-       return NULL;
+       snprintf(unknown, sizeof(unknown), "acct_unknown_%u", qtype);
+       return unknown;
 }
 
 /*
@@ -426,7 +440,7 @@ static int qsd_qtype_init(const struct lu_env *env, struct qsd_instance *qsd,
                       qsd->qsd_svname, qtype_name(qtype),
                       PTR_ERR(qqi->qqi_acct_obj));
                qqi->qqi_acct_obj = NULL;
-               qsd->qsd_acct_failed = true;
+               qqi->qqi_acct_failed = true;
        }
 
        /* open global index copy */
@@ -536,11 +550,9 @@ void qsd_fini(const struct lu_env *env, struct qsd_instance *qsd)
        for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++)
                qsd_qtype_fini(env, qsd, qtype);
 
-       if (qsd->qsd_exp) {
-               /* deregister connection to the quota master */
-               qsd->qsd_exp_valid = false;
-               lustre_deregister_lwp_item(&qsd->qsd_exp);
-       }
+       /* deregister connection to the quota master */
+       qsd->qsd_exp_valid = false;
+       lustre_deregister_lwp_item(&qsd->qsd_exp);
 
        /* release per-filesystem information */
        if (qsd->qsd_fsinfo != NULL) {
@@ -740,13 +752,14 @@ int qsd_prepare(const struct lu_env *env, struct qsd_instance *qsd)
        for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++) {
                struct qsd_qtype_info   *qqi = qsd->qsd_type_array[qtype];
 
-               if (qsd_type_enabled(qsd, qtype) && qsd->qsd_acct_failed) {
+               if (qsd_type_enabled(qsd, qtype) &&
+                   qqi->qqi_acct_failed) {
                        LCONSOLE_ERROR("%s: can't enable quota enforcement "
                                       "since space accounting isn't functional"
                                       ". Please run tunefs.lustre --quota on "
                                       "an unmounted filesystem if not done "
                                       "already\n", qsd->qsd_svname);
-                       break;
+                       continue;
                }
 
                rc = qsd_start_reint_thread(qqi);