Work on update while servers are running. Three lock files introduced.
[idzebra-moved-to-github.git] / index / lockidx.c
index ed7c7f8..75bec86 100644 (file)
@@ -4,7 +4,12 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: lockidx.c,v $
- * Revision 1.1  1995-12-07 17:38:47  adam
+ * Revision 1.2  1995-12-08 16:22:54  adam
+ * Work on update while servers are running. Three lock files introduced.
+ * The servers reload their registers when necessary, but they don't
+ * reestablish result sets yet.
+ *
+ * Revision 1.1  1995/12/07  17:38:47  adam
  * Work locking mechanisms for concurrent updates/commit.
  *
  */
 #include "index.h"
 
 static int lock_fd = -1;
+static int server_lock_cmt = -1;
+static int server_lock_org = -1;
+
+int zebraIndexWait (int commitPhase)
+{
+    char pathPrefix[1024];
+    char path[1024];
+    int fd;
+    
+    zebraLockPrefix (pathPrefix);
+
+    if (server_lock_cmt == -1)
+    {
+        sprintf (path, "%s%s", FNAME_COMMIT_LOCK, pathPrefix);
+        if ((server_lock_cmt = open (path, O_CREAT|O_RDWR|O_SYNC, 0666))
+            == -1)
+        {
+            logf (LOG_FATAL|LOG_ERRNO, "create %s", path);
+            return -1;
+        }
+    }
+    else
+        flock (server_lock_cmt, LOCK_UN);
+    if (server_lock_org == -1)
+    {
+        sprintf (path, "%s%s", FNAME_ORG_LOCK, pathPrefix);
+        if ((server_lock_org = open (path, O_CREAT|O_RDWR|O_SYNC, 0666))
+            == -1)
+        {
+            logf (LOG_FATAL|LOG_ERRNO, "create %s", path);
+            return -1;
+        }
+    }
+    else
+        flock (server_lock_org, LOCK_UN);
+    if (commitPhase)
+        fd = server_lock_cmt;
+    else
+        fd = server_lock_org;
+    if (flock (fd, LOCK_EX|LOCK_NB) == -1)
+    {
+        if (errno != EWOULDBLOCK)
+        {
+            logf (LOG_FATAL|LOG_ERRNO, "flock");
+            exit (1);
+        }
+        if (commitPhase)
+            logf (LOG_LOG, "Waiting for lock cmt");
+        else
+            logf (LOG_LOG, "Waiting for lock org");
+        if (flock (fd, LOCK_EX) == -1)
+        {
+            logf (LOG_FATAL|LOG_ERRNO, "flock");
+            exit (1);
+        }
+    }
+    flock (fd, LOCK_UN);
+    return 0;
+}
+
 
 void zebraIndexLockMsg (const char *str)
 {
-    int l, r;
+    char path[1024];
+    char pathPrefix[1024];
+    int l, r, fd;
 
     assert (lock_fd != -1);
     lseek (lock_fd, 0L, SEEK_SET);
@@ -34,105 +101,115 @@ void zebraIndexLockMsg (const char *str)
         logf (LOG_FATAL|LOG_ERRNO, "write lock file");
         exit (1);
     }
+    zebraLockPrefix (pathPrefix);
+    sprintf (path, "%s%s", pathPrefix, FNAME_TOUCH_TIME);
+    fd = creat (path, 0666);
+    close (fd);
 }
 
-void zebraIndexUnlock (int rw)
+void zebraIndexUnlock (void)
 {
     char path[1024];
     char pathPrefix[1024];
 
-    if (lock_fd == -1)
-        return;
-
     zebraLockPrefix (pathPrefix);
     sprintf (path, "%s%s", pathPrefix, FNAME_MAIN_LOCK);
     unlink (path);
 }
 
-void zebraIndexLock (int rw)
+void zebraIndexLock (int commitNow)
 {
     char path[1024];
     char pathPrefix[1024];
     char buf[256];
     int r;
 
+    if (lock_fd != -1)
+        return ;
     zebraLockPrefix (pathPrefix);
     sprintf (path, "%s%s", pathPrefix, FNAME_MAIN_LOCK);
-    if (rw)
+    while (1)
     {
-        while (1)
+        lock_fd = open (path, O_CREAT|O_RDWR|O_EXCL|O_SYNC, 0666);
+        if (lock_fd == -1)
         {
-            lock_fd = open (path, O_CREAT|O_RDWR|O_EXCL|O_SYNC, 0666);
-            if (lock_fd == -1)
+            lock_fd = open (path, O_RDONLY);
+            assert (lock_fd != -1);
+            if (flock (lock_fd, LOCK_EX|LOCK_NB) == -1)
             {
-                lock_fd = open (path, O_RDONLY);
-                assert (lock_fd != -1);
-                if (flock (lock_fd, LOCK_EX|LOCK_NB) == -1)
+                if (errno == EWOULDBLOCK)
                 {
-                    if (errno == EWOULDBLOCK)
-                    {
-                        logf (LOG_LOG, "Waiting for other index process");
-                        flock (lock_fd, LOCK_EX);
-                        continue;
-                    }
-                    else
-                    {
-                        logf (LOG_FATAL|LOG_ERRNO, "flock %s", path);
-                        exit (1);
-                    }
+                    logf (LOG_LOG, "Waiting for other index process");
+                    flock (lock_fd, LOCK_EX);
+                    continue;
                 }
                 else
                 {
-                    logf (LOG_WARN, "Unlocked %s", path);
-                    r = read (lock_fd, buf, 256);
-                    if (r == 0)
-                    {
-                        logf (LOG_WARN, "Zero length %s", path);
-                        unlink (path);
-                        close (lock_fd);
-                        continue;
-                    }
-                    else if (r == -1)
-                    {
-                        logf (LOG_FATAL|LOG_ERRNO, "read  %s", path);
-                        exit (1);
-                    }
-                    if (*buf == 'r')
+                    logf (LOG_FATAL|LOG_ERRNO, "flock %s", path);
+                    exit (1);
+                }
+            }
+            else
+            {
+                logf (LOG_WARN, "Unlocked %s", path);
+                r = read (lock_fd, buf, 256);
+                if (r == 0)
+                {
+                    logf (LOG_WARN, "Zero length %s", path);
+                    close (lock_fd);
+                    unlink (path);
+                    continue;
+                }
+                else if (r == -1)
+                {
+                    logf (LOG_FATAL|LOG_ERRNO, "read  %s", path);
+                    exit (1);
+                }
+                if (*buf == 'r')
+                {
+                    logf (LOG_WARN, "Previous transaction didn't"
+                          " reach commit");
+                    close (lock_fd);
+                    bf_commitClean ();
+                    unlink (path);
+                    continue;
+                }
+                else if (*buf == 'd')
+                {
+                    logf (LOG_WARN, "Commit file wan't deleted after commit");
+                    close (lock_fd);
+                    bf_commitClean ();
+                    unlink (path);
+                    continue;
+                }                    
+                else if (*buf == 'w')
+                {
+                    logf (LOG_WARN, "Your index may be inconsistent");
+                    exit (1);
+                }
+                else if (*buf == 'c')
+                {
+                    if (commitNow)
                     {
-                        logf (LOG_WARN, "Previous transaction didn't"
-                              " reach commit");
                         unlink (path);
                         close (lock_fd);
                         continue;
                     }
-                    else if (*buf == 'w')
-                    {
-                        logf (LOG_WARN, "Your index may be inconsistent");
-                        exit (1);
-                    }
-                    else if (*buf == 'c')
-                    {
-                        logf (LOG_FATAL, "Previous transaction didn't"
-                              " finish commit. Restore now!");
-                        exit (1);
-                    }
-                    else 
-                    {
-                        logf (LOG_FATAL, "Unknown id 0x%02x in %s", *buf,
-                              path);
-                        exit (1);
-                    }
+                    logf (LOG_FATAL, "Previous transaction didn't"
+                          " finish commit. Commit now!");
+                    exit (1);
+                }
+                else 
+                {
+                    logf (LOG_FATAL, "Unknown id 0x%02x in %s", *buf,
+                          path);
+                    exit (1);
                 }
             }
-            else
-                break;
         }
-        flock (lock_fd, LOCK_EX);
+        else
+            break;
     }
-}
-
-void zebraIndexLockCommit (void)
-{
-
+    flock (lock_fd, LOCK_EX);
 }