X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Flockidx.c;h=286bd4144578c9a4770f8b9c1df822a894bc9438;hb=18689333339cd8c6039e1f8877eca72b891f5c38;hp=75bec8692107ff1f9349c670ad0d6f0556b350f5;hpb=bf27228e5485151ee52bfd87dd91b025544ab6b2;p=idzebra-moved-to-github.git diff --git a/index/lockidx.c b/index/lockidx.c index 75bec86..286bd41 100644 --- a/index/lockidx.c +++ b/index/lockidx.c @@ -4,7 +4,31 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: lockidx.c,v $ - * Revision 1.2 1995-12-08 16:22:54 adam + * Revision 1.8 1997-02-12 20:39:46 adam + * Implemented options -f that limits the log to the first + * records. + * Changed some log messages also. + * + * Revision 1.7 1996/10/29 14:08:13 adam + * Uses resource lockDir instead of lockPath. + * + * 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. + * + * 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. @@ -16,12 +40,10 @@ #include #include #include -#include #include #include #include -#include #include "index.h" static int lock_fd = -1; @@ -38,7 +60,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) { @@ -47,10 +69,10 @@ int zebraIndexWait (int commitPhase) } } else - flock (server_lock_cmt, LOCK_UN); + 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) { @@ -59,12 +81,12 @@ int zebraIndexWait (int commitPhase) } } else - flock (server_lock_org, LOCK_UN); + zebraUnlock (server_lock_org); if (commitPhase) fd = server_lock_cmt; else fd = server_lock_org; - if (flock (fd, LOCK_EX|LOCK_NB) == -1) + if (zebraLockNB (fd, 1) == -1) { if (errno != EWOULDBLOCK) { @@ -75,13 +97,13 @@ int zebraIndexWait (int commitPhase) logf (LOG_LOG, "Waiting for lock cmt"); else logf (LOG_LOG, "Waiting for lock org"); - if (flock (fd, LOCK_EX) == -1) + if (zebraLock (fd, 1) == -1) { logf (LOG_FATAL|LOG_ERRNO, "flock"); exit (1); } } - flock (fd, LOCK_UN); + zebraUnlock (fd); return 0; } @@ -130,17 +152,25 @@ 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); - if (flock (lock_fd, LOCK_EX|LOCK_NB) == -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); + } + if (zebraLockNB (lock_fd, 1) == -1) { if (errno == EWOULDBLOCK) { - logf (LOG_LOG, "Waiting for other index process"); - flock (lock_fd, LOCK_EX); + logf (LOG_LOG, "waiting for other index process"); + zebraLock (lock_fd, 1); + zebraUnlock (lock_fd); + close (lock_fd); continue; } else @@ -151,23 +181,23 @@ void zebraIndexLock (int commitNow) } else { - logf (LOG_WARN, "Unlocked %s", path); + logf (LOG_WARN, "unlocked %s", path); r = read (lock_fd, buf, 256); if (r == 0) { - logf (LOG_WARN, "Zero length %s", path); + 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); + logf (LOG_FATAL|LOG_ERRNO, "read %s", path); exit (1); } if (*buf == 'r') { - logf (LOG_WARN, "Previous transaction didn't" + logf (LOG_WARN, "previous transaction didn't" " reach commit"); close (lock_fd); bf_commitClean (); @@ -176,7 +206,7 @@ void zebraIndexLock (int commitNow) } else if (*buf == 'd') { - logf (LOG_WARN, "Commit file wan't deleted after commit"); + logf (LOG_WARN, "commit file wan't deleted after commit"); close (lock_fd); bf_commitClean (); unlink (path); @@ -184,7 +214,7 @@ void zebraIndexLock (int commitNow) } else if (*buf == 'w') { - logf (LOG_WARN, "Your index may be inconsistent"); + logf (LOG_WARN, "your index may be inconsistent"); exit (1); } else if (*buf == 'c') @@ -195,13 +225,13 @@ void zebraIndexLock (int commitNow) close (lock_fd); continue; } - logf (LOG_FATAL, "Previous transaction didn't" + logf (LOG_FATAL, "previous transaction didn't" " finish commit. Commit now!"); exit (1); } else { - logf (LOG_FATAL, "Unknown id 0x%02x in %s", *buf, + logf (LOG_FATAL, "unknown id 0x%02x in %s", *buf, path); exit (1); } @@ -210,6 +240,6 @@ void zebraIndexLock (int commitNow) else break; } - flock (lock_fd, LOCK_EX); + zebraLock (lock_fd, 1); }