From: František Dvořák <valtri@civ.zcu.cz>
Date: Fri, 24 Jun 2011 15:12:56 +0000 (+0000)
Subject: Quit parent process silently on background purge (improvement for SB #77974).
X-Git-Tag: glite-lbjp-common_R_3_0_8_1~25
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=18a32601b959912d43fca9aaeebe1167440fc949;p=jra1mw.git

Quit parent process silently on background purge (improvement for SB #77974).
---

diff --git a/org.glite.lb.server/src/lb_proto.c b/org.glite.lb.server/src/lb_proto.c
index 247c369..ea5a8ff 100644
--- a/org.glite.lb.server/src/lb_proto.c
+++ b/org.glite.lb.server/src/lb_proto.c
@@ -1073,7 +1073,7 @@ edg_wll_ErrorCode edg_wll_Proto(edg_wll_Context ctx,
 						free(et);
 						free(ed);
 					} else {
-						glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_INFO, "Background purge done, %d jobs purged.", i - 1);
+						glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_INFO, "Background purge done successfully.");
 					}
 					*response = NULL;
 					if (requestPTR) free(requestPTR);
diff --git a/org.glite.lbjp-common.server-bones/src/srvbones.c b/org.glite.lbjp-common.server-bones/src/srvbones.c
index 8fcdcb8..dd41c39 100644
--- a/org.glite.lbjp-common.server-bones/src/srvbones.c
+++ b/org.glite.lbjp-common.server-bones/src/srvbones.c
@@ -538,8 +538,11 @@ static int slave(slave_data_init_hnd data_init_hnd, int sock)
 					srv = -1;
 					glite_common_log(set_log_category, LOG_PRIORITY_DEBUG, "[%d] %s, connection closed",getpid(),strerror(rv));
 					continue;
-				}
-				else if ( rv < 0 ) {
+				} else if (rv == -EINPROGRESS) {
+					/*	background operation -> parent forked -> kill slave */
+					glite_common_log(set_log_category, LOG_PRIORITY_DEBUG, "[%d] terminating parent",getpid());
+					exit(0);
+				} else if ( rv < 0 ) {
 					/*	unknown error -> clasified as FATAL -> kill slave
 					 */
 					glite_common_log(set_log_category, LOG_PRIORITY_INFO, "[%d] %s, terminating",getpid(),strerror(-rv));