aboutsummaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-11-12 17:47:31 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-11-12 17:50:34 -0400
commitba78630681ab7e987b70e67acaaf477912fe00bb (patch)
treeffe1202f212114fca535db22dba02de229d00330 /doc/git-annex.mdwn
parent00fdc3063fe586cdce35ba8dbe2f1b024479522c (diff)
pid locking configuration and abstraction layer for git-annex
(not actually used anywhere yet)
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn24
1 files changed, 24 insertions, 0 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index d35702804..c28d8af6c 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -965,6 +965,30 @@ Here are all the supported configuration settings.
which does not support symbolic links, or hard links, or unix permissions.
This is automatically probed by "git annex init".
+* `annex.pidlock`
+
+ Normally, git-annex uses fine-grained lock files to allow multiple
+ processes to run concurrently without getting in each others' way.
+ That works great, unless you are using git-annex on a filesystem that
+ does not support POSIX fcntl locks. This is sometimes the case when
+ using NFS or Lustre filesystems.
+
+ To support such situations, you can set annex.pidlock to true, and it
+ will fall back to a single top-level pid file lock.
+
+ (Although, often, you'd really be better off fixing your networked
+ filesystem configuration to support POSIX locks..)
+
+* `annex.pidlocktimeout`
+
+ When using pid lock files, it's possible for a stale lock file to get
+ left behind by previous run of git-annex that crashed or was interrupted.
+ This is mostly avoided, but can occur especially when using a network
+ file system.
+
+ git-annex will wait up to this many seconds for the pid lock
+ file to go away, and will then abort if it cannot continue. Default: 300
+
* `remote.<name>.annex-cost`
When determining which repository to