Diane Delgado's changes for a fixed table-locking order

[moira.git] / gen / hesiod.dc

diff --git a/gen/hesiod.dc b/gen/hesiod.dc
index d99b2f87c809fd71841fd9c8e7c0099fe2bee8d8..f83218b1b8cdcdcdf878e90cab527a526ce824ca 100644 (file)
--- a/gen/hesiod.dc
+++ b/gen/hesiod.dc
@@ -122,7 +122,7 @@ get_mach()
     EXEC SQL DECLARE m_cursor CURSOR FOR
       SELECT name, mach_id
       FROM machine
-      WHERE status = 1
+      WHERE status = 1 and mach_id != 0
       ORDER BY mach_id;
     EXEC SQL OPEN m_cursor;
     while (1) {
@@ -309,8 +309,10 @@ do_groups()
     EXEC SQL WHENEVER SQLERROR GOTO sqlerr;
 
     /* get lock records */
-    EXEC SQL SELECT modtime INTO :name FROM list WHERE list_id = 0;
+    EXEC SQL SELECT modtime INTO :name FROM imembers WHERE list_id = 0;
     EXEC SQL SELECT modtime INTO :name FROM users WHERE users_id = 0;
+    EXEC SQL SELECT modtime INTO :name FROM list WHERE list_id = 0;
+
 
     EXEC SQL DECLARE l_cursor CURSOR FOR
       SELECT name, gid, list_id
@@ -458,6 +460,11 @@ do_filsys()
     sq = sq_create();
     sq2 = sq_create();
 
+    /* get lock records */
+
+    EXEC SQL SELECT modtime INTO :name from filesys where filsys_id = 0;
+    EXEC SQL SELECT modtime INTO :name from fsgroup where filsys_id = 0;
+
     EXEC SQL DECLARE f_cursor CURSOR FOR
       SELECT label, type, name, mach_id, access, mount, comments, filsys_id
       FROM filesys
@@ -646,6 +653,12 @@ do_cluster()
     fprintf(stderr, "Building cluster.db\n");
     get_mach();
 
+    /* get lock records */
+    EXEC SQL SELECT modtime INTO :name  FROM machine where mach_id = 0;
+    EXEC SQL SELECT modtime INTO :name  FROM cluster where clu_id = 0;
+    EXEC SQL SELECT modtime INTO :name  FROM mcmap where mach_id = 0;
+    EXEC SQL SELECT modtime INTO :name  FROM svc where clu_id = 0;
+
     EXEC SQL SELECT MAX(clu_id) INTO :maxclu FROM cluster;
     maxclu++;
     setsize = howmany(maxclu, NSETBITS);
@@ -1063,3 +1076,10 @@ do_service()
     db_error(sqlca.sqlcode);
     return(0);
 }
+
+
+
+
+
+
+