test/rgw: refactor test_multi.py for use in qa suite #14433

cbodley · 2017-04-10T13:34:53Z

at a high level, this patch set:

creates a new rgw_multi module under src/test/rgw/
moves test cases from test_multi.py into rgw_multi/tests.py,
adds a rgw_multi/multisite.py that provides interfaces for rgw_multi/tests.py, and
rewrites test_multi.py to implement those interfaces in rgw_multi/multisite.py in terms of mstart.sh and related shell scripts. the usage of test_multi.py remains unchanged

the main goal is to factor out the parts that depend on shell scripts like mstart.sh, so that we can run these test cases inside of the rgw qa suite against clusters set up in teuthology

rgw_multi/multisite.py contains a SystemObject base class and derived classes for Zone, ZoneGroup, Period, Realm, and User. these classes provide wrappers for the radosgw-admin commands that manipulate them, along with the ability to parse the resulting json. rgw_multi/multisite.py also includes some interfaces for Cluster and Gateway that abstract away those details of the test environment

the first commit reverts some changes to underlying shell scripts that forced cluster names to use a zgX-cY format (from zonegroup support in #14216). the second commit goes on to update and complete the unused test-rgw-multisite.sh script

use of the logging module was inspired by @theanalyst's work in #10609

cbodley · 2017-04-10T14:36:19Z

requesting feedback on the organization of rgw_multi.py, rgw_multi_tests.py, and test_multi.py. i have a feeling that rgw_multi.py and rgw_multi_tests.py belong under ceph/qa/ somewhere, maybe ceph/qa/workunits/rgw? in that case, i'm not sure how to make ceph/src/test/rgw/test_multi.py find them without messing with PYTHONPATH

theanalyst · 2017-04-10T16:15:49Z

src/test/rgw/rgw_multi.py

+        self.connection = connection
+
+    def start(self, args = None):
+        """ start the gateway """


we could enforce this via the abc module, and the @abstractmethod decorator, but this is also fine https://docs.python.org/2/library/abc.html#abc.abstractmethod

neat, i didn't know about abc. are there concrete advantages to using it in this case? it's hard for me to tell based on the docs (and lack of python background)

well the difference is that this would be caught at runtime when calling the method and the abstract method would raise a TypeError when trying to instantiate an object itself if the derived class didn't implement the method. Since this is a test suite it wouldn't probably matter that much I guess

gotcha. i'm really bad at python, so this is exactly the kind of feedback i need!

theanalyst · 2017-04-10T16:20:37Z

src/test/rgw/rgw_multi_tests.py

+
+def meta_master_log_status(master_zone):
+    cmd = 'mdlog status' + master_zone.zone_args()
+    (mdlog_status_json, retcode) = master_zone.cluster.admin_ro(cmd)


the tuple is not needed as such, but mostly a nit

to clarify, you're saying i should drop the ()s?

theanalyst · 2017-04-10T16:23:16Z

src/test/rgw/rgw_multi_tests.py

+
+    markers={}
+    i = 0
+    for s in mdlog_status:


for i, s in enumerate(mdlog_status)

theanalyst · 2017-04-10T16:24:03Z

src/test/rgw/rgw_multi_tests.py

+    log.info('starting meta checkpoint for zone=%s', zone.name)
+
+    while True:
+        (num_shards, sync_status) = meta_sync_status(zone)


same as earlier comment wrt to function unpacking

theanalyst · 2017-04-10T16:30:25Z

src/test/rgw/test_multi.py


 def gen_access_key():
-     return ''.join(random.SystemRandom().choice(string.ascii_uppercase + string.digits) for _ in range(16))
+    return ''.join(random.SystemRandom().choice(string.ascii_uppercase + string.digits) for _ in range(16))


random.choice(...) would be fine I guess

cbodley · 2017-04-12T18:02:36Z

pushed an update with a few changes:

new files are now in a module located in src/test/rgw/rgw_multi/
removed the Log interface, because test_multi.py and teuthology are both using the logging module anyway
Cluster.admin() and related functions take commands/arguments as a list of strings

cbodley · 2017-04-17T19:29:43Z

pushed an update that uses the abc module to enforce abstract methods

i've made enough progress on the rgw_multisite teuthology task that i don't expect it to require any more changes to this rgw_multi module

this makes the underlying scripts more flexible, because they don't depend on having a cluster name in the zgX-cY format Signed-off-by: Casey Bodley <cbodley@redhat.com>

the script was incomplete and unused, but it seems useful in itself to bring up a simple multisite cluster without having to go through test_multi.py. it's also a good test for functions in the other test-rgw-*.sh scripts Signed-off-by: Casey Bodley <cbodley@redhat.com>

Signed-off-by: Casey Bodley <cbodley@redhat.com>

logging changes inspired by Abhishek Lekshmanan <abhishek@suse.com> Signed-off-by: Casey Bodley <cbodley@redhat.com>

yehudasa · 2017-04-18T23:27:13Z

@cbodley the abc change doesn't work in python2, see yehudasa@fccddad for a fix

cbodley · 2017-04-18T23:37:21Z

thanks @yehudasa, i had just pushed a fix for that

yehudasa

lgtm

cbodley added rgw tests labels Apr 10, 2017

cbodley requested review from yehudasa and oritwas April 10, 2017 13:35

theanalyst reviewed Apr 10, 2017

View reviewed changes

cbodley force-pushed the wip-rgw-multi-py branch from f625cc7 to 840f10a Compare April 12, 2017 17:56

cbodley force-pushed the wip-rgw-multi-py branch from 840f10a to 5a31966 Compare April 17, 2017 19:25

cbodley added 6 commits April 18, 2017 14:49

test/rgw: test_multi.py uses cluster_id for calls

6be0000

this makes the underlying scripts more flexible, because they don't depend on having a cluster name in the zgX-cY format Signed-off-by: Casey Bodley <cbodley@redhat.com>

test/rgw: add skeleton rgw_multi module

173ee90

Signed-off-by: Casey Bodley <cbodley@redhat.com>

test/rgw: add rgw_multi/multisite.py

76c9673

Signed-off-by: Casey Bodley <cbodley@redhat.com>

test/rgw: add tests in rgw_multi/tests.py based on multisite.py

87f8c26

Signed-off-by: Casey Bodley <cbodley@redhat.com>

test/rgw: rewrite test_multi.py in terms of rgw_multi

55f276b

logging changes inspired by Abhishek Lekshmanan <abhishek@suse.com> Signed-off-by: Casey Bodley <cbodley@redhat.com>

cbodley force-pushed the wip-rgw-multi-py branch from 5a31966 to 55f276b Compare April 18, 2017 23:15

yehudasa approved these changes Apr 19, 2017

View reviewed changes

yehudasa merged commit 205a39c into ceph:master Apr 19, 2017

cbodley deleted the wip-rgw-multi-py branch April 19, 2017 17:34

theanalyst mentioned this pull request Apr 20, 2017

[wip] rgw: test_multi use logging module for logs #10609

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test/rgw: refactor test_multi.py for use in qa suite #14433

test/rgw: refactor test_multi.py for use in qa suite #14433

cbodley commented Apr 10, 2017 •

edited

cbodley commented Apr 10, 2017

theanalyst Apr 10, 2017

cbodley Apr 10, 2017

theanalyst Apr 10, 2017 •

edited

cbodley Apr 10, 2017

theanalyst Apr 10, 2017

cbodley Apr 10, 2017

theanalyst Apr 10, 2017

theanalyst Apr 10, 2017

theanalyst Apr 10, 2017

theanalyst Apr 10, 2017

cbodley commented Apr 12, 2017

cbodley commented Apr 17, 2017

yehudasa commented Apr 18, 2017

cbodley commented Apr 18, 2017

yehudasa left a comment

test/rgw: refactor test_multi.py for use in qa suite #14433

test/rgw: refactor test_multi.py for use in qa suite #14433

Conversation

cbodley commented Apr 10, 2017 • edited

cbodley commented Apr 10, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

theanalyst Apr 10, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cbodley commented Apr 12, 2017

cbodley commented Apr 17, 2017

yehudasa commented Apr 18, 2017

cbodley commented Apr 18, 2017

yehudasa left a comment

Choose a reason for hiding this comment

cbodley commented Apr 10, 2017 •

edited

theanalyst Apr 10, 2017 •

edited