From 21a2a08ce64af622c7997145ecc35baac892d10b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Wed, 6 Jan 2010 19:03:44 +0000 Subject: [PATCH] Finalize MSG publish support via L&B harvester in glite 3.1. --- org.glite.lb.doc/src/LBAG-Installation.tex | 2 ++ org.glite.lb.harvester/src/harvester.c | 2 +- org.glite.yaim.lb/config/functions/config_glite_lb | 8 +++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/org.glite.lb.doc/src/LBAG-Installation.tex b/org.glite.lb.doc/src/LBAG-Installation.tex index 2877785..755acee 100644 --- a/org.glite.lb.doc/src/LBAG-Installation.tex +++ b/org.glite.lb.doc/src/LBAG-Installation.tex @@ -136,6 +136,8 @@ export data are written for use by lgcmon/R-GMA (default: \texttt{heppc24.hep.ph.ic.ac.uk} machine certificate) \item \texttt{GLITE\_LB\_SUPER\_USERS} -- additional super-users (default: empty) \item \texttt{GLITE\_LB\_TYPE} -- type of the \LB service: server, proxy, both (default: server) +\item \texttt{GLITE\_LB\_HARVESTER\_ENABLED} -- set to \texttt{true} for sending notification, used mainly for export to MSG publish system (default: \texttt{false}) +\item \texttt{GLITE\_LB\_HARVESTER\_MSG\_OPTIONS} -- additional options for MSG publish (default: \texttt{--wlcg}) \end{itemize} In addition to those, YAIM LB module uses following parameters: diff --git a/org.glite.lb.harvester/src/harvester.c b/org.glite.lb.harvester/src/harvester.c index 00045b0..828d0de 100644 --- a/org.glite.lb.harvester/src/harvester.c +++ b/org.glite.lb.harvester/src/harvester.c @@ -569,7 +569,7 @@ int wlcg_send_message(thread_t *t) { if (status) { lprintf(t, WRN, "%s exited with %d", config.wlcg_binary, status); } else { - lprintf(t, INF, "%s exited successfully", config.wlcg_binary); + lprintf(t, DBG, "%s exited successfully", config.wlcg_binary); if (!config.wlcg_no_remove) remove(t->dash_filename); } } else { diff --git a/org.glite.yaim.lb/config/functions/config_glite_lb b/org.glite.yaim.lb/config/functions/config_glite_lb index 8d63333..637a487 100644 --- a/org.glite.yaim.lb/config/functions/config_glite_lb +++ b/org.glite.yaim.lb/config/functions/config_glite_lb @@ -18,6 +18,8 @@ function config_glite_lb_setenv(){ yaimgridenv_set GLITE_LB_RTM_ENABLED ${GLITE_LB_RTM_ENABLED:-false} yaimgridenv_set GLITE_LB_RTM_DN ${GLITE_LB_RTM_DN:-/C=UK/O=eScience/OU=Imperial/L=Physics/CN=heppc24.hep.ph.ic.ac.uk/Email=janusz.martyniak@imperial.ac.uk} yaimgridenv_set GLITE_LB_SUPER_USERS ${GLITE_LB_SUPER_USERS:-} + yaimgridenv_set GLITE_LB_HARVESTER_ENABLED ${GLITE_LB_HARVESTER_ENABLED:-false} + yaimgridenv_set GLITE_LB_HARVESTER_MSG_OPTIONS "${GLITE_LB_HARVESTER_MSG_OPTIONS:---wlcg}" yaimgridenv_set GLITE_LB_TYPE ${GLITE_LB_TYPE:-server} @@ -103,7 +105,7 @@ function config_glite_lb() { mysql -u root --password="$MYSQL_PASSWORD" -e "ALTER TABLE states MAX_ROWS=9500000;" lbserver20 mysql -u root --password="$MYSQL_PASSWORD" -e "ALTER TABLE events MAX_ROWS=175000000;" lbserver20 - if [ x"$GLITE_LB_RTM_ENABLED" = x"true" ]; then + if [ x"$GLITE_LB_RTM_ENABLED" = x"true" -o x"GLITE_LB_HARVESTER_ENABLED" = x"true" ]; then # index for querying older jobs by real time monitor cat << EOF | $GLITE_LOCATION/bin/glite-lb-bkindex -rv [ @@ -180,6 +182,10 @@ EOF cat ${GLITE_LOCATION}/etc/LB-super-users.prev ${GLITE_LOCATION}/etc/LB-super-users.add | sort | uniq > ${GLITE_LOCATION}/etc/LB-super-users rm ${GLITE_LOCATION}/etc/LB-super-users.prev ${GLITE_LOCATION}/etc/LB-super-users.add + if [ ! -f ${GLITE_LOCATION}/etc/glite-lb-harvester.conf ]; then + echo $HOSTNAME > ${GLITE_LOCATION}/etc/glite-lb-harvester.conf + fi + . /opt/glite/etc/profile.d/grid-env.sh ${GLITE_LOCATION}/etc/init.d/glite-lb-bkserverd stop #Temporary workaround to kill glite-lb-*-interlogd -- 1.8.2.3