Fixed dump uploads.

Example JP import script (just little tested).

diff --git a/org.glite.jp.client/Makefile b/org.glite.jp.client/Makefile
index 10b006c..61c05d1 100644 (file)
--- a/org.glite.jp.client/Makefile
+++ b/org.glite.jp.client/Makefile
@@ -146,6 +146,7 @@ install:
        ${INSTALL} -m 755 ${daemon} ${PREFIX}/bin
        ${INSTALL} -m 644 ${LIB} ${PREFIX}/lib
        ${INSTALL} -m 644 jpps_upload_files ${PREFIX}/examples/glite-jp-primary-upload_files
+       cd ${top_srcdir}/examples && ${INSTALL} -m 644 glite-jp-importer.sh ${PREFIX}/examples/
        cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${PREFIX}/${STAGETO}
        if [ x${DOSTAGE} = xyes ]; then \
                cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${STAGE_HDRS} ${PREFIX}/${STAGETO} ; \

diff --git a/org.glite.jp.client/doc/README.jpimporter b/org.glite.jp.client/doc/README.jpimporter
index a5629db..5041ca6 100644 (file)
--- a/org.glite.jp.client/doc/README.jpimporter
+++ b/org.glite.jp.client/doc/README.jpimporter
@@ -64,7 +64,7 @@ LB server like this:
 is stored in the /tmp/lb_server_jpreg directory.)
 
 Then you should run the jpimporter daemon on the same host:
-./glite-jp-importer -k <hostcert> -k <hostkey> -p jpps.server.address:8900 -r /tmp/lb_server_jpreg -d /tmp/lb_server_jpdump
+./glite-jp-importer -c <hostcert> -k <hostkey> -p jpps.server.address:8900 -r /tmp/lb_server_jpreg -d /tmp/lb_server_jpdump
 
 (Every job registration anounced in /tmp/lb_server_jpreg directory will be sent
 to the JP PS at the address jpps.server.address:8900.)

diff --git a/org.glite.jp.client/examples/glite-jp-importer.sh b/org.glite.jp.client/examples/glite-jp-importer.sh
new file mode 100644 (file)
index 0000000..f0ea65f
--- /dev/null
+++ b/org.glite.jp.client/examples/glite-jp-importer.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+
+#
+# example script for purging LB and importing the dumps to JP
+#
+
+# job provenance server
+JBSERVER=umbar.ics.muni.cz:8901
+# bookkeeping server
+BKSERVER=scientific.civ.zcu.cz:9000
+# dump directory of bkserver (-D argument)
+BKSERVER_DUMPDIR=/tmp/dump
+# LB maildir for job registration (-J argument)
+BKSERVER_JOBREG_MAILDIR=/tmp/lb_server_jpreg
+
+CERT_ARGS="-c ~/.cert/hostcert.pem -k ~/.cert/hostkey.pem"
+LB_DUMPDIR=/tmp/lb_server_dump
+BKSERVER_DUMPDIR_OLD=/tmp/dump.old
+LB_EXPORTDIR=/tmp/lb_export
+PREFIX=`dirname $0`/..
+LOGDIR=/tmp/log
+
+
+[ -d $LB_DUMPDIR ] || mkdir -p $LB_DUMPDIR
+[ -d $BKSERVER_DUMPDIR ] || mkdir -p $BKSERVER_DUMPDIR
+[ -d $BKSERVER_DUMPDIR_OLD ] || mkdir -p $BKSERVER_DUMPDIR_OLD
+[ -d $LB_EXPORTDIR ] || mkdir -p $LB_EXPORTDIR
+[ -d $LOGDIR ] || mkdir -p $LOGDIR
+
+$PREFIX/bin/glite-jp-importer -r $BKSERVER_JOBREG_MAILDIR -d $LB_DUMPDIR $CERT_ARGS -g -p $JBSERVER > $LOGDIR/jp-importer.log 2>&1 &
+
+while [ 1 ]; do
+  $PREFIX/sbin/glite-lb-purge -o 1 -l -m $BKSERVER
+
+  for file in $BKSERVER_DUMPDIR/*; do
+    rm -f $LB_EXPORTDIR/*
+    $PREFIX/sbin/glite-lb-lb_dump_exporter -d $file -s $LB_EXPORTDIR -m $LB_DUMPDIR
+    mv $file $BKSERVER_DUMPDIR_OLD
+  done
+
+  sleep 30
+done

diff --git a/org.glite.jp.client/src/jpimporter.c b/org.glite.jp.client/src/jpimporter.c
index 5b2d26d..7a30ef8 100644 (file)
--- a/org.glite.jp.client/src/jpimporter.c
+++ b/org.glite.jp.client/src/jpimporter.c
@@ -445,7 +445,7 @@ static int dump_importer(void)
        } else do {
                su_in.job = tab[_job].val;
                su_in.class_ = "urn:org.glite.jp.primary:lb";
-               su_in.name = tab[_file].val;
+               su_in.name = NULL;
                su_in.commitBefore = 1000 + time(NULL);
                su_in.contentType = "text/lb";
                dprintf(("[%s] Importing LB dump file '%s'\n", name, tab[_file].val));