Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2014-01-01 15:52:25 -04:00
commit 84e9f764f1
19 changed files with 1039 additions and 1 deletions

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="EskildHustvedt"
ip="80.202.213.197"
subject="comment 3"
date="2014-01-01T02:36:47Z"
content="""
The browser doesn't crash, it stays up, though the git annex page disappears (replaced by the usual \"connection refused\" page from firefox) after a few seconds (ie. \"git annex webapp\" starts the browser, the git-annex page appears for a few seconds, and then it disappears as git-annex crashes, leaving the browser still running).
The latest daily build appears to work now though: git-annex version: 5.20140101-gf9e5218, so that seems to have done the trick.
"""]]

View file

@ -0,0 +1,520 @@
### Please describe the problem.
After running for a while, the assistant maxes my CPU. I have evidence
here that it is just sitting there, doing apparently nothing (transfers
are finished), eating precious CPU.
Nowadays, I do not let the assistant run on its own, otherwise it makes
my office noisy because the CPU fan starts.
This makes the assistant and the webapp basically unuseable for me:
if i want to use its feature, I must remember to shut down the daemon
every time I am done with it, which seems contrary to the spirit of
the project. :)
### What steps will reproduce the problem?
It's a little unclear. There was a peculiar crash here (power cable
yanked out) during a `git annex copy`, which *was* eating up all CPU,
but mostly through I/O.
That is the purple block in this graph:
![CPU usage during the last 24 hours][cpu-day.png]
Power was yanked out about right after that purple block was gone:
![Uptime in the last 24 hours][uptime-day.png]
Files were copied to an external drive at the time of the crash,
which explains the high iowait. The last lines in daemon.log are:
[[!format txt """
sent 184184937 bytes received 31 bytes 13643330.96 bytes/sec
total size is 184162304 speedup is 1.00
[2013-12-31 23:56:47 EST] Transferrer: Uploaded American ..Queen.avi
[2013-12-31 23:56:47 EST] Pusher: Syncing with backup
To /backup/srv/video
5155be4..7d904d5 git-annex -> synced/git-annex
"""]]
And daemon.status:
[[!format txt """
lastRunning:1388569856.366405s
scanComplete:True
sanityCheckRunning:False
lastSanityCheck:1387169250.801117s
"""]]
When the machine rebooted, I logged in, and resumed the transfer using
`git annex copy`. The assistant was also started automatically during
my session, but I wasn't aware of that until this morning (7AM) when i
came back to the terminal and noticed how noisy it was.
At that point i did `killall git-annex` and CPU usage returned to
normal, as the frequency of the CPU:
![CPU frequency scaling in the last 24 hours][cpuspeed-day.png]
I am trying to see if I can reproduce this problem reliably - I
just started the assistant again now, and while the CPU usage is
already high, I will forgive it for now because it's doing its
initial scans... Let's see what happens in the afternoon! --[[anarcat]]
Update: I seem to be able to reproduce. I just started the webapp and
the scans were performed. They are now finished, yet the CPU usage is
still high:
[[!format txt """
top - 14:10:20 up 1 day, 1:16, 7 users, load average: 5,51, 3,61, 2,53
Tasks: 292 total, 2 running, 288 sleeping, 0 stopped, 2 zombie
%Cpu(s): 60,9 us, 7,8 sy, 0,6 ni, 29,5 id, 0,8 wa, 0,0 hi, 0,5 si, 0,0 st
KiB Mem: 8162960 total, 6943100 used, 1219860 free, 1065464 buffers
KiB Swap: 4022268 total, 15452 used, 4006816 free, 1983252 cached
PID USER PR NI VIRT RES SHR S %CPU %MEM TIME+ COMMAND
18364 anarcat 20 0 152m 27m 18m S 53,7 0,3 0:35.61 git-annex
8388 anarcat 20 0 192m 54m 21m S 47,8 0,7 12:55.19 git-annex
18671 anarcat 20 0 157m 33m 18m S 29,9 0,4 0:22.65 git-annex
"""]]
An strace on 18364 yields:
[[!format txt """
[pid 18366] clock_gettime(0x3 /* CLOCK_??? */, {79, 537245076}) = 0
[pid 18364] <... futex resumed> ) = ? ERESTARTSYS (To be restarted)
[pid 18364] --- SIGVTALRM (Virtual timer expired) @ 0 (0) ---
[pid 18364] rt_sigreturn(0x1a) = 202
[pid 18364] futex(0x3de703c, FUTEX_WAIT_PRIVATE, 51, NULL <unfinished ...>
[pid 18366] rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0
[pid 18366] rt_sigprocmask(SIG_BLOCK, [TERM], [], 8) = 0
[pid 18366] clock_gettime(0x2 /* CLOCK_??? */, {82, 256339453}) = 0
[pid 18366] clock_gettime(0x3 /* CLOCK_??? */, {79, 537670797}) = 0
[pid 18366] rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0
[pid 18366] rt_sigprocmask(SIG_BLOCK, [TERM], [], 8) = 0
[pid 18366] clock_gettime(0x2 /* CLOCK_??? */, {82, 256748972}) = 0
[pid 18366] clock_gettime(0x3 /* CLOCK_??? */, {79, 538079838}) = 0
[pid 18366] rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0
[pid 18366] rt_sigprocmask(SIG_BLOCK, [TERM], [], 8) = 0
[pid 18366] clock_gettime(0x2 /* CLOCK_??? */, {82, 257202502}) = 0
[pid 18366] clock_gettime(0x3 /* CLOCK_??? */, {79, 538533443}) = 0
[pid 18366] rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0
[pid 18366] rt_sigprocmask(SIG_BLOCK, [TERM], [], 8) = 0
[pid 18366] clock_gettime(0x2 /* CLOCK_??? */, {82, 257611085}) = 0
[pid 18366] clock_gettime(0x3 /* CLOCK_??? */, {79, 538941839}) = 0
[pid 18366] rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0
[pid 18366] rt_sigprocmask(SIG_BLOCK, [TERM], [], 8) = 0
[pid 18366] clock_gettime(0x2 /* CLOCK_??? */, {82, 258018398}) = 0
[pid 18366] clock_gettime(0x3 /* CLOCK_??? */, {79, 539349100}) = 0
[pid 18366] rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0
[pid 18366] rt_sigprocmask(SIG_BLOCK, [TERM], [], 8) = 0
[pid 18366] clock_gettime(0x2 /* CLOCK_??? */, {82, 258433069}) = 0
[pid 18366] clock_gettime(0x3 /* CLOCK_??? */, {79, 539763939}) = 0
[pid 18366] rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0
[pid 18366] rt_sigprocmask(SIG_BLOCK, [TERM], [], 8) = 0
[pid 18366] clock_gettime(0x2 /* CLOCK_??? */, {82, 258863864}) = 0
[pid 18366] clock_gettime(0x3 /* CLOCK_??? */, {79, 540195885}) = 0
[pid 18366] rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0
[pid 18366] rt_sigprocmask(SIG_BLOCK, [TERM], [], 8) = 0
[pid 18366] clock_gettime(0x2 /* CLOCK_??? */, {82, 259295204}) = 0
[pid 18366] clock_gettime(0x3 /* CLOCK_??? */, {79, 540626505}) = 0
[pid 18366] rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0
[pid 18366] rt_sigprocmask(SIG_BLOCK, [TERM], [], 8) = 0
[pid 18366] clock_gettime(0x2 /* CLOCK_??? */, {82, 259729523}) = 0
[pid 18366] clock_gettime(0x3 /* CLOCK_??? */, {79, 541060751}) = 0
[pid 18366] rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0
[pid 18366] rt_sigprocmask(SIG_BLOCK, [TERM], [], 8) = 0
[pid 18366] clock_gettime(0x2 /* CLOCK_??? */, {82, 260131616}) = 0
[pid 18366] clock_gettime(0x3 /* CLOCK_??? */, {79, 541463041}) = 0
[pid 18366] rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0
[pid 18366] rt_sigprocmask(SIG_BLOCK, [TERM], [], 8) = 0
[pid 18366] clock_gettime(0x2 /* CLOCK_??? */, {82, 260539761}) = 0
[pid 18366] clock_gettime(0x3 /* CLOCK_??? */, {79, 541871201}) = 0
[pid 18366] rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0
[pid 18366] rt_sigprocmask(SIG_BLOCK, [TERM], [], 8) = 0
[pid 18366] clock_gettime(0x2 /* CLOCK_??? */, {82, 260970889}) = 0
[pid 18366] clock_gettime(0x3 /* CLOCK_??? */, {79, 542302047}) = 0
[pid 18366] rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0
[pid 18366] rt_sigprocmask(SIG_BLOCK, [TERM], [], 8) = 0
[pid 18366] clock_gettime(0x2 /* CLOCK_??? */, {82, 261378036}) = 0
[pid 18366] clock_gettime(0x3 /* CLOCK_??? */, {79, 542709166}) = 0
[pid 18366] rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0
[pid 18366] rt_sigprocmask(SIG_BLOCK, [TERM], [], 8) = 0
[pid 18366] clock_gettime(0x2 /* CLOCK_??? */, {82, 261780507}) = 0
[pid 18366] clock_gettime(0x3 /* CLOCK_??? */, {79, 543111819}) = 0
[pid 18366] rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0
[pid 18366] rt_sigprocmask(SIG_BLOCK, [TERM], [], 8) = 0
[pid 18366] clock_gettime(0x2 /* CLOCK_??? */, {82, 262194032}) = 0
[pid 18366] clock_gettime(0x3 /* CLOCK_??? */, {79, 543525143}) = 0
[pid 18366] rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0
[pid 18366] rt_sigprocmask(SIG_BLOCK, [TERM], [], 8) = 0
[pid 18366] clock_gettime(0x2 /* CLOCK_??? */, {82, 262610040}) = 0
[pid 18366] clock_gettime(0x3 /* CLOCK_??? */, {79, 543941528}) = 0
[pid 18366] rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0
[pid 18366] rt_sigprocmask(SIG_BLOCK, [TERM], [], 8) = 0
[pid 18366] clock_gettime(0x2 /* CLOCK_??? */, {82, 263042272}) = 0
[pid 18366] clock_gettime(0x3 /* CLOCK_??? */, {79, 544374016}) = 0
[pid 18366] rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0
[pid 18366] rt_sigprocmask(SIG_BLOCK, [TERM], [], 8) = 0
[pid 18366] clock_gettime(0x2 /* CLOCK_??? */, {82, 263532359}) = 0
[pid 18366] clock_gettime(0x3 /* CLOCK_??? */, {79, 544864814}) = 0
[pid 18366] rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0
[pid 18364] <... futex resumed> ) = ? ERESTARTSYS (To be restarted)
[pid 18364] --- SIGVTALRM (Virtual timer expired) @ 0 (0) ---
[pid 18364] rt_sigreturn(0x1a) = 202
[pid 18364] futex(0x3de703c, FUTEX_WAIT_PRIVATE, 51, NULL <unfinished ...>
"""]]
[cpu-day.png]: http://paste.anarc.at/cpu-day.png
[uptime-day.png]: http://paste.anarc.at/uptime-day.png
[cpuspeed-day.png]: http://paste.anarc.at/cpuspeed-day.png
### What version of git-annex are you using? On what operating system?
Debian wheezy.
[[!format sh """
anarcat@marcos:~$ git annex version
git-annex version: 5.20131109-gf2cb5b9
build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS Feeds Quvi TDFA CryptoHash
key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
remote types: git gcrypt S3 bup directory rsync web webdav glacier hook
"""]]
### Please provide any additional information below.
This *may* be related to [[bugs/webapp_takes_100__37___of_the_cpu/]],
but I didn't observe both problems simultaneously so far - ie. the
webapp doesn't need to run for this bug to happen.
Here's the output of top:
[[!format sh """
top - 04:55:01 up 16:01, 10 users, load average: 3,96, 3,72, 3,59
Tasks: 293 total, 6 running, 284 sleeping, 0 stopped, 3 zombie
%Cpu(s): 87,4 us, 10,9 sy, 0,6 ni, 0,1 id, 0,3 wa, 0,0 hi, 0,7 si, 0,0 st
KiB Mem: 8162960 total, 6847120 used, 1315840 free, 1084756 buffers
KiB Swap: 4022268 total, 1320 used, 4020948 free, 2041108 cached
PID USER PR NI VIRT RES SHR S %CPU %MEM TIME+ COMMAND
8099 anarcat 20 0 144m 28m 18m S 34,0 0,4 460:10.96 git-annex
6525 anarcat 20 0 436m 295m 18m S 28,4 3,7 448:50.71 git-annex
11146 munin 20 0 25376 6540 1896 R 28,4 0,1 0:00.05 munin-update
8045 anarcat 20 0 165m 41m 18m S 22,7 0,5 455:14.41 git-annex
11142 root 20 0 32316 7356 2016 R 22,7 0,1 0:00.05 ikisite
11144 aegir 20 0 161m 16m 6608 R 22,7 0,2 0:00.05 php
2649 liquidso 20 0 222m 54m 5516 S 5,7 0,7 40:40.61 liquidsoap
11149 anarcat 20 0 24448 1552 1072 R 5,7 0,0 0:00.01 top
1 root 20 0 10644 784 652 S 0,0 0,0 0:01.10 init
2 root 20 0 0 0 0 S 0,0 0,0 0:00.01 kthreadd
3 root 20 0 0 0 0 S 0,0 0,0 2:10.09 ksoftirqd/0
6 root rt 0 0 0 0 S 0,0 0,0 0:00.22 migration/0
7 root rt 0 0 0 0 S 0,0 0,0 0:00.59 watchdog/0
8 root rt 0 0 0 0 S 0,0 0,0 0:00.25 migration/1
10 root 20 0 0 0 0 S 0,0 0,0 2:11.10 ksoftirqd/1
12 root rt 0 0 0 0 S 0,0 0,0 0:00.17 watchdog/1
13 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 cpuset
14 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 khelper
15 root 20 0 0 0 0 S 0,0 0,0 0:00.00 kdevtmpfs
16 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 netns
17 root 20 0 0 0 0 S 0,0 0,0 0:00.17 sync_supers
18 root 20 0 0 0 0 S 0,0 0,0 0:00.00 bdi-default
19 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 kintegrityd
20 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 kblockd
22 root 20 0 0 0 0 S 0,0 0,0 0:00.06 khungtaskd
23 root 20 0 0 0 0 S 0,0 0,0 3:04.23 kswapd0
24 root 25 5 0 0 0 S 0,0 0,0 0:00.00 ksmd
25 root 39 19 0 0 0 S 0,0 0,0 0:00.00 khugepaged
26 root 20 0 0 0 0 S 0,0 0,0 0:00.00 fsnotify_mark
27 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 crypto
113 root 20 0 0 0 0 S 0,0 0,0 0:00.01 khubd
133 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 ata_sff
153 root 20 0 0 0 0 S 0,0 0,0 0:05.68 scsi_eh_0
158 root 20 0 0 0 0 S 0,0 0,0 0:00.00 scsi_eh_1
160 root 20 0 0 0 0 S 0,0 0,0 0:00.09 kworker/u:2
161 root 20 0 0 0 0 S 0,0 0,0 0:00.00 scsi_eh_2
162 root 20 0 0 0 0 S 0,0 0,0 0:00.00 scsi_eh_3
163 root 20 0 0 0 0 S 0,0 0,0 0:01.43 kworker/u:3
294 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 kdmflush
295 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 kcryptd_io
296 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 kcryptd
305 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 kdmflush
307 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 kdmflush
311 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 kdmflush
313 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 kdmflush
341 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 kdmflush
342 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 kcryptd_io
343 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 kcryptd
352 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 kdmflush
354 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 kdmflush
356 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 kdmflush
358 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 kdmflush
361 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 kdmflush
400 root 20 0 0 0 0 S 0,0 0,0 0:00.00 jbd2/dm-1-8
401 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 ext4-dio-unwrit
468 root 20 0 0 0 0 S 0,0 0,0 0:02.19 kworker/1:2
538 root 20 0 21804 1804 796 S 0,0 0,0 0:00.10 udevd
705 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 kpsmoused
878 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 hd-audio0
890 postfix 20 0 44216 2460 1912 S 0,0 0,0 0:00.00 pickup
939 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 kvm-irqfd-clean
1150 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 firewire
1719 root 20 0 0 0 0 S 0,0 0,0 0:03.40 flush-254:3
1786 root 20 0 0 0 0 S 0,0 0,0 0:00.17 jbd2/dm-2-8
1787 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 ext4-dio-unwrit
1788 root 20 0 0 0 0 S 0,0 0,0 0:06.60 jbd2/dm-3-8
1789 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 ext4-dio-unwrit
1790 root 20 0 0 0 0 S 0,0 0,0 0:02.56 jbd2/dm-4-8
1791 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 ext4-dio-unwrit
1792 root 20 0 0 0 0 S 0,0 0,0 0:01.19 jbd2/dm-8-8
1793 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 ext4-dio-unwrit
2004 anarcat 20 0 0 0 0 Z 0,0 0,0 0:17.57 chromium
2379 root 20 0 115m 1796 928 S 0,0 0,0 0:02.16 rsyslogd
2435 icecast2 20 0 148m 4440 2780 S 0,0 0,1 0:56.15 icecast2
2488 root 20 0 4112 644 500 S 0,0 0,0 0:00.66 acpid
2513 daemon 20 0 16668 156 0 S 0,0 0,0 0:00.00 atd
2536 proxy 20 0 6884 344 196 S 0,0 0,0 0:00.00 polipo
2573 messageb 20 0 31488 2548 884 S 0,0 0,0 0:00.79 dbus-daemon
2626 bind 20 0 111m 15m 2276 S 0,0 0,2 0:00.46 named
2694 root 20 0 82308 3112 2520 S 0,0 0,0 0:00.03 gdm3
2729 root 20 0 99,3m 4652 3608 S 0,0 0,1 0:00.02 gdm-simple-slav
2731 root 20 0 178m 27m 9908 S 0,0 0,3 40:30.80 Xorg
2738 root 20 0 282m 14m 6576 S 0,0 0,2 0:02.98 apache2
2763 root 20 0 0 0 0 S 0,0 0,0 0:00.92 flush-254:4
2779 root 20 0 21000 1164 904 S 0,0 0,0 0:00.00 bluetoothd
2784 avahi 20 0 34236 1876 1460 S 0,0 0,0 0:00.15 avahi-daemon
2786 avahi 20 0 34032 440 184 S 0,0 0,0 0:00.00 avahi-daemon
2792 root 10 -10 0 0 0 S 0,0 0,0 0:00.00 krfcommd
2829 bitlbee 20 0 45216 1136 712 S 0,0 0,0 0:00.00 bitlbee
2973 root 20 0 136m 3572 2892 S 0,0 0,0 0:00.37 accounts-daemon
2974 clamav 20 0 45432 2172 1260 S 0,0 0,0 0:26.77 freshclam
2997 root 20 0 141m 4552 3072 S 0,0 0,1 0:00.21 polkitd
3021 root 20 0 18876 984 740 S 0,0 0,0 0:00.48 cron
3062 root 20 0 75948 3436 2304 S 0,0 0,0 0:00.03 cupsd
3064 colord 20 0 152m 8672 3344 S 0,0 0,1 0:00.10 colord
3069 root 20 0 126m 4116 2964 S 0,0 0,1 0:00.16 console-kit-dae
3071 colord 20 0 300m 12m 7932 S 0,0 0,2 0:01.23 colord-sane
3171 nobody 10 -10 44328 1672 1048 S 0,0 0,0 0:00.88 gpsd
3178 root 20 0 9204 3508 380 S 0,0 0,0 0:39.47 haveged
3192 ikiwiki- 20 0 13772 864 728 S 0,0 0,0 0:00.00 git-daemon
3310 anarcat 20 0 91856 27m 2820 S 0,0 0,3 0:03.30 xterm
3314 anarcat 20 0 24004 5452 1876 S 0,0 0,1 0:00.54 bash
3336 root 20 0 152m 4172 3300 S 0,0 0,1 0:00.07 upowerd
3437 root 20 0 0 0 0 S 0,0 0,0 0:00.00 scsi_eh_6
3438 root 20 0 0 0 0 S 0,0 0,0 6:52.70 usb-storage
3470 anarcat 20 0 61648 2516 1912 S 0,0 0,0 0:00.01 gvfs-gphoto2-vo
3474 anarcat 20 0 78024 2564 2048 S 0,0 0,0 0:02.04 gvfs-afc-volume
3530 root 20 0 52400 10m 2064 S 0,0 0,1 0:03.34 munin-node
3599 rtkit 21 1 39632 1344 1112 S 0,0 0,0 0:00.30 rtkit-daemon
3721 root 20 0 4176 700 560 S 0,0 0,0 0:00.01 mysqld_safe
3899 anarcat 20 0 85216 21m 2872 S 0,0 0,3 0:00.76 xterm
3903 anarcat 20 0 23216 4688 1804 S 0,0 0,1 0:00.58 bash
4108 mysql 30 10 434m 137m 4396 S 0,0 1,7 1:53.14 mysqld
4109 root 20 0 4084 628 524 S 0,0 0,0 0:00.00 logger
4209 anarcat 20 0 129m 23m 18m S 0,0 0,3 1:06.16 git-annex
4226 root 20 0 183m 4888 3504 S 0,0 0,1 0:00.08 gdm-session-wor
4240 anarcat 20 0 21360 2572 2188 S 0,0 0,0 0:00.34 git
4431 root 20 0 0 0 0 S 0,0 0,0 0:00.00 kauditd
4447 anarcat 20 0 4176 664 548 S 0,0 0,0 0:00.03 sh
4530 ntp 20 0 41052 2284 1644 S 0,0 0,0 0:02.71 ntpd
4593 postgres 20 0 102m 9008 7680 S 0,0 0,1 0:01.04 postgres
4667 anarcat 20 0 12384 1072 704 S 0,0 0,0 0:00.11 ssh-agent
4668 anarcat 20 0 20164 372 156 S 0,0 0,0 0:01.03 gpg-agent
4671 anarcat 20 0 24184 552 304 S 0,0 0,0 0:00.00 dbus-launch
4672 anarcat 20 0 30668 1592 736 S 0,0 0,0 0:01.10 dbus-daemon
4704 anarcat 20 0 49456 2740 2216 S 0,0 0,0 0:00.13 xfconfd
4711 anarcat 20 0 63740 3124 2312 S 0,0 0,0 0:02.61 xscreensaver
4713 anarcat 20 0 156m 8232 5856 S 0,0 0,1 0:06.14 xfce4-session
4714 postgres 20 0 102m 1952 616 S 0,0 0,0 0:06.79 postgres
4715 postgres 20 0 102m 1704 376 S 0,0 0,0 0:04.95 postgres
4716 postgres 20 0 102m 3068 1128 S 0,0 0,0 0:01.32 postgres
4717 postgres 20 0 72884 1800 416 S 0,0 0,0 0:00.99 postgres
4735 postgrey 20 0 66452 14m 3136 S 0,0 0,2 0:00.40 /usr/sbin/postg
4753 anarcat 20 0 124m 4060 2916 S 0,0 0,0 0:00.02 xfsettingsd
4754 anarcat 20 0 166m 6496 5204 S 0,0 0,1 0:00.07 Thunar
4778 anarcat 20 0 63364 2564 2096 S 0,0 0,0 0:00.03 gvfsd
4783 anarcat 20 0 305m 14m 9568 S 0,0 0,2 0:52.46 xfce4-panel
4790 anarcat 20 0 156m 7968 6232 S 0,0 0,1 0:00.23 xfdesktop
4791 root 20 0 21516 804 496 S 0,0 0,0 0:00.00 dovecot
4837 anarcat 20 0 148m 4296 2768 S 0,0 0,1 0:11.87 xfce4-settings-
4856 anarcat 20 0 26620 1248 988 S 0,0 0,0 1:19.60 xcompmgr
4873 anarcat 20 0 115m 8004 3872 S 0,0 0,1 0:07.42 awesome
4887 anarcat 20 0 267m 12m 8664 S 0,0 0,2 0:02.51 update-notifier
4899 anarcat 20 0 183m 5868 4708 S 0,0 0,1 0:00.18 polkit-gnome-au
4905 anarcat 20 0 56320 4180 2040 S 0,0 0,1 0:00.10 gconfd-2
4908 anarcat 9 -11 300m 6912 4184 S 0,0 0,1 0:08.00 pulseaudio
4916 root 20 0 126m 4208 3056 S 0,0 0,1 0:02.46 udisks-daemon
4917 root 20 0 47408 776 428 S 0,0 0,0 0:06.61 udisks-daemon
4921 anarcat 20 0 113m 3200 2448 S 0,0 0,0 0:00.00 gconf-helper
4972 anarcat 20 0 145m 7432 5880 S 0,0 0,1 0:00.09 panel-16-systra
4974 anarcat 20 0 148m 9328 7348 S 0,0 0,1 2:40.37 xfce4-weather-p
4975 anarcat 20 0 174m 11m 8312 S 0,0 0,1 0:42.26 xfce4-xkb-plugi
4978 mpd 20 0 503m 29m 2920 S 0,0 0,4 1:24.97 mpd
5029 mpd 20 0 256m 6412 4008 S 0,0 0,1 0:11.74 pulseaudio
5030 dovecot 20 0 13044 768 592 S 0,0 0,0 0:00.00 anvil
5031 root 20 0 13172 944 628 S 0,0 0,0 0:00.00 log
5034 root 20 0 23156 2536 768 S 0,0 0,0 0:00.00 config
5040 mpd 20 0 113m 3192 2448 S 0,0 0,0 0:00.00 gconf-helper
5234 root 20 0 0 0 0 S 0,0 0,0 0:01.19 kworker/0:1
5745 root 20 0 37788 2472 1912 S 0,0 0,0 0:00.68 master
5756 postfix 20 0 44368 2700 2100 S 0,0 0,0 0:00.27 qmgr
5807 root 20 0 49848 1216 608 S 0,0 0,0 0:00.05 sshd
5908 debian-t 20 0 56008 21m 2988 S 0,0 0,3 0:21.87 tor
5928 debian-t 30 10 190m 31m 2560 S 0,0 0,4 7:35.56 transmission-da
5948 anarcat 20 0 71776 8204 2860 S 0,0 0,1 0:05.76 xterm
5954 anarcat 20 0 22956 4540 1772 S 0,0 0,1 0:00.10 bash
6019 spampd 20 0 147m 62m 1844 S 0,0 0,8 0:00.55 spampd
6049 root 0 -20 0 0 0 S 0,0 0,0 0:00.00 iprt
6085 root 20 0 3948 84 0 S 0,0 0,0 0:00.00 minissdpd
6095 root 20 0 17404 908 744 S 0,0 0,0 0:00.00 getty
6096 root 20 0 17404 908 744 S 0,0 0,0 0:00.00 getty
6097 root 20 0 17404 904 744 S 0,0 0,0 0:00.00 getty
6098 root 20 0 17404 896 744 S 0,0 0,0 0:00.00 getty
6099 root 20 0 17404 900 744 S 0,0 0,0 0:00.00 getty
6100 root 20 0 17404 904 744 S 0,0 0,0 0:00.00 getty
6108 anarcat 20 0 24248 1040 816 S 0,0 0,0 0:00.08 screen
6109 anarcat 20 0 25864 2640 796 S 0,0 0,0 0:05.37 screen
6110 anarcat 20 0 22868 4220 1624 S 0,0 0,1 0:00.06 bash
6153 root 20 0 0 0 0 S 0,0 0,0 0:00.00 flush-254:8
6174 anarcat 20 0 22872 4224 1624 S 0,0 0,1 0:00.07 bash
6238 anarcat 20 0 103m 12m 5232 S 0,0 0,2 0:20.80 irssi
6252 anarcat 20 0 212m 40m 13m S 0,0 0,5 1:09.74 emacs23
6534 anarcat 20 0 22876 4400 1716 S 0,0 0,1 0:00.07 bash
6598 anarcat 20 0 302m 163m 3864 S 0,0 2,0 17:19.63 offlineimap
6616 anarcat 20 0 22408 2648 2228 S 0,0 0,0 0:05.04 git
6662 root 20 0 0 0 0 S 0,0 0,0 0:01.25 kworker/1:1
6666 root 20 0 0 0 0 S 0,0 0,0 0:00.00 flush-254:2
6897 anarcat 20 0 1011m 159m 47m S 0,0 2,0 4:54.69 chromium
6902 postfix 20 0 46744 3396 2400 S 0,0 0,0 0:00.09 tlsmgr
6903 anarcat 20 0 283m 7952 2788 S 0,0 0,1 0:05.03 chromium
6904 anarcat 20 0 6240 356 272 S 0,0 0,0 0:00.00 chrome-sandbox
6905 anarcat 20 0 304m 17m 12m S 0,0 0,2 0:00.02 chromium
6908 anarcat 20 0 320m 5800 764 S 0,0 0,1 0:00.16 chromium
6950 anarcat 20 0 955m 31m 16m S 0,0 0,4 0:01.68 chromium
6955 anarcat 20 0 953m 33m 17m S 0,0 0,4 0:01.25 chromium
6960 anarcat 20 0 959m 36m 15m S 0,0 0,5 0:08.32 chromium
6965 anarcat 20 0 957m 34m 14m S 0,0 0,4 0:10.25 chromium
6970 anarcat 20 0 1029m 114m 17m S 0,0 1,4 0:46.99 chromium
6975 anarcat 20 0 953m 26m 14m S 0,0 0,3 0:00.53 chromium
6980 anarcat 20 0 959m 35m 16m S 0,0 0,4 0:14.68 chromium
6985 anarcat 20 0 963m 45m 17m S 0,0 0,6 0:22.59 chromium
6990 anarcat 20 0 952m 25m 13m S 0,0 0,3 0:00.70 chromium
6995 anarcat 20 0 960m 36m 18m S 0,0 0,5 0:27.21 chromium
7040 anarcat 20 0 979m 69m 22m S 0,0 0,9 0:05.41 chromium
7055 anarcat 20 0 966m 51m 20m S 0,0 0,6 0:04.88 chromium
7063 anarcat 20 0 967m 42m 18m S 0,0 0,5 0:04.46 chromium
7072 anarcat 20 0 967m 49m 19m S 0,0 0,6 0:05.17 chromium
7078 anarcat 20 0 971m 53m 19m S 0,0 0,7 0:05.68 chromium
7087 anarcat 20 0 963m 51m 19m S 0,0 0,7 0:04.75 chromium
7096 anarcat 20 0 961m 48m 18m S 0,0 0,6 0:04.75 chromium
7107 anarcat 20 0 161m 4440 3252 S 0,0 0,1 0:02.90 gvfs-gdu-volume
7127 anarcat 20 0 967m 55m 22m S 0,0 0,7 1:07.92 chromium
7183 anarcat 20 0 912m 55m 20m S 0,0 0,7 0:04.97 chromium
7213 anarcat 20 0 964m 47m 19m S 0,0 0,6 0:04.69 chromium
7235 anarcat 20 0 965m 65m 21m S 0,0 0,8 0:05.26 chromium
7258 anarcat 20 0 961m 57m 20m S 0,0 0,7 0:05.39 chromium
7285 anarcat 20 0 18652 2484 1000 S 0,0 0,0 0:01.25 git
7434 anarcat 39 19 18124 1960 964 S 0,0 0,0 0:00.29 git
7445 www-data 20 0 141m 24m 5620 S 0,0 0,3 0:00.71 munin-cgi-graph
7452 anarcat 20 0 980m 63m 22m S 0,0 0,8 0:02.50 chromium
7492 anarcat 20 0 978m 64m 21m S 0,0 0,8 0:03.74 chromium
7498 anarcat 20 0 978m 61m 21m S 0,0 0,8 0:01.42 chromium
7518 anarcat 20 0 984m 63m 22m S 0,0 0,8 0:04.38 chromium
7532 anarcat 20 0 973m 56m 21m S 0,0 0,7 0:02.28 chromium
7813 root 20 0 0 0 0 S 0,0 0,0 0:01.22 kworker/0:2
7899 root 20 0 0 0 0 S 0,0 0,0 0:00.96 kworker/1:0
8058 anarcat 20 0 24488 1460 1104 S 0,0 0,0 0:28.34 git
8107 anarcat 20 0 17412 1384 1100 S 0,0 0,0 0:00.00 git
8130 anarcat 20 0 23792 7572 1004 S 0,0 0,1 0:41.63 git
8236 anarcat 39 19 21152 4940 964 S 0,0 0,1 0:00.71 git
8405 anarcat 20 0 17368 1364 1108 S 0,0 0,0 0:00.54 git
8407 anarcat 20 0 17464 1336 964 S 0,0 0,0 0:00.03 git
8610 anarcat 20 0 78228 14m 2860 S 0,0 0,2 0:00.37 xterm
8614 anarcat 20 0 23084 4548 1796 S 0,0 0,1 0:00.28 bash
8689 anarcat 20 0 72992 9224 2860 S 0,0 0,1 0:00.38 xterm
8693 anarcat 20 0 22876 4380 1696 S 0,0 0,1 0:00.07 bash
8735 root 20 0 99,3m 4616 3576 S 0,0 0,1 0:00.02 gdm-simple-slav
8736 root 20 0 142m 15m 6664 S 0,0 0,2 0:00.56 Xorg
8755 Debian-g 20 0 30196 1184 736 S 0,0 0,0 0:00.01 dbus-daemon
8756 root 20 0 119m 4548 3432 S 0,0 0,1 0:00.08 gdm-session-wor
8757 root 20 0 55872 2116 1572 S 0,0 0,0 0:00.00 sudo
8759 aegir 20 0 20640 2248 1660 S 0,0 0,0 0:00.07 bash
8769 Debian-g 20 0 266m 10m 7720 S 0,0 0,1 0:00.07 gnome-session
8773 Debian-g 20 0 502m 24m 10m S 0,0 0,3 0:00.85 gnome-settings-
8780 Debian-g 20 0 51980 2236 1836 S 0,0 0,0 0:00.00 gvfsd
8784 Debian-g 9 -11 237m 6044 3644 S 0,0 0,1 0:00.07 pulseaudio
8785 Debian-g 20 0 113m 3196 2448 S 0,0 0,0 0:00.00 gconf-helper
8787 Debian-g 20 0 52956 3756 1932 S 0,0 0,0 0:00.06 gconfd-2
8790 Debian-g 20 0 279m 9124 6632 S 0,0 0,1 0:00.12 metacity
8795 Debian-g 20 0 171m 9328 7056 S 0,0 0,1 0:00.04 polkit-gnome-au
8796 Debian-g 20 0 362m 16m 11m S 0,0 0,2 0:00.68 gdm-simple-gree
8812 root 20 0 72360 3916 2948 S 0,0 0,0 0:00.08 gdm-session-wor
9129 root 20 0 0 0 0 S 0,0 0,0 0:00.74 kworker/0:0
9311 www-data 20 0 288m 44m 33m S 0,0 0,6 0:07.55 apache2
10405 www-data 20 0 287m 42m 32m S 0,0 0,5 0:06.75 apache2
10406 www-data 20 0 287m 44m 34m S 0,0 0,6 0:07.02 apache2
10409 www-data 20 0 287m 41m 31m S 0,0 0,5 0:06.51 apache2
10412 www-data 20 0 287m 42m 32m S 0,0 0,5 0:06.82 apache2
10413 www-data 20 0 291m 40m 27m S 0,0 0,5 0:06.52 apache2
10415 www-data 20 0 287m 39m 29m S 0,0 0,5 0:06.67 apache2
10416 www-data 20 0 288m 42m 31m S 0,0 0,5 0:06.28 apache2
10417 www-data 20 0 290m 50m 38m S 0,0 0,6 0:07.43 apache2
10878 root 20 0 0 0 0 S 0,0 0,0 0:00.02 kworker/0:3
11037 anarcat 20 0 4180 584 488 S 0,0 0,0 0:00.00 sh
11038 anarcat 20 0 62760 4964 3244 S 0,0 0,1 0:00.48 notmuch
11040 anarcat 20 0 4180 652 544 S 0,0 0,0 0:00.00 post-new
11133 root 20 0 52576 1468 1052 S 0,0 0,0 0:00.00 cron
11134 root 20 0 52576 1464 1052 S 0,0 0,0 0:00.00 cron
11135 root 20 0 52576 1468 1052 S 0,0 0,0 0:00.00 cron
11138 aegir 20 0 4176 576 484 S 0,0 0,0 0:00.00 sh
11139 root 20 0 4176 580 484 S 0,0 0,0 0:00.00 sh
11141 munin 20 0 4176 576 480 S 0,0 0,0 0:00.00 sh
11143 root 20 0 4240 324 248 S 0,0 0,0 0:00.00 xargs
11145 munin 20 0 4176 576 484 S 0,0 0,0 0:00.00 munin-cron
11166 anarcat 20 0 61364 2988 2468 R 0,0 0,0 0:00.00 notmuch
11167 anarcat 20 0 61364 752 212 R 0,0 0,0 0:00.00 notmuch
12004 www-data 20 0 292m 52m 37m S 0,0 0,7 0:09.05 apache2
12172 anarcat 20 0 4092 580 480 S 0,0 0,0 0:00.00 emacsclient
12465 spampd 20 0 149m 65m 2840 S 0,0 0,8 0:01.41 spampd
12468 spampd 20 0 150m 67m 2840 S 0,0 0,8 0:01.07 spampd
12895 anarcat 20 0 970m 51m 21m S 0,0 0,6 0:01.80 chromium
13761 anarcat 20 0 0 0 0 Z 0,0 0,0 0:00.00 git
16056 root 20 0 21800 1464 452 S 0,0 0,0 0:00.00 udevd
16057 root 20 0 21800 1340 332 S 0,0 0,0 0:00.00 udevd
16655 www-data 20 0 147m 8232 700 S 0,0 0,1 0:00.04 apache2
17006 anarcat 20 0 526m 29m 17m S 0,0 0,4 0:19.95 gmpc
17959 www-data 20 0 70828 24m 2172 S 0,0 0,3 1:22.37 munin-cgi-html
18082 anarcat 20 0 71776 8164 2820 S 0,0 0,1 0:00.12 xterm
18086 anarcat 20 0 23048 4664 1804 S 0,0 0,1 0:00.18 bash
18571 anarcat 20 0 258m 11m 8296 S 0,0 0,1 0:00.11 xfrun4
19692 spampd 20 0 148m 64m 2832 S 0,0 0,8 0:00.63 spampd
25574 anarcat 20 0 952m 31m 15m S 0,0 0,4 0:00.71 chromium
25590 anarcat 20 0 0 0 0 Z 0,0 0,0 0:41.75 chromium
"""]]
And here's the process tree:
[[!format sh """
$ ps -O start xf | grep git-annex
8610 13:03:21 S ? 00:00:00 xterm -class UXTerm -title uxterm -u8
8614 13:03:21 S pts/4 00:00:00 \_ bash
12172 13:13:15 S pts/4 00:00:00 \_ emacsclient --alternate-editor=vim -c install.hostmaster.inc
8099 13:00:20 S ? 07:40:31 /usr/local/bin/git-annex assistant --startdelay=5s
8107 13:00:20 S ? 00:00:00 \_ git --git-dir=/srv/books/.git --work-tree=/srv/books -c core.bare=false cat-file --batch
8405 13:00:28 S ? 00:00:00 \_ git --git-dir=/srv/books/.git --work-tree=/srv/books -c core.bare=false cat-file --batch
8407 13:00:28 S ? 00:00:00 \_ git --git-dir=/srv/books/.git --work-tree=/srv/books -c core.bare=false check-ignore -z --stdin --verbose --non-matching
8045 13:00:11 S ? 07:35:36 /usr/local/bin/git-annex assistant --startdelay=5s
8058 13:00:11 S ? 00:00:28 \_ git --git-dir=/srv/mp3/.git --work-tree=/srv/mp3 cat-file --batch
8130 13:00:21 S ? 00:00:41 \_ git --git-dir=/srv/mp3/.git --work-tree=/srv/mp3 check-ignore -z --stdin --verbose --non-matching
8236 13:00:24 S ? 00:00:00 \_ git --git-dir=/srv/mp3/.git --work-tree=/srv/mp3 check-attr -z --stdin annex.backend annex.numcopies --
7107 12:58:40 S ? 00:00:02 /usr/lib/gvfs/gvfs-gdu-volume-monitor
6525 12:57:25 S ? 07:29:13 /usr/local/bin/git-annex assistant --startdelay=5s
6616 12:57:34 S ? 00:00:05 \_ git --git-dir=/srv/video/.git --work-tree=/srv/video cat-file --batch
7285 12:58:45 S ? 00:00:01 \_ git --git-dir=/srv/video/.git --work-tree=/srv/video check-ignore -z --stdin --verbose --non-matching
7434 12:58:51 S ? 00:00:00 \_ git --git-dir=/srv/video/.git --work-tree=/srv/video check-attr -z --stdin annex.backend annex.numcopies --
4209 19:30:17 S ? 00:01:06 \_ /usr/local/bin/git-annex transferkeys --readfd 25 --writefd 24
4240 19:30:17 S ? 00:00:00 \_ git --git-dir=/srv/video/.git --work-tree=/srv/video cat-file --batch
13761 23:56:38 Z ? 00:00:00 \_ [git] <defunct>
6252 12:56:59 S ? 00:01:09 /usr/bin/emacs23
"""]]

View file

@ -0,0 +1,81 @@
### Please describe the problem.
Having set up a key pair, the assistant is unable to use it to log in. The console only shows a single attempt to log in, when it's adding the key to the remote machine's authorized_keys file. This is evidently failing, as the key is not actually added to authorized_keys, possibly because the shell script it tries to execute is malformed (crazy quoting, I can't untangle it), or possibly because it failed to ask for a password (I expected it to, but it didn't prompt for one). Also, once I do add the key to authorized_keys, I can ssh in using it but asking the assistant to retry still fails.
### What steps will reproduce the problem?
Set up a remote repository.
### What version of git-annex are you using? On what operating system?
Windows 7, Version: 5.20131230-g192d991
### Please provide any additional information below.
Failed to make repository
Something went wrong setting up the repository on the remote server.
Transcript:
Permission denied, please try again.
Permission denied, please try again.
Permission denied (publickey,gssapi-keyex,gssapi-with-mic,password).
[[!format sh """
[2014-01-01 03:28:05 Eastern Standard Time] call: ssh-keygen ["-P","","-f","C:\\
Users\\FAMILY~1\\AppData\\Local\\Temp\\git-annex-keygen.5\\key"]
Generating public/private rsa key pair.
cygwin warning:
MS-DOS style path detected: C:\Users\FAMILY~1\AppData\Local\Temp\git-annex-key
gen.5\key
Preferred POSIX equivalent is: /cygdrive/c/Users/FAMILY~1/AppData/Local/Temp/g
it-annex-keygen.5/key
CYGWIN environment variable option "nodosfilewarning" turns off this warning.
Consult the user's guide for more details about POSIX paths:
http://cygwin.com/cygwin-ug-net/using.html#using-pathnames
Your identification has been saved in C:\Users\FAMILY~1\AppData\Local\Temp\git-a
nnex-keygen.5\key.
Your public key has been saved in C:\Users\FAMILY~1\AppData\Local\Temp\git-annex
-keygen.5\key.pub.
The key fingerprint is:
c7:0f:81:19:c8:39:cc:e1:d3:6a:62:9a:d5:d2:9f:c1 Familyroom@Familyroom-PC
The key's randomart image is:
+--[ RSA 2048]----+
| +.+. |
| .B. + |
| o.+ . |
| o + . . |
| = = E + |
| = + . + o |
| o o . |
| |
| |
+-----------------+
[2014-01-01 03:28:07 Eastern Standard Time] chat: ssh ["-p","22","rlbrooks@celeb
dil.db48x.net","sh -c 'mkdir -p '\"'\"'annex/test'\"'\"'&&cd '\"'\"'annex/test'\
"'\"'&&if [ ! -d .git ]; then git init --bare --shared && git config receive.den
yNonFastforwards false; fi&&git annex init&&mkdir -p ~/.ssh&&if [ ! -e ~/.ssh/gi
t-annex-shell ]; then (echo '\"'\"'#!/bin/sh'\"'\"';echo '\"'\"'set -e'\"'\"';ec
ho '\"'\"'if [ \"x$SSH_ORIGINAL_COMMAND\" != \"x\" ]; then'\"'\"';echo '\"'\"'ex
ec git-annex-shell -c \"$SSH_ORIGINAL_COMMAND\"'\"'\"';echo '\"'\"'else'\"'\"';e
cho '\"'\"'exec git-annex-shell -c \"$@\"'\"'\"';echo '\"'\"'fi'\"'\"') > ~/.ssh
/git-annex-shell; fi&&chmod 700 ~/.ssh/git-annex-shell&&touch ~/.ssh/authorized_
keys&&chmod 600 ~/.ssh/authorized_keys&&echo '\"'\"'command=\"GIT_ANNEX_SHELL_DI
RECTORY='\"'\"'\"'\"'\"'\"'\"'\"'annex/test'\"'\"'\"'\"'\"'\"'\"'\"' ~/.ssh/git-
annex-shell\",no-agent-forwarding,no-port-forwarding,no-X11-forwarding ssh-rsa A
AAAB3NzaC1yc2EAAAADAQABAAABAQDeB64i+DhYBCq0mdet6sBr1JCtYR5zNc0E9NYaZbBVRBcpZDCRs
AS1z8mjyEnb49y7AnNgsx/f7xAWtyFHFr8AbrYnaHmJYicix0R6inDXZ42WJTusHVW47/1ysErHmEusZ
KWXNzN5bu8bOoz0FqCh4Ymo3QjgMzk6+PoWqSCmwewuX++RkB6q1IN1VTMqJguPtdQpTp3hCIV6GENf6
HvnLUQ59JKg1sgt5UA88zDAMlXicmUeuHRSW7nVlVIBHFDJW8f5CyF66wiuGTLdhhMlaOqpUqIEHubPF
ZE4iTOC/uuOdWjGgySX681ub4seKyz7h8uDePPo0uz0BXJpt9vT Familyroom@Familyroom-PC\n'\
"'\"' >>~/.ssh/authorized_keys'"]
"""]]
[[!format sh """
$ ssh rlbrooks@git-annex-celebdil.db48x.net-rlbrooks_annex
git-annex-shell: bad parameters
Usage: git-annex-shell [-c] command [parameters ...] [option ..]
Options:
--force allow actions that may lose annexed data
-F --fast avoid slow operations
-a --auto automatic mode
-q --quiet avoid verbose output
etc
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawm5WyknJirJJridJjiPNgrlYxGG9xrZBvA"
nickname="Daniel"
subject="comment 3"
date="2013-12-31T23:47:43Z"
content="""
Yea, the only relevant change I noticed was 5c834daf5, and it's not particularly relevant.
However, its occurred to me that I started the webapp differently this time than last; I used the start menu shortcut this time rather than typing git annex webapp in the git shell. It's not surprising that the environment variables would be quite different between the two.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawm5WyknJirJJridJjiPNgrlYxGG9xrZBvA"
nickname="Daniel"
subject="comment 4"
date="2013-12-31T23:56:24Z"
content="""
Yea, if I start it from the Git Bash command line, it continues past this to a completely different error.
"""]]

View file

@ -0,0 +1,11 @@
### Please describe the problem.
The log doesn't say what the webapp is running (probably ssh or similar), but it complains that ~/.ssh/config has the wrong permissions. This being cygwin, I'm not sure I can even change them; I'll poke around and see. Currently they're 0644.
### What steps will reproduce the problem?
Create a remote repository
### What version of git-annex are you using? On what operating system?
Windows 7, git-annex version 5.20131230-g192d991
### Please provide any additional information below.
I have no daemon.log, and the console log isn't particularly detailed today; it had just created an ssh key and shown it's fingerprint.

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawm5WyknJirJJridJjiPNgrlYxGG9xrZBvA"
nickname="Daniel"
subject="comment 1"
date="2014-01-01T09:50:27Z"
content="""
So I can get around this by manually changing the permissions on this directory and it's files (using the windows permissions editor) so that only the user has access to it, and no other groups do (including Administrators). This seems like something the assistant should handle.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.227"
subject="comment 7"
date="2014-01-01T17:29:03Z"
content="""
OSX, Android, Windows all updated. Debian backport and linux autobuilds updated.
"""]]

View file

@ -0,0 +1,80 @@
### Please describe the problem.
gsha256sum crashes continiously, so that excessive logs must be removed and the notebook is not responsive.
Mac OS Mavericks
### What steps will reproduce the problem?
I cannot reproduce it. My guess is that it has problems with special characters in filenames of my music repository.
### What version of git-annex are you using? On what operating system?
Version: 5.20131221-g00d1673
Build flags: Assistant Webapp Pairing Testsuite S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA CryptoHash
### Please provide any additional information below.
[[!format sh """
# If you can, paste a complete transcript of the problem occurring here.
# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
[2014-01-01 11:50:02 CET] main: starting assistant version 5.20131221-g00d1673
[2014-01-01 11:53:43 CET] TransferScanner: Syncing with sokrates.local_Musik
Already up-to-date.
(scanning...) [2014-01-01 11:53:45 CET] Watcher: Performing startup scan
Already up-to-date.
The installed version of git is too old for .gitignores to be honored by git-annex.
To ssh://juh@git-annex-sokrates.local-juh_Musik/~/Musik/
0ec1344..c7bc58c git-annex -> synced/git-annex
.DS_Store
0 0% 0.00kB/s 0:00:00
21508 100% 238.68kB/s 0:00:00 (xfer#1, to-check=0/1)
sent 42 bytes received 21602 bytes 14429.33 bytes/sec
total size is 21508 speedup is 0.99
[2014-01-01 12:10:03 CET] Transferrer: Downloaded .DS_Store
[2014-01-01 12:10:03 CET] Pusher: Syncing with sokrates.local_Musik
To ssh://juh@git-annex-sokrates.local-juh_Musik/~/Musik/
c7bc58c..c3ad19a git-annex -> synced/git-annex
(Recording state in git...)
(started...) [2014-01-01 12:33:25 CET] Committer: Adding 15 - 23 s.. drøm.ogg 04 Cuatro..ielo.flac 05 Compadrón.flac 07 Buscan..dón.flac 10 Adiós..lita.flac 12 Bésam..Boca.flac 14 Nunca ..idar.flac 03 Adiós..ngo).flac 06 Selecc..ngo).flac and 2745 other files
add Edvard Grieg/Grieg Edition/Complete Piano Music/Complete Piano Music, Volume X (feat. piano_ Geir Henning Braaten)/15 - 23 småstykker for klaver, EG 104 No. 7- En drøm.ogg Committer crashed: gsha256sum parse error
[2014-01-01 12:33:27 CET] Committer: warning Committer crashed: gsha256sum parse error
.DS_Store
0 0% 0.00kB/s 0:00:00
6148 100% 5.86MB/s 0:00:00 (xfer#1, to-check=0/1)
sent 42 bytes received 6242 bytes 4189.33 bytes/sec
total size is 6148 speedup is 0.98
[2014-01-01 12:49:45 CET] Transferrer: Downloaded .DS_Store
[2014-01-01 12:49:45 CET] Pusher: Syncing with sokrates.local_Musik
[2014-01-01 12:53:42 CET] NetWatcherFallback: Syncing with sokrates.local_Musik
From ssh://git-annex-sokrates.local-juh_Musik/~/Musik
0ec1344..c3ad19a git-annex -> sokrates.local_Musik/git-annex
fatal: Unable to create '/home/juh/Musik/.git/refs/heads/synced/git-annex.lock': Die Datei existiert bereits.
If no other git process is currently running, this probably means a
git process crashed in this repository earlier. Make sure no other git
process is running and remove the file manually to continue.
git-annex-shell: git-shell failed
fatal: The remote end hung up unexpectedly
fatal: The remote end hung up unexpectedly
To ssh://juh@git-annex-sokrates.local-juh_Musik/~/Musik/
c3ad19a..e6da014 git-annex -> synced/git-annex
From ssh://git-annex-sokrates.local-juh_Musik/~/Musik
c3ad19a..e6da014 git-annex -> sokrates.local_Musik/git-annex
Everything up-to-date
[2014-01-01 13:11:59 CET] UpgradeWatcher: A new version of git-annex has been installed.
"""]]
I can send you the crash report of hsha256sum if you need it.

View file

@ -0,0 +1,81 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnX1msQxnLoSeu7q-i-c9BWghonsN7Qmns"
nickname="Jan Ulrich"
subject="Additional infos"
date="2014-01-01T13:23:45Z"
content="""
I am not sure whether this is related. But I now see this in syslog:
[[!format sh \"\"\"
cs_invalid_page(0x10fc36000): p=51598[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:05 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10f60f000): p=51599[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:05 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10f905000): p=51600[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:05 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10b57a000): p=51601[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:05 janulrimacbook2 kernel[0]: nspace-handler-unblock: did not find token 34386
Jan 1 14:21:05 janulrimacbook2.fritz.box com.apple.mtmd[52]: handler unblock failed. (status=-1/errno=2/token=34386/fd=7)
Jan 1 14:21:05 janulrimacbook2 kernel[0]: nspace-handler-unblock: did not find token 34384
Jan 1 14:21:05 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x106c9a000): p=51602[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:05 janulrimacbook2.fritz.box com.apple.mtmd[52]: handler unblock failed. (status=-1/errno=2/token=34384/fd=6)
Jan 1 14:21:05 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10c334000): p=51603[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:06 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x103397000): p=51608[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:06 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x101417000): p=51609[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:06 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10db10000): p=51610[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:06 janulrimacbook2 kernel[0]: nspace-handler-unblock: did not find token 34391
Jan 1 14:21:06 janulrimacbook2.fritz.box com.apple.mtmd[52]: handler unblock failed. (status=-1/errno=2/token=34391/fd=6)
Jan 1 14:21:06 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10db07000): p=51613[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:07 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x103be4000): p=51614[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:07 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10a980000): p=51615[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:08 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10ef68000): p=51616[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:08 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x101b74000): p=51617[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:08 janulrimacbook2 kernel[0]: nspace-handler-unblock: did not find token 34398
Jan 1 14:21:08 janulrimacbook2.fritz.box com.apple.mtmd[52]: handler unblock failed. (status=-1/errno=2/token=34398/fd=7)
Jan 1 14:21:08 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x1026fe000): p=51618[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:08 janulrimacbook2 kernel[0]: nspace-handler-unblock: did not find token 34394
Jan 1 14:21:08 janulrimacbook2.fritz.box com.apple.mtmd[52]: handler unblock failed. (status=-1/errno=2/token=34394/fd=6)
Jan 1 14:21:08 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x1051ed000): p=51623[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:08 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10b4c0000): p=51624[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:08 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x109b98000): p=51626[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:08 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x105972000): p=51628[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:08 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x104060000): p=51629[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:08 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10ecb2000): p=51630[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:09 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x107d65000): p=51631[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:09 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10b50c000): p=51632[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:10 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x106bfc000): p=51633[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:10 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x104c53000): p=51634[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:10 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x108998000): p=51635[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:10 janulrimacbook2 kernel[0]: nspace-handler-unblock: did not find token 34409
Jan 1 14:21:10 janulrimacbook2.fritz.box com.apple.mtmd[52]: handler unblock failed. (status=-1/errno=2/token=34409/fd=6)
Jan 1 14:21:10 janulrimacbook2 kernel[0]: nspace-handler-unblock: did not find token 34405
Jan 1 14:21:10 janulrimacbook2.fritz.box com.apple.mtmd[52]: handler unblock failed. (status=-1/errno=2/token=34405/fd=5)
Jan 1 14:21:10 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10392b000): p=51636[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:10 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x1049ad000): p=51641[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:10 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x109f60000): p=51642[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:10 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10fcd2000): p=51643[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:11 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10590f000): p=51646[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:12 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x1044eb000): p=51647[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:12 janulrimacbook2 kernel[0]: nspace-handler-unblock: did not find token 34416
Jan 1 14:21:12 janulrimacbook2.fritz.box com.apple.mtmd[52]: handler unblock failed. (status=-1/errno=2/token=34416/fd=5)
Jan 1 14:21:12 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10f911000): p=51648[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:12 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x1066dc000): p=51649[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:12 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10430a000): p=51655[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:13 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x1099b0000): p=51656[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:13 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10e80a000): p=51657[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:13 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10bf16000): p=51660[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:13 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10240c000): p=51661[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:14 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x103009000): p=51662[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:14 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x108d02000): p=51663[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:14 janulrimacbook2 kernel[0]: nspace-handler-unblock: did not find token 34421
Jan 1 14:21:14 janulrimacbook2.fritz.box com.apple.mtmd[52]: handler unblock failed. (status=-1/errno=2/token=34421/fd=5)
Jan 1 14:21:14 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10c7c6000): p=51664[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:14 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10612b000): p=51665[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:14 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x105872000): p=51670[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:14 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10a5b0000): p=51671[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:15 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x1062dc000): p=51672[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:15 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x104963000): p=51675[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:15 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x105b9c000): p=51676[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:15 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x10eb19000): p=51677[git] final status 0x0, allow (remove VALID)ing page
Jan 1 14:21:16 janulrimacbook2 kernel[0]: CODE SIGNING: cs_invalid_page(0x1094d0000): p=51678[git] final status 0x0, allow (remove VALID)ing page
\"\"\"]]
"""]]

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.227"
subject="comment 2"
date="2014-01-01T16:48:45Z"
content="""
> Exception Type: EXC_BAD_INSTRUCTION (SIGILL)
So, clearly not related to the filename passed to gsha256sum.
If you run the command \"/Applications/git-annex.app/Contents/MacOS/runshell gsha256sum\", does it also crash then?
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnX1msQxnLoSeu7q-i-c9BWghonsN7Qmns"
nickname="Jan Ulrich"
subject="Yes"
date="2014-01-01T18:18:32Z"
content="""
It says:
Illegal instruction: 4
"""]]

View file

@ -4,7 +4,7 @@ automatically updated to v5. There's no actual change in that upgrade, it
just simplifies things to have only one supported annex.version.
Added youtube playlist support to git-annex. Seems I had almost all the
peices needed, and didn't know it. Only about a dozen lines of code!
pieces needed, and didn't know it. Only about a dozen lines of code!
Added PREPARE-FAILURE support to the external special remote interface.

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8"
nickname="Hamza"
subject="comment 2"
date="2014-01-01T01:50:57Z"
content="""
Is it possible to do it from command line? I was thinking with a time limit I would spread the fsck over a mount run it once a while to make sure all data is actually there when I need it.
"""]]

View file

@ -0,0 +1,92 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawk_W9oOMDiBaU_xLIbeaTF8wW2wJzJ7bfw"
nickname="Christopher"
subject="comment 4"
date="2014-01-01T15:23:17Z"
content="""
I know that checking of files is a git message, I was just providing it for context.
I know that my other repos do not have these things checked in, because one of them is offline and not involved in this, and the other repo literally can't contain that much data, which is the biggest reason this is an issue.
Here are the commits I don't like:
commit 1ae2410a4bc3e35edbfd9d48a577bcfc7e3a8836
Author: Christopher Vollick <0@psycoti.ca>
Date: Mon Dec 30 23:22:47 2013 -0500
git-annex automatic sync
:120000 100644 185b311... fd03ae5... T subdir1/other_file0309
:120000 100644 515e6df... 44f8383... T subdir1/other_file0309
commit 7403e3116eb34e2b192dfa3ea4c16e35f82210ba
Author: Christopher Vollick <0@psycoti.ca>
Date: Sat Dec 21 19:12:56 2013 -0500
git-annex automatic sync
:120000 100644 185b311... fd03ae5... T subdir1/other_file0309
:120000 100644 515e6df... 357d9a7... T subdir1/other_file0309
:120000 100644 079f69f... 97c785a... T subdir1/file01
:120000 100644 c69574a... 1589721... T subdir1/file02
:120000 100644 01d98a4... 154a059... T subdir1/file03
:120000 100644 6ee02d5... 6857f73... T subdir1/file04
:120000 100644 aab78e7... 19bae04... T subdir1/file05
:120000 100644 9f8d11b... bd5b501... T subdir1/file06
:120000 100644 ca824c1... a9e0b9e... T subdir1/file07
:120000 100644 c85f526... a6383fc... T subdir1/file08
:120000 100644 a6d957d... 9b99c99... T subdir1/file09
:120000 100644 d3de258... d51da9a... T subdir1/file10
:120000 100644 3cc803e... 8f7945f... T subdir1/other_file0005
:120000 100644 cd94cca... 1c06cf8... T subdir1/other_file0006
:120000 100644 1442c98... fee3c1d... T subdir1/other_file0201
:120000 100644 4131025... f732332... T subdir1/other_file0202
:120000 100644 865214f... 1178931... T subdir1/other_file0203
:120000 100644 a0f84e2... 6c39a4a... T subdir1/other_file0204
:120000 100644 21bf0c1... bbb3c93... T subdir1/other_file0205
:120000 100644 5f6a5f3... d298a97... T subdir1/other_file0206
:120000 100644 3d7f034... 4cac0d1... T subdir1/other_file0207
:120000 100644 ee75d44... d769e8e... T subdir1/other_file0208
:120000 100644 f381401... 5f1a7f3... T subdir1/other_file0209
:120000 100644 8b6a409... 1db8c37... T subdir1/other_file0210
:120000 100644 c6a23f1... 5a9bbf5... T subdir1/other_file0211
:120000 100644 17a34c7... 068c619... T subdir1/other_file0212
:120000 100644 3c7fe0a... 356315b... T subdir1/other_file0213
:120000 100644 4b61d45... e9747e5... T subdir1/other_file0214
:120000 100644 1c0d845... f7a11d3... T subdir1/other_file0301
:120000 100644 cdd57b2... fb5512f... T subdir1/other_file0302
:120000 100644 9bb8ffc... 9b3897d... T subdir1/other_file0303
:120000 100644 007cfa6... 93e36d7... T subdir1/other_file0304
:120000 100644 24cf5d3... 9eecff4... T subdir1/other_file0305
:120000 100644 d9be965... 6c612f4... T subdir1/other_file0306
:120000 100644 20cd474... 9d1c714... T subdir1/other_file0307
:120000 100644 3f24532... 9ff7770... T subdir1/other_file0308
:120000 100644 3939cbe... de9fefd... T subdir1/other_file0308
:120000 100644 9de87f9... 2242892... T subdir1/other_file0309
:120000 100644 7250b17... a544af6... T subdir1/other_file0310
:120000 100644 9de87f9... 2242892... T subdir1/other_file0312
:120000 100644 14fbe43... f643564... T subdir1/other_file0401
:120000 100644 0f28f22... e4b5e2c... T subdir1/other_file0402
:120000 100644 6704647... 4529fb0... T subdir1/other_file0403
:120000 100644 65b3742... dacc2ce... T subdir1/other_file0404
:120000 100644 14ad1d6... a4f7dab... T subdir1/other_file0405
:120000 100644 87bda81... a3b2a0a... T subdir1/other_file0406
:120000 100644 23fd37b... 7ea3182... T subdir1/other_file0407
:120000 100644 a82d025... aa0e1f6... T subdir1/other_file0408
:120000 100644 cd350d3... c225b3d... T subdir1/other_file0409
:120000 100644 2ce6c3b... 1efffa6... T subdir1/other_file0410
:120000 100644 3f780d5... 207f8af... T subdir1/other_file0411
:120000 100644 27ecf10... 4a34b2d... T subdir1/other_file0412
:120000 100644 5cf1ba0... ab0b15d... T subdir1/other_file0413
:120000 100644 a1cccd7... 274dbd1... T subdir1/other_file0004
Now, the most interesting part here is that commit 7403e3116eb is dated Sat Dec 21.
That is not when I was attempting this. The 30th, shown in 1ae24 is.
That makes me think that I have failed to reset properly, and so when I'm telling it to sync it's not recomputing the thing, it's just grabbing the thing it did last time.
Now, I still don't know why it chose to do that, but perhaps it wouldn't choose to do that again if I could figure out how to get it to forget that path.
Thoughts?
"""]]

View file

@ -0,0 +1,15 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawk_W9oOMDiBaU_xLIbeaTF8wW2wJzJ7bfw"
nickname="Christopher"
subject="comment 5"
date="2014-01-01T16:37:38Z"
content="""
Ok, so, looking into it a little more I think I've found that I screwed up updating a ref, so I didn't reset synced/master like I thought I did.
So, I don't know why it chose to make this choice in the first place, but I was able to reset and manually change my way around it.
That being said, I don't want to do this a lot, because I'm not fully clear on what the synced branches represent.
Is it that, on repo1, repo2/synced/master is the last thing that pushed over, and that after a sync local synced/master is always master, and before that it's the last sync to anywhere?
How safe is it to screw around with these things?
"""]]

View file

@ -0,0 +1,65 @@
I have just done a sync in a direct mode repo:
git-annex sync sshremote
It has quite a few conflicts (both sides adding the same file with same content). But somehow the merge won't conclude. Here's some log:
$ git-annex sync sshremote
commit ok
pull sshremote
warning: no common commits
remote: Counting objects: 32162, done.
remote: Compressing objects: 100% (31192/31192), done.
remote: Total 32162 (delta 3), reused 32162 (delta 3)
Receiving objects: 100% (32162/32162), 3.39 MiB | 1.61 MiB/s, done.
Resolving deltas: 100% (3/3), done.
From sshremote:/repo
* [new branch] annex/direct/master -> sshremote/annex/direct/master
* [new branch] git-annex -> sshremote/git-annex
* [new branch] master -> sshremote/master
* [new branch] synced/master -> sshremote/synced/master
Auto-merging file1
CONFLICT (add/add): Merge conflict in file1
Auto-merging file2
CONFLICT (add/add): Merge conflict in file2
Auto-merging file3
CONFLICT (add/add): Merge conflict in file3
Auto-merging file4
CONFLICT (add/add): Merge conflict in file4
Automatic merge failed; fix conflicts and then commit the result.
file1: needs merge
file2: needs merge
file3: needs merge
file4: needs merge
^C
I waited for a few minutes, and checked that both cpu and disk activity is near zero on both server. So I interrupted it, thinking it might be some locking issue.
But now I cannot sync with the remote anymore because the merge is still in process. How should I resolve the conflicts? I could do it manually if I cannot use annex's auto merge.
$ git-annex sync sshremote
commit ok
pull sshremote
fatal: You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge.
fatal: You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge.
failed
$ git merge --abort
fatal: This operation must be run in a work tree
Update: this is running on OSX with:
git-annex version: 5.20131221-g00d1673
build flags: Assistant Webapp Pairing Testsuite S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA CryptoHash
key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
remote types: git gcrypt S3 bup directory rsync web webdav glacier hook
local repository version: 3
default repository version: 3
supported repository versions: 3 5
upgrade supported from repository versions: 0 1 2 4

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnX1msQxnLoSeu7q-i-c9BWghonsN7Qmns"
nickname="Jan Ulrich"
subject="Filed a bug report"
date="2014-01-01T13:06:22Z"
content="""
Sorry,
i filed a bug report with logs.
"""]]

View file

@ -0,0 +1,9 @@
I am working on rehauling my backup scripts here, and I was originally doing an rsync of everything to an external drive, but now I think I can be smarted and skip my annexes in that rsync, and use git-annex superpowers to do the sync instead.
I have added this to my backup script:
( cd /srv/video && git annex copy --to backup . )
And it works, so yaaay. :) However, I feel it could be faster. This seems to check each file one at a time, but doesn't git-annex keep a state of the remote internally, which would allow it to copy over only the missing files, without checking if each file is present individually?
I mean, it's still pretty fast considering the dataset, but I wonder if there isn't some fast/easier way. Keep in mind I am hesitant of using the assistant for this because I am [[confused_about_external_drives]], the [[bugs/webapp takes 100% of the cpu]] and the [[bugs/assistant eats all CPU]]. I would prefer to script this anyways. --[[anarcat]]