From 621bfb23bc8b97560f55d94667ab363fd5a0db52 Mon Sep 17 00:00:00 2001 From: Nick Vladiceanu Date: Wed, 5 Sep 2018 12:41:56 +0200 Subject: [PATCH 1/3] Update pump.py --- pump.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pump.py b/pump.py index 21aca110..dd4e92a7 100755 --- a/pump.py +++ b/pump.py @@ -186,13 +186,17 @@ def filter_source_buckets(self, source_map): logging.debug("source_buckets: " + ",".join([n['name'] for n in source_buckets])) - bucket_source = getattr(self.opts, "bucket_source", None) - if bucket_source: - logging.debug("bucket_source: " + bucket_source) - source_buckets = [b for b in source_buckets - if b['name'] == bucket_source] + buckets_source = set(getattr(self.opts, "bucket_source", [])) + if buckets_source: + buckets_source_list = [] + for bucket_source in buckets_source: + logging.debug("bucket_source: " + bucket_source) + buckets_source_list.extend([b for b in source_buckets + if b['name'] == bucket_source]) + source_buckets = buckets_source_list logging.debug("source_buckets filtered: " + - ",".join([n['name'] for n in source_buckets])) + ",".join([n['name'] for n in source_buckets])) + return source_buckets def filter_source_nodes(self, source_bucket, source_map): @@ -1083,7 +1087,8 @@ def find_source_bucket_name(opts, source_map): source_bucket = source_map['buckets'][0]['name'] if not source_bucket: return "error: please specify a bucket_source", None - logging.debug("source_bucket: " + source_bucket) + for bucket in source_bucket: + logging.debug("source_bucket: " + bucket) return 0, source_bucket def find_sink_bucket_name(opts, source_bucket): From 713ef86fde7bf7a659b2dcfb70030c5689feaed0 Mon Sep 17 00:00:00 2001 From: Nick Vladiceanu Date: Wed, 5 Sep 2018 12:44:06 +0200 Subject: [PATCH 2/3] Update pump_transfer.py --- pump_transfer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pump_transfer.py b/pump_transfer.py index 8818a3dd..24bc34f2 100755 --- a/pump_transfer.py +++ b/pump_transfer.py @@ -136,7 +136,7 @@ def opt_parser(self): def opt_parser_options(self, p): p.add_option("-b", "--bucket-source", - action="store", type="string", default=None, + action="append", type="string", default=[], help="""Single named bucket from source cluster to transfer""") p.add_option("-B", "--bucket-destination", action="store", type="string", default=None, From ef2f804893b2e0eb15ccf0d7a0e6efb0aa88ef07 Mon Sep 17 00:00:00 2001 From: Nick Vladiceanu Date: Wed, 5 Sep 2018 14:53:13 +0200 Subject: [PATCH 3/3] Update pump_transfer.py --- pump_transfer.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pump_transfer.py b/pump_transfer.py index 24bc34f2..086720a0 100755 --- a/pump_transfer.py +++ b/pump_transfer.py @@ -136,7 +136,7 @@ def opt_parser(self): def opt_parser_options(self, p): p.add_option("-b", "--bucket-source", - action="append", type="string", default=[], + action="store", type="string", default=None, help="""Single named bucket from source cluster to transfer""") p.add_option("-B", "--bucket-destination", action="store", type="string", default=None, @@ -273,8 +273,8 @@ def __init__(self): def opt_parser_options(self, p): p.add_option("-b", "--bucket-source", - action="store", type="string", default=None, - help="""single bucket from source to backup""") + action="append", type="string", default=[], + help="""single or multiple buckets from source to backup""") p.add_option("", "--single-node", action="store_true", default=False, help="""use a single server node from the source only,