* GPL HEADER END
*/
/*
- * Copyright (c) 2011, 2012, Intel, Inc.
+ * Copyright (c) 2012, Intel Corporation.
* Use is subject to license terms.
*
* Author: Johann Lombardi <johann.lombardi@intel.com>
struct quota_body *req_qbody,
struct quota_body *rep_qbody,
struct lustre_handle *lockh,
- union ldlm_wire_lvb *lvb,
+ struct lquota_lvb *lvb,
void *arg, int rc)
{
struct qsd_instance *qsd = qqi->qqi_qsd;
CDEBUG(D_QUOTA, "%s: global quota lock successfully acquired, glb "
"fid:"DFID", glb ver:"LPU64", slv fid:"DFID", slv ver:"LPU64"\n",
qsd->qsd_svname, PFID(&req_qbody->qb_fid),
- lvb->l_lquota.lvb_glb_ver, PFID(&rep_qbody->qb_slv_fid),
+ lvb->lvb_glb_ver, PFID(&rep_qbody->qb_slv_fid),
rep_qbody->qb_slv_ver);
*slv_ver = rep_qbody->qb_slv_ver;
fid = global ? &qqi->qqi_fid : &qqi->qqi_slv_fid;
/* let's do a 1MB bulk */
- npages = min_t(unsigned int, PTLRPC_MAX_BRW_SIZE, 1 << 20);
+ npages = min_t(unsigned int, OFD_MAX_BRW_SIZE, 1 << 20);
npages /= CFS_PAGE_SIZE;
/* allocate pages for bulk index read */
lqe = lqe_locate(env, qqi->qqi_site, qid);
if (IS_ERR(lqe)) {
- CWARN("%s: Fail to locate lqe. "DFID", %ld\n",
+ CWARN("%s: failed to locate lqe. "DFID", %ld\n",
qsd->qsd_svname, PFID(&qqi->qqi_fid),
PTR_ERR(lqe));
GOTO(out, rc = PTR_ERR(lqe));
}
- if (!lqe->lqe_enforced) {
- lqe_putref(lqe);
- goto next;
- }
-
rc = qsd_refresh_usage(env, lqe);
if (rc) {
- CWARN("%s: Fail to get usage. "DFID", %d\n",
+ CWARN("%s: failed to get usage. "DFID", %d\n",
qsd->qsd_svname, PFID(&qqi->qqi_fid), rc);
lqe_putref(lqe);
GOTO(out, rc);
}
- rc = qsd_dqacq(env, lqe, QSD_REP);
+ rc = qsd_adjust(env, lqe);
lqe_putref(lqe);
-
if (rc) {
- CWARN("%s: Fail to report quota. "DFID", %d\n",
+ CWARN("%s: failed to report quota. "DFID", %d\n",
qsd->qsd_svname, PFID(&qqi->qqi_fid), rc);
GOTO(out, rc);
}
next:
rc = iops->next(env, it);
if (rc < 0)
- CWARN("%s: Error next "DFID". %d\n", qsd->qsd_svname,
- PFID(&qqi->qqi_fid), rc);
+ CWARN("%s: failed to parse index, ->next error:%d "DFID
+ "\n", qsd->qsd_svname, rc, PFID(&qqi->qqi_fid));
} while (rc == 0);
/* reach the end */
{
int connected;
- cfs_read_lock(&qsd->qsd_lock);
+ read_lock(&qsd->qsd_lock);
connected = qsd->qsd_exp_valid ? 1 : 0;
- cfs_read_unlock(&qsd->qsd_lock);
+ read_unlock(&qsd->qsd_lock);
return connected;
}
{
int started;
- cfs_read_lock(&qsd->qsd_lock);
+ read_lock(&qsd->qsd_lock);
started = qsd->qsd_started ? 1 : 0;
- cfs_read_unlock(&qsd->qsd_lock);
+ read_unlock(&qsd->qsd_lock);
return started;
}
memset(&qti->qti_lvb, 0, sizeof(qti->qti_lvb));
- cfs_read_lock(&qsd->qsd_lock);
+ read_lock(&qsd->qsd_lock);
/* check whether we already own a global quota lock for this type */
if (lustre_handle_is_used(&qqi->qqi_lockh) &&
ldlm_lock_addref_try(&qqi->qqi_lockh, qsd_glb_einfo.ei_mode) == 0) {
- cfs_read_unlock(&qsd->qsd_lock);
+ read_unlock(&qsd->qsd_lock);
/* force refresh of global & slave index copy */
- qti->qti_lvb.l_lquota.lvb_glb_ver = ~0ULL;
+ qti->qti_lvb.lvb_glb_ver = ~0ULL;
qti->qti_slv_ver = ~0ULL;
} else {
/* no valid lock found, let's enqueue a new one */
- cfs_read_unlock(&qsd->qsd_lock);
+ read_unlock(&qsd->qsd_lock);
memset(&qti->qti_body, 0, sizeof(qti->qti_body));
memcpy(&qti->qti_body.qb_fid, &qqi->qqi_fid,
CDEBUG(D_QUOTA, "%s: glb_ver:"LPU64"/"LPU64",slv_ver:"LPU64"/"
LPU64"\n", qsd->qsd_svname,
- qti->qti_lvb.l_lquota.lvb_glb_ver, qqi->qqi_glb_ver,
+ qti->qti_lvb.lvb_glb_ver, qqi->qqi_glb_ver,
qti->qti_slv_ver, qqi->qqi_slv_ver);
}
OBD_FAIL_TIMEOUT(OBD_FAIL_QUOTA_DELAY_REINT, 10);
- if (qqi->qqi_glb_ver != qti->qti_lvb.l_lquota.lvb_glb_ver) {
+ if (qqi->qqi_glb_ver != qti->qti_lvb.lvb_glb_ver) {
rc = qsd_reint_index(env, qqi, true);
if (rc) {
CWARN("%s: reint global for "DFID" failed. %d\n",
out_env:
OBD_FREE_PTR(env);
out:
- cfs_write_lock(&qsd->qsd_lock);
+ write_lock(&qsd->qsd_lock);
qqi->qqi_reint = 0;
- cfs_write_unlock(&qsd->qsd_lock);
+ write_unlock(&qsd->qsd_lock);
qqi_putref(qqi);
lu_ref_del(&qqi->qqi_reference, "reint_thread", thread);
}
}
+static int qsd_entry_iter_cb(cfs_hash_t *hs, cfs_hash_bd_t *bd,
+ cfs_hlist_node_t *hnode, void *data)
+{
+ struct lquota_entry *lqe;
+ int *pending = (int *)data;
+
+ lqe = cfs_hlist_entry(hnode, struct lquota_entry, lqe_hash);
+ LASSERT(atomic_read(&lqe->lqe_ref) > 0);
+
+ lqe_read_lock(lqe);
+ *pending += lqe->lqe_pending_req;
+ lqe_read_unlock(lqe);
+
+ return 0;
+}
+
+static bool qsd_pending_updates(struct qsd_qtype_info *qqi)
+{
+ struct qsd_instance *qsd = qqi->qqi_qsd;
+ struct qsd_upd_rec *upd;
+ struct lquota_entry *lqe, *n;
+ int dqacq = 0;
+ bool updates = false;
+ ENTRY;
+
+ /* any pending quota adjust? */
+ spin_lock(&qsd->qsd_adjust_lock);
+ cfs_list_for_each_entry_safe(lqe, n, &qsd->qsd_adjust_list, lqe_link) {
+ if (lqe2qqi(lqe) == qqi) {
+ cfs_list_del_init(&lqe->lqe_link);
+ lqe_putref(lqe);
+ }
+ }
+ spin_unlock(&qsd->qsd_adjust_lock);
+
+ /* any pending updates? */
+ read_lock(&qsd->qsd_lock);
+ cfs_list_for_each_entry(upd, &qsd->qsd_upd_list, qur_link) {
+ if (upd->qur_qqi == qqi) {
+ read_unlock(&qsd->qsd_lock);
+ CDEBUG(D_QUOTA, "%s: pending %s updates for type:%d.\n",
+ qsd->qsd_svname,
+ upd->qur_global ? "global" : "slave",
+ qqi->qqi_qtype);
+ GOTO(out, updates = true);
+ }
+ }
+ read_unlock(&qsd->qsd_lock);
+
+ /* any pending quota request? */
+ cfs_hash_for_each_safe(qqi->qqi_site->lqs_hash, qsd_entry_iter_cb,
+ &dqacq);
+ if (dqacq) {
+ CDEBUG(D_QUOTA, "%s: pending dqacq for type:%d.\n",
+ qsd->qsd_svname, qqi->qqi_qtype);
+ updates = true;
+ }
+ EXIT;
+out:
+ if (updates)
+ CERROR("%s: Delaying reintegration for qtype:%d until pending "
+ "updates are flushed.\n",
+ qsd->qsd_svname, qqi->qqi_qtype);
+ return updates;
+}
+
int qsd_start_reint_thread(struct qsd_qtype_info *qqi)
{
struct ptlrpc_thread *thread = &qqi->qqi_reint_thread;
if (!qsd_type_enabled(qqi->qqi_qsd, qqi->qqi_qtype))
RETURN(0);
+ if (qqi->qqi_qsd->qsd_acct_failed)
+ /* no space accounting support, can't enable enforcement */
+ RETURN(0);
+
/* check if the reintegration has already started or finished */
- cfs_write_lock(&qsd->qsd_lock);
+ write_lock(&qsd->qsd_lock);
if ((qqi->qqi_glb_uptodate && qqi->qqi_slv_uptodate) ||
qqi->qqi_reint || qsd->qsd_stopping) {
- cfs_write_unlock(&qsd->qsd_lock);
+ write_unlock(&qsd->qsd_lock);
RETURN(0);
}
qqi->qqi_reint = 1;
- cfs_write_unlock(&qsd->qsd_lock);
+ write_unlock(&qsd->qsd_lock);
+
+ /* there could be some unfinished global or index entry updates
+ * (very unlikely), to avoid them messing up with the reint
+ * procedure, we just return and try to re-start reint later. */
+ if (qsd_pending_updates(qqi)) {
+ write_lock(&qsd->qsd_lock);
+ qqi->qqi_reint = 0;
+ write_unlock(&qsd->qsd_lock);
+ RETURN(0);
+ }
rc = cfs_create_thread(qsd_reint_main, (void *)qqi, 0);
if (rc < 0) {
thread_set_flags(thread, SVC_STOPPED);
- cfs_write_lock(&qsd->qsd_lock);
+ write_lock(&qsd->qsd_lock);
qqi->qqi_reint = 0;
- cfs_write_unlock(&qsd->qsd_lock);
+ write_unlock(&qsd->qsd_lock);
RETURN(rc);
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff