From 063521cc7c0beb5372df2f5ff14867b02faf436b Mon Sep 17 00:00:00 2001 From: Christophe Courtaut Date: Tue, 15 Oct 2013 19:53:03 +0200 Subject: [PATCH] Rename variable to match option parsing variable name (again) The object_timeout variable was renamed object_sync_timeout in the option parser, but not elsewhere. This patch fixes it. Signed-off-by: Christophe Courtaut --- radosgw_agent/cli.py | 4 ++-- radosgw_agent/sync.py | 4 ++-- radosgw_agent/worker.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/radosgw_agent/cli.py b/radosgw_agent/cli.py index 18bb7a3..5e7fea9 100644 --- a/radosgw_agent/cli.py +++ b/radosgw_agent/cli.py @@ -201,7 +201,7 @@ class TestHandler(BaseHTTPRequestHandler): syncer = sync_cls(TestHandler.src, TestHandler.dest, TestHandler.max_entries, rgw_data_log_window=TestHandler.rgw_data_log_window, - object_timeout=TestHandler.object_timeout) + object_sync_timeout=TestHandler.object_sync_timeout) syncer.prepare() syncer.sync( TestHandler.num_workers, @@ -290,7 +290,7 @@ def main(): meta_syncer = meta_cls(src, dest, args.max_entries) data_syncer = data_cls(src, dest, args.max_entries, rgw_data_log_window=args.rgw_data_log_window, - object_timeout=args.object_sync_timeout) + object_sync_timeout=args.object_sync_timeout) # fetch logs first since data logs need to wait before becoming usable # due to rgw's window of data log updates during which the bucket index diff --git a/radosgw_agent/sync.py b/radosgw_agent/sync.py index 6e3cfdb..4ab5c8a 100644 --- a/radosgw_agent/sync.py +++ b/radosgw_agent/sync.py @@ -23,7 +23,7 @@ class Syncer(object): self.worker_cls = None # filled in by subclass constructor self.num_shards = None self.max_entries = max_entries - self.object_timeout = kwargs.get('object_timeout') + self.object_sync_timeout = kwargs.get('object_sync_timeout') def init_num_shards(self): if self.num_shards is not None: @@ -86,7 +86,7 @@ class Syncer(object): self.dest, daemon_id=self.daemon_id, max_entries=max_entries, - object_timeout=self.object_timeout, + object_sync_timeout=self.object_sync_timeout, ) for i in xrange(num_workers)] for process in processes: diff --git a/radosgw_agent/worker.py b/radosgw_agent/worker.py index ab0de6a..538fee9 100644 --- a/radosgw_agent/worker.py +++ b/radosgw_agent/worker.py @@ -166,14 +166,14 @@ class DataWorker(Worker): super(DataWorker, self).__init__(*args, **kwargs) self.type = 'data' self.op_id = 0 - self.object_timeout = kwargs.get('object_timeout', 60 * 60 * 60) + self.object_sync_timeout = kwargs.get('object_sync_timeout', 60 * 60 * 60) self.daemon_id = kwargs['daemon_id'] def sync_object(self, bucket, obj): self.op_id += 1 local_op_id = self.local_lock_id + ':' + str(self.op_id) try: - until = time.time() + self.object_timeout + until = time.time() + self.object_sync_timeout client.sync_object_intra_region(self.dest_conn, bucket, obj, self.src.zone.name, self.daemon_id, -- 2.47.3