[Cluster-devel] cluster/cman-kernel/src cnxman.c

[pcaulfield@sourceware.org <pcaulfield@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	STABLE
Changes by:	pcaulfield at sourceware.org	2007-02-27 10:38:04

Modified files:
	cman-kernel/src: cnxman.c 

Log message:
	Stop cman_tool from trying to restart us while we are shutting things down.
	bz#229797

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman-kernel/src/cnxman.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.42.2.12.4.1.2.15&r2=1.42.2.12.4.1.2.16

--- cluster/cman-kernel/src/Attic/cnxman.c	2007/02/07 15:25:04	1.42.2.12.4.1.2.15
+++ cluster/cman-kernel/src/Attic/cnxman.c	2007/02/27 10:38:04	1.42.2.12.4.1.2.16
@@ -162,6 +162,7 @@
 #define ACK_TIMEOUT   1
 #define RESEND_NEEDED 2
 #define TIDY_BARRIERS 3
+#define IN_SHUTDOWN   4
 
 /* A queue of messages waiting to be sent. If kcl_sendmsg is called outside of
  * process context then the messages get put in here */
@@ -417,6 +418,7 @@
 	}
 	P_COMMS("closing down\n");
 
+	set_bit(IN_SHUTDOWN, &mainloop_flags);
 	quit_threads = 1;	/* force other thread to die too */
 
 	/* Wait for membership thread to finish, that way any
@@ -440,6 +442,7 @@
 	kfree(iobuf);
 
 	complete(&cluster_thread_comp);
+	clear_bit(IN_SHUTDOWN, &mainloop_flags);
 	return 0;
 }
 
@@ -1034,6 +1037,10 @@
 	if (master_sock && protocol == CLPROTO_MASTER)
 		return -EBUSY;
 
+	/* We are shutting down - please be patient */
+	if (protocol == CLPROTO_MASTER && test_bit(IN_SHUTDOWN, &mainloop_flags))
+		return -EBUSY;
+
 	/* cnxman not running and a client was requested */
 	if (!atomic_read(&cnxman_running) && protocol != CLPROTO_MASTER)
 		return -ENETDOWN;