aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2010-03-17 14:18:41 +0100
committerPhilipp Reisner <philipp.reisner@linbit.com>2010-05-18 01:01:05 +0200
commite4f925e12ea5daaa9baf2dd5af9c4951721dae95 (patch)
tree1a4022d30e051a58ef68734f11f9db62f9078fad /drivers/block
parent8c484ee4910b36c9ac273ad1150261c6ebfc1ef7 (diff)
downloadkernel_samsung_smdk4412-e4f925e12ea5daaa9baf2dd5af9c4951721dae95.zip
kernel_samsung_smdk4412-e4f925e12ea5daaa9baf2dd5af9c4951721dae95.tar.gz
kernel_samsung_smdk4412-e4f925e12ea5daaa9baf2dd5af9c4951721dae95.tar.bz2
drbd: Do not upgrade state to Outdated if already Inconsistent [Bugz 277]
There was a race condition: In a situation with a SyncSource+Primary and a SyncTarget+Secondary node, and a resync dependency to some other device. After both nodes decided to do the resync, the other device finishes its resync process. At that time SyncSource already sent the P_SYNC_UUID packet, and already updated its peer disk state to Inconsistent. The SyncTarget node waits for the P_SYNC_UUID and sends a state packet to report the resync dependency change. That packet still carries a disk state of Outdated. Impact: If application writes come in, during that time on the Primary node, those do not get replicated, and the out-of-sync counter gets increased. => The completion of resync is not detected on the primary node. => stalled. Those blocks get resync'ed with the next resync, since the are get marked as out-of-sync in the bitmap. In order to fix this, we filter out that wrong state change in the sanitize_state() function. Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/drbd/drbd_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index db7a07a..8f84a9f 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -840,7 +840,7 @@ static union drbd_state sanitize_state(struct drbd_conf *mdev, union drbd_state
break;
case C_WF_BITMAP_S:
case C_PAUSED_SYNC_S:
- ns.pdsk = D_OUTDATED;
+ ns.pdsk = os.pdsk > D_OUTDATED ? D_OUTDATED : os.pdsk;
break;
case C_SYNC_SOURCE:
ns.pdsk = D_INCONSISTENT;