Commit 40f165f4 authored May 28, 2010 by Tao Ma Committed by Joel Becker Jun 15, 2010

ocfs2: Move orphan scan work to ocfs2_wq.



We used to let orphan scan work in the default work queue,
but there is a corner case which will make the system deadlock.
The scenario is like this:
1. set heartbeat threadshold to 200. this will allow us to have a
   great chance to have a orphan scan work before our quorum decision.
2. mount node 1.
3. after 1~2 minutes, mount node 2(in order to make the bug easier
   to reproduce, better add maxcpus=1 to kernel command line).
4. node 1 do orphan scan work.
5. node 2 do orphan scan work.
6. node 1 do orphan scan work. After this, node 1 hold the orphan scan
   lock while node 2 know node 1 is the master.
7. ifdown eth2 in node 2(eth2 is what we do ocfs2 interconnection).

Now when node 2 begins orphan scan, the system queue is blocked.

The root cause is that both orphan scan work and quorum decision work
will use the system event work queue. orphan scan has a chance of
blocking the event work queue(in dlm_wait_for_node_death) so that there
is no chance for quorum decision work to proceed.

This patch resolve it by moving orphan scan work to ocfs2_wq.

Signed-off-by: Tao Ma <tao.ma@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>

parent 6469272c

fs/ocfs2/journal.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1936,7 +1936,7 @@ void ocfs2_orphan_scan_work(struct work_struct *work)
		mutex_lock(&os->os_lock);
		ocfs2_queue_orphan_scan(osb);
		if (atomic_read(&os->os_state) == ORPHAN_SCAN_ACTIVE)
		schedule_delayed_work(&os->os_orphan_scan_work,
		queue_delayed_work(ocfs2_wq, &os->os_orphan_scan_work,
		ocfs2_orphan_scan_timeout());
		mutex_unlock(&os->os_lock);
		}
		@@ -1976,7 +1976,7 @@ void ocfs2_orphan_scan_start(struct ocfs2_super *osb)
		atomic_set(&os->os_state, ORPHAN_SCAN_INACTIVE);
		else {
		atomic_set(&os->os_state, ORPHAN_SCAN_ACTIVE);
		schedule_delayed_work(&os->os_orphan_scan_work,
		queue_delayed_work(ocfs2_wq, &os->os_orphan_scan_work,
		ocfs2_orphan_scan_timeout());
		}
		}

Admin message