X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Flockidx.c;h=26af6846cb55aadaf251ad61f9ec76c39bfbe296;hb=9b4f970d2816490fa4cc850fabc51f494ee5612b;hp=ed7c7f8e93793efb1caf1758aa98b1091d8c6e18;hpb=4e2fc80e64f3d7895a871ea5b08aa80045a59f2c;p=idzebra-moved-to-github.git diff --git a/index/lockidx.c b/index/lockidx.c index ed7c7f8..26af684 100644 --- a/index/lockidx.c +++ b/index/lockidx.c @@ -1,138 +1,312 @@ /* - * Copyright (C) 1994-1995, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: lockidx.c,v $ - * Revision 1.1 1995-12-07 17:38:47 adam + * Revision 1.20 2000-10-16 20:16:00 adam + * Fixed problem with close of lock file for WIN32. + * + * Revision 1.19 2000/09/05 14:04:05 adam + * Updates for prefix 'yaz_' for YAZ log functions. + * + * Revision 1.18 2000/02/24 11:00:07 adam + * Fixed bug: indexer would run forever when lock dir was non-existant. + * + * Revision 1.17 1999/12/08 15:03:11 adam + * Implemented bf_reset. + * + * Revision 1.16 1999/02/02 14:50:57 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.15 1998/02/17 10:31:33 adam + * Fixed bug in zebraIndexUnlock. On NT, the lock files wasn't removed. + * + * Revision 1.14 1998/01/12 15:04:08 adam + * The test option (-s) only uses read-lock (and not write lock). + * + * Revision 1.13 1997/09/29 09:08:36 adam + * Revised locking system to be thread safe for the server. + * + * Revision 1.12 1997/09/25 14:54:43 adam + * WIN32 files lock support. + * + * Revision 1.11 1997/09/17 12:19:15 adam + * Zebra version corresponds to YAZ version 1.4. + * Changed Zebra server so that it doesn't depend on global common_resource. + * + * Revision 1.10 1997/09/09 13:38:07 adam + * Partial port to WIN95/NT. + * + * Revision 1.9 1997/09/04 13:58:04 adam + * Added O_BINARY for open calls. + * + * 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. + * + * Revision 1.1 1995/12/07 17:38:47 adam * Work locking mechanisms for concurrent updates/commit. * */ #include #include +#ifdef WIN32 +#include +#else #include -#include +#endif #include #include #include -#include #include "index.h" -static int lock_fd = -1; +static ZebraLockHandle server_lock_main = NULL; +static ZebraLockHandle server_lock_cmt = NULL; +static ZebraLockHandle server_lock_org = NULL; + +int zebraIndexWait (int commitPhase) +{ + ZebraLockHandle h; + + if (server_lock_cmt) + zebra_unlock (server_lock_cmt); + else + { + char path[1024]; + + zebra_lock_prefix (common_resource, path); + strcat (path, FNAME_COMMIT_LOCK); + server_lock_cmt = zebra_lock_create (path, 1); + if (!server_lock_cmt) + { + logf (LOG_WARN|LOG_ERRNO, "cannot create lock %s", path); + return -1; + } + } + if (server_lock_org) + zebra_unlock (server_lock_org); + else + { + char path[1024]; + + zebra_lock_prefix (common_resource, path); + strcat (path, FNAME_ORG_LOCK); + server_lock_org = zebra_lock_create (path, 1); + if (!server_lock_org) + { + logf (LOG_WARN|LOG_ERRNO, "cannot create lock %s", path); + return -1; + } + } + if (commitPhase) + h = server_lock_cmt; + else + h = server_lock_org; + if (zebra_lock_nb (h)) + { +#ifndef WIN32 + if (errno != EWOULDBLOCK) + { + logf (LOG_FATAL|LOG_ERRNO, "flock"); + exit (1); + } +#endif + if (commitPhase) + logf (LOG_LOG, "Waiting for lock cmt"); + else + logf (LOG_LOG, "Waiting for lock org"); + if (zebra_lock (h) == -1) + { + logf (LOG_FATAL, "flock"); + exit (1); + } + } + zebra_unlock (h); + return 0; +} + void zebraIndexLockMsg (const char *str) { - int l, r; + char path[1024]; + int l, r, fd; - assert (lock_fd != -1); - lseek (lock_fd, 0L, SEEK_SET); + assert (server_lock_main); + fd = zebra_lock_fd (server_lock_main); + lseek (fd, 0L, SEEK_SET); l = strlen(str); - r = write (lock_fd, str, l); + r = write (fd, str, l); if (r != l) { logf (LOG_FATAL|LOG_ERRNO, "write lock file"); exit (1); } + zebra_lock_prefix (common_resource, path); + strcat (path, 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); + + zebra_lock_prefix (common_resource, path); + strcat (path, FNAME_MAIN_LOCK); +#ifdef WIN32 + zebra_lock_destroy (server_lock_main); + if (unlink (path) && errno != ENOENT) + logf (LOG_WARN|LOG_ERRNO, "unlink %s failed", path); +#else + if (unlink (path) && errno != ENOENT) + logf (LOG_WARN|LOG_ERRNO, "unlink %s failed", path); + zebra_lock_destroy (server_lock_main); +#endif + server_lock_main = 0; } -void zebraIndexLock (int rw) +int zebraIndexLock (BFiles bfs, int commitNow, const char *rval) { char path[1024]; - char pathPrefix[1024]; char buf[256]; int r; - zebraLockPrefix (pathPrefix); - sprintf (path, "%s%s", pathPrefix, FNAME_MAIN_LOCK); - if (rw) + if (server_lock_main) + return 0; + + zebra_lock_prefix (common_resource, path); + strcat (path, FNAME_MAIN_LOCK); + while (1) { - while (1) + server_lock_main = zebra_lock_create (path, 2); + if (!server_lock_main) { - lock_fd = open (path, O_CREAT|O_RDWR|O_EXCL|O_SYNC, 0666); - if (lock_fd == -1) + server_lock_main = zebra_lock_create (path, 1); + if (!server_lock_main) { - lock_fd = open (path, O_RDONLY); - assert (lock_fd != -1); - if (flock (lock_fd, LOCK_EX|LOCK_NB) == -1) + logf (LOG_FATAL, "couldn't obtain indexer lock"); + exit (1); + } + if (zebra_lock_nb (server_lock_main) == -1) + { +#ifdef WIN32 + logf (LOG_LOG, "waiting for other index process"); + zebra_lock (server_lock_main); + zebra_unlock (server_lock_main); + zebra_lock_destroy (server_lock_main); + continue; +#else + 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"); + zebra_lock (server_lock_main); + zebra_unlock (server_lock_main); + zebra_lock_destroy (server_lock_main); + 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); + } +#endif + } + else + { + int fd = zebra_lock_fd (server_lock_main); + + logf (LOG_WARN, "unlocked %s", path); + r = read (fd, buf, 256); + if (r == 0) + { + logf (LOG_WARN, "zero length %s", path); + zebra_lock_destroy (server_lock_main); + 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"); + zebra_lock_destroy (server_lock_main); + bf_commitClean (bfs, rval); + unlink (path); + continue; + } + else if (*buf == 'd') + { + logf (LOG_WARN, "commit file wan't deleted after commit"); + zebra_lock_destroy (server_lock_main); + bf_commitClean (bfs, rval); + unlink (path); + continue; + } + else if (*buf == 'w') + { + logf (LOG_WARN, + "The lock file indicates that your index is"); + logf (LOG_WARN, "inconsistent. Perhaps the indexer"); + logf (LOG_WARN, "terminated abnormally in the previous"); + logf (LOG_WARN, "run. You can try to proceed by"); + logf (LOG_WARN, "deleting the file %s", path); + exit (1); + } + else if (*buf == 'c') + { + if (commitNow) { - logf (LOG_WARN, "Previous transaction didn't" - " reach commit"); unlink (path); - close (lock_fd); + zebra_lock_destroy (server_lock_main); 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) -{ - + zebra_lock (server_lock_main); + return 0; }