From: Kotresh HR <khiremat@redhat.com>
Date: Fri, 19 Feb 2021 11:08:31 +0000 (+0530)
Subject: pybind/ceph_volume_client: Fix auth-metadata file recovery
X-Git-Tag: v15.2.10~18^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3c9a4837d113192eac5773f3d9f16de7de9c06e8;p=ceph.git

pybind/ceph_volume_client: Fix auth-metadata file recovery

Fixes: https://tracker.ceph.com/issues/49294
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 99cdfdad59175a19bc06859e69301ca0478a2db4)
---

diff --git a/src/pybind/ceph_volume_client.py b/src/pybind/ceph_volume_client.py
index 393d0033acdb..0253bbb353f7 100644
--- a/src/pybind/ceph_volume_client.py
+++ b/src/pybind/ceph_volume_client.py
@@ -380,6 +380,8 @@ class CephFSVolumeClient(object):
                 # VMeta update looks clean. Ceph auth update must have been
                 # clean.
                 if vol_meta['auths'][auth_id] == want_auth:
+                    auth_meta['subvolumes'][volume]['dirty'] = False
+                    self._auth_metadata_set(auth_id, auth_meta)
                     continue
 
                 readonly = access_level == 'r'