X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Flockidx.c;h=994f4952e9caf7c578e60a044578d0d606374938;hb=79176bd8a477e1c64ac3ec03b50405ed5ed85a3f;hp=f2c418ccf88ac93533922fe9fa942d3f2a4815a5;hpb=5f8ba9f35bd3c9aeafe26613021f2edd141b8611;p=idzebra-moved-to-github.git diff --git a/index/lockidx.c b/index/lockidx.c index f2c418c..994f495 100644 --- a/index/lockidx.c +++ b/index/lockidx.c @@ -1,51 +1,29 @@ -/* - * Copyright (C) 1994-1995, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: lockidx.c,v $ - * 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. - * - */ +/* $Id: lockidx.c,v 1.22 2002-08-02 19:26:55 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 + Index Data Aps + +This file is part of the Zebra server. + +Zebra is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Zebra; see the file LICENSE.zebra. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. +*/ + + #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include @@ -55,134 +33,151 @@ #include #include "index.h" +#include "zserver.h" -static int lock_fd = -1; -static int server_lock_cmt = -1; -static int server_lock_org = -1; +static ZebraLockHandle server_lock_main = NULL; +static ZebraLockHandle server_lock_cmt = NULL; +static ZebraLockHandle server_lock_org = NULL; -int zebraIndexWait (int commitPhase) +int zebraIndexWait (ZebraHandle zh, int commitPhase) { - char pathPrefix[1024]; - char path[1024]; - int fd; - - zebraLockPrefix (pathPrefix); + ZebraLockHandle h; - if (server_lock_cmt == -1) + if (server_lock_cmt) + zebra_unlock (server_lock_cmt); + else { - sprintf (path, "%s%s", pathPrefix, FNAME_COMMIT_LOCK); - if ((server_lock_cmt = open (path, O_BINARY|O_CREAT|O_RDWR|O_SYNC, - 0666)) - == -1) - { - logf (LOG_FATAL|LOG_ERRNO, "create %s", path); - return -1; - } + char path[1024]; + + zebra_lock_prefix (zh->service->res, 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 - zebraUnlock (server_lock_cmt); - if (server_lock_org == -1) { - sprintf (path, "%s%s", pathPrefix, FNAME_ORG_LOCK); - if ((server_lock_org = open (path, O_BINARY|O_CREAT|O_RDWR|O_SYNC, - 0666)) - == -1) - { - logf (LOG_FATAL|LOG_ERRNO, "create %s", path); - return -1; - } + char path[1024]; + + zebra_lock_prefix (zh->service->res, 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; + } } - else - zebraUnlock (server_lock_org); if (commitPhase) - fd = server_lock_cmt; + h = server_lock_cmt; else - fd = server_lock_org; - if (zebraLockNB (fd, 1) == -1) + 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 (zebraLock (fd, 1) == -1) + if (zebra_lock (h) == -1) { - logf (LOG_FATAL|LOG_ERRNO, "flock"); + logf (LOG_FATAL, "flock"); exit (1); } } - zebraUnlock (fd); + zebra_unlock (h); return 0; } -void zebraIndexLockMsg (const char *str) +void zebraIndexLockMsg (ZebraHandle zh, const char *str) { char path[1024]; - char pathPrefix[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); } - zebraLockPrefix (pathPrefix); - sprintf (path, "%s%s", pathPrefix, FNAME_TOUCH_TIME); + zebra_lock_prefix (zh->service->res, path); + strcat (path, FNAME_TOUCH_TIME); fd = creat (path, 0666); close (fd); } -void zebraIndexUnlock (void) +void zebraIndexUnlock (ZebraHandle zh) { char path[1024]; - char pathPrefix[1024]; - - zebraLockPrefix (pathPrefix); - sprintf (path, "%s%s", pathPrefix, FNAME_MAIN_LOCK); - unlink (path); + + zebra_lock_prefix (zh->service->res, 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 commitNow) +int zebraIndexLock (BFiles bfs, ZebraHandle zh, int commitNow, + const char *rval) { 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 (server_lock_main) + return 0; + + zebra_lock_prefix (zh->service->res, path); + strcat (path, FNAME_MAIN_LOCK); while (1) { - lock_fd = open (path, O_BINARY|O_CREAT|O_RDWR|O_EXCL, 0666); - if (lock_fd == -1) + server_lock_main = zebra_lock_create (path, 2); + if (!server_lock_main) { - lock_fd = open (path, O_BINARY|O_RDWR); - if (lock_fd == -1) + server_lock_main = zebra_lock_create (path, 1); + if (!server_lock_main) { - if (errno == ENOENT) - continue; - logf (LOG_FATAL|LOG_ERRNO, "open %s", path); - exit (1); + logf (LOG_FATAL, "couldn't obtain indexer lock"); + exit (1); } - if (zebraLockNB (lock_fd, 1) == -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) { logf (LOG_LOG, "waiting for other index process"); - zebraLock (lock_fd, 1); - zebraUnlock (lock_fd); - close (lock_fd); + zebra_lock (server_lock_main); + zebra_unlock (server_lock_main); + zebra_lock_destroy (server_lock_main); continue; } else @@ -190,16 +185,19 @@ void zebraIndexLock (int commitNow) 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 (lock_fd, buf, 256); + r = read (fd, buf, 256); if (r == 0) { logf (LOG_WARN, "zero length %s", path); - close (lock_fd); - unlink (path); + zebra_lock_destroy (server_lock_main); + unlink (path); continue; } else if (r == -1) @@ -211,22 +209,27 @@ void zebraIndexLock (int commitNow) { logf (LOG_WARN, "previous transaction didn't" " reach commit"); - close (lock_fd); - bf_commitClean (); + 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"); - close (lock_fd); - bf_commitClean (); + zebra_lock_destroy (server_lock_main); + bf_commitClean (bfs, rval); unlink (path); continue; } else if (*buf == 'w') { - logf (LOG_WARN, "your index may be inconsistent"); + 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') @@ -234,7 +237,7 @@ void zebraIndexLock (int commitNow) if (commitNow) { unlink (path); - close (lock_fd); + zebra_lock_destroy (server_lock_main); continue; } logf (LOG_FATAL, "previous transaction didn't" @@ -252,6 +255,7 @@ void zebraIndexLock (int commitNow) else break; } - zebraLock (lock_fd, 1); + zebra_lock (server_lock_main); + return 0; }