summaryrefslogtreecommitdiff
path: root/doc/bugs/git-annex_merge_stalls/comment_1_31578a754945bdcb902c62ff58704bcb._comment
diff options
context:
space:
mode:
authorGravatar http://joeyh.name/ <http://joeyh.name/@web>2013-09-09 15:45:17 +0000
committerGravatar admin <admin@branchable.com>2013-09-09 15:45:17 +0000
commitcde0000c23255918f255ad26bc65c61767100eea (patch)
treefeb3a2988ebfe84d0b67fd1bca731746b5dfcfa1 /doc/bugs/git-annex_merge_stalls/comment_1_31578a754945bdcb902c62ff58704bcb._comment
parentdd61149fc3ea2b6fa02425e7dad82ef9e58222b6 (diff)
Added a comment
Diffstat (limited to 'doc/bugs/git-annex_merge_stalls/comment_1_31578a754945bdcb902c62ff58704bcb._comment')
-rw-r--r--doc/bugs/git-annex_merge_stalls/comment_1_31578a754945bdcb902c62ff58704bcb._comment17
1 files changed, 17 insertions, 0 deletions
diff --git a/doc/bugs/git-annex_merge_stalls/comment_1_31578a754945bdcb902c62ff58704bcb._comment b/doc/bugs/git-annex_merge_stalls/comment_1_31578a754945bdcb902c62ff58704bcb._comment
new file mode 100644
index 000000000..123212d5d
--- /dev/null
+++ b/doc/bugs/git-annex_merge_stalls/comment_1_31578a754945bdcb902c62ff58704bcb._comment
@@ -0,0 +1,17 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.153.255.110"
+ subject="comment 1"
+ date="2013-09-09T15:45:17Z"
+ content="""
+The relevant part of the log is:
+
+<pre>
+65332/0x53591a: open(\"/Users/gsolsberry/annex/.git/annex/journal.lck\0\", 0x601, 0x1B6) = 8 0
+65332/0x53591a: fcntl(0x8, 0x9, 0x107009D60) = -1 Err#-1
+</pre>
+
+waitToSetLock thinks fcntl is failing to lock the file due to something else having it locked, and retries, leading to the hang.
+
+I'm told on irc that this was installed using the prebuilt image, and that a previous version of it didn't have the problem.
+"""]]