Skip to contentSkip to conversation

ceph: add ceph_has_realms_with_quotas() check into ceph_quota_update_statfs()

PATCH In review Viacheslav Dubeyko 2 participants 2 messages Apr 9 – Apr 27

Subsystems (2)
lore
Share & tools
lore

Viacheslav Dubeyko

author maintainer
#0 lore raw

PATCH v2 1/1 ceph: add ceph_has_realms_with_quotas() check into ceph_quota_update_statfs()

From: Viacheslav Dubeyko <[email protected]>

When MDS rejects a session, remove_session_caps() -> __ceph_remove_cap() -> ceph_change_snap_realm() clears i_snap_realm for every inode that loses its last cap. The realm is restored once caps are re-granted after reconnect. It is not a real error and thsi patch changes pr_err_ratelimited_client() on doutc().

Every quota methods ceph_quota_is_max_files_exceeded(), ceph_quota_is_max_bytes_exceeded(), ceph_quota_is_max_bytes_approaching() calls ceph_has_realms_with_quotas() check. This patch adds the missing ceph_has_realms_with_quotas() call into ceph_quota_update_statfs().

v2
Small cleanup by adding braces for multiline if-else statements and changing the comments.

cc Alex Markuze <[email protected]>
cc Ilya Dryomov <[email protected]>
cc Patrick Donnelly <[email protected]>
cc Ceph Development <[email protected]>
---
 fs/ceph/quota.c | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)
fs/ceph/quota.c +25 -8
index 4dc9426643e8..67ce1ff1a421 100644
@@ -230,10 +230,17 @@ static int get_quota_realm(struct ceph_mds_client *mdsc, struct inode *inode,
 	realm = ceph_inode(inode)->i_snap_realm;
 	if (realm)
 		ceph_get_snap_realm(mdsc, realm);
-	else
-		pr_err_ratelimited_client(cl,
-				"%p %llx.%llx null i_snap_realm\n",
-				inode, ceph_vinop(inode));
+	else {
+		/*
+		 * i_snap_realm is NULL when all caps have been released, e.g.
+		 * after an MDS session rejection. This is a transient state;
+		 * the realm will be restored once caps are re-granted.
+		 * Treat it as "no quota realm found".
+		 */
+		doutc(cl, "%p %llx.%llx null i_snap_realm\n",
+		      inode, ceph_vinop(inode));
+	}
+
 	while (realm) {
 		bool has_inode;
 
@@ -342,10 +349,17 @@ static bool check_quota_exceeded(struct inode *inode, enum quota_check_op op,
 	realm = ceph_inode(inode)->i_snap_realm;
 	if (realm)
 		ceph_get_snap_realm(mdsc, realm);
-	else
-		pr_err_ratelimited_client(cl,
-				"%p %llx.%llx null i_snap_realm\n",
-				inode, ceph_vinop(inode));
+	else {
+		/*
+		 * i_snap_realm is NULL when all caps have been released, e.g.
+		 * after an MDS session rejection. This is a transient state;
+		 * the realm will be restored once caps are re-granted.
+		 * Treat it as "quota not exceeded".
+		 */
+		doutc(cl, "%p %llx.%llx null i_snap_realm\n",
+		      inode, ceph_vinop(inode));
+	}
+
 	while (realm) {
 		bool has_inode;
 
@@ -496,6 +510,9 @@ bool ceph_quota_update_statfs(struct ceph_fs_client *fsc, struct kstatfs *buf)
 	u64 total = 0, used, free;
 	bool is_updated = false;
 
+	if (!ceph_has_realms_with_quotas(d_inode(fsc->sb->s_root)))
+		return false;
+
 	down_read(&mdsc->snap_rwsem);
 	get_quota_realm(mdsc, d_inode(fsc->sb->s_root), QUOTA_GET_MAX_BYTES,
 			&realm, true);
Signature · 1 line
2.53.0
maintainer Reviewed-by on v2 1/1
#1 lore raw
Quoted 91 lines · Viacheslav Dubeyko

From: Viacheslav Dubeyko <[email protected]>

When MDS rejects a session, remove_session_caps() -> __ceph_remove_cap() -> ceph_change_snap_realm() clears i_snap_realm for every inode that loses its last cap. The realm is restored once caps are re-granted after reconnect. It is not a real error and thsi patch changes pr_err_ratelimited_client() on doutc().

Every quota methods ceph_quota_is_max_files_exceeded(), ceph_quota_is_max_bytes_exceeded(), ceph_quota_is_max_bytes_approaching() calls ceph_has_realms_with_quotas() check. This patch adds the missing ceph_has_realms_with_quotas() call into ceph_quota_update_statfs().

v2
Small cleanup by adding braces for multiline if-else statements and changing the comments.

cc Alex Markuze <[email protected]>
cc Ilya Dryomov <[email protected]>
cc Patrick Donnelly <[email protected]>
cc Ceph Development <[email protected]>
---
 fs/ceph/quota.c | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)
fs/ceph/quota.c +25 -9
index 4dc9426643e8..67ce1ff1a421 100644
@@ -230,10 +230,17 @@ static int get_quota_realm(struct ceph_mds_client *mdsc, struct inode *inode,
        realm = ceph_inode(inode)->i_snap_realm;
        if (realm)
                ceph_get_snap_realm(mdsc, realm);
-       else
-               pr_err_ratelimited_client(cl,
-                               "%p %llx.%llx null i_snap_realm\n",
-                               inode, ceph_vinop(inode));
+       else {
+               /*
+                * i_snap_realm is NULL when all caps have been released, e.g.
+                * after an MDS session rejection. This is a transient state;
+                * the realm will be restored once caps are re-granted.
+                * Treat it as "no quota realm found".
+                */
+               doutc(cl, "%p %llx.%llx null i_snap_realm\n",
+                     inode, ceph_vinop(inode));
+       }
+
        while (realm) {
                bool has_inode;
 
@@ -342,10 +349,17 @@ static bool check_quota_exceeded(struct inode *inode, enum quota_check_op op,
        realm = ceph_inode(inode)->i_snap_realm;
        if (realm)
                ceph_get_snap_realm(mdsc, realm);
-       else
-               pr_err_ratelimited_client(cl,
-                               "%p %llx.%llx null i_snap_realm\n",
-                               inode, ceph_vinop(inode));
+       else {
+               /*
+                * i_snap_realm is NULL when all caps have been released, e.g.
+                * after an MDS session rejection. This is a transient state;
+                * the realm will be restored once caps are re-granted.
+                * Treat it as "quota not exceeded".
+                */
+               doutc(cl, "%p %llx.%llx null i_snap_realm\n",
+                     inode, ceph_vinop(inode));
+       }
+
        while (realm) {
                bool has_inode;
 
@@ -496,6 +510,9 @@ bool ceph_quota_update_statfs(struct ceph_fs_client *fsc, struct kstatfs *buf)
        u64 total = 0, used, free;
        bool is_updated = false;
 
+       if (!ceph_has_realms_with_quotas(d_inode(fsc->sb->s_root)))
+               return false;
+
        down_read(&mdsc->snap_rwsem);
        get_quota_realm(mdsc, d_inode(fsc->sb->s_root), QUOTA_GET_MAX_BYTES,
                        &realm, true);
--

2.53.0