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

This commit is contained in:
Joey Hess 2017-08-20 16:51:06 -04:00
commit 3577f874a3
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
8 changed files with 275 additions and 0 deletions

View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="ilovezfs"
avatar="http://cdn.libravatar.org/avatar/f2b3954cf2ed0a551de9a49d3b6a64d0"
subject="Exception: getCurrentDirectory:getWorkingDirectory: resource exhausted (Too many open files)"
date="2017-08-18T18:28:01Z"
content="""
Thanks! 6.20170818 does build with Cabal 2.0.0. However, I'm still seeing the too many open files error.
The log is here: https://gist.github.com/ilovezfs/5dabc76086ba4b028b1eae7f301a5219
"""]]

View file

@ -0,0 +1,26 @@
### Please describe the problem.
Ive just experienced something strange. When files are copied (instead of moved) into a repo with an assistant running, some of them get lost.
### What steps will reproduce the problem?
1. Start the assistant.
2. `cp -rv some-big-directory your-annex-repo/`
3. Wait for sync to finish.
4. Compare some-big-directory with your-annex-repo/some-big-directory.
It might be of some importance that Im syncing this repo to 5 different machines.
### What version of git-annex are you using? On what operating system?
git-annex version: 6.20170520
local repository version: 6
operating system: linux x86_64
### Please provide any additional information below.
Hard to tell, sometimes it happens, sometimes not.
### 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)
Sure, very cool, but this data loss thing creeped me out!

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="michalrus"
avatar="http://cdn.libravatar.org/avatar/83c0b6e7f9d20f09a892263c4903bbae"
subject="comment 1"
date="2017-08-20T15:47:03Z"
content="""
These files can be seen in `git annex unused` on the machine that was to add them…
"""]]

View file

@ -0,0 +1,111 @@
[[!comment format=mdwn
username="michalrus"
avatar="http://cdn.libravatar.org/avatar/83c0b6e7f9d20f09a892263c4903bbae"
subject="comment 2"
date="2017-08-20T16:45:09Z"
content="""
Ive got some `git log -S'KEY'` of what happened. Names censored. So it seems like peers are deleting and re-adding this files, and at the end they end up deleted. :( The last commit is me manually re-adding them one last time.
Please note, that these are completely new files, its not possible that merges are deleting them.
```
commit 38134b87fdd6957c578f2a9d06d6c50aefee361b
Author: Elzbieta
Date: Sun Aug 20 18:21:04 2017 +0200
Re-add unused files
...7e4a6e20cba47b04eefef5ad0a85e16b00e8f5bbc5bcfade24ad0b934738d790.docx | 1 +
1 file changed, 1 insertion(+)
commit 9d3be6aafe84fa7e114f5de12c0a15adc0b2704e
Author: Elzbieta
Date: Sun Aug 20 12:20:13 2017 +0200
git-annex in elzbietarus
.../SA\305\201ATKA \305\232LEDZIOWA, SA\305\201ATKA Z SZYNKI.docx\" | 1 +
1 file changed, 1 insertion(+)
commit 92c1e62f8483c6b4fa263180a8a506bf5d0a46c7
Author: Elzbieta
Date: Sun Aug 20 12:20:10 2017 +0200
git-annex in elzbietarus
.../SA\305\201ATKA \305\232LEDZIOWA, SA\305\201ATKA Z SZYNKI.docx\" | 1 -
1 file changed, 1 deletion(-)
commit cd51d4dfed402a0929d357bb9557923618fdadff
Author: Robert
Date: Sun Aug 20 12:19:56 2017 +0200
git-annex in robertrus-qx511
.../SA\305\201ATKA \305\232LEDZIOWA, SA\305\201ATKA Z SZYNKI.docx\" | 1 +
1 file changed, 1 insertion(+)
commit 879256502d8047f0a3ed5487a57854076459f9a7
Author: Robert
Date: Sun Aug 20 12:19:54 2017 +0200
git-annex in robertrus-qx511
.../SA\305\201ATKA \305\232LEDZIOWA, SA\305\201ATKA Z SZYNKI.docx\" | 1 -
1 file changed, 1 deletion(-)
commit 7196eb855f2ca3ca87959002c3e61c7e060d7ae6
Author: Elzbieta
Date: Sun Aug 20 12:19:50 2017 +0200
git-annex in elzbietarus
.../SA\305\201ATKA \305\232LEDZIOWA, SA\305\201ATKA Z SZYNKI.docx\" | 1 +
1 file changed, 1 insertion(+)
commit f566cb65b19aa6144e7587cdcb2a8b910584391c
Author: Elzbieta
Date: Sun Aug 20 12:19:42 2017 +0200
git-annex in elzbietarus
.../SA\305\201ATKA \305\232LEDZIOWA, SA\305\201ATKA Z SZYNKI.docx\" | 1 -
1 file changed, 1 deletion(-)
commit de732718be3c25580463ddc5cd8abaf5eb6ca4be
Author: Michal Rus <m@michalrus.com>
Date: Sun Aug 20 12:19:28 2017 +0200
git-annex in michalrus
.../SA\305\201ATKA \305\232LEDZIOWA, SA\305\201ATKA Z SZYNKI.docx\" | 1 -
1 file changed, 1 deletion(-)
commit b25b6274332bc5ac42dc0b6a0d69abe3bd32e0e0
Author: Robert
Date: Sun Aug 20 12:19:24 2017 +0200
git-annex in robertrus-np300e5a
.../SA\305\201ATKA \305\232LEDZIOWA, SA\305\201ATKA Z SZYNKI.docx\" | 1 +
1 file changed, 1 insertion(+)
commit f26399a8a62ae54eec45355f60228bc55527302d
Author: Robert
Date: Sun Aug 20 12:19:22 2017 +0200
git-annex in robertrus-np300e5a
.../SA\305\201ATKA \305\232LEDZIOWA, SA\305\201ATKA Z SZYNKI.docx\" | 1 -
1 file changed, 1 deletion(-)
commit 103a62866df6fa8c7e18b727865c6c354fd6fc12
Author: Elzbieta
Date: Sun Aug 20 12:16:29 2017 +0200
git-annex in elzbietarus
.../SA\305\201ATKA \305\232LEDZIOWA, SA\305\201ATKA Z SZYNKI.docx\" | 1 +
1 file changed, 1 insertion(+)
```
"""]]

View file

@ -0,0 +1,27 @@
### Please describe the problem.
When an assistant adds a lot of new files, and theres an assistant running for the repo on each of some 5 machines, infinite loop happens on those receiving the new files.
### What steps will reproduce the problem?
1. Have 5 machines with a repo checked out.
2. Run git-annex-assistant on each.
3. Copy a lot of files into the repo on one machine.
4. Look at the webapp UIs on other machines.
5. In the UI, the same files get enqueued and dequeued repeatedly and nothing else happens.
### What version of git-annex are you using? On what operating system?
git-annex version: 6.20170520
local repository version: 6
operating system: linux x86_64
### Please provide any additional information below.
### 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! But do you test it for similar races on more than two simultaneous machines?

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="michalrus"
avatar="http://cdn.libravatar.org/avatar/83c0b6e7f9d20f09a892263c4903bbae"
subject="comment 1"
date="2017-08-20T15:27:31Z"
content="""
Restarting the daemon helps, but I cant reasonably expect my parents to do this regularly… :c
"""]]

View file

@ -0,0 +1,52 @@
### Please describe the problem.
"git annex help" says to run "git-annex command --help", but doing so reports unrecognized option.
### What steps will reproduce the problem?
15:25:14 -0500 adam@tooz:/tmp$ git annex help
The most frequently used git-annex commands are:
init initialize git-annex
add add files to annex
drop indicate content of files not currently wanted
get make content of annexed files available
move move content of files to/from another repository
copy copy content of files to/from another repository
sync synchronize local repository with remotes
whereis lists repositories that have file content
fsck check for problems
Run 'git-annex' for a complete command list.
Run 'git-annex command --help' for help on a specific command.
Run `git annex help options' for a list of common options.
15:26:27 -0500 adam@tooz:/tmp$ git annex add --help
git-annex: unrecognized option `--help'
Usage: git-annex add [PATH ...] [option ...]
--include-dotfiles don't skip dotfiles
To see additional options common to all commands, run: git annex help options
### What version of git-annex are you using? On what operating system?
git-annex version: 5.20141125
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
### 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.
"""]]
### 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)

View file

@ -0,0 +1,34 @@
### Please describe the problem.
Long help output doesn't honor PAGER
### What steps will reproduce the problem?
* Open a small terminal
* Run "git annex help options"
* Note how it displays the full text.
* Run "git help add"
* Docs are viewed via the PAGER
### What version of git-annex are you using? On what operating system?
git-annex version: 5.20141125
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
### 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.
"""]]
### 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)