/*
- * 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.12 1997-09-25 14:54:43 adam
+ * Revision 1.21 2002-02-20 17:30:01 adam
+ * Work on new API. Locking system re-implemented
+ *
+ * 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
*/
#include <stdio.h>
#include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
#include <io.h>
#else
#include <unistd.h>
#include <errno.h>
#include "index.h"
+#include "zserver.h"
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];
ZebraLockHandle h;
-
- zebraLockPrefix (common_resource, pathPrefix);
if (server_lock_cmt)
zebra_unlock (server_lock_cmt);
else
{
- sprintf (path, "%s%s", pathPrefix, FNAME_COMMIT_LOCK);
+ 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)
{
zebra_unlock (server_lock_org);
else
{
- sprintf (path, "%s%s", pathPrefix, FNAME_ORG_LOCK);
+ 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)
{
h = server_lock_org;
if (zebra_lock_nb (h))
{
-#ifndef WINDOWS
+#ifndef WIN32
if (errno != EWOULDBLOCK)
{
logf (LOG_FATAL|LOG_ERRNO, "flock");
}
-void zebraIndexLockMsg (const char *str)
+void zebraIndexLockMsg (ZebraHandle zh, const char *str)
{
char path[1024];
- char pathPrefix[1024];
int l, r, fd;
assert (server_lock_main);
logf (LOG_FATAL|LOG_ERRNO, "write lock file");
exit (1);
}
- zebraLockPrefix (common_resource, 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 (common_resource, 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 (BFiles bfs, int commitNow, const char *rval)
+int zebraIndexLock (BFiles bfs, ZebraHandle zh, int commitNow,
+ const char *rval)
{
char path[1024];
- char pathPrefix[1024];
char buf[256];
int r;
if (server_lock_main)
- return ;
- zebraLockPrefix (common_resource, pathPrefix);
- sprintf (path, "%s%s", pathPrefix, FNAME_MAIN_LOCK);
+ return 0;
+
+ zebra_lock_prefix (zh->service->res, path);
+ strcat (path, FNAME_MAIN_LOCK);
while (1)
{
server_lock_main = zebra_lock_create (path, 2);
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 (zebra_lock_nb (server_lock_main) == -1)
{
-#ifdef WINDOWS
+#ifdef WIN32
logf (LOG_LOG, "waiting for other index process");
zebra_lock (server_lock_main);
zebra_unlock (server_lock_main);
}
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')
break;
}
zebra_lock (server_lock_main);
+ return 0;
}
projects / idzebra-moved-to-github.git / blobdiff