Merge lp:~jontai/openvista-gtm-integration/bug398068 into lp:openvista-gtm-integration

[Jon Tai]

[jeff.apple (jeff-apple)]

review: Approve

=== modified file 'packages/rpm/openvista-utils.spec'
--- packages/rpm/openvista-utils.spec	2009-07-08 04:10:08 +0000
+++ packages/rpm/openvista-utils.spec	2009-07-11 06:06:21 +0000
@@ -1,6 +1,6 @@
 Name:		openvista-utils
 Version:	0.8.3
-Release:	2
+Release:	3
 Summary:	Utilities for configuring and managing OpenVista
 License:	AGPL
 Vendor:		Medsphere Systems Corporation
@@ -159,11 +159,28 @@
 %pre
 /usr/sbin/useradd -G gtm openvista 2> /dev/null || :
 
+# update lock space in existing databases if upgrading
+%triggerun -- openvista-utils <= 0.8.3-2
+for instance in /opt/openvista/*; do
+    if [ -L ${instance}/gtm ]; then
+        gtm_dist=${instance}/gtm gtmgbldir=${instance}/globals/mumps.gld gtmroutines=${instance}/gtm ${instance}/gtm/mumps -run ^GDE > /dev/null 2>&1 <<EOF
+CHANGE -SEGMENT DEFAULT -LOCK_SPACE=400
+CHANGE -SEGMENT SCRATCH -LOCK_SPACE=400
+TEMPLATE -SEGMENT -LOCK_SPACE=400
+EXIT
+EOF
+        gtm_dist=${instance}/gtm gtmgbldir=${instance}/globals/mumps.gld ${instance}/gtm/mupip set -region -lock_space=400 DEFAULT
+        gtm_dist=${instance}/gtm gtmgbldir=${instance}/globals/mumps.gld ${instance}/gtm/mupip set -region -lock_space=400 SCRATCH
+    fi
+done
+
 %post
-/sbin/chkconfig --add openvista-databases
-/sbin/chkconfig openvista-databases on
-/sbin/chkconfig --add openvista
-/sbin/chkconfig openvista on
+if [ $1 = 1 ]; then
+    /sbin/chkconfig --add openvista-databases
+    /sbin/chkconfig openvista-databases on
+    /sbin/chkconfig --add openvista
+    /sbin/chkconfig openvista on
+fi
 
 /sbin/service httpd reload > /dev/null 2>&1 || :
 

=== modified file 'scripts/usr/sbin/ovinstanceadd'
--- scripts/usr/sbin/ovinstanceadd	2009-07-02 17:33:42 +0000
+++ scripts/usr/sbin/ovinstanceadd	2009-07-11 04:52:44 +0000
@@ -232,9 +232,9 @@
 (
     umask 027
     mumps -run ^GDE > /dev/null 2>&1 <<EOF
-CHANGE -SEGMENT DEFAULT -ACCESS_METHOD=BG -BLOCK_SIZE=4096 -ALLOCATION=1024 -EXTENSION_COUNT=1024 -GLOBAL_BUFFER_COUNT=4096 -FILE=$root/$instance/globals/default.dat
+CHANGE -SEGMENT DEFAULT -ACCESS_METHOD=BG -BLOCK_SIZE=4096 -ALLOCATION=1024 -EXTENSION_COUNT=1024 -GLOBAL_BUFFER_COUNT=4096 -LOCK_SPACE=400 -FILE=$root/$instance/globals/default.dat
 CHANGE -REGION DEFAULT -RECORD_SIZE=4080 -KEY_SIZE=255 -JOURNAL=(BEFORE_IMAGE,FILE_NAME="$root/$instance/journals/default.mjl") -DYNAMIC_SEGMENT=DEFAULT
-TEMPLATE -SEGMENT -ACCESS_METHOD=BG -BLOCK_SIZE=4096 -ALLOCATION=1024 -EXTENSION_COUNT=1024 -GLOBAL_BUFFER_COUNT=4096
+TEMPLATE -SEGMENT -ACCESS_METHOD=BG -BLOCK_SIZE=4096 -ALLOCATION=1024 -EXTENSION_COUNT=1024 -GLOBAL_BUFFER_COUNT=4096 -LOCK_SPACE=400
 TEMPLATE -REGION -RECORD_SIZE=4080 -KEY_SIZE=255 -NOJOURNAL
 ADD -SEGMENT SCRATCH -FILE=$root/$instance/globals/scratch.dat
 ADD -REGION SCRATCH -DYNAMIC_SEGMENT=SCRATCH