b7d4d7
From baeca3c9b70548463ceea0ae27e6f98cf06e96b7 Mon Sep 17 00:00:00 2001
b7d4d7
From: srijan-sivakumar <ssivakum@redhat.com>
b7d4d7
Date: Tue, 28 Jul 2020 22:27:34 +0530
b7d4d7
Subject: [PATCH 526/526] Quota quota_fsck.py, converting byte string to string
b7d4d7
b7d4d7
Issue: The quota_fsck.py script throws an TypeError
b7d4d7
due to the fact that the data is read as bytes and then
b7d4d7
the string operations are applied on the. Now, in python3
b7d4d7
string is unicode and hence we get the type error.
b7d4d7
b7d4d7
Code Changes:
b7d4d7
Decoding the bytes value into utf-8 format.
b7d4d7
b7d4d7
>Change-Id: Ia1ff52a821d664a371c8166692ff506ae39f6e40
b7d4d7
>Signed-off-by: srijan-sivakumar <ssivakum@redhat.com>
b7d4d7
>Fixes: #1401
b7d4d7
Upstream patch: https://review.gluster.org/c/glusterfs/+/24785
b7d4d7
b7d4d7
BUG: 1719171
b7d4d7
Change-Id: Ia1ff52a821d664a371c8166692ff506ae39f6e40
b7d4d7
Signed-off-by: srijan-sivakumar <ssivakum@redhat.com>
b7d4d7
Reviewed-on: https://code.engineering.redhat.com/gerrit/224780
b7d4d7
Tested-by: RHGS Build Bot <nigelb@redhat.com>
b7d4d7
Reviewed-by: Kshithij Iyer <kiyer@redhat.com>
b7d4d7
Reviewed-by: Rinku Kothiya <rkothiya@redhat.com>
b7d4d7
---
b7d4d7
 extras/quota/quota_fsck.py | 1 +
b7d4d7
 1 file changed, 1 insertion(+)
b7d4d7
b7d4d7
diff --git a/extras/quota/quota_fsck.py b/extras/quota/quota_fsck.py
b7d4d7
index 174f2a2..ea8d638 100755
b7d4d7
--- a/extras/quota/quota_fsck.py
b7d4d7
+++ b/extras/quota/quota_fsck.py
b7d4d7
@@ -157,6 +157,7 @@ def get_quota_xattr_brick(dpath):
b7d4d7
     xattr_dict['parents'] = {}
b7d4d7
 
b7d4d7
     for xattr in pairs:
b7d4d7
+        xattr = xattr.decode("utf-8")
b7d4d7
         xattr_key = xattr.split("=")[0]
b7d4d7
         if re.search("# file:", xattr_key):
b7d4d7
             # skip the file comment
b7d4d7
-- 
b7d4d7
1.8.3.1
b7d4d7