drbd: fix race when forcefully disconnecting

Browse source

If a forced disconnect hits a restarting receiver right after it passed
its final "if (C_DISCONNECTING)" test in drbdd_init(), but before it was
actually restarted by drbd_thread_setup, we could be left with a
connection stuck in C_DISCONNECTING, never reaching C_STANDALONE,
which would be necessary to take it down or reconfigure it.

Move the last cleanup into w_after_conn_state_ch(), and do an additional
state change request in conn_try_disconnect(), just in case.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

...

This commit is contained in:

Lars Ellenberg 2011-05-02 10:45:05 +02:00 • committed by Philipp Reisner

parent 88104ca458

commit f3dfa40a67

3 changed files with 62 additions and 50 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

85

drivers/block/drbd/drbd_nl.c

View file

14

drivers/block/drbd/drbd_receiver.c

View file

13

drivers/block/drbd/drbd_state.c

View file