From 18a32601b959912d43fca9aaeebe1167440fc949 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Fri, 24 Jun 2011 15:12:56 +0000 Subject: [PATCH] Quit parent process silently on background purge (improvement for SB #77974). --- org.glite.lb.server/src/lb_proto.c | 2 +- org.glite.lbjp-common.server-bones/src/srvbones.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) 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)); -- 1.8.2.3