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

This commit is contained in:
Joey Hess 2016-03-09 13:13:28 -04:00
parent c6f81e8ef5
commit 0cdd4f9f58
Failed to extract signature
7 changed files with 169 additions and 0 deletions

View file

@ -0,0 +1,28 @@
[[!comment format=mdwn
username="ellis"
subject="comment 5"
date="2016-03-09T10:04:14Z"
content="""
1) I'm afraid I don't have any real knowledge of VFAT -- always avoided it, but this is a shared drive, so it seemed best to just leave it with the factory formatting.
2) The output from `mount` is shown at the bottom of comment 3. The drive gets automounted when I plug it in.
3) \"Can you chmod the file to have some mode other than 444?\"
Yes. Here's a console transcript. After running `chmod 644`, git annex was able to drop the file.
% cd /media/ellis/USB04/repo/taiji-lib
% ls -l ./annex/objects/97e/78c/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav
-r--r--r-- 1 ellis ellis 38464078 Mär 4 18:32 ./annex/objects/97e/78c/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav
% chmod 644 ./annex/objects/97e/78c/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav
% ls -l ./annex/objects/97e/78c/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav
-rw-r--r-- 1 ellis ellis 38464078 Mär 4 18:32 ./annex/objects/97e/78c/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav
% git annex dropunused 101 --force
dropunused 101 ok
(recording state in git...)
"""]]

View file

@ -0,0 +1,27 @@
### Please describe the problem.
I ran `git annex fsck` on some files, and the fsck reported that hashes were incorrect and the files were moved.
### What steps will reproduce the problem?
I don't know.
### What version of git-annex are you using? On what operating system?
```
git-annex version: 6.20160229
build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV Inotify DBus DesktopNotify XMPP ConcurrentOutput TorrentParser MagicMime Feeds Quvi
key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 SHA1E SHA1 MD5E MD5 WORM URL
remote types: git gcrypt S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
```
on NixOS linux 64 bit - unstable channel
### Please provide any additional information below.
The problem was on several disks, different manufacturer, different disk size, etc. The fsck always transformed hashA -> hashB, so the hashes were equal before and after the fsck run on all disks, though the link to the "old" file was not fixed to point to the "new" file.
### 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)
I use annex for years now, never had a problem with it. It is one of the most awesome pieces of software I've seen in the last 10 years, though I only use a really small part of it. Sometimes it bugs me a little that it consumes quite a lot of memory on large repositories, though most of the time this is not an issue for me.

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="mail@f1d77c48f528d8c7b885900281887e045ad5114e"
nickname="mail"
subject="Solution"
date="2016-03-09T16:03:35Z"
content="""
The solution proposed by \"joeyh\" on irc was to remove the symlink (`git rm` it) and then move the actual file from .git/annex/bad back to the file and `git annex add` it again.
Worked beautifully.
"""]]

View file

@ -0,0 +1,54 @@
### Please describe the problem.
4 out of 269 tests failed (4468.00s)
hard to assess how critical they are...
### What steps will reproduce the problem?
run git annex test
### What version of git-annex are you using? On what operating system?
6.20160307+gitgb095561-1~ndall+1
### Please provide any additional information below.
[Full log](http://www.onerussian.com/tmp/git-annex-tests-6.20160307+gitgb095561-1~ndall+1.log)
[[!format sh """
smaug:/mnt/nfs/scrap/datalad/test_annex
$> grep -B5 FAIL git-annex-tests-6.20160307+gitgb095561-1~ndall+1.log
crypto: OK (50.57s)
preferred content: OK (20.36s)
add subdirs: OK (8.97s)
addurl: .t/tmprepo73/.git/annex/keys: removeDirectoryRecursive: unsatisfied constraints (Directory not empty)
sleeping 10 seconds and will retry directory cleanup
FAIL
--
293ed4c..c16b350 git-annex -> synced/git-annex
dd272eb..ffe1721 master -> synced/master
OK (11.64s)
addurl: .t/tmprepo73/.git/annex/keys/.nfs0000000009a305870000020e: removeDirectoryRecursive: resource busy (Device or resource busy)
sleeping 10 seconds and will retry directory cleanup
FAIL
--
0993b09..c09ddc4 git-annex -> synced/git-annex
a823824..520f58c master -> synced/master
OK (13.67s)
addurl: .t/tmprepo73/.git/annex/keys/.nfs0000000009a305870000020e: removeDirectoryRecursive: resource busy (Device or resource busy)
sleeping 10 seconds and will retry directory cleanup
FAIL
--
OK (14.59s)
addurl: On branch master
nothing to commit, working directory clean
.t/tmprepo73/.git/annex/keys/.nfs0000000009a305870000020e: removeDirectoryRecursive: resource busy (Device or resource busy)
sleeping 10 seconds and will retry directory cleanup
FAIL
# End of transcript or log.
"""]]
[[!meta author=yoh]]