[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 11/19] mirror: Double-check immediately before replacing
From: |
Max Reitz |
Subject: |
[PATCH v4 11/19] mirror: Double-check immediately before replacing |
Date: |
Tue, 18 Feb 2020 11:34:46 +0100 |
There is no guarantee that we can still replace the node we want to
replace at the end of the mirror job. Double-check by calling
bdrv_recurse_can_replace().
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block/mirror.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/block/mirror.c b/block/mirror.c
index cacbc70014..447051dbc6 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -700,7 +700,19 @@ static int mirror_exit_common(Job *job)
* drain potential other users of the BDS before changing the graph. */
assert(s->in_drain);
bdrv_drained_begin(target_bs);
- bdrv_replace_node(to_replace, target_bs, &local_err);
+ /*
+ * Cannot use check_to_replace_node() here, because that would
+ * check for an op blocker on @to_replace, and we have our own
+ * there.
+ */
+ if (bdrv_recurse_can_replace(src, to_replace)) {
+ bdrv_replace_node(to_replace, target_bs, &local_err);
+ } else {
+ error_setg(&local_err, "Can no longer replace '%s' by '%s', "
+ "because it can no longer be guaranteed that doing so "
+ "would not lead to an abrupt change of visible data",
+ to_replace->node_name, target_bs->node_name);
+ }
bdrv_drained_end(target_bs);
if (local_err) {
error_report_err(local_err);
--
2.24.1
- [PATCH v4 02/19] blockdev: Allow resizing everywhere, (continued)
- [PATCH v4 02/19] blockdev: Allow resizing everywhere, Max Reitz, 2020/02/18
- [PATCH v4 03/19] block: Drop bdrv_is_first_non_filter(), Max Reitz, 2020/02/18
- [PATCH v4 04/19] iotests: Let 041 use -blockdev for quorum children, Max Reitz, 2020/02/18
- [PATCH v4 05/19] quorum: Fix child permissions, Max Reitz, 2020/02/18
- [PATCH v4 06/19] block: Add bdrv_recurse_can_replace(), Max Reitz, 2020/02/18
- [PATCH v4 07/19] blkverify: Implement .bdrv_recurse_can_replace(), Max Reitz, 2020/02/18
- [PATCH v4 08/19] quorum: Implement .bdrv_recurse_can_replace(), Max Reitz, 2020/02/18
- [PATCH v4 09/19] block: Use bdrv_recurse_can_replace(), Max Reitz, 2020/02/18
- [PATCH v4 10/19] block: Remove bdrv_recurse_is_first_non_filter(), Max Reitz, 2020/02/18
- [PATCH v4 12/19] quorum: Stop marking it as a filter, Max Reitz, 2020/02/18
- [PATCH v4 11/19] mirror: Double-check immediately before replacing,
Max Reitz <=
- [PATCH v4 13/19] iotests: Use complete_and_wait() in 155, Max Reitz, 2020/02/18
- [PATCH v4 14/19] iotests: Add VM.assert_block_path(), Max Reitz, 2020/02/18
- [PATCH v4 16/19] iotests: Resolve TODOs in 041, Max Reitz, 2020/02/18
- [PATCH v4 15/19] iotests/041: Drop superfluous shutdowns, Max Reitz, 2020/02/18
- [PATCH v4 17/19] iotests: Use self.image_len in TestRepairQuorum, Max Reitz, 2020/02/18
- [PATCH v4 18/19] iotests: Add tests for invalid Quorum @replaces, Max Reitz, 2020/02/18
- [PATCH v4 19/19] iotests: Check that @replaces can replace filters, Max Reitz, 2020/02/18