Commit graph

8984 commits

Author SHA1 Message Date
Joey Hess
9c30b358a7
close bug the right way 2019-01-22 17:44:08 -04:00
Joey Hess
17eb4b9b60
response 2019-01-22 17:43:03 -04:00
lukasstraub2@bbbb2ef261a0994edda5f5f55999dfac5998d4e5
3de15d094e rename done/Unable_to_initialize_v5_Repository_on_a_Crippled_Filesystem.mdwn to bugs/done/Unable_to_initialize_v5_Repository_on_a_Crippled_Filesystem.mdwn 2019-01-22 20:47:23 +00:00
lukasstraub2@bbbb2ef261a0994edda5f5f55999dfac5998d4e5
6e8c0abb25 rename bugs/Unable_to_initialize_v5_Repository_on_a_Crippled_Filesystem.mdwn to done/Unable_to_initialize_v5_Repository_on_a_Crippled_Filesystem.mdwn 2019-01-22 20:43:35 +00:00
Joey Hess
6ec7295870
Android: For armv71 architecture, use the armel build
This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
2019-01-22 11:50:29 -04:00
Joey Hess
ac858df32c
response 2019-01-21 16:31:15 -04:00
Joey Hess
112bb82fc2
Windows: If 64 bit git is installed, use it when installing git-annex.
However, rsync still won't work with 64 bit git and
this is still not the documented way to install it.

So, if both 64 and 32 are installed, go with 32.

And if neither git can be found, default to 32.
2019-01-21 15:51:48 -04:00
yarikoptic
603c4477f0 removed 2019-01-21 19:32:21 +00:00
yarikoptic
ef075c1c1a Added a comment 2019-01-21 19:23:17 +00:00
yarikoptic
06e5c3b145 Added a comment 2019-01-21 19:22:52 +00:00
Joey Hess
a254abfe78
Merge branch 'master' of ssh://git-annex.branchable.com 2019-01-21 15:19:44 -04:00
Joey Hess
912aefe19c
comment 2019-01-21 15:19:16 -04:00
yarikoptic
00bbf06e8d Added a comment 2019-01-21 19:17:29 +00:00
yarikoptic
354e8ae638 fixedup the link 2019-01-21 19:11:53 +00:00
Joey Hess
6f0d98f2ab
analysis and close as misconfiguration 2019-01-21 14:43:32 -04:00
Joey Hess
b7e1225d1e
followup 2019-01-21 14:28:19 -04:00
Joey Hess
b4c4ef912b
followup 2019-01-21 14:23:02 -04:00
yarikoptic
de3ac38a6f initial report on windows autostart script 2019-01-21 04:13:11 +00:00
zsolt
e83e7bcc29 Added a comment: works! 2019-01-18 22:40:39 +00:00
Joey Hess
5a94033cfd
followup 2019-01-18 13:54:14 -04:00
Joey Hess
facdeea47e
response 2019-01-18 11:55:31 -04:00
zsolt
64caba7a91 2019-01-18 09:31:08 +00:00
Joey Hess
63069a9bd7
close 2019-01-16 15:08:35 -04:00
guzik.sergey@9391b6c15e4938a539e36fbe5bab71df07111d2e
92013d86f6 2019-01-11 10:40:22 +00:00
6yearold@36d59212c29d2959d6532d6db7928f01541bcf83
a472cd3488 Added a comment 2019-01-11 06:28:32 +00:00
alogic0@d8fbd9f5b547237a650aa1d5605c2d3592496916
d2dd0a2b52 Added a comment: it's fixed 2019-01-11 00:54:02 +00:00
duncan_bayne
74682ffaad Added a comment: Known issue 2019-01-09 09:17:20 +00:00
duncan_bayne
3126dfd84d Added a comment: Bug raised 2019-01-08 21:13:38 +00:00
anarcat
2f3559d970 one more SNAFU with webdav 2019-01-06 19:35:15 +00:00
anarcat
0a90a48612 fix typo and triage 2019-01-06 19:23:36 +00:00
anarcat
cf04151ab6 Added a comment: thanks! 2019-01-06 04:12:03 +00:00
anarcat
9c6a644896 Added a comment: bump 2019-01-05 23:06:05 +00:00
ka7
328773f807 Added a comment: (better formating..) 2019-01-03 14:15:21 +00:00
ka7
7092fe9c1a Added a comment: got it 2019-01-03 14:10:19 +00:00
CandyAngel
a9d85d2993 Added a comment 2019-01-03 12:29:41 +00:00
ka7
934a1176cd 2019-01-03 11:17:31 +00:00
kirelagin@6d93475882c55a329fedae6be1971868a775ec7e
2122de1ad6 2019-01-02 17:37:57 +00:00
Woazboat
8e019f4752 2019-01-02 16:31:30 +00:00
kirelagin@6d93475882c55a329fedae6be1971868a775ec7e
a2565ad514 2019-01-02 14:34:46 +00:00
yarikoptic
944c0cab90 Added a comment: the build details 2019-01-02 01:14:39 +00:00
duncan_bayne
c992b20c2b Added a comment: Thanks 2019-01-01 22:26:45 +00:00
andrew
e0533176c1 2019-01-01 19:49:07 +00:00
andrew
38a7d7e779 Added a comment 2019-01-01 19:00:08 +00:00
andrew
87af69903d Added a comment 2019-01-01 18:47:59 +00:00
Joey Hess
2ae7ea02ad
followup 2019-01-01 12:16:20 -04:00
Joey Hess
b5174b7253
compiler toolchain being broken in freebsd update is not a bug in git-annex 2019-01-01 12:09:40 -04:00
flpgdt@f64318f00d9e1c9535e11f5d27c80c1d799cce00
8cdf87215e Added a comment 2018-12-31 16:53:50 +00:00
andrew
b7f66c20ac 2018-12-30 23:24:43 +00:00
andrew
5bfa629c6a Added a comment 2018-12-30 23:23:47 +00:00
andrew
cb4f55b64c 2018-12-30 22:13:27 +00:00
andrew
279573b601 2018-12-30 22:12:55 +00:00
andrew
a7b4eb5255 Added a comment 2018-12-30 22:12:09 +00:00
Chymera
2bc58a6786 Added a comment 2018-12-30 20:47:00 +00:00
lukasstraub2@bbbb2ef261a0994edda5f5f55999dfac5998d4e5
538cb2f77d 2018-12-30 16:56:59 +00:00
https://wentasah.mojeid.cz/#iQiZsiSMeH
2f8c5bd4c9 2018-12-30 00:35:20 +00:00
duncan_bayne
4eb86176e6 Made blog link an actual link. 2018-12-27 21:52:24 +00:00
duncan_bayne
b11bf6f605 Add version numbers 2018-12-27 21:51:14 +00:00
duncan_bayne
46a2ef38a5 2018-12-27 21:49:52 +00:00
flpgdt@f64318f00d9e1c9535e11f5d27c80c1d799cce00
ace6065c30 Added a comment 2018-12-22 20:06:32 +00:00
Chymera
fd85095bf4 Added a comment 2018-12-20 23:13:01 +00:00
Chymera
0c54ac9971 2018-12-20 22:57:54 +00:00
yarikoptic
b17168876e initial report 2018-12-20 19:42:39 +00:00
CandyAngel
ab4a1bed95 Added a comment 2018-12-20 09:19:15 +00:00
ga@2217a6e07239bc6b36af2a9134b2647fdebcabcd
246ac9f1ce Added a comment: Worked around 2018-12-19 21:09:43 +00:00
Joey Hess
6d381df0e6
sync --content: Fix dropping unwanted content from the local repository
This fixes a bug with the numcopies counting when using sync --content.
It did not always pass the local repo uuid to handleDropsFrom, and so the
numcopies counting was off by one, and unwanted local content would only be
dropped when there were numcopies+1 remote copies.

Also, support dropping local content that has reached an
exporttree remote that is not untrusted (currently only S3 remotes
with versioning).
2018-12-18 13:58:12 -04:00
Joey Hess
9438ecc30b
whaaa 2018-12-18 12:15:43 -04:00
rangedrew
c39966c072 2018-12-18 07:22:48 +00:00
rangedrew
14cb97c225 2018-12-18 07:21:39 +00:00
Joey Hess
17b9756300
bug report 2018-12-17 16:09:48 -04:00
gueux
f8ccfa3694 2018-12-12 09:39:51 +00:00
gueux
1d755720b9 Added a comment 2018-12-11 21:23:38 +00:00
Joey Hess
acecf8b6c9
followup 2018-12-11 16:46:24 -04:00
gueux
c4b6115f76 removed 2018-12-11 18:41:43 +00:00
gueux
99ecb1bc7a 2018-12-11 18:41:14 +00:00
gueux
8a056286ef Added a comment: strace 2018-12-11 18:36:50 +00:00
gueux
b5de22b9f0 2018-12-11 18:10:39 +00:00
Joey Hess
bbf7dcc193
fix bugs involving v7 unlocked files and direct mode
* Fix bug upgrading from direct mode to v7: when files in the repository
  were already committed as v7 unlocked files elsewhere, and the
  content was present in the direct mode repository, the annexed files
  got their full content checked into git.
* Fix bug that caused v7 unlocked files in a direct mode repository
  to get locked when committing.

This commit was sponsored by Nick Piper on Patreon.
2018-12-11 13:47:35 -04:00
Joey Hess
6718a9b200
Merge branch 'master' of ssh://git-annex.branchable.com 2018-12-11 13:13:41 -04:00
Joey Hess
fcf9ef6d62
bug 2018-12-11 13:13:22 -04:00
anarcat
5ce5129bb6 fixed in 11dbb829bc 2018-12-11 17:12:57 +00:00
anarcat
5e3323bc4a rename forum/why_are_all_those_files_modified.mdwn to bugs/why_are_all_those_files_modified.mdwn 2018-12-11 17:09:47 +00:00
yarikoptic
c7a48ca1d8 tuned up description and added my meta to find it later 2018-12-11 16:51:54 +00:00
anarcat
7c944336cb forgot to sign that bug! will try to test this as soon as the next release comes out - thanks! 2018-12-11 16:51:18 +00:00
yarikoptic
04716a623e Initial report on addurl file:/// not working on Windows 2018-12-11 16:50:31 +00:00
Joey Hess
dd554fabb8
fix link on download page and add a few more to break later 2018-12-10 12:55:13 -04:00
Joey Hess
0870838337
Merge branch 'master' of ssh://git-annex.branchable.com 2018-12-10 12:54:58 -04:00
Joey Hess
3f587d447a
fix webdav reversion
webdav: When initializing, avoid trying to make a directory at the top of
the webdav server, which could never accomplish anything and failed on
nextcloud servers. (Reversion introduced in version 6.20170925.)

This commit was sponsored by mo on patreon.
2018-12-10 12:49:51 -04:00
yarikoptic
b44aea6da9 2018-12-10 16:14:00 +00:00
yarikoptic
f0b1718cb0 2018-12-10 16:13:40 +00:00
Joey Hess
61b1f9deaf
close 2018-12-09 11:44:53 -04:00
Joey Hess
c34474830b
close 2018-12-09 11:41:34 -04:00
Joey Hess
41b9d77201
comment 2018-12-09 11:14:09 -04:00
Ilya_Shlyakhter
85651be9c4 added bug report about git index lock being held during concurrent operations 2018-12-07 17:08:25 +00:00
xsteadfastx
8e3b73caf7 Added a comment 2018-12-06 09:09:48 +00:00
StéphaneGL
b6ea79d09e Added a comment 2018-12-05 22:58:57 +00:00
Joey Hess
8f1701a440
close 2018-12-05 12:14:33 -04:00
xsteadfastx
b30fb7fad7 Added a comment 2018-12-05 09:57:36 +00:00
lukasstraub2@bbbb2ef261a0994edda5f5f55999dfac5998d4e5
2e4b39b307 Added a comment: Workaround 2018-12-04 19:37:38 +00:00
Joey Hess
635692410b
Merge branch 'master' of ssh://git-annex.branchable.com 2018-12-04 14:18:31 -04:00
Joey Hess
51eea6fcfa
close 2018-12-04 13:15:16 -04:00
Joey Hess
32234ebe23
respond 2018-12-04 13:13:57 -04:00
anarcat
76ed3303df Added a comment: thanks! 2018-12-04 17:10:16 +00:00
Joey Hess
aa8243df4c
dropunused edge case when annex.thin caused unused object to be modified
dropunused: When an unused object file has gotten modified, eg due to
annex.thin being set, don't silently skip it, but display a warning and let
--force drop it.

This commit was sponsored by Ethan Aubin.
2018-12-04 12:20:34 -04:00
Joey Hess
96d2000570
analysis, already fixed 2018-12-04 12:17:48 -04:00
xsteadfastx
e4dedb352a Added a comment 2018-12-04 09:46:47 +00:00
anarcat
956d8377d5 oops, problem between keyboard and chair? 2018-12-04 01:54:11 +00:00
anarcat
13fd7cf00e some user confusion with v7 repos 2018-12-04 01:50:29 +00:00
StéphaneGL
20d811f55a 2018-12-03 18:40:17 +00:00
Joey Hess
b71d62b1aa
Merge branch 'master' of ssh://git-annex.branchable.com 2018-12-03 14:36:22 -04:00
StéphaneGL
8f58627a48 Added a comment 2018-12-03 18:22:10 +00:00
StéphaneGL
e29f5c4b26 removed 2018-12-03 18:21:38 +00:00
StéphaneGL
d502eebd42 Added a comment 2018-12-03 18:20:29 +00:00
Joey Hess
2544a24765
merge 2018-12-03 13:42:56 -04:00
Joey Hess
41eb9d405e
followup 2018-12-03 13:31:20 -04:00
lukasstraub2@bbbb2ef261a0994edda5f5f55999dfac5998d4e5
1079b5b296 2018-11-30 20:51:48 +00:00
Joey Hess
5a741c624e
Make bittorrent special remote work w/o btshowmetainfo installed when it was build with torrentparser. Thanks, Robert Schütz 2018-11-27 12:31:06 -04:00
robert.schuetz@7942237bf71a2ae4f5d3cb047d167612b8c9e311
15d3ecc9cf 2018-11-26 14:26:08 +00:00
TroisSinges
a79e467c10 Added a comment 2018-11-23 07:33:55 +00:00
TroisSinges
f8099b45af 2018-11-23 07:31:07 +00:00
jwiklund@3ecbaacd157648da5a91042b6aa44f36b107b5c7
debd21ccba 2018-11-22 16:43:49 +00:00
jwiklund@3ecbaacd157648da5a91042b6aa44f36b107b5c7
b23aba36f9 2018-11-22 16:42:37 +00:00
jwiklund@3ecbaacd157648da5a91042b6aa44f36b107b5c7
3c1df9f4dd 2018-11-22 16:40:41 +00:00
andrew
e95e15f65b Added a comment 2018-11-20 21:56:03 +00:00
andrew
2d03a4fbd2 Added a comment 2018-11-20 21:42:11 +00:00
marvin@3296bf3c446430c3b2ebc32b5c784ee976620847
987af8d251 2018-11-20 19:34:26 +00:00
Joey Hess
636e6ab67a
close 2018-11-20 11:45:30 -04:00
yarikoptic
61f53f09cf initial FTBFS on sid 2018-11-20 03:09:53 +00:00
yarikoptic
76fc9af4c1 Added a comment 2018-11-19 22:46:01 +00:00
Joey Hess
171dbe81c6
finally done with this 2018-11-19 18:44:03 -04:00
Joey Hess
9c0cece35a
followup 2018-11-19 18:12:03 -04:00
Joey Hess
e053df9451
followup 2018-11-19 17:49:59 -04:00
Joey Hess
b82b775639
followup 2018-11-19 17:45:57 -04:00
yarikoptic
a078de4667 Added a comment: reconfirming with new build option 2018-11-19 21:33:34 +00:00
Joey Hess
36d4fee6b0
followup 2018-11-19 17:31:16 -04:00
yarikoptic
cd18edf858 Added a comment 2018-11-19 21:14:10 +00:00
yarikoptic
58a496d8a2 Added a comment 2018-11-19 21:10:48 +00:00
Joey Hess
362605d6c6
followup 2018-11-19 17:07:13 -04:00
Joey Hess
d418557b5e
Merge branch 'master' of ssh://git-annex.branchable.com 2018-11-19 17:01:15 -04:00
Joey Hess
ed27662e96
comment 2018-11-19 17:00:56 -04:00
yarikoptic
e52063d046 Added a comment 2018-11-19 20:55:27 +00:00
Joey Hess
12a8634d6b
Merge branch 'master' of ssh://git-annex.branchable.com 2018-11-19 16:50:46 -04:00
Joey Hess
ff9d1ed203
clarify 2018-11-19 16:50:17 -04:00
yarikoptic
1475fce58d Added a comment 2018-11-19 20:26:33 +00:00
yarikoptic
7c024f6882 Added a comment 2018-11-19 19:25:35 +00:00
Joey Hess
9127fe4821
add DebugLocks build flag
Using the method described in
https://www.fpcomplete.com/blog/2018/05/pinpointing-deadlocks-in-haskell
but my own code to implement it, and with callstacks added.

This work is supported by the NIH-funded NICEMAN (ReproNim TR&D3) project.
2018-11-19 15:02:43 -04:00
Joey Hess
e612633999
rethrow ExitStatus exceptions
Several git-annex commands want to exit right away, but that's an
exception, which is caught due to 39fbaa0682.
So, re-throw it.
2018-11-19 13:18:08 -04:00
Joey Hess
9508e02ad9
comment 2018-11-19 13:17:42 -04:00
Joey Hess
6bbcccc5bb
comment 2018-11-19 13:09:45 -04:00
Joey Hess
17fe45fc6f
comment 2018-11-19 12:41:37 -04:00
yarikoptic
9b1c371c13 Added a comment: dependencies information 2018-11-19 15:54:14 +00:00
yarikoptic
aee99a7ce5 2018-11-19 15:39:27 +00:00
yarikoptic
fb079c1dcb Added a comment 2018-11-19 04:08:37 +00:00
yarikoptic
2770e1791a Added a comment 2018-11-19 03:18:23 +00:00
yarikoptic
dacb3603dc initial FTBFS on sid 2018-11-18 19:04:50 +00:00
michael.hanke@c60e12358aa3fc6060531bdead1f530ac4d582ec
f39db41d20 Added a comment: git annex init --version=6 leaves repo dirty 2018-11-18 17:00:21 +00:00
andrew
64355f8c08 Added a comment 2018-11-17 19:07:07 +00:00
yarikoptic
900bf34362 Added a comment 2018-11-16 22:12:58 +00:00
yarikoptic
958d037467 initial suggestion to have ghc version reported in annex version output 2018-11-16 22:06:51 +00:00
yarikoptic
4238064600 Added a comment 2018-11-15 20:43:27 +00:00
Joey Hess
39fbaa0682
catch all (non-async) exceptions when running a commandAction
When a command is operating on multiple files and there's an error with
one, try harder to continue to the rest. (As was already done for many
types of errors including IO errors.)

This handles cases like lockContentForRemoval throwing an exception when
the content is already locked. Just because a drop of one file fails, does
not mean it shouldn't go on to try to drop other files.

I looked over uses of `giveup` in Command/*; there are too many to check
them all extensively, but none stood out as being problems that should let
one commandAction stop running other commandActions. Worst case, something
bad will happen and rather than stopping right away with an error,
git-annex will display multiple errors as it fails over and over on each
file. I don't think I ever really intended `error`/`giveup` to stop other
commandActions; this was a relic of old confusion over haskell exception
handling.

Test suite passes.

This commit was sponsored by Ethan Aubin.
2018-11-15 15:59:43 -04:00
Joey Hess
04b5ed09d8
close old unreproducible bug report 2018-11-15 15:17:49 -04:00
Joey Hess
ee9c974e06
followup 2018-11-15 14:37:25 -04:00
Joey Hess
ca55119749
Merge branch 'master' of ssh://git-annex.branchable.com 2018-11-15 14:32:26 -04:00
Joey Hess
025f90bfcc
followup 2018-11-15 14:30:38 -04:00
yarikoptic
98825e26d8 Added a comment 2018-11-15 18:06:10 +00:00
Joey Hess
05bfce7ca8
comments 2018-11-15 13:36:20 -04:00
Joey Hess
71cc9cfaa2
improve smudge --clean behavior on outside work tree files
smudge: When passed a file located outside the working tree, eg by git
diff, avoid erroring out.

This commit was sponsored by Ewen McNeill on Patreon.
2018-11-15 13:04:40 -04:00
sorsasampo@35b3d76c4c73ffc3f2c89e965c47a3f6a2721228
1815b027a2 2018-11-15 16:03:12 +00:00
yarikoptic
90f86575cb Added a comment: my bad 2018-11-15 12:34:58 +00:00
yarikoptic
5f53dcbf80 Added a comment 2018-11-13 20:02:18 +00:00
Joey Hess
d65df7ab21
improve messages around export conflicts
When an export conflict prevents accessing a special remote, be clearer
about what the problem is and how to resolve it.

This commit was sponsored by Trenton Cronholm on Patreon.
2018-11-13 15:50:06 -04:00
Joey Hess
e2589670da
update slightly 2018-11-13 15:13:44 -04:00
Joey Hess
4b14438c9a
suggestion 2018-11-13 14:04:37 -04:00
Joey Hess
381bc4ab34
followup 2018-11-13 13:50:59 -04:00
Joey Hess
170b88b95e
followup 2018-11-13 13:50:15 -04:00
Joey Hess
f4e0719aa3
followup and close 2018-11-13 13:34:12 -04:00
https://launchpad.net/~barthelemy
ab4be761be Added a comment: cannot reproduce on git-annex 6.20180913 2018-11-13 09:32:55 +00:00
yarikoptic
329599428b Added a comment: yeap -- it is netbase which is needed 2018-11-13 04:20:28 +00:00
yarikoptic
84b1fb72d4 Added a comment 2018-11-13 04:14:28 +00:00
Joey Hess
6f69ede2ea
Merge branch 'master' of ssh://git-annex.branchable.com 2018-11-12 17:31:52 -04:00
Joey Hess
a720f377af
bug report 2018-11-12 17:19:33 -04:00
anarcat
40dddf9ee1 Added a comment: probably fixed indeed 2018-11-12 20:54:05 +00:00
https://launchpad.net/~barthelemy
05d2cd9e14 2018-11-12 20:46:59 +00:00
Joey Hess
5d49408871
Merge branch 'master' of ssh://git-annex.branchable.com 2018-11-12 16:40:21 -04:00
Joey Hess
1e4111a1d2
close dup of fixed issue 2018-11-12 16:16:26 -04:00
Joey Hess
ff9bd9620e
Fix resume of download of url when the whole file content is already actually downloaded
Don't much like that there's no way to distinguish between having the whole
content and having an old version of the file that's bigger, but of course
resuming a http transfer can always yield the wrong result if the file on
the http server is changing, and git-annex will detect that when it
verifies the downloaded content.

This work is supported by the NIH-funded NICEMAN (ReproNim TR&D3) project.
2018-11-12 16:08:47 -04:00
Joey Hess
c24bdfd689
response 2018-11-12 15:44:44 -04:00
yarikoptic
19f7bd294f Added a comment 2018-11-12 19:34:00 +00:00
yarikoptic
7fe1a83f7f Added a comment 2018-11-12 19:27:48 +00:00
yarikoptic
47f6bfdb7e Added a comment 2018-11-12 19:15:53 +00:00
Joey Hess
563f8b7c0f
followup 2018-11-12 14:54:50 -04:00
Joey Hess
e4125318d8
response 2018-11-12 14:52:30 -04:00
yarikoptic
396b6134ac added my meta 2018-11-12 18:02:03 +00:00
yarikoptic
6f0cbbd204 initial report on annex not properly considering http somehow while within docker 2018-11-12 18:00:18 +00:00
Joey Hess
58d1b2510c
Merge branch 'master' of ssh://git-annex.branchable.com 2018-11-12 13:26:10 -04:00
yarikoptic
9d47fcac49 Added a comment 2018-11-12 17:25:43 +00:00
Joey Hess
5ce078da92
bash completion fix
Fix bash completion of "git annex" to propertly handle files with spaces
and other problem characters. (Completion of "git-annex" already did.)

This commit was sponsored by Jake Vosloo on Patreon.
2018-11-12 13:23:05 -04:00
andrew
34d77ecdfd 2018-11-12 16:51:12 +00:00
yarikoptic
8f8b746f67 Added a comment: reply on the issue 2018-11-12 16:48:08 +00:00
andrew
b3d6b2dad9 Added a comment 2018-11-12 16:37:44 +00:00
andrew
4184878218 2018-11-12 16:36:26 +00:00
Joey Hess
d01c7c173c
response 2018-11-12 12:10:40 -04:00
Joey Hess
5bb2c72b6d
followup 2018-11-12 12:03:39 -04:00
Joey Hess
911f75232b
followup 2018-11-12 11:49:44 -04:00
Joey Hess
398bac4530
not dup 2018-11-12 11:23:56 -04:00
xelxebar
cd5c53ca60 2018-11-12 03:28:38 +00:00
andrew
2429763490 Added a comment 2018-11-12 03:17:48 +00:00
andrew
8853f6b13c 2018-11-11 21:39:56 +00:00
andrew
87efebb590 Added a comment 2018-11-11 21:35:26 +00:00
andrew
97453224ed 2018-11-11 21:33:37 +00:00
yarikoptic
b1a5ea5f53 original double complain on get -J 2018-11-08 18:05:56 +00:00
yarikoptic
1011d957aa Added a comment 2018-11-06 20:01:08 +00:00
Joey Hess
6ecd55a9fa
Fixed some other potential hangs in the P2P protocol
Finishes the start made in 983c9d5a53, by
handling the case where `transfer` fails for some other reason, and so the
ReadContent callback does not get run. I don't know of a case where
`transfer` does fail other than the locking dealt with in that commit, but
it's good to have a guarantee.

StoreContent and StoreContentTo had a similar problem.
Things like `getViaTmp` may decide not to run the transfer action.
And `transfer` could certianly fail, if another transfer of the same
object was in progress. (Or a different object when annex.pidlock is set.)

If the transfer action was not run, the content of the object would
not all get consumed, and so would get interpreted as protocol commands,
which would not go well.

My approach to fixing all of these things is to set a TVar only
once all the data in the transfer is known to have been read/written.
This way the internals of `transfer`, `getViaTmp` etc don't matter.

So in ReadContent, it checks if the transfer completed.
If not, as long as it didn't throw an exception, send empty and Invalid
data to the callback. On an exception the state of the protocol is unknown
so it has to raise ProtoFailureException and close the connection,
same as before.

In StoreContent, if the transfer did not complete
some portion of the DATA has been read, so the protocol is in an unknown
state and it has to close the conection as well.

(The ProtoFailureMessage used here matches the one in Annex.Transfer, which
is the most likely reason. Not ideal to duplicate it..)

StoreContent did not ever close the protocol connection before. So this is
a protocol change, but only in an exceptional circumstance, and it's not
going to break anything, because clients already need to deal with the
connection breaking at any point.

The way this new behavior looks (here origin has annex.pidlock = true so will
only accept one upload to it at a time):

git annex copy --to origin -J2
copy x (to origin...) ok
copy y (to origin...)
  Lost connection (fd:25: hGetChar: end of file)

This work is supported by the NIH-funded NICEMAN (ReproNim TR&D3) project.
2018-11-06 14:52:32 -04:00
Joey Hess
9adc0b3417
Merge branch 'master' of ssh://git-annex.branchable.com 2018-11-06 13:01:00 -04:00
Joey Hess
983c9d5a53
git-annex-shell: fix transfer hang
Fix hang when transferring the same objects to two different clients at the
same time. (Or when annex.pidlock is used, two different objects to the
same or different clients.)

Could also potentially occur if a client was downloading an object and
somehow lost connection but that git-annex-shell was still running and
holding the transfer lock.

This does not guarantee that, if `transfer` fails for some other reason,
a DATA response will be made.

This work is supported by the NIH-funded NICEMAN (ReproNim TR&D3) project.
2018-11-06 13:00:37 -04:00
yarikoptic
68adc08502 initial report on failing to get a file after it actually got to tmp/ fully 2018-11-06 03:43:40 +00:00
Joey Hess
0a0242224d
full analysis 2018-11-05 18:25:55 -04:00
Joey Hess
44769d9285
Merge branch 'master' of ssh://git-annex.branchable.com 2018-11-05 17:13:16 -04:00
Joey Hess
14075afbd7
updated analysis 2018-11-05 17:12:19 -04:00
yarikoptic
0f0a6336cd Added a comment 2018-11-05 21:01:35 +00:00
yarikoptic
2003b42efb Added a comment 2018-11-05 20:53:48 +00:00
Joey Hess
c31ea81ee9
pidlock 2018-11-05 15:37:46 -04:00
Joey Hess
3c50fa130c
Merge branch 'master' of ssh://git-annex.branchable.com 2018-11-05 14:39:18 -04:00
Joey Hess
3ef13f128f
followup on bug triage 2018-11-05 14:38:32 -04:00
Joey Hess
fd128e5a3f
code review and response 2018-11-05 14:28:02 -04:00
marvin@3296bf3c446430c3b2ebc32b5c784ee976620847
4d11214908 Added a comment 2018-11-05 18:22:49 +00:00
yarikoptic
aabfdca800 Added a comment 2018-11-05 17:31:46 +00:00
Joey Hess
5f213d45b1
Merge branch 'master' of ssh://git-annex.branchable.com 2018-11-05 12:34:54 -04:00
Joey Hess
0cb6d14383
followup 2018-11-05 12:34:27 -04:00
yarikoptic
13f9e79df1 removed 2018-11-05 16:03:47 +00:00
yarikoptic
02c74a0dfd Added a comment 2018-11-05 16:00:53 +00:00
yarikoptic
eb218d4e59 Added a comment 2018-11-05 15:57:17 +00:00
Joey Hess
42f1ea72de
followup 2018-11-05 11:47:58 -04:00
Joey Hess
cb69b77625
fix link 2018-11-05 11:39:04 -04:00
anarcat
16cbeb6aff Added a comment: oops 2018-11-03 19:52:48 +00:00
spwhitton
f09f846fea Added a comment 2018-11-03 19:41:32 +00:00
anarcat
4241de01c8 p2pstdio doesn't exist in stretch and buster doesn't degrade gracefully 2018-11-03 19:30:29 +00:00
yarikoptic
c6cb372a9d Added a comment: tests fail - can't build to test the change 2018-11-02 21:51:16 +00:00
yarikoptic
4d24b712b0 Added a comment 2018-11-02 19:58:06 +00:00
Joey Hess
0c05b92b7c
Merge branch 'master' of ssh://git-annex.branchable.com 2018-11-02 13:45:57 -04:00
Joey Hess
c371a8b10e
followup 2018-11-02 13:42:57 -04:00
andrew
af385e2d34 Added a comment 2018-11-01 12:15:35 +00:00
andrew
937d9d545a Added a comment 2018-11-01 12:02:59 +00:00
yarikoptic
0753ad46c2 It was "user error", things work now properlyish 2018-11-01 03:53:02 +00:00
Joey Hess
37d00ca671
response 2018-10-31 13:50:51 -04:00
Adam.Schmalhofer@245dc7fa3c05299fc8973ae4241bcab07cd36140
506283c3f9 initial issue description 2018-10-31 15:51:04 +00:00
Ilya_Shlyakhter
8673c18f41 removed 2018-10-31 14:53:50 +00:00
Joey Hess
1428568554
retry when sqlite throws ErrorIO
I suspect this may be due to SQLITE_IOERR_SHORT_READ, but have not
verified.

I was able to reproduce it on Linux after running the test suite in a loop
for 1-3 hours until it failed.

The WAL mode entry change in 3963c5fcf5
may have hidden the problem I was seeing; I have not seen an ErrorIO
since then.
2018-10-30 18:06:38 -04:00
Ilya_Shlyakhter
24419efa35 Added a comment 2018-10-29 21:10:29 +00:00
Ilya_Shlyakhter
6b5f2ecf0e Added a comment 2018-10-29 21:08:55 +00:00