From 303d8eef05e6a3594d7c05055b85774d6d59dc26 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Milo=C5=A1=20Mula=C4=8D?= Date: Thu, 30 Mar 2006 13:35:46 +0000 Subject: [PATCH] temporary patch silo; just for short time share --- org.glite.lb/deployment/README | 2 + org.glite.lb/deployment/deploy_jp.diff | 156 ++++++++++++++++++ org.glite.lb/deployment/deploy_lb.diff | 279 +++++++++++++++++++++++++++++++++ 3 files changed, 437 insertions(+) create mode 100644 org.glite.lb/deployment/README create mode 100644 org.glite.lb/deployment/deploy_jp.diff create mode 100644 org.glite.lb/deployment/deploy_lb.diff diff --git a/org.glite.lb/deployment/README b/org.glite.lb/deployment/README new file mode 100644 index 0000000..630889d --- /dev/null +++ b/org.glite.lb/deployment/README @@ -0,0 +1,2 @@ +deploy_lb - against glite-deployment-lb_R_2_1_2 +deploy_jp - against HEAD diff --git a/org.glite.lb/deployment/deploy_jp.diff b/org.glite.lb/deployment/deploy_jp.diff new file mode 100644 index 0000000..e0525c8 --- /dev/null +++ b/org.glite.lb/deployment/deploy_jp.diff @@ -0,0 +1,156 @@ +Index: org.glite/project/global.dependencies.properties +=================================================================== +RCS file: /cvs/jra1mw/org.glite/project/global.dependencies.properties,v +retrieving revision 1.486 +diff -u -r1.486 global.dependencies.properties +--- org.glite/project/global.dependencies.properties 17 Mar 2006 18:19:31 -0000 1.486 ++++ org.glite/project/global.dependencies.properties 30 Mar 2006 11:32:58 -0000 +@@ -1352,6 +1352,25 @@ + ext.globus-sdk.rpm.version = ${ext.vdt.version} + ext.globus-sdk.rpm.age = 1 + ++# Globus vdt data server - grid ftp server ++ext.globus-data-server.name = ${ext.globus.name} ++ext.globus-data-server.vendor = ${ext.globus.vendor} ++ext.globus-data-server.version = ${ext.globus.version} ++ext.globus-data-server.platform = ${platform} ++ext.globus-data-server.subdir = ${ext.globus-data-server.name}/${ext.globus-data-server.version}/${ext.globus-data-server.platform} ++ext.globus-data-server.rep.base = ${jra1.rep.base} ++ext.globus-data-server.rep.file = ++ext.globus-data-server.rep.subdir = ++ext.globus-data-server.rep.url = ${ext.globus-data-server.rep.base}/${ext.globus-data-server.subdir}/${ext.globus-data-server.rep.subdir}/${ext.globus-data-server.rep.file} ++ext.globus-data-server.files = ++ext.globus-data-server.download = http://www.cs.wisc.edu/vdt/releases/1.2.2/installing-rpms.html ++ext.globus-data-server.homepage = http://www.cs.wisc.edu/vdt//index.html ++ext.globus-data-server.description = The Globus Toolkit(R). This is the version packaged by VDT. ++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 + ext.gpt.vendor = gpt +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 30 Mar 2006 11:32:58 -0000 +@@ -814,6 +814,39 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -891,6 +924,8 @@ + wn, + wms, + lb, ++ jpps, ++ jpis, + io-server, + io-client, + ce, +Index: org.glite.deployment/project/dependencies.properties +=================================================================== +RCS file: /cvs/jra1mw/org.glite.deployment/project/dependencies.properties,v +retrieving revision 1.528 +diff -u -r1.528 dependencies.properties +--- org.glite.deployment/project/dependencies.properties 22 Aug 2005 17:00:02 -0000 1.528 ++++ org.glite.deployment/project/dependencies.properties 30 Mar 2006 11:32:58 -0000 +@@ -38,6 +38,8 @@ + org.glite.deployment.wn.version = HEAD + org.glite.deployment.wms.version = HEAD + org.glite.deployment.lb.version = HEAD ++org.glite.deployment.jpps.version = HEAD ++org.glite.deployment.jpis.version = HEAD + org.glite.deployment.io-server.version = HEAD + org.glite.deployment.io-client.version = HEAD + org.glite.deployment.ce.version = HEAD +Index: org.glite.deployment/project/glite.deployment.csf.xml +=================================================================== +RCS file: /cvs/jra1mw/org.glite.deployment/project/glite.deployment.csf.xml,v +retrieving revision 1.45 +diff -u -r1.45 glite.deployment.csf.xml +--- org.glite.deployment/project/glite.deployment.csf.xml 22 Aug 2005 17:00:02 -0000 1.45 ++++ org.glite.deployment/project/glite.deployment.csf.xml 30 Mar 2006 11:32:58 -0000 +@@ -389,6 +389,14 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -832,6 +840,28 @@ + tag="${org.glite.deployment.lb.version}" /> + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + diff --git a/org.glite.lb/deployment/deploy_lb.diff b/org.glite.lb/deployment/deploy_lb.diff new file mode 100644 index 0000000..f6b5b76 --- /dev/null +++ b/org.glite.lb/deployment/deploy_lb.diff @@ -0,0 +1,279 @@ +Index: org.glite.deployment.lb/config/scripts/glite-lb-config.py +=================================================================== +RCS file: /cvs/jra1mw/org.glite.deployment.lb/config/scripts/glite-lb-config.py,v +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 15 Mar 2006 14:51:40 -0000 +@@ -120,7 +120,12 @@ + + if not os.path.exists('/tmp/mysql.sock'): + os.symlink('/var/lib/mysql/mysql.sock', '/tmp/mysql.sock') +- ++ ++ ++ #------------------------------------------------------------------- ++ # start bkserver ++ #------------------------------------------------------------------- ++ + pid = glib.getPID('bkserverd') + if pid != 0: + print 'The gLite LB Server service is already running. Restarting...' +@@ -133,7 +138,7 @@ + pid = glib.getPID('bkserverd') + + if (pid != 0): +- print "The gLite LB Server service has been started ", ++ print "The gLite LB Server service has been started ", + glib.printOkMessage() + else: + glib.printErrorMessage("Could not start the gLite LB Server service") +@@ -142,6 +147,36 @@ + return 1 + + #------------------------------------------------------------------- ++ # start jp-importer, if enabled ++ #------------------------------------------------------------------- ++ ++ lb_export = 0 ++ if params.has_key('lb.export.enabled'): ++ if params['lb.export.enabled'] == "true": ++ lb_export = 1 ++ ++ if lb_export: ++ pid = glib.getPID('jp-importer') ++ if pid != 0: ++ print 'The gLite JP Importer service is already running. Restarting...' ++ os.system('%s/etc/init.d/glite-jp-importer stop' % os.environ['GLITE_LOCATION']) ++ else: ++ print 'Starting the gLite JP Importer service...' ++ ++ os.system('%s/etc/init.d/glite-jp-importer start' % os.environ['GLITE_LOCATION']) ++ ++ pid = glib.getPID('jp-importer') ++ ++ if (pid != 0): ++ print "The gLite JP Importer service has been started ", ++ glib.printOkMessage() ++ else: ++ glib.printErrorMessage("Could not start the gLite JP Importer service") ++ glib.printErrorMessage("Please verify and re-run the script "), ++ glib.printFailedMessage() ++ return 1 ++ ++ #------------------------------------------------------------------- + # Start Servicetool + #------------------------------------------------------------------- + +@@ -161,6 +196,10 @@ + if (pid != 0): + os.system('%s/etc/init.d/glite-lb-bkserverd stop' % os.environ['GLITE_LOCATION']) + ++ #------------------------------------------------------------------- ++ # Book Keeping Server ++ #------------------------------------------------------------------- ++ + pid = glib.getPID('bkserverd') + if (pid != 0): + print 'Could not stop the LB Server service ', +@@ -171,6 +210,25 @@ + glib.printOkMessage() + + #------------------------------------------------------------------- ++ # JP Importer ++ #------------------------------------------------------------------- ++ ++ pid = glib.getPID('jp-importer') ++ if (pid != 0): ++ os.system('%s/etc/init.d/glite-jp-importer stop' % os.environ['GLITE_LOCATION']) ++ ++ pid = glib.getPID('jp-importer') ++ if (pid != 0): ++ print 'Could not stop the JP Importer service ', ++ glib.printFailedMessage() ++ error_level = 1 ++ else: ++ if params.has_key('lb.export.enabled'): ++ if params['lb.export.enabled'] == "true": ++ print 'The JP Importer service has been stopped ', ++ glib.printOkMessage() ++ ++ #------------------------------------------------------------------- + # MySQL + #------------------------------------------------------------------- + +@@ -195,6 +253,10 @@ + if retval != 0: + error_level = 1 + ++ retval = os.system('%s/etc/init.d/glite-jp-importer status' % os.environ['GLITE_LOCATION']) ++ if retval != 0: ++ error_level = 1 ++ + #------------------------------------------------------------------- + # Servicetool + #------------------------------------------------------------------- +@@ -325,7 +387,27 @@ + print "\n==> MySQL database %s already exist\n" % params['lb.database.name'] + + self.mysql.stop() +- ++ ++ # ------------------------------------------------------------------ ++ # export from bkserver to cron ++ # ------------------------------------------------------------------ ++ if 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()) ++ file.write('$GLITE_LOCATION/examples/glite-lb-export.sh\n') ++ file.close() ++ os.system('/bin/chmod 0755 %s/etc/glite-lb-export-cron-wrapper.sh' % os.environ['GLITE_LOCATION']) ++ ++ file = open('/etc/cron.d/glite-lb-export.cron', 'w') ++ file.write('# periodically run purge and export jobs from bkserver\n') ++ file.write('00,30 * * * * %s %s/etc/glite-lb-export-cron-wrapper.sh\n' % (params['glite.user.name'], os.environ['GLITE_LOCATION'])) ++ file.close() ++ os.system('/bin/chmod 0755 /etc/cron.d/glite-lb-export.cron') ++ ++ # Touch cron spool directory to cause reloading of the crontabs ++ os.system("/bin/touch /var/spool/cron") ++ + #------------------------------------------------------------------- + # RGMA servicetool: configure servicetool + #------------------------------------------------------------------- +@@ -411,6 +493,17 @@ + # Perl + glib.addEnvPath("PERL5LIB", "%s/lib/perl:%s/lib/perl5" % (os.environ['GPT_LOCATION'],os.environ['GLITE_LOCATION'])) + ++ # LB export ++ glib.export('GLITE_LB_EXPORT_ENABLED', params['lb.export.enabled']); ++ glib.export('GLITE_LB_EXPORT_BKSERVER', params['lb.export.bkserver']); ++ 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']); ++ glib.export('GLITE_LB_EXPORT_DUMPDIR', params['lb.export.dump']); ++ glib.export('GLITE_LB_EXPORT_DUMPDIR_OLD', params['lb.export.dump.old']); ++ glib.export('GLITE_LB_EXPORT_EXPORTDIR', params['lb.export.export']); ++ glib.export('GLITE_LB_EXPORT_PURGE_ARGS', '"%s"' % params['lb.export.purgeargs']); ++ + # Set environment + glib.setUserEnv() + +Index: org.glite.deployment.lb/config/templates/glite-lb.cfg.xml +=================================================================== +RCS file: /cvs/jra1mw/org.glite.deployment.lb/config/templates/glite-lb.cfg.xml,v +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 15 Mar 2006 14:51:40 -0000 +@@ -17,9 +17,16 @@ + parameter. Leave it empty of comment it out to use the same as 'glite.user.name'" + value="changeme"/> + +- ++ ++ ++ ++ ++ + + + +@@ -55,6 +62,12 @@ + [Example: 17M][Type: Integer][Unit: MB]" + value="17M"/> + ++ ++ ++ + + + +@@ -67,7 +80,42 @@ + destination + + +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +Index: org.glite.deployment.lb/project/glite-lb.sdf.xml.template +=================================================================== +RCS file: /cvs/jra1mw/org.glite.deployment.lb/project/glite-lb.sdf.xml.template,v +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 15 Mar 2006 14:51:40 -0000 +@@ -57,6 +57,12 @@ + build="@org.glite.lb.server-bones.info.build@" + arch="i386"/> + ++ ++ + + ++ ++ +