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
+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 @@
</if>
</target>
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 @@
<equals arg1="${org.glite.deployment.lb.version}" arg2="HEAD" />
</condition>
===================================================================
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')
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):
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
#-------------------------------------------------------------------
# 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'])
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()
#-------------------------------------------------------------------
# MySQL
#-------------------------------------------------------------------
-@@ -204,6 +262,10 @@
+@@ -204,6 +262,10 @@ python %s-config [OPTION...]""" % (self.
if retval != 0:
error_level = 1
#-------------------------------------------------------------------
# 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()
+ 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")
#-------------------------------------------------------------------
# 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
===================================================================
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"/>
<!-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -->
<!-- System parameters - You should leave these alone -->
<!-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -->
-@@ -67,7 +80,42 @@
+@@ -67,7 +80,47 @@
<value>destination</value>
</lb.index.list>
-
+
-+ <lb.export.bkserver
-+ description="Book Keeping Server service when differs from default port on localhost.
-+ [Example: localhost:9000][Type: string]"
-+ value=""/>
-+
+ <lb.export.jpreg
-+ description="Maildir for job registrations.
-+ [Example: /tmp/jpreg][Type: string]"
-+ value=""/>
++ description="Spool directory where job registration requests are stored before delivered to JPPS.
++ [Type: string]"
++ value="/tmp/jpreg"/>
+
+ <lb.export.jpdump
-+ description="Maildir for job dumps.
-+ [Example: /tmp/jpdump][Type: string]"
-+ value=""/>
++ description="Spool directory where dump upload requests are stored before delivered to JPPS.
++ [Type: string]"
++ value="/tmp/jpdump"/>
+
+ <lb.export.dump
-+ description="Dump directory for purged jobs.
-+ [Example: /tmp/dump][Type: string]"
++ description="Temporary directory for monitoring dumps, it's cleaned automatically.
++ [Type: string]"
++ value="/tmp/dump"/>
++
++ <lb.export.purge
++ description="Temporary directory for dumps of purged jobs.
++ [Type: string]"
++ value="/tmp/purge"/>
++
++ <lb.export.purge.keep
++ description="Directory for dumps of jobs that were already handled (sent to JPPS).
++ [Type: string]"
+ value=""/>
+
-+ <lb.export.dump.old
-+ description="Dump directory for handled purged jobs.
-+ [Example: /tmp/dump.old][Type: string]"
-+ value=""/>
++ <lb.export.jobs
++ description="Exported events in file per job form before delivered to JPPS.
++ [Type: string]"
++ value="/tmp/lb_export"/>
+
-+ <lb.export.export
-+ description="Exported events divided to file per job.
-+ [Example: /tmp/lb_export][Type: string]"
++ <lb.export.jobs.keep
++ description="Keep the already handled exported events in file per job form.
++ [Type: string]"
+ value=""/>
+
+ <lb.export.purgeargs
-+ description="Purge arguments (with timeouts).
-+ [Example: -a 1h -c 1h -n 1h -o 1d][Type: string]"
-+ value="-a 1d -c 1d -n 1d -o 7d"/>
++ 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"/>
+
</parameters>
===================================================================
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"/>
<component name="gridsite"
version="@org.gridsite.core.info.version@"
age="@org.gridsite.core.info.age@"
-Index: org.glite.security/project/dependencies.properties
-===================================================================
-RCS file: /cvs/jra1mw/org.glite.security/project/dependencies.properties,v
-retrieving revision 1.313.2.317.2.55
-diff -u -r1.313.2.317.2.55 dependencies.properties
---- org.glite.security/project/dependencies.properties 14 Jun 2006 10:26:21 -0000 1.313.2.317.2.55
-+++ org.glite.security/project/dependencies.properties 21 Jul 2006 09:57:27 -0000
-@@ -42,7 +42,7 @@
- org.glite.security.lcas-plugins-check-executable.version = glite-security-lcas-plugins-check-executable_R_1_2_0
- org.glite.security.lcas-interface.version = glite-security-lcas-interface_R_1_3_1
- org.glite.security.lcas.version = glite-security-lcas_R_1_3_1
--org.glite.security.gsoap-plugin.version = glite-security-gsoap-plugin_R_1_2_3
-+org.glite.security.gsoap-plugin.version = glite-security-gsoap-plugin_R_1_3_1
- org.glite.security.cgsi-gsoap.version = glite-security-cgsi-gsoap_R_1_1_15_6
- org.glite.security.proxyrenewal.version = glite-security-proxyrenewal_R_1_0_19
- org.glite.security.jobrepository.version = glite-security-jobrepository_R_1_2_2
git://scientific.zcu.cz / jra1mw.git / commitdiff