]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
rbd-mirror: make stop properly cancel restart
authorMykola Golub <mgolub@suse.com>
Tue, 5 May 2020 14:23:59 +0000 (15:23 +0100)
committerMykola Golub <mgolub@suse.com>
Thu, 10 Jun 2021 12:00:03 +0000 (15:00 +0300)
commitadd2cc669502162f327a239b12a1904ebc8b1bbd
tree70058daf8daa7408d0ddcc80ba1584b3c667b0ab
parente4d083d98ac56eee6184415ecca0f81c7f112910
rbd-mirror: make stop properly cancel restart

Previously, if stop was issued when restart was at "stopping"
stage, the stop was just ignored.

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 0a3794e56256be33a71e363da34ee84ffc34fef7)

Conflicts:
src/tools/rbd_mirror/ImageReplayer.cc (FunctionContext vs LambdaContext,
                                       update stop's args in handle_remote_journal_metadata_updated)
src/tools/rbd_mirror/ImageReplayer.h (Mutex vs ceph::mutex)
src/tools/rbd_mirror/ImageReplayer.cc
src/tools/rbd_mirror/ImageReplayer.h