New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rgw: add --num-zonegroups option for multi test #14216

Merged
merged 1 commit into from Apr 6, 2017

Conversation

Projects
None yet
3 participants
@dongbula

dongbula commented Mar 29, 2017

Signed-off-by: lvshuhua lvshuhua@cmss.chinamobile.com

@yehudasa yehudasa requested a review from cbodley Mar 30, 2017

@dongbula

This comment has been minimized.

dongbula commented Mar 31, 2017

@cbodley please help me review this pr :)

realm.meta_checkpoint()
rgw_zg.meta_checkpoint()

This comment has been minimized.

@cbodley

cbodley Mar 31, 2017

Contributor

i think we still want a RGWRealm in some form. for meta_checkpoint() in particular, we want to wait for all zones in all zonegroups to catch up to the metadata master zone

This comment has been minimized.

@dongbula

dongbula Apr 1, 2017

you are right, i change the RGWRealm to RGWZonegroup to keep those test case behaving like before. Anyway, we need something like real realm.

This comment has been minimized.

@dongbula
@cbodley

in zone_meta_checkpoint(), need to pass realm.master_zone in the call to self.meta_master_log_status(self.master_zone)

(zg_json, retcode) = zone.cluster.rgw_admin('--rgw-realm=' + self.realm + ' --rgw-zonegroup=' + zone.zg + ' --rgw-zone=' + zone.zone_name + ' zone modify --master=1')
(period_json, retcode) = zone.cluster.rgw_admin('--rgw-realm=' + self.realm + ' period update --commit')
(zg_json, retcode) = zone.cluster.rgw_admin('--rgw-realm=' + self.realm_name + ' --rgw-zonegroup=' + zone.zg_name + ' --rgw-zone=' + zone.zone_name + ' zone modify --master=1')
(period_json, retcode) = zone.cluster.rgw_admin('--rgw-realm=' + self.realm_name + ' period update --commit')

This comment has been minimized.

@cbodley

cbodley Apr 3, 2017

Contributor

need to update realm.master_zone here if self.is_master_zg

This comment has been minimized.

@dongbula

dongbula Apr 4, 2017

have added it, thanks

for i in range(1, args.num_zonegroups):
rgw_multi.setup(not args.no_bootstrap, args.tenant)

This comment has been minimized.

@cbodley

cbodley Apr 3, 2017

Contributor

this breaks when there are more than 2 zonegroups - the second loop will repeatedly try to initialize the last zonegroup. need to combine the two for loops:

    for i in range(1, args.num_zonegroups):
        rgw_multi = RGWMulti(i + 1, int(args.num_zones), int(args.gateways_per_zone), master_zg_base_port + 100 * i, master_zg_base_port)
        rgw_multi.setup(not args.no_bootstrap, args.tenant)

also, since rgw_multi isn't used elsewhere (and it no longer means what it used to), could you remove the global rgw_multi?

This comment has been minimized.

@dongbula

dongbula Apr 4, 2017

okey, have done it

lvshuhua
rgw: add --num-zonegroups option for multi test
Signed-off-by: lvshuhua <lvshuhua@cmss.chinamobile.com>
@cbodley

cbodley approved these changes Apr 6, 2017

great work on this, thanks! i look forward to getting better test coverage of multi-zonegroup configurations 👍

@cbodley cbodley merged commit d108f2d into ceph:master Apr 6, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment