Commit graph

7301 commits

Author SHA1 Message Date
EskildHustvedt
f23452ff34 2016-10-29 08:06:00 +00:00
johannes@12f1850a57e13cc234b5ebf88a5d3ac68915a6c2
cf168e1c6f Added a comment 2016-10-28 10:17:19 +00:00
Joey Hess
0ae08947ac
Run ssh with ServerAliveInterval 60
So that stalled transfers will be noticed within about 3 minutes,
even if TCPKeepAlive is disabled or doesn't work.

Rather than setting with -o, use -F with another config file,
so that any settings in ~/.ssh/config or /etc/ssh/ssh_config overrides this.
2016-10-26 16:41:34 -04:00
Joey Hess
075602b1df
comment 2016-10-26 16:18:52 -04:00
Joey Hess
8dcf79694d
enable forwardRetry for command-line transfers
If a transfer fails for some reason, but some data managed to be sent, the
transfer will be retried. (The assistant already did this.)

Possible impacts:

* More ssh prompts if ssh needs to prompt for a password to connect to a
  host, or is prompting about some other problem like a ssh key mismatch.

* More data transfer due to retrying, epecially when a remote does not
  support resuming a transfer.

  In the worst case, a lot of data will be transferred but it fails before
  the end, and then all that data gets transferred again plus one byte more;
  repeat until it manages to get the whole file.
2016-10-26 15:38:27 -04:00
Joey Hess
ca2435b21b
remove duplicate of top of page 2016-10-26 14:25:54 -04:00
Joey Hess
0e9224b2b4
comment 2016-10-26 14:24:13 -04:00
Joey Hess
3237976d76
comment 2016-10-26 14:13:00 -04:00
Joey Hess
8f2547ef89
comment 2016-10-26 14:04:59 -04:00
Joey Hess
c546e3a5c8
cose 2016-10-26 13:44:08 -04:00
Joey Hess
a7e9db48a7
comment 2016-10-26 13:27:18 -04:00
Joey Hess
55d4d51590
Merge branch 'master' of ssh://git-annex.branchable.com 2016-10-26 13:17:19 -04:00
Joey Hess
1a8ba7eab4
Improve ssh socket cleanup code to skip over the cruft that NFS sometimes puts in a directory when a file is being deleted. 2016-10-26 13:16:41 -04:00
jonan
80dac1cfdd 2016-10-25 10:51:29 +00:00
JohnKozak
c65cbaee99 2016-10-23 21:05:57 +00:00
JohnKozak
daa66dc8bd 2016-10-23 18:30:21 +00:00
ewen
ecb6ca5602 2016-10-21 06:12:49 +00:00
johannes@12f1850a57e13cc234b5ebf88a5d3ac68915a6c2
38e76f27b9 Added a comment 2016-10-19 10:28:13 +00:00
johannes@12f1850a57e13cc234b5ebf88a5d3ac68915a6c2
6d4f446a06 2016-10-18 10:09:44 +00:00
Joey Hess
3a3f126956
close 2016-10-17 16:36:35 -04:00
Joey Hess
10ca4b9788
Improve style of offline html build of website. 2016-10-17 15:55:49 -04:00
Joey Hess
cc5de0a94b
close 2016-10-17 15:30:33 -04:00
Joey Hess
8e22114735
upgrade: Handle upgrade to v6 when the repository already contains v6 unlocked files whose content is already present.
Closes https://github.com/datalad/datalad/issues/1020

The use of runWriter in scanUnlockedFiles broke due to this change;
it failed with blocked indefinitely in mvar, because the database write
handle was taken while linkFromAnnex needed to also write to it (to update
the inode cache). So, switched to using a separate runWriter for each call
to addAssociatedFileFast. A little less efficient, but not greatly; the
writes should all still be cached.
2016-10-17 15:19:47 -04:00
Joey Hess
93425dd575
note 2016-10-17 14:21:55 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
17cce14d19 original whining 2016-10-17 16:17:59 +00:00
https://launchpad.net/~helpunclejackoff
867a4ac4e8 Added a comment: Dumb old me.... 2016-10-15 10:12:17 +00:00
Joey Hess
3f25317ad5
fix tree graft-in bug
When adding a tree like a/b/c/d when a/b already exists, fixes the bug that
the tree that got created was a/b/a/b/c/d

Just need to flatten out the top N directories of the tree that's being
grafted in, so we get the c/d part. This was complicated by the Tree
data type being a rose tree rather than a regular tree.

This commit was sponsored by Nick Daly on Patreon.
2016-10-11 15:36:40 -04:00
Joey Hess
66ebf1a8f9
add test case for sync_in_adjusted_branch_deleted_recently_added_files
This commit was sponsored by Denis Dzyubenko on Patreon.
2016-10-11 14:22:49 -04:00
Joey Hess
b82c3e0783
sync: Fix bug in adjusted branch merging that could cause recently added files to be lost when updating the adjusted branch.
The modification flag was not being set when making modifications deep
in a tree, so parent trees were not updated to contain the modified tree.

Seems to have exposed another bug where the wrong filename gets grafted in.

This commit was sponsored by Brock Spratlen on Patreon.
2016-10-10 15:00:45 -04:00
Joey Hess
d2527c421c
more analysis 2016-10-10 14:23:24 -04:00
Joey Hess
75c7215857
reproduce recipe 2016-10-10 12:56:21 -04:00
https://launchpad.net/~helpunclejackoff
f244d942ee 2016-10-09 18:42:14 +00:00
https://launchpad.net/~helpunclejackoff
dfd0e0290a Move the env description to the right place 2016-10-09 18:41:50 +00:00
https://launchpad.net/~helpunclejackoff
11f6bbaca8 2016-10-09 18:36:52 +00:00
xloem
16c0b372b0 Added a comment 2016-10-09 12:13:39 +00:00
https://launchpad.net/~stephane-gourichon-lpad
d1e21aad3a Reporting missing file in locally installed doc causing reduced reading comfort. 2016-10-09 07:16:25 +00:00
pot
31509c3796 2016-10-06 20:13:07 +00:00
pot
48b97cb3f0 Added a comment: 780 source files.... 2016-10-06 20:05:41 +00:00
ddenis
6cdcda6e32 Added a comment 2016-10-06 16:59:03 +00:00
jk@3f2b4ce16bbac41470815333505aa47b91b7a9a6
4338251817 Added a comment 2016-10-06 10:42:53 +00:00
Joey Hess
933bc5c917
Support using v3 repositories without upgrading them to v5.
An easy change now that supportedVersions is a list. Since v3 and v5 are
identical other than version number, just add v3 to the list.

This commit was sponsored by andrea rota.
2016-10-05 16:53:09 -04:00
Joey Hess
f23446b60e
verified fix on OSX 2016-10-05 16:08:49 -04:00
Joey Hess
5416fd21a1
moreinfo 2016-10-05 15:51:42 -04:00
Joey Hess
34530e59d9
Avoid using a lot of memory when large objects are present in the git repository
.. and have to be checked to see if they are a pointed to an annexed file.

Cases where such memory use could occur included, but were not limited to:
  - git commit -a of a large unlocked file (in v5 mode)
  - git-annex adjust when a large file was checked into git directly
Generally, any use of catKey was a potential problem.

Fix by using git cat-file --batch-check to check size before catting.
This adds another git batch process, which is included in the CatFileHandle
for simplicity.

There could be performance impact, anywhere catKey is used. Particularly
likely to affect adjusted branch generation speed, and operations on
unlocked files in v6 mode. Hopefully since the --batch-check and
--batch read the same data, disk buffering will avoid most overhead.
Leaving only the overhead of talking to the process over the pipe and
whatever computation --batch-check needs to do.

This commit was sponsored by Bruno BEAUFILS on Patreon.
2016-10-05 15:24:13 -04:00
Joey Hess
a747373b40
comment 2016-10-05 13:30:46 -04:00
Joey Hess
90eec318bf
moreinfo 2016-10-05 13:01:35 -04:00
pot
2629850fdf 2016-10-01 11:41:01 +00:00
ddenis
455de2fb1b 2016-09-30 22:06:49 +00:00
pot
5a076dcf04 Added a comment: inodes.... 2016-09-30 22:00:31 +00:00
Joey Hess
76e5d8bf8a
comment 2016-09-26 16:53:27 -04:00