From: Alex Zhuravlev <bzzz@whamcloud.com>
Date: Tue, 23 Apr 2019 14:51:28 +0000 (+0300)
Subject: LU-12178 osd: do not rebalance quota under memory pressure
X-Git-Tag: 2.12.53~30
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=c5e5b7cd872eb2fa0028cef8b1a5e5c51b085b44;ds=sidebyside

LU-12178 osd: do not rebalance quota under memory pressure

this will happen eventually.

Signed-off-by: Alex Zhuravlev <bzzz@whamcloud.com>
Change-Id: Ibe4ef9e45deed5ea19169f3affed322351785357
Reviewed-on: https://review.whamcloud.com/34741
Reviewed-by: Patrick Farrell <pfarrell@whamcloud.com>
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c
index 25eebba..41ee352 100644
--- a/lustre/osd-ldiskfs/osd_handler.c
+++ b/lustre/osd-ldiskfs/osd_handler.c
@@ -2083,7 +2083,11 @@ static int osd_trans_cb_add(struct thandle *th, struct dt_txn_commit_cb *dcb)
 static void osd_object_delete(const struct lu_env *env, struct lu_object *l)
 {
 	struct osd_object *obj = osd_obj(l);
+	struct qsd_instance *qsd = osd_def_qsd(osd_obj2dev(obj));
 	struct inode *inode = obj->oo_inode;
+	__u64 projid;
+	qid_t uid;
+	qid_t gid;
 
 	LINVRNT(osd_invariant(obj));
 
@@ -2092,28 +2096,36 @@ static void osd_object_delete(const struct lu_env *env, struct lu_object *l)
 	 */
 
 	osd_index_fini(obj);
-	if (inode != NULL) {
-		struct qsd_instance *qsd = osd_def_qsd(osd_obj2dev(obj));
-		qid_t uid = i_uid_read(inode);
-		qid_t gid = i_gid_read(inode);
-		__u64 projid = i_projid_read(inode);
 
-		obj->oo_inode = NULL;
-		iput(inode);
-		if (!obj->oo_header && qsd) {
-			struct osd_thread_info *info = osd_oti_get(env);
-			struct lquota_id_info *qi = &info->oti_qi;
+	if (!inode)
+		return;
+
+	uid = i_uid_read(inode);
+	gid = i_gid_read(inode);
+	projid = i_projid_read(inode);
+
+	obj->oo_inode = NULL;
+	iput(inode);
 
-			/* Release granted quota to master if necessary */
-			qi->lqi_id.qid_uid = uid;
-			qsd_op_adjust(env, qsd, &qi->lqi_id, USRQUOTA);
+	/* do not rebalance quota if the caller needs to release memory
+	 * otherwise qsd_refresh_usage() may went into a new ldiskfs
+	 * transaction and risk to deadlock - LU-12178 */
+	if (current->flags & (PF_MEMALLOC | PF_KSWAPD))
+		return;
 
-			qi->lqi_id.qid_uid = gid;
-			qsd_op_adjust(env, qsd, &qi->lqi_id, GRPQUOTA);
+	if (!obj->oo_header && qsd) {
+		struct osd_thread_info *info = osd_oti_get(env);
+		struct lquota_id_info *qi = &info->oti_qi;
 
-			qi->lqi_id.qid_uid = projid;
-			qsd_op_adjust(env, qsd, &qi->lqi_id, PRJQUOTA);
-		}
+		/* Release granted quota to master if necessary */
+		qi->lqi_id.qid_uid = uid;
+		qsd_op_adjust(env, qsd, &qi->lqi_id, USRQUOTA);
+
+		qi->lqi_id.qid_uid = gid;
+		qsd_op_adjust(env, qsd, &qi->lqi_id, GRPQUOTA);
+
+		qi->lqi_id.qid_uid = projid;
+		qsd_op_adjust(env, qsd, &qi->lqi_id, PRJQUOTA);
 	}
 }