openstack/charm-percona-cluster
Code Issues Proposed changes

Sync helpers for 20.05

Browse Source 
Change-Id: Ibc49348b236c1b7dd4dc4ab2408940180b60cff0
This commit is contained in:
Aurelien Lourot 2020-05-18 14:49:44 +02:00
parent 2f69eeb003
commit 654d4bfc4c
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,5 +1,5 @@
#!/usr/bin/make #!/usr/bin/make
PYTHON := /usr/bin/env python PYTHON := /usr/bin/env python3
export PYTHONPATH := hooks export PYTHONPATH := hooks
lint: lint:

38
charmhelpers/contrib/storage/linux/ceph.py
View File

@ -92,6 +92,7 @@ DEFAULT_PGS_PER_OSD_TARGET = 100
DEFAULT_POOL_WEIGHT = 10.0 DEFAULT_POOL_WEIGHT = 10.0
LEGACY_PG_COUNT = 200 LEGACY_PG_COUNT = 200
DEFAULT_MINIMUM_PGS = 2 DEFAULT_MINIMUM_PGS = 2
AUTOSCALER_DEFAULT_PGS = 32
class OsdPostUpgradeError(Exception): class OsdPostUpgradeError(Exception):
@ -399,16 +400,28 @@ class ReplicatedPool(Pool):
def create(self): def create(self):
if not pool_exists(self.service, self.name): if not pool_exists(self.service, self.name):
nautilus_or_later = cmp_pkgrevno('ceph-common', '14.2.0') >= 0
# Create it # Create it
cmd = ['ceph', '--id', self.service, 'osd', 'pool', 'create', if nautilus_or_later:
self.name, str(self.pg_num)] cmd = [
'ceph', '--id', self.service, 'osd', 'pool', 'create',
'--pg-num-min={}'.format(
min(AUTOSCALER_DEFAULT_PGS, self.pg_num)
),
self.name, str(self.pg_num)
]
else:
cmd = [
'ceph', '--id', self.service, 'osd', 'pool', 'create',
self.name, str(self.pg_num)
]
try: try:
check_call(cmd) check_call(cmd)
# Set the pool replica size # Set the pool replica size
update_pool(client=self.service, update_pool(client=self.service,
pool=self.name, pool=self.name,
settings={'size': str(self.replicas)}) settings={'size': str(self.replicas)})
nautilus_or_later = cmp_pkgrevno('ceph-common', '14.2.0') >= 0
if nautilus_or_later: if nautilus_or_later:
# Ensure we set the expected pool ratio # Ensure we set the expected pool ratio
update_pool(client=self.service, update_pool(client=self.service,
@ -466,10 +479,24 @@ class ErasurePool(Pool):
k = int(erasure_profile['k']) k = int(erasure_profile['k'])
m = int(erasure_profile['m']) m = int(erasure_profile['m'])
pgs = self.get_pgs(k + m, self.percent_data) pgs = self.get_pgs(k + m, self.percent_data)
nautilus_or_later = cmp_pkgrevno('ceph-common', '14.2.0') >= 0
# Create it # Create it
cmd = ['ceph', '--id', self.service, 'osd', 'pool', 'create', if nautilus_or_later:
cmd = [
'ceph', '--id', self.service, 'osd', 'pool', 'create',
'--pg-num-min={}'.format(
min(AUTOSCALER_DEFAULT_PGS, pgs)
),
self.name, str(pgs), str(pgs), self.name, str(pgs), str(pgs),
'erasure', self.erasure_code_profile] 'erasure', self.erasure_code_profile
]
else:
cmd = [
'ceph', '--id', self.service, 'osd', 'pool', 'create',
self.name, str(pgs), str(pgs),
'erasure', self.erasure_code_profile
]
try: try:
check_call(cmd) check_call(cmd)
try: try:
@ -478,7 +505,6 @@ class ErasurePool(Pool):
name=self.app_name) name=self.app_name)
except CalledProcessError: except CalledProcessError:
log('Could not set app name for pool {}'.format(self.name, level=WARNING)) log('Could not set app name for pool {}'.format(self.name, level=WARNING))
nautilus_or_later = cmp_pkgrevno('ceph-common', '14.2.0') >= 0
if nautilus_or_later: if nautilus_or_later:
# Ensure we set the expected pool ratio # Ensure we set the expected pool ratio
update_pool(client=self.service, update_pool(client=self.service,