set the params for versioned operations before using them

Signed-off-by: Alfredo Deza <adeza@redhat.com>

diff --git a/radosgw_agent/client.py b/radosgw_agent/client.py
index 70d7a17923d71b1769407429f5774421e092ed90..30cbcd265984ba0f7ee0026c2bb023066d9eb5bf 100644 (file)
--- a/radosgw_agent/client.py
+++ b/radosgw_agent/client.py
@@ -303,14 +303,17 @@ def sync_object_intra_region(connection, bucket_name, obj, src_zone,
 
     if is_versioned(obj):
         log.debug('detected obj as versioned: %s' % obj.name)
+
+        # set the extra params to support versioned operations
+        params['rgwx-version-id'] = obj.version_id
+        params['rgwx-versioned-epoch'] = obj.VersionedEpoch
+
         # delete_marker may not exist in the obj
         if getattr(obj, 'delete_marker', None) is True:
             log.debug('obj %s has a delete_marker, marking for deletion' % obj.name)
             # when the object has a delete marker we need to create it with
             # a delete marker on the destination rather than copying
             return mark_delete_object(connection, bucket_name, obj, params=params)
-        params['rgwx-version-id'] = obj.version_id
-        params['rgwx-versioned-epoch'] = obj.VersionedEpoch
 
     path = u'{bucket}/{object}'.format(
         bucket=bucket_name,