Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mimic: rbd-mirror: handle duplicates in image sync throttler queue #28815

Merged
merged 1 commit into from Jul 16, 2019

Conversation

@trociny
Copy link
Contributor

trociny commented Jul 1, 2019

@trociny trociny added this to the mimic milestone Jul 1, 2019
@smithfarm

This comment has been minimized.

Copy link
Contributor

smithfarm commented Jul 8, 2019

jenkins test make check

@smithfarm

This comment has been minimized.

Copy link
Contributor

smithfarm commented Jul 8, 2019

Does not compile:

Scanning dependencies of target librbd
[ 78%] Building CXX object src/librbd/CMakeFiles/librbd.dir/librbd.cc.o
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/rbd_mirror/test_mock_ImageSyncThrottler.cc: In member function 'virtual void rbd::mirror::TestMockImageSyncThrottler_Duplicate_Test::TestBody()':
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/rbd_mirror/test_mock_ImageSyncThrottler.cc:117:50: error: no matching function for call to 'rbd::mirror::ImageSyncThrottler<librbd::{anonymous}::MockTestImageCtx>::ImageSyncThrottler(CephContext*&)'
   MockImageSyncThrottler throttler(g_ceph_context);
                                                  ^
In file included from /home/jenkins-build/build/workspace/ceph-pull-requests/src/test/rbd_mirror/test_mock_ImageSyncThrottler.cc:33:0:
/home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rbd_mirror/ImageSyncThrottler.cc:31:1: note: candidate: rbd::mirror::ImageSyncThrottler<ImageCtxT>::ImageSyncThrottler() [with ImageCtxT = librbd::{anonymous}::MockTestImageCtx]
 ImageSyncThrottler<I>::ImageSyncThrottler()
 ^~~~~~~~~~~~~~~~~~~~~
/home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rbd_mirror/ImageSyncThrottler.cc:31:1: note:   candidate expects 0 arguments, 1 provided
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/rbd_mirror/test_mock_ImageSyncThrottler.cc: In member function 'virtual void rbd::mirror::TestMockImageSyncThrottler_Duplicate2_Test::TestBody()':
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/rbd_mirror/test_mock_ImageSyncThrottler.cc:140:50: error: no matching function for call to 'rbd::mirror::ImageSyncThrottler<librbd::{anonymous}::MockTestImageCtx>::ImageSyncThrottler(CephContext*&)'
   MockImageSyncThrottler throttler(g_ceph_context);
                                                  ^
In file included from /home/jenkins-build/build/workspace/ceph-pull-requests/src/test/rbd_mirror/test_mock_ImageSyncThrottler.cc:33:0:
/home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rbd_mirror/ImageSyncThrottler.cc:31:1: note: candidate: rbd::mirror::ImageSyncThrottler<ImageCtxT>::ImageSyncThrottler() [with ImageCtxT = librbd::{anonymous}::MockTestImageCtx]
 ImageSyncThrottler<I>::ImageSyncThrottler()
 ^~~~~~~~~~~~~~~~~~~~~
/home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rbd_mirror/ImageSyncThrottler.cc:31:1: note:   candidate expects 0 arguments, 1 provided
make[3]: *** [src/test/rbd_mirror/CMakeFiles/unittest_rbd_mirror.dir/test_mock_ImageSyncThrottler.cc.o] Error 1
make[2]: *** [src/test/rbd_mirror/CMakeFiles/unittest_rbd_mirror.dir/all] Error 2
Fixes: http://tracker.ceph.com/issues/40519
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 2f35ab7)

Conflicts:
    src/test/rbd_mirror/test_mock_ImageSyncThrottler.cc:
       no g_ceph_context arg for MockImageSyncThrottler constructor
@trociny trociny force-pushed the trociny:wip-40593-mimic branch from 8d47ae7 to 6131bda Jul 8, 2019
@trociny

This comment has been minimized.

Copy link
Contributor Author

trociny commented Jul 9, 2019

@smithfarm fixed. Thanks.

Copy link
Contributor

dillaman left a comment

👍

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Jul 15, 2019

@yuriw yuriw merged commit 940d6e0 into ceph:mimic Jul 16, 2019
4 checks passed
4 checks passed
Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.