From 9b2995426ea206df9a4d8f14bbdb8e8baf73d91b Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Thu, 8 Feb 2018 09:09:00 +0530 Subject: glusterd: import volumes in separate synctask With brick multiplexing, to attach a brick to an existing brick process the prerequisite is to have the compatible brick to finish it's initialization and portmap sign in and hence the thread might have to go to a sleep and context switch the synctask to allow the brick process to communicate with glusterd. In normal code path, this works fine as glusterd_restart_bricks () is launched through a separate synctask. In case there's a mismatch of the volume when glusterd restarts, glusterd_import_friend_volume is invoked and then it tries to call glusterd_start_bricks () from the main thread which eventually may land into the similar situation. Now since this is not done through a separate synctask, the 1st brick will never be able to get its turn to finish all of its handshaking and as a consequence to it, all the bricks will fail to get attached to it. Solution : Execute import volume and glusterd restart bricks in separate synctask. Importing snaps had to be also done through synctask as there's a dependency of the parent volume need to be available for the importing snap functionality to work. >mainline patch : https://review.gluster.org/#/c/19357/ https://review.gluster.org/#/c/19536/ https://review.gluster.org/#/c/19539/ Change-Id: I290b244d456afcc9b913ab30be4af040d340428c BUG: 1543706 Signed-off-by: Atin Mukherjee (cherry picked from commit cb0339f9229fc5c05d7ef4cfcc4ca9c4569f3755) --- ...shot-issue-with-other-processes-accessing-mounted-path.t | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'tests') diff --git a/tests/bugs/snapshot/bug-1482023-snpashot-issue-with-other-processes-accessing-mounted-path.t b/tests/bugs/snapshot/bug-1482023-snpashot-issue-with-other-processes-accessing-mounted-path.t index c5a00881705..22f98d2b5a7 100644 --- a/tests/bugs/snapshot/bug-1482023-snpashot-issue-with-other-processes-accessing-mounted-path.t +++ b/tests/bugs/snapshot/bug-1482023-snpashot-issue-with-other-processes-accessing-mounted-path.t @@ -92,20 +92,33 @@ EXPECT "0" mounted_snaps ${V1} # handled during handshake. activate_snapshots + +EXPECT 'Started' snapshot_status ${V0}_snap; +EXPECT 'Started' snapshot_status ${V1}_snap; + kill_glusterd 2 + deactivate_snapshots +EXPECT 'Stopped' snapshot_status ${V0}_snap; +EXPECT 'Stopped' snapshot_status ${V1}_snap; + TEST start_glusterd 2 # Updates form friend should reflect as snap was deactivated while glusterd # process was inactive and mount point should also not exist. +EXPECT_WITHIN $PROBE_TIMEOUT 2 peer_count; EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" mounted_snaps ${V0} EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" mounted_snaps ${V1} kill_glusterd 2 activate_snapshots +EXPECT 'Started' snapshot_status ${V0}_snap; +EXPECT 'Started' snapshot_status ${V1}_snap; TEST start_glusterd 2 +EXPECT_WITHIN $PROBE_TIMEOUT 2 peer_count; + # Updates form friend should reflect as snap was activated while glusterd # process was inactive and mount point should exist. EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" mounted_snaps ${V0} -- cgit