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

This commit is contained in:
Joey Hess 2013-07-26 17:02:12 -04:00
commit 5645003f70
7 changed files with 88 additions and 0 deletions

View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="2001:4978:f:21a::2"
subject="comment 4"
date="2013-07-26T16:52:26Z"
content="""
The 4201 dangling blobs is a little bit strange, although it could certianly happen in some normal scenarios.
Overall, your repository seems to be ok except for this weird data in the one file. I do not anticipate the extra garbage causing any problems at all.
To track this down, we need to find the commit that added the garbage. One way, assuming you're using indirect mode, is to `git checkout git-annex; git blame uuid.log` and `git show` the commit that added the garbage. If you're using direct mode, you should first `git clone` the repository and do that in the clone.
"""]]

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.110"
subject="comment 6"
date="2013-07-26T20:59:42Z"
content="""
I think that the whole `git show $sha` for each commit will provide useful context.
I want to understand what happened here, because there are multiple weird things going on, and it's important to root cause this sort of bug.
What version of git-annex is on the rPi and how was it installed? Is there a simple operation you can do that segfaults every time?
"""]]

View file

@ -0,0 +1,24 @@
[[!comment format=mdwn
username="http://mey.vn/"
ip="46.65.14.106"
subject="comment 7"
date="2013-07-26T18:11:25Z"
content="""
thanks; the current ```uuid.log``` file carries content from 8 distinct commits :
335cb49c 2013-07-22 16:57:32 +0100
4ec397f7 2013-07-22 16:57:26 +0100
50542096 2013-07-22 17:19:21 +0100
621a1a03 2013-07-22 16:57:28 +0100
63dd4509 2013-07-22 16:57:26 +0100
8c2d3ff7 2013-07-22 16:57:19 +0100
9ba4166d 2013-07-22 18:38:29 +0100
e182ee60 2013-07-22 16:57:26 +0100
would the whole diff for each commit be useful, or just the part related to uuid.log?
all these commits were done by git-annex on my laptop; the earliest of these commits come seconds after two commits done on another node - a raspberry pi running armhf Raspbian, although i now see that ```git-annex``` and ```git-annex-shell``` on this rPi are constantly segfaulting (though i can't understand the reason from the strace output): perhaps a segfault while dealing with a git operation on the rPi started the metadata corruption somehow?
btw - if this could be useful to track down a possible bug in git-annex (although only involving some metadata, not the actual data), i am happy to dig further to provide all the information needed to understand what might have happened, but if it's not something worth investigating further in the bigger scheme of things, from my point of view i'm ok with restarting a fresh annex with content moved from this annex, and pristine metadata :)
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="2001:4978:f:21a::2"
subject="comment 9"
date="2013-07-26T16:55:08Z"
content="""
Like I sort of expected, this is missing a remote.$foo.annex-uuid setting. But I don't know why yet. I need a debug log to figure this out.
Can you enable debugging (run git-annex webapp --debug), reproduce the problem again, and send me the log?
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="2001:4978:f:21a::2"
subject="comment 3"
date="2013-07-26T16:45:26Z"
content="""
Michael, you're right. Thanks for fact checking my late night comment! ;)
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog"
nickname="Michael"
subject="comment 1"
date="2013-07-26T16:16:04Z"
content="""
How about
git annex find . --format='${bytesize} ${file}\n' |sort -n|sed 's/[0-9]* //'|while read file; do git annex copy \"$file\" --to=your_remote; done
"""]]

View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="2001:4978:f:21a::2"
subject="comment 2"
date="2013-07-26T16:44:35Z"
content="""
Note that you don't need to shut down the assistant; you can run multiple git-annex commands simulantaneously safely.
You will probably want to set that repository to be in the manual group in the assistant though.
Another way to do it is to make rsync.net a small archive, and move or copy your important files into `archive` directories.
You can also set up multiple remotes using the same rsync.net account. So you could have a transfer remote that's used to ship files between clients, as well as your archive remote.
"""]]