swift

History

Daisuke Morita 843184f3fe Sync metadata in 'rsync_then_merge' in db_replicator

In previous 'rsync_then_merge' remote objects are merged with
rsync'ed local objects, but remote metadata is not merged with local
one. Account/Container replicator sometimes uses rsync for db sync if
there is a big difference of record history in db files between 'local'
and 'remote' servers. If replicator needs to rsync local db to remote
but metadata in local db is older, older info of metadata can be
distributed then some metadata values can be missing or go back to older.

This patch fixes this problem by merging 'remote' metadata with
rsync'ed local db file.

Closes-Bug: #1570118

Change-Id: Icdf0a936fc456c5462471938cbc365bd012b05d4

2017-05-11 17:39:16 -04:00

account

Make timestamp setting to be consistent in test loop

2017-01-12 17:44:10 -08:00

cli

Fixed get ring name from recon cli

2017-04-13 07:01:03 +00:00

common

Sync metadata in 'rsync_then_merge' in db_replicator

2017-05-11 17:39:16 -04:00

container

Replace 'assertTrue(a not in b)' with 'assertNotIn(a, b)'