X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Flockidx.c;h=2c59bdd2b81e044d7616f422267ab84ca1e7c19f;hb=b8844c65622c12fb105bf7fc6bab2fc237af7c14;hp=c04bd89494e17e1e78764308a21cf98fec70de30;hpb=4495fac3b7f760814dd3b41d0f64e5077193eeee;p=idzebra-moved-to-github.git

diff --git a/index/lockidx.c b/index/lockidx.c
index c04bd89..2c59bdd 100644
--- a/index/lockidx.c
+++ b/index/lockidx.c
@@ -4,7 +4,18 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: lockidx.c,v $
- * Revision 1.3  1995-12-11 11:43:29  adam
+ * Revision 1.6  1996-03-26 16:01:13  adam
+ * New setting lockPath: directory of various lock files.
+ *
+ * Revision 1.5  1995/12/13  08:46:09  adam
+ * Locking uses F_WRLCK and F_RDLCK again!
+ *
+ * Revision 1.4  1995/12/12  16:00:57  adam
+ * System call sync(2) used after update/commit.
+ * Locking (based on fcntl) uses F_EXLCK and F_SHLCK instead of F_WRLCK
+ * and F_RDLCK.
+ *
+ * Revision 1.3  1995/12/11  11:43:29  adam
  * Locking based on fcntl instead of flock.
  * Setting commitEnable removed. Command line option -n can be used to
  * prevent commit if commit setting is defined in the configuration file.
@@ -42,7 +53,7 @@ int zebraIndexWait (int commitPhase)
 
     if (server_lock_cmt == -1)
     {
-        sprintf (path, "%s%s", FNAME_COMMIT_LOCK, pathPrefix);
+        sprintf (path, "%s%s", pathPrefix, FNAME_COMMIT_LOCK);
         if ((server_lock_cmt = open (path, O_CREAT|O_RDWR|O_SYNC, 0666))
             == -1)
         {
@@ -54,7 +65,7 @@ int zebraIndexWait (int commitPhase)
         zebraUnlock (server_lock_cmt);
     if (server_lock_org == -1)
     {
-        sprintf (path, "%s%s", FNAME_ORG_LOCK, pathPrefix);
+        sprintf (path, "%s%s", pathPrefix, FNAME_ORG_LOCK);
         if ((server_lock_org = open (path, O_CREAT|O_RDWR|O_SYNC, 0666))
             == -1)
         {
@@ -134,17 +145,26 @@ void zebraIndexLock (int commitNow)
     sprintf (path, "%s%s", pathPrefix, FNAME_MAIN_LOCK);
     while (1)
     {
-        lock_fd = open (path, O_CREAT|O_RDWR|O_EXCL|O_SYNC, 0666);
+        lock_fd = open (path, O_CREAT|O_RDWR|O_EXCL, 0666);
         if (lock_fd == -1)
         {
-            lock_fd = open (path, O_RDONLY);
-            assert (lock_fd != -1);
+            lock_fd = open (path, O_RDWR);
+            if (lock_fd == -1) 
+            {
+                if (errno == ENOENT)
+                    continue;
+                logf (LOG_FATAL|LOG_ERRNO, "open %s", path);
+                exit (1);
+            }
+            logf (LOG_LOG, "zebraLockNB");
             if (zebraLockNB (lock_fd, 1) == -1)
             {
                 if (errno == EWOULDBLOCK)
                 {
                     logf (LOG_LOG, "Waiting for other index process");
                     zebraLock (lock_fd, 1);
+                    zebraUnlock (lock_fd);
+                    close (lock_fd);
                     continue;
                 }
                 else
@@ -166,7 +186,7 @@ void zebraIndexLock (int commitNow)
                 }
                 else if (r == -1)
                 {
-                    logf (LOG_FATAL|LOG_ERRNO, "read  %s", path);
+                    logf (LOG_FATAL|LOG_ERRNO, "read %s", path);
                     exit (1);
                 }
                 if (*buf == 'r')