Joey Hess [Tue, 17 Aug 2021 16:41:36 +0000 (12:41 -0400)]
plumb VerifyConfig into retrieveKeyFile
This fixes the recent reversion that annex.verify is not honored,
because retrieveChunks was passed RemoteVerify baser, but baser
did not have export/import set up.
Sponsored-by: Dartmouth College's DANDI project
Joey Hess [Tue, 17 Aug 2021 14:28:18 +0000 (10:28 -0400)]
comment
yarikoptic [Mon, 16 Aug 2021 21:58:07 +0000 (21:58 +0000)]
initial report about needing newer gpg to get tests pass
yarikoptic [Mon, 16 Aug 2021 21:38:13 +0000 (21:38 +0000)]
Added a comment: note on `sec=` on the mount
Joey Hess [Mon, 16 Aug 2021 21:30:04 +0000 (17:30 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 16 Aug 2021 21:29:39 +0000 (17:29 -0400)]
status update
Joey Hess [Mon, 16 Aug 2021 20:51:58 +0000 (16:51 -0400)]
incremental verify for webdav special remote
Sponsored-by: Dartmouth College's DANDI project
Joey Hess [Mon, 16 Aug 2021 20:22:00 +0000 (16:22 -0400)]
incremental verify for directory special remote
Added fileRetriever', which will let the remaining special remotes
eventually also support incremental verify.
Sponsored-by: Dartmouth College's DANDI project
Joey Hess [Mon, 16 Aug 2021 19:56:24 +0000 (15:56 -0400)]
refactor fileCopier
Sponsored-by: Dartmouth College's DANDI project
Joey Hess [Mon, 16 Aug 2021 19:25:06 +0000 (15:25 -0400)]
move comment
Joey Hess [Mon, 16 Aug 2021 19:15:32 +0000 (15:15 -0400)]
status update
I was wrong about S3 supporting tailVerify.
Joey Hess [Mon, 16 Aug 2021 19:01:28 +0000 (15:01 -0400)]
handle AlreadyInUseError
As happens when using the directory special remote, gitlfs, webdav, and
S3. But not external, adb, gcrypt, hook, or rsync.
Sponsored-by: Dartmouth College's DANDI project
Joey Hess [Mon, 16 Aug 2021 18:50:21 +0000 (14:50 -0400)]
better handling of finishing up incomplete incremental verify
Now it's run in VerifyStage.
I thought about keeping the file handle open, and resuming reading where
tailVerify left off. But that risks leaking open file handles, until the
GC closes them, if the deferred verification does not get resumed. Since
that could perhaps happen if there's an exception somewhere, I decided
that was too unsafe.
Instead, re-open the file, seek, and resume.
Sponsored-by: Dartmouth College's DANDI project
Joey Hess [Mon, 16 Aug 2021 16:42:44 +0000 (12:42 -0400)]
improve tailVerify
Wait for the file to get modified, not only opened. This way, if a
remote does not support resuming, and opens a new file over top of the
existing file, it will wait until that remote starts writing, and open
the file it's writing to, not the old file.
Sponsored-by: Dartmouth College's DANDI project
yarikoptic [Mon, 16 Aug 2021 17:44:01 +0000 (17:44 +0000)]
update description that it is isilon under
Added a comment: type=git special remote cannot be enabled, no uuid is generated
https://christian.amsuess.com/chrysn [Sun, 15 Aug 2021 19:01:37 +0000 (19:01 +0000)]
migrate script: Get full list of remotes that have a file; doc updates; progress output; corner case fixes
https://christian.amsuess.com/chrysn [Sun, 15 Aug 2021 17:42:54 +0000 (17:42 +0000)]
Added a comment: Another example
https://christian.amsuess.com/chrysn [Sun, 15 Aug 2021 11:48:58 +0000 (11:48 +0000)]
migrate script: Do whereis work before to speed up processing
https://christian.amsuess.com/chrysn [Sun, 15 Aug 2021 11:47:31 +0000 (11:47 +0000)]
Added a comment: annex-to-annex
https://christian.amsuess.com/chrysn [Sun, 15 Aug 2021 11:04:37 +0000 (11:04 +0000)]
migrate script: Fix accidentally commented-out fsck run
https://christian.amsuess.com/chrysn [Sun, 15 Aug 2021 10:37:53 +0000 (10:37 +0000)]
migrate script: Don't try on all remotes, look where it is and drop from there (faster)
spwhitton [Fri, 13 Aug 2021 22:08:57 +0000 (22:08 +0000)]
Added a comment: annex-to-annex
https://christian.amsuess.com/chrysn [Fri, 13 Aug 2021 20:58:57 +0000 (20:58 +0000)]
Convert previously missing attachment
https://christian.amsuess.com/chrysn [Fri, 13 Aug 2021 20:53:48 +0000 (20:53 +0000)]
Tool to drop migrated files for good
Joey Hess [Fri, 13 Aug 2021 20:36:33 +0000 (16:36 -0400)]
fix windows build
Joey Hess [Fri, 13 Aug 2021 20:35:20 +0000 (16:35 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Fri, 13 Aug 2021 20:20:48 +0000 (16:20 -0400)]
status update
Joey Hess [Fri, 13 Aug 2021 20:16:46 +0000 (16:16 -0400)]
catch more exceptions
I saw this:
.git/annex/tmp/SHA256E-s1234376--
5ba8e06e0163b217663907482bbed57684d7188024155ddc81da0710dfd2687d: openBinaryFile: resource busy (file is locked)
guess catching IO exceptions did not catch that one.
Joey Hess [Fri, 13 Aug 2021 19:43:29 +0000 (15:43 -0400)]
incremental hashing for fileRetriever
It uses tailVerify to hash the file while it's being written.
This is able to sometimes avoid a separate checksum step. Although
if the file gets written quickly enough, tailVerify may not see it
get created before the write finishes, and the checksum still happens.
Testing with the directory special remote, incremental checksumming did
not happen. But then I disabled the copy CoW probing, and it did work.
What's going on with that is the CoW probe creates an empty file on
failure, then deletes it, and then the file is created again. tailVerify
will open the first, empty file, and so fails to read the content that
gets written to the file that replaces it.
The directory special remote really ought to be able to avoid needing to
use tailVerify, and while other special remotes could do things that
cause similar problems, they probably don't. And if they do, it just
means the checksum doesn't get done incrementally.
Sponsored-by: Dartmouth College's DANDI project
Joey Hess [Fri, 13 Aug 2021 19:35:18 +0000 (15:35 -0400)]
INotify.removeWatch can crash
Unsure why, possibly if the file has been replaced by another file.
Joey Hess [Fri, 13 Aug 2021 18:51:15 +0000 (14:51 -0400)]
inotify reports paths relative to directory being watched
Sponsored-by: Dartmouth College's DANDI project
Joey Hess [Fri, 13 Aug 2021 17:39:02 +0000 (13:39 -0400)]
convert tailVerify to not finalize the verification
Added failIncremental so it can force failure to verify.
Sponsored-by: Dartmouth College's DANDI project
Joey Hess [Fri, 13 Aug 2021 16:32:01 +0000 (12:32 -0400)]
tailVerify: return deferred action when it gets behind
Sponsored-by: Dartmouth College's DANDI project
jkniiv@b330fc3a602d36a37a67b2a2d99d4bed3bb653cb [Fri, 13 Aug 2021 03:42:10 +0000 (03:42 +0000)]
the fact that I needed a modification/patch to build mentioned
jkniiv@b330fc3a602d36a37a67b2a2d99d4bed3bb653cb [Fri, 13 Aug 2021 03:31:45 +0000 (03:31 +0000)]
prop_view_roundtrips fails (occasionally)
jkniiv@b330fc3a602d36a37a67b2a2d99d4bed3bb653cb [Fri, 13 Aug 2021 02:17:50 +0000 (02:17 +0000)]
windows build fails as of
7550ef9a2
Joey Hess [Thu, 12 Aug 2021 18:50:12 +0000 (14:50 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 12 Aug 2021 18:49:48 +0000 (14:49 -0400)]
comment
Joey Hess [Thu, 12 Aug 2021 18:36:56 +0000 (14:36 -0400)]
add tailVerify
Not yet used, but this will let all remotes verify incrementally if it's
acceptable to pay the performance price. See comment for details of when
it will perform badly. I anticipate using this for all special remotes
that use fileRetriever. Except perhaps for a few like GitLFS that could
feed the incremental verifier themselves despite using that.
Sponsored-by: Dartmouth College's DANDI project
yarikoptic [Wed, 11 Aug 2021 20:25:51 +0000 (20:25 +0000)]
a report on the flood of failing tests on discovery
Joey Hess [Wed, 11 Aug 2021 18:51:05 +0000 (14:51 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
jasonb@ab4484d9961a46440958fa1a528e0fc435599057 [Wed, 11 Aug 2021 18:49:41 +0000 (18:49 +0000)]
Added a comment: I have this behavior consistently on the 2 repos I use
Joey Hess [Wed, 11 Aug 2021 18:42:49 +0000 (14:42 -0400)]
incremental verify for chunked remotes
Simply feed each chunk in turn to the incremental verifier.
When resuming an interrupted retrieve, it does not do incremental
verification. That would need to read the file, up to the resume point,
and feed it to the incremental verifier. That seems easy to get wrong.
Also it would mean extra work done before the transfer can start. Which
would complicate displaying progress, and would perhaps not appear to the
user as if it was resuming from where it left off. Instead, in that
situation, return UnVerified, and let the verification be done in a
separate pass.
Granted, Annex.CopyFile does manage all that, but it's not complicated
by dealing with chunks too.
Sponsored-by: Dartmouth College's DANDI project
Lukey [Wed, 11 Aug 2021 18:25:51 +0000 (18:25 +0000)]
Added a comment
Joey Hess [Wed, 11 Aug 2021 17:43:30 +0000 (13:43 -0400)]
incremental verify for byteRetriever special remotes
Several special remotes verify content while it is being retrieved,
avoiding a separate checksum pass. They are: S3, bup, ddar, and
gcrypt (with a local repository).
Not done when using chunking, yet.
Complicated by Retriever needing to change to be polymorphic. Which in turn
meant RankNTypes is needed, and also needed some code changes. The
change in Remote.External does not change behavior at all but avoids
the type checking failing because of a "rigid, skolem type" which
"would escape its scope". So I refactored slightly to make the type
checker's job easier there.
Unfortunately, directory uses fileRetriever (except when chunked),
so it is not amoung the improved ones. Fixing that would need a way for
FileRetriever to return a Verification. But, since the file retrieved
may be encrypted or chunked, it would be extra work to always
incrementally checksum the file while retrieving it. Hm.
Some other special remotes use fileRetriever, and so don't get incremental
verification, but could be converted to byteRetriever later. One is
GitLFS, which uses downloadConduit, which writes to the file, so could
verify as it goes. Other special remotes like web could too, but don't
use Remote.Helper.Special and so will need to be addressed separately.
Sponsored-by: Dartmouth College's DANDI project
Joey Hess [Wed, 11 Aug 2021 16:16:49 +0000 (12:16 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 11 Aug 2021 00:45:02 +0000 (20:45 -0400)]
simplify and speed up Utility.FileSystemEncoding
This eliminates the distinction between decodeBS and decodeBS', encodeBS
and encodeBS', etc. The old implementation truncated at NUL, and the
primed versions had to do extra work to avoid that problem. The new
implementation does not truncate at NUL, and is also a lot faster.
(Benchmarked at 2x faster for decodeBS and 3x for encodeBS; more for the
primed versions.)
Note that filepath-bytestring 1.4.2.1.8 contains the same optimisation,
and upgrading to it will speed up to/fromRawFilePath.
AFAIK, nothing relied on the old behavior of truncating at NUL. Some
code used the faster versions in places where I was sure there would not
be a NUL. So this change is unlikely to break anything.
Also, moved s2w8 and w82s out of the module, as they do not involve
filesystem encoding really.
Sponsored-by: Shae Erisson on Patreon
Joey Hess [Wed, 11 Aug 2021 00:04:17 +0000 (20:04 -0400)]
remove unused function
Ilya_Shlyakhter [Tue, 10 Aug 2021 16:28:33 +0000 (16:28 +0000)]
Added a comment: sorry
Joey Hess [Mon, 9 Aug 2021 20:00:57 +0000 (16:00 -0400)]
comment
Joey Hess [Mon, 9 Aug 2021 19:33:59 +0000 (15:33 -0400)]
sheeeeeeeeesh
Joey Hess [Mon, 9 Aug 2021 19:20:19 +0000 (15:20 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 9 Aug 2021 19:17:48 +0000 (15:17 -0400)]
simplify
yarikoptic [Mon, 9 Aug 2021 17:58:55 +0000 (17:58 +0000)]
Added a comment
yarikoptic [Mon, 9 Aug 2021 17:34:39 +0000 (17:34 +0000)]
Added a comment
Ilya_Shlyakhter [Mon, 9 Aug 2021 17:28:31 +0000 (17:28 +0000)]
Added a comment: standalone build version vs standard release version
Joey Hess [Mon, 9 Aug 2021 17:03:19 +0000 (13:03 -0400)]
comment
Joey Hess [Mon, 9 Aug 2021 16:46:10 +0000 (12:46 -0400)]
response
Joey Hess [Mon, 9 Aug 2021 16:44:20 +0000 (12:44 -0400)]
typo
Joey Hess [Mon, 9 Aug 2021 16:31:48 +0000 (12:31 -0400)]
don't use changelog version in commit message
changelog may have a new unreleased version open already
Joey Hess [Mon, 9 Aug 2021 16:31:36 +0000 (12:31 -0400)]
close
Joey Hess [Mon, 9 Aug 2021 16:11:47 +0000 (12:11 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 9 Aug 2021 16:06:10 +0000 (12:06 -0400)]
rsync special remote: Stop displaying rsync progress, and use git-annex's own progress display
Reasons are same as in commit
cee14f147ac229c99f001b3a0aaaefb4cb6f7785.
(It was already done when using -J.)
Sponsored-by: Mark Reidenbach on Patreon
alex [Mon, 9 Aug 2021 04:21:11 +0000 (04:21 +0000)]
Added a comment: Automatic watch for the heuristic
yarikoptic [Fri, 6 Aug 2021 22:11:46 +0000 (22:11 +0000)]
get failing to get if with --debug
yarikoptic [Fri, 6 Aug 2021 21:53:42 +0000 (21:53 +0000)]
reporting on odds in downloads.
Lukey [Fri, 6 Aug 2021 06:02:38 +0000 (06:02 +0000)]
Added a comment
Rob [Thu, 5 Aug 2021 18:13:36 +0000 (18:13 +0000)]
Added a comment: creating directory special remote "in-place"
Joey Hess [Wed, 4 Aug 2021 16:40:56 +0000 (12:40 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 4 Aug 2021 16:40:25 +0000 (12:40 -0400)]
done!
Joey Hess [Wed, 4 Aug 2021 16:39:54 +0000 (12:39 -0400)]
Merge branch 'vectorclock'
Joey Hess [Tue, 3 Aug 2021 20:45:20 +0000 (16:45 -0400)]
deal better with clock skew situations, using vector clocks
* Deal with clock skew, both forwards and backwards, when logging
information to the git-annex branch.
* GIT_ANNEX_VECTOR_CLOCK can now be set to a fixed value (eg 1)
rather than needing to be advanced each time a new change is made.
* Misuse of GIT_ANNEX_VECTOR_CLOCK will no longer confuse git-annex.
When changing a file in the git-annex branch, the vector clock to use is now
determined by first looking at the current time (or GIT_ANNEX_VECTOR_CLOCK
when set), and comparing it to the newest vector clock already in use in
that file. If a newer time stamp was already in use, advance it forward by
a second instead.
When the clock is set to a time in the past, this avoids logging with
an old timestamp, which would risk that log line later being ignored in favor
of "newer" line that is really not newer.
When a log entry has been made with a clock that was set far ahead in the
future, this avoids newer information being logged with an older timestamp
and so being ignored in favor of that future-timestamped information.
Once all clocks get fixed, this will result in the vector clocks being
incremented, until finally enough time has passed that time gets back ahead
of the vector clock value, and then it will return to usual operation.
(This latter situation is not ideal, but it seems the best that can be done.
The issue with it is, since all writers will be incrementing the last
vector clock they saw, there's no way to tell when one writer made a write
significantly later in time than another, so the earlier write might
arbitrarily be picked when merging. This problem is why git-annex uses
timestamps in the first place, rather than pure vector clocks.)
Advancing forward by 1 second is somewhat arbitrary. setDead
advances a timestamp by just 1 picosecond, and the vector clock could
too. But then it would interfere with setDead, which wants to be
overrulled by any change. So it could use 2 picoseconds or something,
but that seems weird. It could just as well advance it forward by a
minute or whatever, but then it would be harder for real time to catch
up with the vector clock when forward clock slew had happened.
A complication is that many log files contain several different peices of
information, and it may be best to only use vector clocks for the same peice
of information. For example, a key's location log file contains
InfoPresent/InfoMissing for each UUID, and it only looks at the vector
clocks for the UUID that is being changed, and not other UUIDs.
Although exactly where the dividing line is can be hard to determine.
Consider metadata logs, where a field "tag" can have multiple values set
at different times. Should it advance forward past the last tag?
Probably. What about when a different field is set, should it look at
the clocks of other fields? Perhaps not, but currently it does, and
this does not seems like it will cause any problems.
Another one I'm not entirely sure about is the export log, which is
keyed by (fromuuid, touuid). So if multiple repos are exporting to the
same remote, different vector clocks can be used for that remote.
It looks like that's probably ok, because it does not try to determine
what order things occurred when there was an export conflict.
Sponsored-by: Jochen Bartl on Patreon
Ilya_Shlyakhter [Wed, 4 Aug 2021 15:47:12 +0000 (15:47 +0000)]
Added a comment: downloading torrent files to annex
Joey Hess [Tue, 3 Aug 2021 21:14:06 +0000 (17:14 -0400)]
devblog
Joey Hess [Tue, 3 Aug 2021 21:06:27 +0000 (17:06 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Tue, 3 Aug 2021 21:05:50 +0000 (17:05 -0400)]
branch
spwhitton [Tue, 3 Aug 2021 19:10:10 +0000 (19:10 +0000)]
Added a comment
Joey Hess [Tue, 3 Aug 2021 18:03:25 +0000 (14:03 -0400)]
update
Joey Hess [Tue, 3 Aug 2021 17:48:03 +0000 (13:48 -0400)]
new todo.. I seem to have cracked a longstanding problem
Sponsored-by: Jochen Bartl on Patreon
jwrauch [Tue, 3 Aug 2021 16:36:21 +0000 (16:36 +0000)]
Added a comment
Joey Hess [Tue, 3 Aug 2021 16:22:58 +0000 (12:22 -0400)]
add: When adding a dotfile, avoid treating its name as an extension.
Joey Hess [Tue, 3 Aug 2021 16:21:10 +0000 (12:21 -0400)]
add news item for git-annex 8.
20210803
Joey Hess [Tue, 3 Aug 2021 16:20:45 +0000 (12:20 -0400)]
releasing package git-annex version 8.
20210803
Joey Hess [Tue, 3 Aug 2021 16:18:10 +0000 (12:18 -0400)]
whitespace
Ilya_Shlyakhter [Tue, 3 Aug 2021 15:14:53 +0000 (15:14 +0000)]
Added a comment
Ilya_Shlyakhter [Tue, 3 Aug 2021 15:06:35 +0000 (15:06 +0000)]
Added a comment: don't give up ;)
Lukey [Tue, 3 Aug 2021 07:54:13 +0000 (07:54 +0000)]
Added a comment
Joey Hess [Mon, 2 Aug 2021 18:11:36 +0000 (14:11 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 2 Aug 2021 17:59:23 +0000 (13:59 -0400)]
fix test suite
14683da9ebd629c3f77405b646d3f5661874f9d6 caused a test suite failure.
When the content of a key is not present, a LinkAnnexFailed is returned,
but replaceFile then tried to move the file into place, and since it was
not written, that crashed.
Sponsored-by: Boyd Stephen Smith Jr. on Patreon
Joey Hess [Mon, 2 Aug 2021 17:42:27 +0000 (13:42 -0400)]
fix missing new lines in processTranscript
jwrauch [Mon, 2 Aug 2021 17:03:23 +0000 (17:03 +0000)]
yarikoptic [Mon, 2 Aug 2021 16:56:19 +0000 (16:56 +0000)]
initial observation of .dot filename to consider having .dot extension
Added a comment: Also seeing this behaviour
Added a comment
Joey Hess [Fri, 30 Jul 2021 22:36:03 +0000 (18:36 -0400)]
work around strange auto-init bug
git-annex get when run as the first git-annex command in a new repo did not
populate unlocked files. (Reversion in version 8.
20210621)
I am not entirely happy with this, because I don't understand how
428c91606b434512d1986622e751c795edf4df44 caused the problem in the first
place, and I don't fully understand how skipping calling scanAnnexedFiles
during autoinit avoids the problem.
Kept the explicit call to scanAnnexedFiles during git-annex init,
so that when reconcileStaged is expensive, it can be made to run then,
rather than at some later point when the information is needed.
Sponsored-by: Brock Spratlen on Patreon
Joey Hess [Fri, 30 Jul 2021 22:01:36 +0000 (18:01 -0400)]
remove unused code
Joey Hess [Fri, 30 Jul 2021 21:46:11 +0000 (17:46 -0400)]
remove second pass in scanAnnexedFiles
The pass was needed to populate files when annex.thin was set,
but in commit
73e0cbbb19703f08daf783d8788370726f852162,
reconcileStaged started to do that. So, this second pass is not needed
any longer.