Removing workaround function, correcting globus function and add configuration

to increase DB size

diff --git a/org.glite.yaim.lb/config/functions/config_glite_lb b/org.glite.yaim.lb/config/functions/config_glite_lb
index a49e7a3..1571055 100644 (file)
--- a/org.glite.yaim.lb/config/functions/config_glite_lb
+++ b/org.glite.yaim.lb/config/functions/config_glite_lb
@@ -13,8 +13,9 @@ function config_glite_lb_setenv(){
   yaimgridenv_set X509_CERT_DIR /etc/grid-security/certificates
   yaimgridenv_set X509_VOMS_DIR /etc/grid-security/vomsdir
 
-  yaimgridpath_append LD_LIBRARY_PATH /opt/globus/lib  
-  yaimgridpath_append LD_LIBRARY_PATH /opt/c-ares/lib
+  yaimgridpath_append LD_LIBRARY_PATH ${INSTALL_ROOT:-opt}/glite/lib  
+  yaimgridpath_append LD_LIBRARY_PATH ${INSTALL_ROOT:-opt}/globus/lib  
+  yaimgridpath_append LD_LIBRARY_PATH ${INSTALL_ROOT:-opt}/c-ares/lib
 }
 
 function config_glite_lb() {
@@ -63,12 +64,19 @@ function config_glite_lb() {
     mysql -u root --password="$MYSQL_PASSWORD" -e "GRANT ALL PRIVILEGES on lbserver20.* to lbserver IDENTIFIED BY '' WITH GRANT OPTION;"
     mysql -u root --password="$MYSQL_PASSWORD" -e "GRANT ALL PRIVILEGES on lbserver20.* to lbserver@'$HOSTNAME' IDENTIFIED BY '' WITH GRANT OPTION;"
     mysql -u root --password="$MYSQL_PASSWORD" -e "GRANT ALL PRIVILEGES on lbserver20.* to lbserver@localhost IDENTIFIED BY '' WITH GRANT OPTION;"
+    mysql -u root --password="$MYSQL_PASSWORD" -e "ALTER TABLE short_fields MAX_ROWS=1000000000;" lbserver20
+    mysql -u root --password="$MYSQL_PASSWORD" -e "ALTER TABLE long_fields MAX_ROWS=55000000;" lbserver20
+    mysql -u root --password="$MYSQL_PASSWORD" -e "ALTER TABLE states MAX_ROWS=9500000;" lbserver20
+    mysql -u root --password="$MYSQL_PASSWORD" -e "ALTER TABLE events MAX_ROWS=175000000;" lbserver20
   else
     yaimlog "Database lbserver20 already exists"
   fi
 
   # do we need bkindex?
 
+  GLITE_LOCATION_VAR=${GLITE_LOCATION_VAR:-/var/glite}
+  mkdir -p $GLITE_LOCATION_VAR   # Needed to store PID of LB server 
+
   chown $GLITE_USER:$GLITE_USER $GLITE_LOCATION_VAR
   chmod 0755 $GLITE_LOCATION_VAR
 
@@ -95,6 +103,8 @@ function config_glite_lb() {
     echo "${GLITE_LOCATION}/etc/init.d/glite-lb-bkserverd" >> ${GLITE_LOCATION}/etc/gLiteservices
   fi
 
+  touch ${GLITE_LOCATION}/etc/LB-super-users
+
   . /opt/glite/etc/profile.d/grid-env.sh
   ${GLITE_LOCATION}/etc/init.d/glite-lb-bkserverd restart
 

diff --git a/org.glite.yaim.lb/config/node-info.d/glite-lb b/org.glite.yaim.lb/config/node-info.d/glite-lb
index 068c1e2..72c0042 100644 (file)
--- a/org.glite.yaim.lb/config/node-info.d/glite-lb
+++ b/org.glite.yaim.lb/config/node-info.d/glite-lb
@@ -1,5 +1,4 @@
 LB_FUNCTIONS="
-config_glite_lb_workarounds
 config_add_pool_env
 config_crl
 config_host_certs
@@ -9,7 +8,7 @@ config_mkgridmap
 config_java
 config_rgma_client
 config_gip_service
-config_globus
+config_globus_clients
 config_glite_lb
 config_glite_locallogger
 config_glite_initd"