mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Joey Hess 2014-07-23 10:43:45 -04:00
commit c675e83f86
9 changed files with 217 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
doc/bugs/git_annex_requested_key_is_not_present_on_random_files_even_though_they_exist___40__Direct_mode__41__.mdwn Normal file
View file

@ -0,0 +1,76 @@
### Please describe the problem.
I have a repo on a server running in direct mode. This repo is running Ubuntu 12.04 LTS. I run a windows laptop and the git-annex client to synchronise via SSH.
### What steps will reproduce the problem?
I set up the repo as normal on the server, clone it on the laptop, then when I issue the 'git annex get workspace' command to get the content for the workspace directory there are 10 random files with which I am getting the following error:
get workspace/XXXXXXXX/Functional_Design/test3.docx (from origin...)
[2014-07-23 11:28:42 GMT Daylight Time] read: rsync ["--progress","--inplace","-
e","'ssh' '-T' 'adam@172.21.25.11' 'git-annex-shell ''sendkey'' ''/mnt/NAS1/repo
s/XXXXXXXXXXXXXXXXX'' ''SHA256E-s31601--6f4995ef93be1f640a8b229f84abc69bd44daf63
6afeae9c1bcf91a6287cd92b.docx'' --uuid 51dce2ea-39c6-4498-a99d-8e189c154eef ''--
'' ''remoteuuid=c5ec0b9a-b79e-4f3b-8f28-0e869b150f9c'' ''direct=1'' ''associated
file=workspace/XXXXXXXX/Functional_Design/test3.docx'' ''--'''","--","dummy:","/
cygdrive/c/repos/XXXXXXXXXXXXXXXXX/.git/annex/tmp/SHA256E-s31601--6f4995ef93be1f
640a8b229f84abc69bd44daf636afeae9c1bcf91a6287cd92b.docx"]
requested key is not present
rsync: connection unexpectedly closed (0 bytes received so far) [Receiver]
rsync error: error in rsync protocol data stream (code 12) at /home/lapo/package
/rsync-3.0.9-1/src/rsync-3.0.9/io.c(605) [Receiver=3.0.9]
rsync failed -- run git annex again to resume file transfer
Unable to access these remotes: origin
Try making some of these repositories available:
51dce2ea-39c6-4498-a99d-8e189c154eef -- root@vpndude:/mnt/NAS1/repos/XXXXXXXXXXXXXXXXXX [origin]
failed
I have checked the files and the keys and they all seem to match. There are hundreds of other files which do work fine.
I deleted the laptop repo and cloned again and had another attempt but the same thing occured again.
I have checked permissions on these files and they are identical to other files which are working.
I have run git annex sync on the server and the laptop, this has no impact.
I have run git annex fsck on both server and laptop and this has no impact.
I'm clueless as to why this is happening.
### What version of git-annex are you using? On what operating system?
Ubuntu 12.04 LTS:
git-annex version: 5.20140716-g8c14ba8
build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus DesktopNotify 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 tahoe glacier ddar hook external
local repository version: 5
supported repository version: 5
upgrade supported from repository versions: 0 1 2 4
Windows 7:
git-annex version: 5.20140717-g3de6e4b
build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV DNS Feed
s Quvi TDFA CryptoHash
key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SH
A256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier ddar ho
ok external
local repository version: 5
supported repository version: 5
upgrade supported from repository versions: 2 3 4
### 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
# End of transcript or log.
"""]]

12
doc/bugs/git_annex_requested_key_is_not_present_on_random_files_even_though_they_exist___40__Direct_mode__41__/comment_1_410a591983ebb593e8ca978ceddf6a2c._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkt8DjG40gowj_ETchFLDS_Z216tr7p1xw"
nickname="Adam"
subject="ok some progress"
date="2014-07-23T14:27:51Z"
content="""
I tried to do the same from another local repository on the server and it worked fine.
I created a Linux VM and that also struggled, but this time with 57 errors.
It turns out that the way my files were being stored on the server was causing it. I had the files stored on a local NAS which was mounted via iSCSI. I moved the repository from the NAS to local storage and then did another clone and it is now working from the Linux VM and the Windows client via SSH. When using git annex get on the Linux VM it is much faster than the native Git bash which takes ages.
"""]]

27
doc/bugs/git_annex_still_deleting_content_when_merging/comment_2_bbbcce7fc5f34d733126c42be8ec0a1d._comment Normal file
View file

@ -0,0 +1,27 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8"
nickname="daniele"
subject="comment 2"
date="2014-07-22T01:47:29Z"
content="""
> I am not familiar with the log syntax shown
You mean the \"git log --stat\" part? Which git command would yield the most helpful syntax in this case?
> AFAICS, the problem occurs on machine B. Which machine is the transcript from?
Sorry I forgot to mention it: yes, it's from machine B.
> Is this \"Removing\" message then printed out by another git command?
Sorry I have no clue here. I didn't issue any git command from the terminal (nor did the user on computer A) if that was part of the question. It was all done in automatic.
> Enabling debug logging would probably help a lot, to narrow that down the next time this occurs.
Will do. I'll set 'annex.debug' to true in .git/config. Sadly, computer A is (a laptop) on vacation at the moment (well outside the local network), so I'll have to wait a couple of weeks to get back to debugging this. I'll have the logs with debug enabled when it happens again.
Thanks again for your support and for developing git-annex.
"""]]

27
doc/bugs/git_annex_still_deleting_content_when_merging/comment_3_f31a73e0e2c43f6a7f158455eadaa56c._comment Normal file
View file

@ -0,0 +1,27 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8"
nickname="daniele"
subject="comment 3"
date="2014-07-22T02:10:14Z"
content="""
I was unsure as to what git-log command would best describe the problematic commits but in the meantime I did a:
git log --graph --decorate=full --full-diff
These are the only three commits of that afternoon (the surrounding history is from completely different hours and very likely unrelated, so it wasn't posted)
* commit d9eb9e94a3973598a847a5bdab1b65e459c1588a
| Author: COMPUTER B
| Date: Thu Jul 17 18:17:16 2014 +0200
|
* commit 6fa27f0849227c490ac4d4d62ca86e4befe5121e
| Author: COMPUTER A
| Date: Thu Jul 17 18:17:14 2014 +0200
|
* commit d25cc793739573057e475c92c8d37ce4ecc7bc9b
| Author: COMPUTER A
| Date: Thu Jul 17 18:17:12 2014 +0200
It's a straight line (fast forward?), I don't see any merging either. Is this normal? Shouldn't a change in Repo A bring a merge in Repo B (where everything stayed the same) when things are synchronized? I don't fully understand how annex syncs happen so don't mind this question if it's all normal.
"""]]

1
doc/forum/Reloading_.git__47__config_mid-sync.mdwn Normal file
View file

@ -0,0 +1 @@
There are some settings (rsync bandwidth settings are my use case) I'd like to reload after assistant starts, possibly mid-sync. Does assistant support SIGHUP, etc? What's the correct way to change bandwidth settings?

21
doc/forum/Standard_groups__47__preferred_contents/comment_3_202a7e2820e0adf079ccd14a7993ad25._comment Normal file
View file

@ -0,0 +1,21 @@
[[!comment format=mdwn
username="divB"
ip="204.17.143.10"
subject="comment 3"
date="2014-07-22T00:11:34Z"
content="""
Unfortunately the same :(
Testcase:
1.) Create a file 'file' on the server, git annex add/sync etc.
2.) On the client: git annex wanted here 'exclude=\"*\" and present'
3.) On the client: git annex get file . The file is now present on the client
4.) Change the file on the server, git annex sync
5.) git annex sync --content on the client
Result: File is dropped again on client
"""]]

15
doc/forum/Standard_groups__47__preferred_contents/comment_4_e0faf9ebd3162e0de860eba0fd28c67c._comment Normal file
View file

@ -0,0 +1,15 @@
[[!comment format=mdwn
username="divB"
ip="204.17.143.10"
subject="comment 4"
date="2014-07-22T00:24:46Z"
content="""
... and for the directories the same:
1.) Create a (sub-)directory 'subdir' with files and sync everything
2.) On the client: git annex get subdir . The subdirectory is now present, all files under it downloaded.
3.) On the server create a new file in 'subdir' and git annex add; git annex sync --content
4.) git annex sync --content on the client
Result: Content of the files is not synced to client
"""]]

13
doc/forum/Standard_groups__47__preferred_contents/comment_5_eb47696244931173bddcbeb8d5f78637._comment Normal file
View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8"
nickname="daniele"
subject="comment 5"
date="2014-07-22T00:29:20Z"
content="""
wait, is the group working together with the preferred content?
Usually you set a repository in a group and then you tell annex that particular group has this preferred content expression (which by default is set to 'standard'). So you could add the repo to 'client' group then set the group 'client' to that preferred content expression. If you only want that particular client to have that expression you can play around with \"groupwanted\", or even define your own group I guess.
Use \"git annex vicfg\" to quickly check both \"group\" and \"wanted\" settings together.
"""]]

25
doc/forum/Standard_groups__47__preferred_contents/comment_6_c70c9fa97bce8e4eb9b3880d8f843aef._comment Normal file
View file

@ -0,0 +1,25 @@
[[!comment format=mdwn
username="divB"
ip="204.17.143.10"
subject="comment 6"
date="2014-07-23T05:20:47Z"
content="""
Hi daniele,
I am not completely sure what you mean but I as far as I understand as soon as I set \"wanted\" to anything other than \"default\" the standard groups do not apply at all.
I can't use vicfg because I use windows and this command hangs ... probably because there is no vi.
However, I can still check the expressions:
$ git annex group here
manual
$ git annex wanted here
exclude=\"*\" and present
$
Have you tried this? Does it work in your case?
Because the standard preferred contents also contains \"present\" so I assume it would behave the same.
Is maybe \"present\" broken or the behavior different than expected?
"""]]