Avoid aborting a transaction that has been deadlocked; and

[moira.git] / server / qrtn.qc

diff --git a/server/qrtn.qc b/server/qrtn.qc
index 319b1b117199a63189cd5cef5b9778c83655c2d4..12bbfa1d7013bbae91597a5b369ee4a23f53d653 100644 (file)
--- a/server/qrtn.qc
+++ b/server/qrtn.qc
@@ -16,7 +16,7 @@ static char *rcsid_qrtn_qc = "$Header$";
 
 char *Argv[16];
 
-static int ingres_errno = 0;
+int ingres_errno = 0;
 extern char *whoami;
 extern FILE *journal;
 
@@ -48,8 +48,7 @@ static int ingerr(num)
     default:
        ingres_errno = SMS_INGRES_ERR;
        com_err(whoami, SMS_INGRES_ERR, " code %d\n", *num);
-       sprintf(buf, "Ingres error %d", *num);
-       send_zgram("ingres_error", buf);
+       critical_alert("SMS", "SMS server encountered INGRES ERROR %d", *num);
        return (*num);
     }
     return (0);
@@ -70,6 +69,7 @@ int sms_open_database()
        
     /* open the database */
 ##  ingres sms
+##  set lockmode session where readlock = exclusive
     return ingres_errno;
 }
 
@@ -137,6 +137,7 @@ sms_process_query(cl, name, argc, argv_ro, action, actarg)
     if (q == (struct query *)0) return(SMS_NO_HANDLE);
     v = q->validate;
 
+    ingres_errno = 0;
     if (q->type != RETRIEVE)
 ##      begin transaction
 
@@ -192,9 +193,6 @@ sms_process_query(cl, name, argc, argv_ro, action, actarg)
                status = do_retrieve(q, pqual, psort, action, actarg);
            }
            if (status != SMS_SUCCESS) break;
-           table = q->rtable;
-##          repeat replace tblstats (retrieves = tblstats.retrieves + 1)
-##                 where tblstats.#table = @table
        } else {
            status = (*v->post_rtn)(q, Argv, cl, action, actarg);
        }
@@ -215,9 +213,11 @@ sms_process_query(cl, name, argc, argv_ro, action, actarg)
            status = do_update(q, &Argv[q->argc], qual, action, actarg);
            if (status != SMS_SUCCESS) break;
            table = q->rtable;
-##         repeat replace tblstats (updates = tblstats.updates + 1,
-##                                  modtime = "now")
-##             where tblstats.#table = @table
+           if (strcmp(q->shortname, "sshi") && strcmp(q->shortname, "ssif")) {
+##             repeat replace tblstats (updates = tblstats.updates + 1,
+##                                      modtime = "now")
+##                 where tblstats.#table = @table
+           }
        }
 
        /* execute followup routine (if any) */
@@ -309,7 +309,9 @@ out:
                fflush(journal);
            }
        } else {
-##          abort              /* it never happened */
+           if (status != SMS_DEADLOCK) {
+##             abort           /* it never happened */
+           }
        }
     }
 
@@ -534,6 +536,10 @@ get_client(cl, client_type, client_id)
     int child;
     struct save_queue *sq_create();
 
+    if (!strcmp(strtrim(list_type), strtrim(member_type)) &&
+       list_id == member_id)
+       return(1);
+
     /* see if client is a direct member of list */
 ##  repeat retrieve (exists = any(m.#member_id where 
 ##                               m.#list_id = @list_id and
@@ -775,6 +781,7 @@ set_next_object_id(object, table)
     if (LOG_RES)
         com_err(whoami, 0, "setting ID %s to %d", name, value);
 ##  repeat replace v (#value = @value) where v.#name = @name
+    if (ingres_errno != 0) return(ingres_errno);
     return(SMS_SUCCESS);
 ##}