openstack
/
charms.ceph
Code Issues Proposed changes

Merge "don't change ownership of empty OSD directories"

This commit is contained in:
Zuul 2019-05-16 11:07:45 +00:00 committed by Gerrit Code Review
parent b32c23a48b 84d384b4c5
commit e4e0100441
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ceph/utils.py
View File

@ -2710,6 +2710,14 @@ def dirs_need_ownership_update(service):
if (curr_owner == expected_owner) and (curr_group == expected_group):
continue
# NOTE(lathiat): when config_changed runs on reboot, the OSD might not
# yet be mounted or started, and the underlying directory the OSD is
# mounted to is expected to be owned by root. So skip the check. This
# may also happen for OSD directories for OSDs that were removed.
if (service == 'osd' and
not os.path.exists(os.path.join(child, 'magic'))):
continue
log('Directory "%s" needs its ownership updated' % child, DEBUG)
return True