From 6528bacd0643f8f0a7c5348569f617a0f0d9478c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Milo=C5=A1=20Mula=C4=8D?= Date: Tue, 24 Apr 2007 08:35:06 +0000 Subject: [PATCH] - split export.enable to purge.enable, export.enable and import.enable to increase configureability - deploymet patch is against org.glite from glite_branch_3_1_0_continous, which seems more vitable now - LB-LP mill do not look into LB dump dir any more --- org.glite.lb.client/src/export.sh | 33 ++++---- org.glite.lb/deployment/deploy_all.diff | 141 +++++++++++++++++++++++--------- 2 files changed, 120 insertions(+), 54 deletions(-) diff --git a/org.glite.lb.client/src/export.sh b/org.glite.lb.client/src/export.sh index 4fa6060..97e69c7 100644 --- a/org.glite.lb.client/src/export.sh +++ b/org.glite.lb.client/src/export.sh @@ -43,6 +43,8 @@ GLITE_LB_EXPORT_PURGE_ARGS=${GLITE_LB_EXPORT_PURGE_ARGS:---cleared 2d --aborted # Book Keeping Server GLITE_LB_SERVER_PORT=${GLITE_LB_SERVER_PORT:-9000} GLITE_LB_EXPORT_BKSERVER=${GLITE_LB_EXPORT_BKSERVER:-localhost:$GLITE_LB_SERVER_PORT} +GLITE_LB_PURGE_ENABLED=${GLITE_LB_PURGE_ENABLED:true} +GLITE_LB_EXPORT_ENABLED=$GLITE_LB_EXPORT_ENABLED:true} [ -d $GLITE_LB_EXPORT_JPDUMP_MAILDIR ] || mkdir -p $GLITE_LB_EXPORT_JPDUMP_MAILDIR [ -d $GLITE_LB_EXPORT_DUMPDIR ] || mkdir -p $GLITE_LB_EXPORT_DUMPDIR @@ -51,24 +53,27 @@ GLITE_LB_EXPORT_BKSERVER=${GLITE_LB_EXPORT_BKSERVER:-localhost:$GLITE_LB_SERVER_ [ -d $GLITE_LB_EXPORT_PURGEDIR_KEEP ] || mkdir -p $GLITE_LB_EXPORT_PURGEDIR_KEEP [ -d $GLITE_LB_EXPORT_JOBSDIR ] || mkdir -p $GLITE_LB_EXPORT_JOBSDIR -X509_USER_CERT="$X509_USER_CERT" X509_USER_KEY="$X509_USER_KEY" $PREFIX/sbin/glite-lb-purge $GLITE_LB_EXPORT_PURGE_ARGS -l -m $GLITE_LB_EXPORT_BKSERVER -s +if [ x"$GLITE_LB_PURGE_ENABLED" = x"true" ]; then + X509_USER_CERT="$X509_USER_CERT" X509_USER_KEY="$X509_USER_KEY" $PREFIX/sbin/glite-lb-purge $GLITE_LB_EXPORT_PURGE_ARGS -l -m $GLITE_LB_EXPORT_BKSERVER -s +fi -for file in $GLITE_LB_EXPORT_PURGEDIR/*; do - if [ -s $file ]; then - $PREFIX/sbin/glite-lb-lb_dump_exporter -d $file -s $GLITE_LB_EXPORT_JOBSDIR -m $GLITE_LB_EXPORT_JPDUMP_MAILDIR - if [ -n "$GLITE_LB_EXPORT_PURGEDIR_KEEP" ]; then - mv $file $GLITE_LB_EXPORT_PURGEDIR_KEEP +if [ x"$GLITE_LB_EXPORT_ENABLED" = x"true" ]; then + for file in $GLITE_LB_EXPORT_PURGEDIR/*; do + if [ -s $file ]; then + $PREFIX/sbin/glite-lb-lb_dump_exporter -d $file -s $GLITE_LB_EXPORT_JOBSDIR -m $GLITE_LB_EXPORT_JPDUMP_MAILDIR + if [ -n "$GLITE_LB_EXPORT_PURGEDIR_KEEP" ]; then + mv $file $GLITE_LB_EXPORT_PURGEDIR_KEEP + else + rm $file + fi else rm $file fi + done + + if [ -n "$GLITE_LB_EXPORT_DUMPDIR_KEEP" ]; then + ls $GLITE_LB_EXPORT_DUMPDIR | xargs -i'{}' cp $GLITE_LB_EXPORT_DUMPDIR/'{}' $GLITE_LB_EXPORT_DUMPDIR_KEEP; else - rm $file + ls $GLITE_LB_EXPORT_DUMPDIR | xargs -i'{}' rm -f $GLITE_LB_EXPORT_DUMPDIR/'{}' fi -done - -if [ -n "$GLITE_LB_EXPORT_DUMPDIR_KEEP" ]; then - ls $GLITE_LB_EXPORT_DUMPDIR | xargs -i'{}' cp $GLITE_LB_EXPORT_DUMPDIR/'{}' $GLITE_LB_EXPORT_DUMPDIR_KEEP; -else - ls $GLITE_LB_EXPORT_DUMPDIR | xargs -i'{}' rm -f $GLITE_LB_EXPORT_DUMPDIR/'{}' fi - diff --git a/org.glite.lb/deployment/deploy_all.diff b/org.glite.lb/deployment/deploy_all.diff index 9c608b8..fbfb5c9 100644 --- a/org.glite.lb/deployment/deploy_all.diff +++ b/org.glite.lb/deployment/deploy_all.diff @@ -1,15 +1,14 @@ Index: org.glite/project/global.dependencies.properties =================================================================== RCS file: /cvs/jra1mw/org.glite/project/global.dependencies.properties,v -retrieving revision 1.482.2.279.2.59 -diff -u -r1.482.2.279.2.59 global.dependencies.properties ---- org.glite/project/global.dependencies.properties 16 Apr 2007 17:13:30 -0000 1.482.2.279.2.59 -+++ org.glite/project/global.dependencies.properties 20 Apr 2007 09:06:21 -0000 -@@ -2093,6 +2093,24 @@ - ext.globus-sdk.rpm.name = vdt_globus_sdk +retrieving revision 1.482.2.279.2.61 +diff -u -r1.482.2.279.2.61 global.dependencies.properties +--- org.glite/project/global.dependencies.properties 23 Apr 2007 09:54:21 -0000 1.482.2.279.2.61 ++++ org.glite/project/global.dependencies.properties 24 Apr 2007 08:20:35 -0000 +@@ -2100,6 +2100,24 @@ ext.globus-sdk.rpm.version = ${ext.vdt.version} ext.globus-sdk.rpm.age = ${ext.vdt.age} -+ + +# Globus vdt data server - grid ftp server +ext.globus-data-server.name = ${ext.globus.name} +ext.globus-data-server.vendor = ${ext.globus.vendor} @@ -27,16 +26,68 @@ diff -u -r1.482.2.279.2.59 global.dependencies.properties +ext.globus-data-server.rpm.name = vdt_globus_data_server +ext.globus-data-server.rpm.version = ${ext.vdt.version} +ext.globus-data-server.rpm.age = 1 - - # GPT - ext.gpt.name = gpt ++ + # google-perftools + ext.google-perftools.name = google-perftools + ext.google-perftools.vendor = google-perftools +@@ -3855,31 +3873,31 @@ + # System dependencies + ################################################################### + +-org.glite.deployment.version = glite-deployment_branch_2_5_0 ++org.glite.deployment.version = HEAD + org.glite.testsuites.version = HEAD +-org.glite.version = glite_branch_3_1_0 ++org.glite.version = HEAD + +-#subsystem version tag = do not remove ++#subsystem version tag = HEAD + org.glite.slcs.version = HEAD +-org.glite.amga.version = glite-amga_R_1_0_0_2 ++org.glite.amga.version = HEAD + org.glite.bdii.version = HEAD +-org.glite.ce.version = glite-ce_R_1_7_13_0 +-org.glite.data.version = glite-data_R_3_1_17_1 +-org.glite.dgas.version = glite-dgas_R_3_1_9_1 +-org.glite.gpbox.version = glite-gpbox_R_1_3_0 ++org.glite.ce.version = HEAD ++org.glite.data.version = HEAD ++org.glite.dgas.version = HEAD ++org.glite.gpbox.version = HEAD + org.glite.info.version = HEAD +-org.glite.jdl.version = glite-jdl_R_3_1_11_1 +-org.glite.jp.version = glite-jp_R_1_3_5_1 +-org.glite.lb.version = glite-lb_R_1_4_1_1 ++org.glite.jdl.version = HEAD ++org.glite.jp.version = HEAD ++org.glite.lb.version = HEAD + org.glite.overlay.version = HEAD +-org.glite.rgma.version = glite-rgma_R_5_0_66_1 +-org.glite.security.version = glite-security_R_3_1_35_1 +-org.glite.service-discovery.version = glite-service-discovery_R_2_0_14 +-org.glite.templates-latex-style.version = glite-templates-latex-style_R_1_0_1 +-org.glite.wms-ui.version = glite-wms-ui_R_3_1_17_1 +-org.glite.wms-utils.version = glite-wms-utils_R_3_1_8 +-org.glite.wms.version = glite-wms_R_3_1_56_1 ++org.glite.rgma.version = HEAD ++org.glite.security.version = HEAD ++org.glite.service-discovery.version = HEAD ++org.glite.templates-latex-style.version = HEAD ++org.glite.wms-ui.version = HEAD ++org.glite.wms-utils.version = HEAD ++org.glite.wms.version = HEAD + +-org.gridsite.core.version = gridsite-core_R_1_1_18_1 ++org.gridsite.core.version = HEAD + org.gridsite.ws.version = HEAD + Index: org.glite.deployment/build.xml =================================================================== RCS file: /cvs/jra1mw/org.glite.deployment/build.xml,v retrieving revision 1.62 diff -u -r1.62 build.xml --- org.glite.deployment/build.xml 22 Aug 2005 17:00:02 -0000 1.62 -+++ org.glite.deployment/build.xml 20 Apr 2007 09:06:21 -0000 ++++ org.glite.deployment/build.xml 24 Apr 2007 08:20:35 -0000 @@ -814,6 +814,39 @@ @@ -92,7 +143,7 @@ RCS file: /cvs/jra1mw/org.glite.deployment/project/dependencies.properties,v retrieving revision 1.529 diff -u -r1.529 dependencies.properties --- org.glite.deployment/project/dependencies.properties 21 Jun 2006 09:29:08 -0000 1.529 -+++ org.glite.deployment/project/dependencies.properties 20 Apr 2007 09:06:21 -0000 ++++ org.glite.deployment/project/dependencies.properties 24 Apr 2007 08:20:35 -0000 @@ -33,6 +33,8 @@ org.glite.deployment.wn.version = HEAD org.glite.deployment.wms.version = HEAD @@ -108,7 +159,7 @@ RCS file: /cvs/jra1mw/org.glite.deployment/project/glite.deployment.csf.xml,v retrieving revision 1.46 diff -u -r1.46 glite.deployment.csf.xml --- org.glite.deployment/project/glite.deployment.csf.xml 31 Jul 2006 09:53:53 -0000 1.46 -+++ org.glite.deployment/project/glite.deployment.csf.xml 20 Apr 2007 09:06:21 -0000 ++++ org.glite.deployment/project/glite.deployment.csf.xml 24 Apr 2007 08:20:35 -0000 @@ -392,6 +392,14 @@ @@ -168,7 +219,7 @@ RCS file: /cvs/jra1mw/org.glite.deployment.lb/config/scripts/glite-lb-config.py, retrieving revision 1.66 diff -u -r1.66 glite-lb-config.py --- org.glite.deployment.lb/config/scripts/glite-lb-config.py 13 Mar 2006 15:22:31 -0000 1.66 -+++ org.glite.deployment.lb/config/scripts/glite-lb-config.py 20 Apr 2007 09:06:21 -0000 ++++ org.glite.deployment.lb/config/scripts/glite-lb-config.py 24 Apr 2007 08:20:35 -0000 @@ -121,6 +121,10 @@ if not os.path.exists('/tmp/mysql.sock'): os.symlink('/var/lib/mysql/mysql.sock', '/tmp/mysql.sock') @@ -196,12 +247,12 @@ diff -u -r1.66 glite-lb-config.py + # start jp-importer, if enabled + #------------------------------------------------------------------- + -+ lb_export = 0 -+ if params.has_key('lb.export.enabled'): -+ if params['lb.export.enabled'] == "true": -+ lb_export = 1 ++ lb_import = 0 ++ if params.has_key('lb.import.enabled'): ++ if params['lb.import.enabled'] == "true": ++ lb_import = 1 + -+ if lb_export: ++ if lb_import: + pid = glib.getPID('jp-importer') + if pid != 0: + print 'The gLite JP Importer service is already running. Restarting...' @@ -254,8 +305,8 @@ diff -u -r1.66 glite-lb-config.py + glib.printFailedMessage() + error_level = 1 + else: -+ if params.has_key('lb.export.enabled'): -+ if params['lb.export.enabled'] == "true": ++ if params.has_key('lb.import.enabled'): ++ if params['lb.import.enabled'] == "true": + print 'The JP Importer service has been stopped ', + glib.printOkMessage() + @@ -283,7 +334,7 @@ diff -u -r1.66 glite-lb-config.py + # ------------------------------------------------------------------ + # export from bkserver to cron + # ------------------------------------------------------------------ -+ if params['GLITE_LB_EXPORT_ENABLED'] == "true": ++ if (params['GLITE_LB_PURGE_ENABLED'] == "true") or (params['GLITE_LB_EXPORT_ENABLED'] == "true"): + file = open('%s/etc/glite-lb-export-cron-wrapper.sh' % os.environ['GLITE_LOCATION'], 'w') + file.write('#! /bin/sh\n') + file.write('. %s\n' % glib.getInstallerExportFile()) @@ -305,12 +356,14 @@ diff -u -r1.66 glite-lb-config.py #------------------------------------------------------------------- # RGMA servicetool: configure servicetool #------------------------------------------------------------------- -@@ -411,6 +494,19 @@ +@@ -411,6 +494,21 @@ # Perl glib.addEnvPath("PERL5LIB", "%s/lib/perl:%s/lib/perl5" % (os.environ['GPT_LOCATION'],os.environ['GLITE_LOCATION'])) + # LB export ++ glib.export('GLITE_LB_PURGE_ENABLED', params['lb.purge.enabled']); + glib.export('GLITE_LB_EXPORT_ENABLED', params['lb.export.enabled']); ++ glib.export('GLITE_LB_IMPORT_ENABLED', params['lb.import.enabled']); + glib.export('GLITE_LB_EXPORT_JPPS', params['lb.export.jpps']); + glib.export('GLITE_LB_EXPORT_JPREG_MAILDIR', params['lb.export.jpreg']); + glib.export('GLITE_LB_EXPORT_JPDUMP_MAILDIR', params['lb.export.jpdump']); @@ -331,7 +384,7 @@ RCS file: /cvs/jra1mw/org.glite.deployment.lb/config/templates/glite-lb.cfg.xml, retrieving revision 1.21 diff -u -r1.21 glite-lb.cfg.xml --- org.glite.deployment.lb/config/templates/glite-lb.cfg.xml 13 Mar 2006 15:19:21 -0000 1.21 -+++ org.glite.deployment.lb/config/templates/glite-lb.cfg.xml 20 Apr 2007 09:06:21 -0000 ++++ org.glite.deployment.lb/config/templates/glite-lb.cfg.xml 24 Apr 2007 08:20:35 -0000 @@ -17,9 +17,16 @@ parameter. Leave it empty of comment it out to use the same as 'glite.user.name'" value="changeme"/> @@ -352,20 +405,36 @@ diff -u -r1.21 glite-lb.cfg.xml -@@ -55,6 +62,12 @@ +@@ -55,6 +62,28 @@ [Example: 17M][Type: Integer][Unit: MB]" value="17M"/> ++ ++ + ++ value="true"/> ++ ++ ++ ++ + + -@@ -67,7 +80,52 @@ +@@ -67,7 +96,44 @@ destination @@ -381,16 +450,6 @@ diff -u -r1.21 glite-lb.cfg.xml + [Type: string]" + value="/tmp/jpdump"/> + -+ -+ -+ -+ + + @@ -408,6 +468,7 @@ diff -u -r1.21 glite-lb.cfg.xml + + + @@ -425,7 +486,7 @@ RCS file: /cvs/jra1mw/org.glite.deployment.lb/project/glite-lb.sdf.xml.template, retrieving revision 1.38 diff -u -r1.38 glite-lb.sdf.xml.template --- org.glite.deployment.lb/project/glite-lb.sdf.xml.template 13 Mar 2006 15:19:21 -0000 1.38 -+++ org.glite.deployment.lb/project/glite-lb.sdf.xml.template 20 Apr 2007 09:06:21 -0000 ++++ org.glite.deployment.lb/project/glite-lb.sdf.xml.template 24 Apr 2007 08:20:35 -0000 @@ -15,7 +15,7 @@ build="@org.glite.deployment.config.info.build@" arch="noarch"/> @@ -467,7 +528,7 @@ RCS file: /cvs/jra1mw/org.glite.deployment.lb/project/properties.xml,v retrieving revision 1.3 diff -u -r1.3 properties.xml --- org.glite.deployment.lb/project/properties.xml 13 Mar 2006 15:19:21 -0000 1.3 -+++ org.glite.deployment.lb/project/properties.xml 20 Apr 2007 09:06:21 -0000 ++++ org.glite.deployment.lb/project/properties.xml 24 Apr 2007 08:20:35 -0000 @@ -62,15 +62,15 @@ Define extra properties here ... ====================================================== --> -- 1.8.2.3