rename partial sync to incremental sync

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>

diff --git a/radosgw_agent/cli.py b/radosgw_agent/cli.py
index 1039ff98aca3c1cfb3bb56d2a8ffe0af7d19f36a..107fabc96669e7448dd26275734877e8791d991a 100644 (file)
--- a/radosgw_agent/cli.py
+++ b/radosgw_agent/cli.py
@@ -24,7 +24,7 @@ def parse_args():
         )
     args, remaining = conf_parser.parse_known_args()
     defaults = dict(
-        sync_scope='partial',
+        sync_scope='incremental',
         log_lock_time=10,
         )
     if args.conf is not None:
@@ -107,8 +107,8 @@ def parse_args():
         )
     parser.add_argument(
         '--sync-scope',
-        choices=['full', 'partial'],
-        default='partial',
+        choices=['full', 'incremental'],
+        default='incremental',
         help='synchronize everything (for a new region) or only things that '
              'have changed since the last run'
         )
@@ -136,7 +136,7 @@ def parse_args():
         'continuous sync',
         )
     parser.add_argument(
-        '--partial-sync-delay',
+        '--incremental-sync-delay',
         type=check_positive_int,
         default=20,
         help='seconds to wait between syncs',
@@ -177,13 +177,13 @@ class TestHandler(BaseHTTPRequestHandler):
                 log.exception('error doing full sync')
                 status = 500
                 resp = str(e)
-        elif self.path.startswith('/metadata/partial'):
+        elif self.path.startswith('/metadata/incremental'):
             try:
-                TestHandler.syncer.sync_partial(TestHandler.num_workers,
+                TestHandler.syncer.sync_incremental(TestHandler.num_workers,
                                                 TestHandler.lock_timeout,
                                                 TestHandler.max_entries)
             except Exception as e:
-                log.exception('error doing partial sync')
+                log.exception('error doing incremental sync')
                 status = 500
                 resp = str(e)
         else:
@@ -243,10 +243,10 @@ def main():
     else:
         while True:
             try:
-                syncer.sync_partial(args.num_workers, args.lock_timeout,
+                syncer.sync_incremental(args.num_workers, args.lock_timeout,
                                     args.max_entries)
             except:
-                log.exception('error doing partial sync, trying again later')
+                log.exception('error doing incremental sync, trying again later')
             log.debug('waiting %d seconds until next sync',
-                      args.partial_sync_delay)
-            time.sleep(args.partial_sync_delay)
+                      args.incremental_sync_delay)
+            time.sleep(args.incremental_sync_delay)

diff --git a/radosgw_agent/sync.py b/radosgw_agent/sync.py
index f8838590144a813a7a78416cc319e04588e3b763..98552411cd9feac350cd4f2da8ba14a0e084f614 100644 (file)
--- a/radosgw_agent/sync.py
+++ b/radosgw_agent/sync.py
@@ -17,7 +17,7 @@ class Syncer:
         self.dest_conn = client.connection(dest)
         self.daemon_id = daemon_id
 
-    def sync_partial(self, num_workers, log_lock_time, max_entries):
+    def sync_incremental(self, num_workers, log_lock_time, max_entries):
         try:
             num_shards = client.num_log_shards(self.src_conn, self._type)
         except:
@@ -31,9 +31,9 @@ class Syncer:
 
         # create the worker processes
         if self._type == 'data':
-            worker_cls = worker.DataWorkerPartial
+            worker_cls = worker.DataWorkerIncremental
         else:
-            worker_cls = worker.MetadataWorkerPartial
+            worker_cls = worker.MetadataWorkerIncremental
         processes = [worker_cls(workQueue,
                                 resultQueue,
                                 log_lock_time,
@@ -46,7 +46,7 @@ class Syncer:
             process.daemon = True
             process.start()
 
-        log.info('Starting partial sync')
+        log.info('Starting incremental sync')
         # enqueue the shards to be synced
         for i in xrange(num_shards):
             workQueue.put(i)

diff --git a/radosgw_agent/worker.py b/radosgw_agent/worker.py
index 9d7c77dccb9fe01e2ace59083f19c88e3449629d..c45506963219cd3bc3302ec360944f8843d42f84 100644 (file)
--- a/radosgw_agent/worker.py
+++ b/radosgw_agent/worker.py
@@ -73,12 +73,12 @@ class MetadataWorker(Worker):
         else:
             client.update_metadata(self.dest_conn, section, name, metadata)
 
-class MetadataWorkerPartial(MetadataWorker):
+class MetadataWorkerIncremental(MetadataWorker):
 
     def __init__(self, *args, **kwargs):
         self.daemon_id = kwargs['daemon_id']
         self.max_entries = kwargs['max_entries']
-        super(MetadataWorkerPartial, self).__init__(*args, **kwargs)
+        super(MetadataWorkerIncremental, self).__init__(*args, **kwargs)
 
     def get_and_process_entries(self, marker, shard_num):
         num_entries = self.max_entries