projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Charmap work
[idzebra-moved-to-github.git]
/
index
/
lockidx.c
diff --git
a/index/lockidx.c
b/index/lockidx.c
index
eb833b2
..
2c59bdd
100644
(file)
--- a/
index/lockidx.c
+++ b/
index/lockidx.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: lockidx.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: lockidx.c,v $
- * Revision 1.4 1995-12-12 16:00:57 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.
* 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.
@@
-47,7
+53,7
@@
int zebraIndexWait (int commitPhase)
if (server_lock_cmt == -1)
{
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)
{
if ((server_lock_cmt = open (path, O_CREAT|O_RDWR|O_SYNC, 0666))
== -1)
{
@@
-59,7
+65,7
@@
int zebraIndexWait (int commitPhase)
zebraUnlock (server_lock_cmt);
if (server_lock_org == -1)
{
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)
{
if ((server_lock_org = open (path, O_CREAT|O_RDWR|O_SYNC, 0666))
== -1)
{
@@
-142,7
+148,7
@@
void zebraIndexLock (int commitNow)
lock_fd = open (path, O_CREAT|O_RDWR|O_EXCL, 0666);
if (lock_fd == -1)
{
lock_fd = open (path, O_CREAT|O_RDWR|O_EXCL, 0666);
if (lock_fd == -1)
{
- lock_fd = open (path, O_RDONLY);
+ lock_fd = open (path, O_RDWR);
if (lock_fd == -1)
{
if (errno == ENOENT)
if (lock_fd == -1)
{
if (errno == ENOENT)
@@
-150,12
+156,15
@@
void zebraIndexLock (int commitNow)
logf (LOG_FATAL|LOG_ERRNO, "open %s", path);
exit (1);
}
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);
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
continue;
}
else
@@
-177,7
+186,7
@@
void zebraIndexLock (int commitNow)
}
else if (r == -1)
{
}
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')
exit (1);
}
if (*buf == 'r')