]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rbd-mirror: handle duplicates in image sync throttler queue 28812/head
authorMykola Golub <mgolub@suse.com>
Tue, 25 Jun 2019 04:38:37 +0000 (05:38 +0100)
committerMykola Golub <mgolub@suse.com>
Mon, 8 Jul 2019 17:24:54 +0000 (20:24 +0300)
commita296904e1ff530342cff74459367c0dbcf740940
tree2be2ca4e13d9d37e6506b64dc9945585b81cbf6f
parent94e54db06195b8aaa0730e8482093fb232864eae
rbd-mirror: handle duplicates in image sync throttler queue

Fixes: http://tracker.ceph.com/issues/40519
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 2f35ab70a59fc22c02c98e5aa80a1e6cde29a226)

Conflicts:
    src/test/rbd_mirror/test_mock_ImageSyncThrottler.cc:
       no g_ceph_context arg for MockImageSyncThrottler constructor
src/test/rbd_mirror/test_mock_ImageSyncThrottler.cc
src/tools/rbd_mirror/ImageSyncThrottler.cc
src/tools/rbd_mirror/ImageSyncThrottler.h
src/tools/rbd_mirror/InstanceWatcher.cc