From: probe <probe>
Date: Thu, 30 Jul 1992 18:00:21 +0000 (+0000)
Subject: Re-initialize the Ubik connection after a prdb update failure.
X-Git-Tag: release77~460
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/16838ad10594be33111aa41854dcaec1e6e88cf1

Re-initialize the Ubik connection after a prdb update failure.
---

diff --git a/incremental/afs.c b/incremental/afs.c
index 9c9a58eb..5749dfa9 100644
--- a/incremental/afs.c
+++ b/incremental/afs.c
@@ -7,6 +7,7 @@
  * <mit-copyright.h>.
  */
 
+#include <stdio.h>
 #include <sys/types.h>
 #include <sys/file.h>
 #include <strings.h>
@@ -24,6 +25,10 @@
 #define STOP_FILE "/moira/afs/noafs"
 #define file_exists(file) (access((file), F_OK) == 0)
 
+#if defined(vax) && !defined(__STDC__)
+#define volatile
+#endif
+
 char *whoami;
 
 /* Main stub routines */
@@ -486,7 +491,7 @@ long pr_try(fn, a1, a2, a3, a4, a5, a6, a7, a8)
     char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8;
 {
     static int initd=0;
-    register long code;
+    volatile register long code;
     register int tries = 0;
 #ifdef DEBUG
     char fname[64];
@@ -502,9 +507,8 @@ long pr_try(fn, a1, a2, a3, a4, a5, a6, a7, a8)
 	    return;
 	}
 	initd = 1;
-    } else {
-	sleep(1);				/* give ptserver room */
     }
+    sleep(1);					/* give ptserver room */
 
     while (code = (*fn)(a1, a2, a3, a4, a5, a6, a7, a8)) {
 #ifdef DEBUG
@@ -519,16 +523,25 @@ long pr_try(fn, a1, a2, a3, a4, a5, a6, a7, a8)
 	else if (fn == pr_ChangeEntry) strcpy(fname, "pr_ChangeEntry");
 	else if (fn == pr_SetFieldsEntry) strcpy(fname, "pr_SetFieldsEntry");
 	else if (fn == pr_AddToGroup) strcpy(fname, "pr_AddToGroup");
-	else {
+	else
 	    sprintf(fname, "pr_??? (0x%08x)", (long)fn);
-	}
 
-	com_err(whoami, code, "%s failed (try %d @%u)", fname, tries+1, t);
+	com_err(whoami, code, "- %s failed (try %d @%u)", fname, tries+1, t);
 #endif
-	if (++tries > 2)
-	    return code;
-	if (code == UNOQUORUM) { sleep(90); continue; }
-	else { sleep(15); continue; }
+	if (++tries > 2) break;		/* 3 tries */
+	
+	if (code == UNOQUORUM) sleep(90);
+	else sleep(15);
+
+	/* Re-initialize the prdb connection */
+    	code=pr_Initialize(0, AFSCONF_CLIENTNAME, 0);
+    	if (!code) code=pr_Initialize(1, AFSCONF_CLIENTNAME, 0);
+	if (code) {
+	    critical_alert("incremental", "Couldn't re-initialize libprot: %s",
+			   error_message(code));
+	    initd = 0;				/* we lost */
+	    break;
+	}
     }
     return code;
 }