From 7ba59b7296995a88cf38adfae84751c7d6b0575b Mon Sep 17 00:00:00 2001
From: Alberto Di Meglio <alberto.di.meglio@cern.ch>
Date: Mon, 5 Dec 2005 16:58:32 +0000
Subject: [PATCH] Added configuration parameter for setting mysql
 max_allowed_packet

---
 org.glite.deployment.lb/CHANGELOG                         |  3 +++
 org.glite.deployment.lb/config/scripts/glite-lb-config.py | 15 ++++++++++-----
 org.glite.deployment.lb/config/templates/glite-lb.cfg.xml | 11 +++++++++++
 org.glite.deployment.lb/project/version.properties        |  4 ++--
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/org.glite.deployment.lb/CHANGELOG b/org.glite.deployment.lb/CHANGELOG
index f80f7d9..e899df1 100644
--- a/org.glite.deployment.lb/CHANGELOG
+++ b/org.glite.deployment.lb/CHANGELOG
@@ -1,3 +1,6 @@
+DATE: 04-12-2005 21:15
+[dimeglio] Added configuration parameter for setting mysql max_allowed_packet
+
 DATE: 23-11-2005 23:50
 [dimeglio] Use ConfigParams class
 [dimeglio] Removed servietool instabce config params, put instance creation in script
diff --git a/org.glite.deployment.lb/config/scripts/glite-lb-config.py b/org.glite.deployment.lb/config/scripts/glite-lb-config.py
index 678a89e..6c951cb 100644
--- a/org.glite.deployment.lb/config/scripts/glite-lb-config.py
+++ b/org.glite.deployment.lb/config/scripts/glite-lb-config.py
@@ -6,7 +6,7 @@
 # For license conditions see the license file or http://eu-egee.org/license.html
 #
 ################################################################################
-# glite-lb-config v. 2.1.0
+# glite-lb-config v. 2.1.1
 #
 # Post-installation script for configuring the gLite Logging and Bookkeping Server
 # Robert Harakaly < robert.harakaly@cern.ch >
@@ -48,7 +48,7 @@ class glite_lb:
     def __init__(self):
         self.mysql = MySQL.Mysql()
         self.verbose = 0
-        self.version = "2.1.0"
+        self.version = "2.1.1"
         self.name = "glite-lb"
         self.friendly_name = "gLite Logging and Bookkeeping"
         
@@ -213,10 +213,10 @@ python %s-config [OPTION...]""" % (self.name, os.environ['GLITE_LOCATION'], \
         #--------------------------------------------------------
         
         if os.system("python %s/glite-security-utils-config.py --subservice" % glib.getScriptPath()):
-            print "\nConfiguring gLite Security Utilities                   ",
+            print "\nConfiguring gLite Security Utilities                      ",
             glib.printFailedMessage()
         else:
-            print "\nConfiguring gLite Security Utilities                   ",
+            print "\nConfiguring gLite Security Utilities                      ",
             glib.printOkMessage()
         
         # Create the GLITE_USER if it doesn't exists
@@ -228,8 +228,8 @@ python %s-config [OPTION...]""" % (self.name, os.environ['GLITE_LOCATION'], \
         glib.printOkMessage()
 
         # Create all directories needed
-        print "\nVerify CA certificates directory            ",
         glib.check_dir(os.environ['GLITE_CERT_DIR'])
+        print "\nVerify CA certificates directory                          ",
         glib.printOkMessage()
          
         # Copy certificates
@@ -245,6 +245,10 @@ python %s-config [OPTION...]""" % (self.name, os.environ['GLITE_LOCATION'], \
         # Configure MySQL
         #--------------------------------------------------------
 
+        # Set mysql parameters
+        #self.mysql.setConfiguration('client','max_allowed_packet',params['mysql.max_allowed_packet'])
+        self.mysql.setConfiguration('mysqld','max_allowed_packet',params['mysql.max_allowed_packet'])
+        
         # start MySQL
         self.mysql.stop()
         time.sleep(5)
@@ -364,6 +368,7 @@ def loadDefaults(params):
     params['mysql.root.password'] = ""
     params['lb.database.name'] = "lbserver20"
     params['lb.database.username'] = "lbserver"
+    params['mysql.max_allowed_packet'] = "17"
     
     params['lbserver.serviceName'] = 'LB Server service at %s' % glib.fq_hostname
     params['lbserver.serviceType'] = 'org.glite.lb.server'
diff --git a/org.glite.deployment.lb/config/templates/glite-lb.cfg.xml b/org.glite.deployment.lb/config/templates/glite-lb.cfg.xml
index d0bc5c4..fab2459 100644
--- a/org.glite.deployment.lb/config/templates/glite-lb.cfg.xml
+++ b/org.glite.deployment.lb/config/templates/glite-lb.cfg.xml
@@ -34,6 +34,11 @@
 			description="Enable check of host certificates"
 			value="true"/>
 
+		<rgma.servicetool.activate
+			description="Turn on/off servicetool for the node.
+				[Example: true ] [Type: 'boolean']"
+			value="true"/>			
+
 		<!-- mysql configuration -->
 		<set.mysql.root.password
 			description="If this parameter is true, then the root password of the mysql database
@@ -42,6 +47,12 @@
 			installation and configuration of the service, if mysql is not managed in some other way"
 			value="false"/>
 
+		<mysql.max_allowed_packet
+			description="This parameter allows to set the max_allowed_packet parameter in the mysql
+			configuration file /etc/my.cnf. The default recommended value for the LB server is 17MB
+			[Example: 17][Type: Integer][Unit: MB]"
+			value="17"/>
+
 		<!-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -->
 		<!-- System parameters - You should leave these alone -->
 		<!-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -->		
diff --git a/org.glite.deployment.lb/project/version.properties b/org.glite.deployment.lb/project/version.properties
index af0c1df..fd56734 100644
--- a/org.glite.deployment.lb/project/version.properties
+++ b/org.glite.deployment.lb/project/version.properties
@@ -1,4 +1,4 @@
 
-module.version = 2.1.0
-module.age = 2
+module.version = 2.1.1
+module.age = 1
 				
\ No newline at end of file
-- 
1.8.2.3