From: Miloš Mulač <mulac@civ.zcu.cz>
Date: Tue, 27 Nov 2007 16:51:37 +0000 (+0000)
Subject: if running both server and proxy services, start at least 2 slaves
X-Git-Tag: glite-yaim-lb_R_4_0_1_1~22
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=f908ba7a3e2bed729e253d7ecfccb47480bdd614;p=jra1mw.git

if running both server and proxy services, start at least 2 slaves
---

diff --git a/org.glite.lb.server/src/bkserverd.c b/org.glite.lb.server/src/bkserverd.c
index 7d5b844..8bae798 100644
--- a/org.glite.lb.server/src/bkserverd.c
+++ b/org.glite.lb.server/src/bkserverd.c
@@ -456,7 +456,7 @@ int main(int argc, char *argv[])
 			  break;
 		case 'P': mode = SERVICE_PROXY;
 			  break;
-		case 'B': mode = SERVICE_PROXY_SERVER;;
+		case 'B': mode = SERVICE_PROXY_SERVER;
 			  break;
 		case 'o': strcpy(socket_path_prefix, optarg);
 			  break;
@@ -479,6 +479,14 @@ int main(int argc, char *argv[])
 	if (mode & SERVICE_SERVER) dprintf(("Staring LB server service\n"));
 	dprintf(("\n"));
 
+	// XXX: workaround for only preudoparallel job registration
+	//	we need at least 2 slaves to avoid locking misbehaviour
+	if ((mode == SERVICE_PROXY_SERVER) && (slaves == 1)) {
+		dprintf(("WARNING: Running both proxy and server services enforces at least 2 slaves\n"));
+		dprintf(("Starting 2 slaves\n"));
+		slaves = 2;
+	}
+
 	if (geteuid()) snprintf(pidfile,sizeof pidfile, "%s/edg-bkserverd.pid", getenv("HOME"));
 
 	fpid = fopen(pidfile,"r");