imporved zombie schema + migration

diff --git a/org.glite.lb.server/config/glite-lb-dbsetup.sql b/org.glite.lb.server/config/glite-lb-dbsetup.sql
index 50d8083..163995e 100644 (file)
--- a/org.glite.lb.server/config/glite-lb-dbsetup.sql
+++ b/org.glite.lb.server/config/glite-lb-dbsetup.sql
@@ -136,15 +136,14 @@ create table zombie_jobs (
        binary_jobid    binary(16)      not null,
        prefix_id       binary(1)       not null,
 
-       primary key (binary_jobid),
-       index (binary_jobid)
+       primary key (binary_jobid)
 ) engine=innodb;
 
 create table zombie_prefixes (
        prefix_id       binary(1)       not null,
        prefix          varchar(255)    binary not null,
 
-       primary key (prefix_id),
+       primary key (prefix_id)
 ) engine=innodb;
 
 

diff --git a/org.glite.lb.server/config/glite-lb-migrate_db2transactions b/org.glite.lb.server/config/glite-lb-migrate_db2transactions
index 11ca040..204d733 100644 (file)
--- a/org.glite.lb.server/config/glite-lb-migrate_db2transactions
+++ b/org.glite.lb.server/config/glite-lb-migrate_db2transactions
@@ -59,7 +59,6 @@ fi
 mysql -u lbserver $DB_NAME -e "ALTER TABLE jobs ADD proxy bool not null"
 mysql -u lbserver $DB_NAME -e "ALTER TABLE jobs ADD server bool not null"
 mysql -u lbserver $DB_NAME -e "ALTER TABLE jobs ADD grey bool not null"
-mysql -u lbserver $DB_NAME -e "ALTER TABLE jobs ADD zombie bool not null"
 mysql -u lbserver $DB_NAME -e "ALTER TABLE jobs ADD nevents int not null"
 
 
@@ -112,3 +111,24 @@ mysql -u lbserver $DB_NAME -e "ALTER TABLE notif_registrations ADD index(STD_net
 
 mysql -u lbserver $DB_NAME -e "ALTER TABLE notif_registrations ADD JDL_VirtualOrganisation varchar(200) null" && \
 mysql -u lbserver $DB_NAME -e "ALTER TABLE notif_registrations ADD index(JDL_VirtualOrganisation)"
+
+
+# zombie jobs
+mysql -u lbserver $DB_NAME -e "\
+\
+create table zombie_jobs (\
+        binary_jobid    binary(16)      not null,\
+        prefix_id       binary(1)       not null,\
+\
+        primary key (binary_jobid)\
+) engine=innodb"
+
+mysql -u lbserver $DB_NAME -e "\
+\
+create table zombie_prefixes (\
+        prefix_id       binary(1)       not null,\
+        prefix          varchar(255)    binary not null,\
+\
+        primary key (prefix_id)\
+) engine=innodb"
+