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

This commit is contained in:
Joey Hess 2021-05-03 10:29:44 -04:00
commit 58fc6a1cdf
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
11 changed files with 111 additions and 8 deletions

View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="ijc@c69abafeb65fa2e784811fc549e9976a5cf4b903"
nickname="ijc"
avatar="http://cdn.libravatar.org/avatar/83432d9f01a0bedc575703583f7aa7c6"
subject="comment 2"
date="2021-05-02T17:54:56Z"
content="""
I don't think git-annex is starting any retrieval process, I have to do it manually. I wasn't sure if it was supposed to (it doesn't seem to try) but maybe that's an aspect of this bug too.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="Lukey"
avatar="http://cdn.libravatar.org/avatar/c7c08e2efd29c692cc017c4a4ca3406b"
subject="comment 3"
date="2021-05-02T18:46:34Z"
content="""
Sorry, I just noticed that you are using s3 and not glacier-cli (which the [[special_remotes/glacier/]] special-remote uses). So it indeed is a bug, since git-annex doesn't handle glacier with s3 as yet far as I know. Maybe you have more luck with the glacier special-remote?
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="Lukey"
avatar="http://cdn.libravatar.org/avatar/c7c08e2efd29c692cc017c4a4ca3406b"
subject="comment 1"
date="2021-05-03T12:12:17Z"
content="""
I tested it with the latest git-annex version (8.20210331-g1fb59a63a) and can't reproduce the bug. So I guess this can be closed.
"""]]

View file

@ -0,0 +1,27 @@
Hi Joey,
### Please describe the problem.
`git annex fromkey` on Windows fails with `git-annex: System.PosixCompat.Files.createSymbolicLink: not supported: illegal operation`
I guess it should create a unlocked file instead on Windows.
### What steps will reproduce the problem?
mkdir test
cd test
git init
git annex init test
touch file
git annex add file
git annex sync
git annex fromkey SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 file2
### What version of git-annex are you using? On what operating system?
git version 2.31.1.windows.1 <br>
git annex 8.20210331-g1fb59a63a <br>
Windows 10 Pro 1903 <br>
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
Yes! git-annex is really great and there is nothing else like it.

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="Lukey"
avatar="http://cdn.libravatar.org/avatar/c7c08e2efd29c692cc017c4a4ca3406b"
subject="comment 1"
date="2021-05-03T10:26:35Z"
content="""
Hmm, from the output above, it is just updating the remote-tracking branch. So it shouldn't affect the local `adjusted/master(hidemissing)` branch at all.
"""]]

View file

@ -0,0 +1,15 @@
I use a backup service which mirrors the contents of directories to The Cloud^(TM). One of the dirs I make it mirror is a directory special remote with encryption and chunking which I move data into.
Now I would like to make GA aware of the second copy that the mirroring service creates of that special remote.
I use BTRFS as the underlying FS, so my idea is it to store the special remote inside a subvolume and then snapshot it before sending it off to mirror. (The same could probably be done with hardlinks as special remotes are read- and unlink-only.) This way I've got a local directory which represents the state of the remote mirror once the service's tool is done uploading it.
My idea was to then let GA know about it in the form of a second directory special remote to give me the correct numcopies count.
The problem I have run into here is that there does not seem to be a way to get GA to "import" pre-existing state of a directory special remote. I just can't get it to recognise the existance of the keys inside it.
I could probably hack up an something that could query the mirrored keys directly and maybe make a special remote out of that but the same problem would apply here as it's still a special remote that changes outside of GA's control.
Is there a way of doing what I want that I may have overlooked? Is there a better way of making GA aware of this external copy perhaps?
Thanks,
- Atemu

View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="Lukey"
avatar="http://cdn.libravatar.org/avatar/c7c08e2efd29c692cc017c4a4ca3406b"
subject="comment 1"
date="2021-05-02T18:36:56Z"
content="""
Hi,
I tested it with `encryption=shared` and it works, but not with chunking. When creating the 2nd remote, you have to look up the cipher of the first one with `git cat-file blob git-annex:remote.log` and pass it to initremote with `cipher=`. Finally, after externally copying everything from the 1st remote to the 2nd remote, you have to run `git annex fsck --fast --all --from=remote2` to make git-annex aware of the copies.
"""]]

View file

@ -1,8 +0,0 @@
[[!comment format=mdwn
username="Lukey"
avatar="http://cdn.libravatar.org/avatar/c7c08e2efd29c692cc017c4a4ca3406b"
subject="comment 1"
date="2020-10-21T19:10:01Z"
content="""
Git on windows configures a diff driver by default, which is probably throwing these errors (For whathever reason... *sigh*). It's the `diff.<driver>.command` setting that you have to unset.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="Lukey"
avatar="http://cdn.libravatar.org/avatar/c7c08e2efd29c692cc017c4a4ca3406b"
subject="comment 1"
date="2021-05-03T12:33:32Z"
content="""
Git on Windows configures a diff driver by default, which is probably throwing these errors (For whathever reason... sigh). It's the `diff.astextplain.textconv` setting that you have to unset. I.e. Launch Git Bash as Administrator and run `git config --unset --system diff.astextplain.textconv`.
"""]]

View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="Lukey"
avatar="http://cdn.libravatar.org/avatar/c7c08e2efd29c692cc017c4a4ca3406b"
subject="comment 1"
date="2021-05-02T08:03:56Z"
content="""
I guess you could just put something like this in your crontab:
`*/5 * * * * cd /path/to/repo; flock -n .git/periodic-sync.lock git annex sync --content --all`
As a optimization, you could only sync with `--content --all` if the git-annex branch changed since the last time it ran.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="Lukey"
avatar="http://cdn.libravatar.org/avatar/c7c08e2efd29c692cc017c4a4ca3406b"
subject="comment 1"
date="2021-05-03T11:04:30Z"
content="""
AFAIK, this is a long known bug and fixing it is hard/impossible. I can't find the original bug report thought.
"""]]