RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-04 23:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17312 from cbodley/wip-21155

Browse Source 
qa: create_cache_pool no longer runs 'pool application enable'

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2017-08-30 00:14:21 +08:00 committed by GitHub
commit d24ba40be3
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qa/tasks/rgw.py
View File

@ -171,7 +171,7 @@ def create_pools(ctx, clients):
create_replicated_pool(remote, data_pool, 64, cluster_name, 'rgw') create_replicated_pool(remote, data_pool, 64, cluster_name, 'rgw')
if ctx.rgw.cache_pools: if ctx.rgw.cache_pools:
create_cache_pool(remote, data_pool, data_pool + '.cache', 64, create_cache_pool(remote, data_pool, data_pool + '.cache', 64,
64*1024*1024, cluster_name, 'rgw') 64*1024*1024, cluster_name)
log.debug('Pools created') log.debug('Pools created')
yield yield

6
qa/tasks/util/rados.py
View File

@ -45,7 +45,7 @@ def create_replicated_pool(remote, name, pgnum, cluster_name="ceph", application
'sudo', 'ceph', 'osd', 'pool', 'application', 'enable', name, application, '--cluster', cluster_name 'sudo', 'ceph', 'osd', 'pool', 'application', 'enable', name, application, '--cluster', cluster_name
]) ])
def create_cache_pool(remote, base_name, cache_name, pgnum, size, cluster_name="ceph", application=None): def create_cache_pool(remote, base_name, cache_name, pgnum, size, cluster_name="ceph"):
remote.run(args=[ remote.run(args=[
'sudo', 'ceph', 'osd', 'pool', 'create', cache_name, str(pgnum), '--cluster', cluster_name 'sudo', 'ceph', 'osd', 'pool', 'create', cache_name, str(pgnum), '--cluster', cluster_name
]) ])
@ -53,10 +53,6 @@ def create_cache_pool(remote, base_name, cache_name, pgnum, size, cluster_name="
'sudo', 'ceph', 'osd', 'tier', 'add-cache', base_name, cache_name, 'sudo', 'ceph', 'osd', 'tier', 'add-cache', base_name, cache_name,
str(size), '--cluster', cluster_name str(size), '--cluster', cluster_name
]) ])
if application:
remote.run(args=[
'sudo', 'ceph', 'osd', 'pool', 'application', 'enable', name, application, '--cluster', cluster_name
])
def cmd_erasure_code_profile(profile_name, profile): def cmd_erasure_code_profile(profile_name, profile):
""" """