From: Ramana Raja <rraja@redhat.com>
Date: Thu, 27 Aug 2020 11:19:50 +0000 (+0530)
Subject: nautilus: mgr/volumes: convert uid and gid to integer type
X-Git-Tag: v14.2.12~111^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F36833%2Fhead;p=ceph.git

nautilus: mgr/volumes: convert uid and gid to integer type

... before chown in py2 environments.

Introduced-by: 0eaf9b0bd2786762160b83edc52d979f5aad233c
Signed-off-by: Ramana Raja <rraja@redhat.com>
---

diff --git a/src/pybind/mgr/volumes/fs/operations/versions/subvolume_base.py b/src/pybind/mgr/volumes/fs/operations/versions/subvolume_base.py
index f2cca47183c7..851ee0849ac8 100644
--- a/src/pybind/mgr/volumes/fs/operations/versions/subvolume_base.py
+++ b/src/pybind/mgr/volumes/fs/operations/versions/subvolume_base.py
@@ -203,6 +203,7 @@ class SubvolumeBase(object):
             uid = self.group.uid
         else:
             try:
+                uid = int(uid)
                 if uid < 0:
                     raise ValueError
             except ValueError:
@@ -213,6 +214,7 @@ class SubvolumeBase(object):
             gid = self.group.gid
         else:
             try:
+                gid = int(gid)
                 if gid < 0:
                     raise ValueError
             except ValueError: