From: František Dvořák Date: Fri, 1 Sep 2006 14:17:32 +0000 (+0000) Subject: Merge forgotten changes from other branch, mark other two patches obsolete. X-Git-Tag: gridsite-core_R_1_3_2~14 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=c307884e2e778b7734110876d9fd2b681940c6b2;p=jra1mw.git Merge forgotten changes from other branch, mark other two patches obsolete. --- diff --git a/org.glite.lb/deployment/README b/org.glite.lb/deployment/README index 630889d..9b104e6 100644 --- a/org.glite.lb/deployment/README +++ b/org.glite.lb/deployment/README @@ -1,2 +1,2 @@ -deploy_lb - against glite-deployment-lb_R_2_1_2 -deploy_jp - against HEAD +deploy_all.diff - against RC31 +deploy_lb, deploy_jp - older patches diff --git a/org.glite.lb/deployment/deploy_all.diff b/org.glite.lb/deployment/deploy_all.diff index f6d2b36..b685d73 100644 --- a/org.glite.lb/deployment/deploy_all.diff +++ b/org.glite.lb/deployment/deploy_all.diff @@ -1,14 +1,14 @@ Index: org.glite/project/global.dependencies.properties =================================================================== RCS file: /cvs/jra1mw/org.glite/project/global.dependencies.properties,v -retrieving revision 1.479.2.77.2.4.2.1.4.2.2.6.2.1.2.4 -diff -u -r1.479.2.77.2.4.2.1.4.2.2.6.2.1.2.4 global.dependencies.properties ---- org.glite/project/global.dependencies.properties 14 Jul 2006 14:29:45 -0000 1.479.2.77.2.4.2.1.4.2.2.6.2.1.2.4 -+++ org.glite/project/global.dependencies.properties 21 Jul 2006 09:57:26 -0000 -@@ -1617,7 +1617,26 @@ +retrieving revision 1.482.2.279 +diff -u -p -u -r1.482.2.279 global.dependencies.properties +--- org.glite/project/global.dependencies.properties 4 Aug 2006 12:21:59 -0000 1.482.2.279 ++++ org.glite/project/global.dependencies.properties 1 Sep 2006 14:13:27 -0000 +@@ -1819,7 +1819,25 @@ ext.globus-sdk.description = The Globus ext.globus-sdk.rpm.name = vdt_globus_sdk ext.globus-sdk.rpm.version = ${ext.vdt.version} - ext.globus-sdk.rpm.age = 1 + ext.globus-sdk.rpm.age = ${ext.vdt.age} - + +# Globus vdt data server - grid ftp server @@ -28,29 +28,17 @@ diff -u -r1.479.2.77.2.4.2.1.4.2.2.6.2.1.2.4 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 ext.gpt.vendor = gpt -@@ -3338,7 +3357,7 @@ - org.glite.dgas.version = glite-dgas_R_1_1_16 - org.glite.gpbox.version = glite-gpbox_R_1_0_15 - org.glite.jdl.version = glite-jdl_R_1_0_0 --org.glite.jp.version = glite-jp_R_1_1_3 --org.glite.lb.version = glite-lb_R_1_2_11 -+org.glite.jp.version = glite-jp_R_1_3_1 -+org.glite.lb.version = glite-lb_R_1_3_2 - org.glite.rgma.version = glite-rgma_R_5_0_43 - org.glite.security.version = glite-security_R_3_0_21 - org.glite.service-discovery.version = glite-service-discovery_R_2_0_12 Index: org.glite.deployment/build.xml =================================================================== RCS file: /cvs/jra1mw/org.glite.deployment/build.xml,v retrieving revision 1.61.2.2.2.12.2.26 -diff -u -r1.61.2.2.2.12.2.26 build.xml +diff -u -p -u -r1.61.2.2.2.12.2.26 build.xml --- org.glite.deployment/build.xml 24 Apr 2006 13:39:27 -0000 1.61.2.2.2.12.2.26 -+++ org.glite.deployment/build.xml 21 Jul 2006 09:57:26 -0000 ++++ org.glite.deployment/build.xml 1 Sep 2006 14:13:27 -0000 @@ -1619,6 +1619,39 @@ @@ -103,28 +91,26 @@ diff -u -r1.61.2.2.2.12.2.26 build.xml Index: org.glite.deployment/project/dependencies.properties =================================================================== RCS file: /cvs/jra1mw/org.glite.deployment/project/dependencies.properties,v -retrieving revision 1.526.2.5.2.127.2.415.2.118 -diff -u -r1.526.2.5.2.127.2.415.2.118 dependencies.properties ---- org.glite.deployment/project/dependencies.properties 27 Jun 2006 10:35:43 -0000 1.526.2.5.2.127.2.415.2.118 -+++ org.glite.deployment/project/dependencies.properties 21 Jul 2006 09:57:26 -0000 -@@ -80,6 +80,10 @@ - - org.glite.deployment.lb.version = glite-deployment-lb_R_2_2_4 - -+ org.glite.deployment.jpis.version = HEAD -+ +retrieving revision 1.526.2.5.2.127.2.415.2.203 +diff -u -p -u -r1.526.2.5.2.127.2.415.2.203 dependencies.properties +--- org.glite.deployment/project/dependencies.properties 30 Aug 2006 07:41:36 -0000 1.526.2.5.2.127.2.415.2.203 ++++ org.glite.deployment/project/dependencies.properties 1 Sep 2006 14:13:27 -0000 +@@ -47,6 +47,8 @@ + org.glite.deployment.hydra.version = glite-deployment-hydra_R_1_0_3 + org.glite.deployment.io-client.version = glite-deployment-io-client_R_2_2_0 + org.glite.deployment.io-server.version = glite-deployment-io-server_R_2_1_8 + org.glite.deployment.jpps.version = HEAD -+ - org.glite.deployment.glite-WMSLB.version = glite-deployment-glite-WMSLB_R_2_4_2 - - org.glite.deployment.wn.version = glite-deployment-wn_R_2_3_8 ++ org.glite.deployment.jpis.version = HEAD + org.glite.deployment.lb.version = glite-deployment-lb_R_2_2_4 + org.glite.deployment.lcg-CE_torque.version = glite-deployment-lcg-CE_torque_R_3_0_4 + org.glite.deployment.lcg-CE.version = glite-deployment-lcg-CE_R_3_0_5 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.44.2.1.2.11.2.24 -diff -u -r1.44.2.1.2.11.2.24 glite.deployment.csf.xml +diff -u -p -u -r1.44.2.1.2.11.2.24 glite.deployment.csf.xml --- org.glite.deployment/project/glite.deployment.csf.xml 18 Apr 2006 15:42:14 -0000 1.44.2.1.2.11.2.24 -+++ org.glite.deployment/project/glite.deployment.csf.xml 21 Jul 2006 09:57:26 -0000 ++++ org.glite.deployment/project/glite.deployment.csf.xml 1 Sep 2006 14:13:28 -0000 @@ -667,6 +667,14 @@ @@ -182,10 +168,10 @@ 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.65.2.4 -diff -u -r1.65.2.4 glite-lb-config.py +diff -u -p -u -r1.65.2.4 glite-lb-config.py --- org.glite.deployment.lb/config/scripts/glite-lb-config.py 26 May 2006 12:24:22 -0000 1.65.2.4 -+++ org.glite.deployment.lb/config/scripts/glite-lb-config.py 21 Jul 2006 09:57:26 -0000 -@@ -129,7 +129,12 @@ ++++ org.glite.deployment.lb/config/scripts/glite-lb-config.py 1 Sep 2006 14:13:34 -0000 +@@ -129,7 +129,12 @@ python %s-config [OPTION...]""" % (self. if not os.path.exists('/tmp/mysql.sock'): os.symlink('/var/lib/mysql/mysql.sock', '/tmp/mysql.sock') @@ -199,7 +185,7 @@ diff -u -r1.65.2.4 glite-lb-config.py pid = glib.getPID('bkserverd') if pid != 0: print 'The gLite LB Server service is already running. Restarting...' -@@ -142,7 +147,7 @@ +@@ -142,7 +147,7 @@ python %s-config [OPTION...]""" % (self. pid = glib.getPID('bkserverd') if (pid != 0): @@ -208,7 +194,7 @@ diff -u -r1.65.2.4 glite-lb-config.py glib.printOkMessage() else: glib.printErrorMessage("Could not start the gLite LB Server service") -@@ -151,6 +156,36 @@ +@@ -151,6 +156,36 @@ python %s-config [OPTION...]""" % (self. return 1 #------------------------------------------------------------------- @@ -245,7 +231,7 @@ diff -u -r1.65.2.4 glite-lb-config.py # Start Servicetool #------------------------------------------------------------------- -@@ -170,6 +205,10 @@ +@@ -170,6 +205,10 @@ python %s-config [OPTION...]""" % (self. if (pid != 0): os.system('%s/etc/init.d/glite-lb-bkserverd stop' % os.environ['GLITE_LOCATION']) @@ -256,7 +242,7 @@ diff -u -r1.65.2.4 glite-lb-config.py pid = glib.getPID('bkserverd') if (pid != 0): print 'Could not stop the LB Server service ', -@@ -180,6 +219,25 @@ +@@ -180,6 +219,25 @@ python %s-config [OPTION...]""" % (self. glib.printOkMessage() #------------------------------------------------------------------- @@ -282,7 +268,7 @@ diff -u -r1.65.2.4 glite-lb-config.py # MySQL #------------------------------------------------------------------- -@@ -204,6 +262,10 @@ +@@ -204,6 +262,10 @@ python %s-config [OPTION...]""" % (self. if retval != 0: error_level = 1 @@ -293,7 +279,7 @@ diff -u -r1.65.2.4 glite-lb-config.py #------------------------------------------------------------------- # Servicetool #------------------------------------------------------------------- -@@ -334,7 +396,27 @@ +@@ -334,7 +396,29 @@ python %s-config [OPTION...]""" % (self. print "\n==> MySQL database %s already exist\n" % params['lb.database.name'] self.mysql.stop() @@ -315,6 +301,8 @@ diff -u -r1.65.2.4 glite-lb-config.py + file.write('00,30 * * * * %s %s/etc/glite-lb-export-cron-wrapper.sh 1>/dev/null\n' % (params['glite.user.name'], os.environ['GLITE_LOCATION'])) + file.close() + os.system('/bin/chmod 0644 /etc/cron.d/glite-lb-export.cron') ++ else ++ os.system('/bin/rm -f /etc/cron.d/glite-lb-export.cron') + + # Touch cron spool directory to cause reloading of the crontabs + os.system("/bin/touch /var/spool/cron") @@ -322,19 +310,19 @@ diff -u -r1.65.2.4 glite-lb-config.py #------------------------------------------------------------------- # RGMA servicetool: configure servicetool #------------------------------------------------------------------- -@@ -420,6 +502,17 @@ +@@ -420,6 +504,17 @@ def set_env(): # 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_DUMPDIR_KEEP', params['lb.export.dump.keep']); ++ glib.export('GLITE_LB_EXPORT_JOBSDIR', params['lb.export.jobs']); ++ glib.export('GLITE_LB_EXPORT_JOBSDIR_KEEP', params['lb.export.jobs.keep']); + glib.export('GLITE_LB_EXPORT_PURGE_ARGS', '%s' % params['lb.export.purgeargs']); + # Set environment @@ -344,9 +332,9 @@ 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 +diff -u -p -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 21 Jul 2006 09:57:26 -0000 ++++ org.glite.deployment.lb/config/templates/glite-lb.cfg.xml 1 Sep 2006 14:13:34 -0000 @@ -17,9 +17,16 @@ parameter. Leave it empty of comment it out to use the same as 'glite.user.name'" value="changeme"/> @@ -380,46 +368,51 @@ diff -u -r1.21 glite-lb.cfg.xml -@@ -67,7 +80,42 @@ +@@ -67,7 +80,47 @@ destination - + -+ -+ + ++ description="Spool directory where job registration requests are stored before delivered to JPPS. ++ [Type: string]" ++ value="/tmp/jpreg"/> + + ++ description="Spool directory where dump upload requests are stored before delivered to JPPS. ++ [Type: string]" ++ value="/tmp/jpdump"/> + + ++ ++ ++ ++ + -+ ++ + -+ + + ++ description="Arguments for LB purge process (a job in a given terminal state will be exported from the LB after timeouts defined here). See also glite-lb-purge documentation. ++ [Example: -c 1h -a 1h -n 1h -o 1d][Type: string]" ++ value="--cleared 2d --aborted 2w --cancelled 2w --other 2m"/> + @@ -428,9 +421,9 @@ 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.2.2 -diff -u -r1.38.2.2 glite-lb.sdf.xml.template +diff -u -p -u -r1.38.2.2 glite-lb.sdf.xml.template --- org.glite.deployment.lb/project/glite-lb.sdf.xml.template 2 May 2006 10:36:19 -0000 1.38.2.2 -+++ org.glite.deployment.lb/project/glite-lb.sdf.xml.template 21 Jul 2006 09:57:26 -0000 ++++ org.glite.deployment.lb/project/glite-lb.sdf.xml.template 1 Sep 2006 14:13:34 -0000 @@ -57,6 +57,12 @@ build="@org.glite.lb.server-bones.info.build@" arch="i386"/> @@ -457,19 +450,3 @@ diff -u -r1.38.2.2 glite-lb.sdf.xml.template @@ -153,6 +163,10 @@ diff -u -r1.44.2.1.2.11.2.24 glite.deployment.csf.xml Revision history: $Log$ + Revision 1.3 2006/06/30 11:30:28 mmulac + actualized patches + - against org.glite a org.glite.deployment from glite_R_3_0_0 + @@ -667,6 +667,14 @@ diff --git a/org.glite.lb/deployment/deploy_lb.diff b/org.glite.lb/deployment/deploy_lb.diff index 36bdf67..d6c74e2 100644 --- a/org.glite.lb/deployment/deploy_lb.diff +++ b/org.glite.lb/deployment/deploy_lb.diff @@ -1,3 +1,5 @@ +This patch was merged to deploy_all.diff, don't use it anymore. + 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