git-annex.git
22 months agosim: support "--" as comment
Joey Hess [Wed, 25 Sep 2024 18:47:32 +0000 (14:47 -0400)]
sim: support "--" as comment

Using this in my sim files that are also mdwn files to avoid comments
being displayed as headers.

22 months agopreparing for release later this week
Joey Hess [Wed, 25 Sep 2024 18:43:52 +0000 (14:43 -0400)]
preparing for release later this week

22 months agoMerge branch 'sim'
Joey Hess [Wed, 25 Sep 2024 18:42:27 +0000 (14:42 -0400)]
Merge branch 'sim'

22 months agoexport only the parts of aeson that are used
Joey Hess [Wed, 25 Sep 2024 18:41:23 +0000 (14:41 -0400)]
export only the parts of aeson that are used

Rather than hiding things not wanted. This fixes a build warning with
aeson-2.2.3 which no longer has a json function.

22 months agoupdate
Joey Hess [Wed, 25 Sep 2024 18:26:32 +0000 (14:26 -0400)]
update

22 months agofix tab damage that broke examples formatting in man page
Joey Hess [Wed, 25 Sep 2024 18:23:04 +0000 (14:23 -0400)]
fix tab damage that broke examples formatting in man page

When did vim default to expandtabs for mdwn? No.

22 months agosupport simulating clusters
Joey Hess [Wed, 25 Sep 2024 18:06:41 +0000 (14:06 -0400)]
support simulating clusters

Without actually simulating cluster implementation at all. Instead, only
the essential fact that cluster gateways know what changes they have
made to each node of a cluster. That is enough for sims like
sizebalanced_cluster.

22 months agodesign for simulating clusters w/o simulating cluster gateways
Joey Hess [Wed, 25 Sep 2024 16:58:26 +0000 (12:58 -0400)]
design for simulating clusters w/o simulating cluster gateways

22 months agoRevert "sim: add commands for cluster management"
Joey Hess [Wed, 25 Sep 2024 16:11:03 +0000 (12:11 -0400)]
Revert "sim: add commands for cluster management"

This reverts commit 344141da63a9f6c46b63a52a116c9757fcf80110.

Rethinking this

22 months agoupdate
Joey Hess [Wed, 25 Sep 2024 16:10:55 +0000 (12:10 -0400)]
update

22 months agosim: add commands for cluster management
Joey Hess [Wed, 25 Sep 2024 15:07:58 +0000 (11:07 -0400)]
sim: add commands for cluster management

Clusters are not actually simulated yet.

22 months agoAdded a comment: Re: default preferred content
nobodyinperson [Wed, 25 Sep 2024 09:25:42 +0000 (09:25 +0000)]
Added a comment: Re: default preferred content

22 months ago(no commit message)
nadir [Wed, 25 Sep 2024 06:41:27 +0000 (06:41 +0000)]

22 months agosim: quiesce before freezing or ending
Joey Hess [Tue, 24 Sep 2024 20:46:09 +0000 (16:46 -0400)]
sim: quiesce before freezing or ending

Probably a good idea for freezing, but especially I hope this fixes a
problem with git-annex sim run that caused it to sometimes crash in
removeDirectoryRecursive with directory not empty, presumably because a
thread was writing there at the same time.

22 months agosim: added run subcommand
Joey Hess [Tue, 24 Sep 2024 16:01:54 +0000 (12:01 -0400)]
sim: added run subcommand

And a nice sim of random preferred content expressions.

22 months agosim: add stepstable
Joey Hess [Tue, 24 Sep 2024 15:47:20 +0000 (11:47 -0400)]
sim: add stepstable

22 months agosim: random preferred content expression generation
Joey Hess [Tue, 24 Sep 2024 15:23:23 +0000 (11:23 -0400)]
sim: random preferred content expression generation

22 months agoprevent action or step from simulating running on a special remote
Joey Hess [Tue, 24 Sep 2024 14:07:09 +0000 (10:07 -0400)]
prevent action or step from simulating running on a special remote

Without any connections, the step command will not try to do any actions
on a special remote.

But even without any connections, it's still possible for a drop action
explicitly run "on" the special remote to do, when numcopies = 0 or
there is a trusted repo. So guard all actions against running on a
special remote too.

22 months agofix state overwrite bug
Joey Hess [Tue, 24 Sep 2024 14:00:38 +0000 (10:00 -0400)]
fix state overwrite bug

I have needed to excercise a lot of care in threading st through, and I
got it wrong here. Probably using a state monad would be a good idea.

22 months agoAdded a comment: Settable default preferred content?
adehnert [Tue, 24 Sep 2024 00:02:21 +0000 (00:02 +0000)]
Added a comment: Settable default preferred content?

22 months agoupdate test case for bug
Joey Hess [Mon, 23 Sep 2024 20:05:11 +0000 (16:05 -0400)]
update test case for bug

after recent changes broke the test case

the other bug I cannot reproduce though

22 months agooops
Joey Hess [Mon, 23 Sep 2024 20:02:39 +0000 (16:02 -0400)]
oops

22 months agosim: avoid step looking for new actions every time
Joey Hess [Mon, 23 Sep 2024 19:50:47 +0000 (15:50 -0400)]
sim: avoid step looking for new actions every time

Once it has a list of actions, it can perform them all.

A disappointing optimisation at least in my test case, which it sped up
by less than 1 second out of 12. But still it did make it faster.

22 months agosped up sim step by about 200%
Joey Hess [Mon, 23 Sep 2024 19:27:45 +0000 (15:27 -0400)]
sped up sim step by about 200%

Noticed that it was quite slow compared with things like action
sendwanted. Guessed that the slowdown is largely due to every step
doing a simulated git pull/push.

So, rather than always doing a pull/push, only do those when no actions
are found without doing a pull/push.

This does mean that step will sometimes experience a split brain
situation, but that seems like a good thing? Because step ought to
explore as many possible scenarios as it reasonably can.

22 months agoadded sim of sizebalanced in a splitbrain situation
Joey Hess [Mon, 23 Sep 2024 19:04:52 +0000 (15:04 -0400)]
added sim of sizebalanced in a splitbrain situation

22 months agoallow complex shell commands
Joey Hess [Mon, 23 Sep 2024 19:04:33 +0000 (15:04 -0400)]
allow complex shell commands

22 months agofix sizebalanced empty size bug
Joey Hess [Mon, 23 Sep 2024 18:30:18 +0000 (14:30 -0400)]
fix sizebalanced empty size bug

Fix bug that prevented anything being stored in an empty repository whose
preferred content expression uses sizebalanced.

22 months agoadds sims collection
Joey Hess [Mon, 23 Sep 2024 17:43:55 +0000 (13:43 -0400)]
adds sims collection

22 months agosim visit as first-class command
Joey Hess [Mon, 23 Sep 2024 17:09:35 +0000 (13:09 -0400)]
sim visit as first-class command

Allows using it in a sim file.

22 months agosim: Fix size tracking for balanced preferred content
Joey Hess [Mon, 23 Sep 2024 16:28:18 +0000 (12:28 -0400)]
sim: Fix size tracking for balanced preferred content

22 months agoupdate
Joey Hess [Mon, 23 Sep 2024 13:38:56 +0000 (09:38 -0400)]
update

22 months agoremoved
AaronBrooks [Sun, 22 Sep 2024 22:21:32 +0000 (22:21 +0000)]
removed

22 months agoAdded a comment: reinject files -- more efficiently
AaronBrooks [Sun, 22 Sep 2024 22:21:05 +0000 (22:21 +0000)]
Added a comment: reinject files -- more efficiently

22 months agoAdded a comment: reinject files -- more efficiently
AaronBrooks [Sun, 22 Sep 2024 22:19:13 +0000 (22:19 +0000)]
Added a comment: reinject files -- more efficiently

22 months agosim: fix state loss bug
Joey Hess [Fri, 20 Sep 2024 22:11:37 +0000 (18:11 -0400)]
sim: fix state loss bug

22 months agopuzzling bug
Joey Hess [Fri, 20 Sep 2024 20:53:40 +0000 (16:53 -0400)]
puzzling bug

22 months agoinvalidate caches after log changes
Joey Hess [Fri, 20 Sep 2024 20:52:17 +0000 (16:52 -0400)]
invalidate caches after log changes

This seems like something Annex.Sim would need to happen. And generally
a really good idea.

22 months agoavoid adding redundant present/notpresent to sim history
Joey Hess [Fri, 20 Sep 2024 19:45:05 +0000 (15:45 -0400)]
avoid adding redundant present/notpresent to sim history

22 months agobugfixes
Joey Hess [Fri, 20 Sep 2024 19:39:52 +0000 (15:39 -0400)]
bugfixes

sim stabilization works now

22 months agosim: better step
Joey Hess [Fri, 20 Sep 2024 19:21:18 +0000 (15:21 -0400)]
sim: better step

On each step, find all the actions that could be done, and pick one of them
to do.

Should detect stability, but that is broken.

22 months agoset simRootDirectory on restore
Joey Hess [Fri, 20 Sep 2024 19:11:55 +0000 (15:11 -0400)]
set simRootDirectory on restore

It's a relative directory and the cwd may be different. Or the repo
could have been moved.

22 months agoremove sim log file
Joey Hess [Fri, 20 Sep 2024 18:57:55 +0000 (14:57 -0400)]
remove sim log file

22 months agoupdate
Joey Hess [Fri, 20 Sep 2024 15:59:35 +0000 (11:59 -0400)]
update

22 months agoupdate
Joey Hess [Fri, 20 Sep 2024 15:26:40 +0000 (11:26 -0400)]
update

22 months agoupdate
Joey Hess [Fri, 20 Sep 2024 15:05:57 +0000 (11:05 -0400)]
update

22 months agosim: implement addtree
Joey Hess [Fri, 20 Sep 2024 14:34:52 +0000 (10:34 -0400)]
sim: implement addtree

22 months agocomment
Joey Hess [Wed, 18 Sep 2024 13:08:42 +0000 (09:08 -0400)]
comment

22 months agosim: tested concurrency over actions
Joey Hess [Tue, 17 Sep 2024 18:39:53 +0000 (14:39 -0400)]
sim: tested concurrency over actions

This demonstrates concurrent behavior that looks right. And with a
random seed, the results are deterministic.

init foo
init bar
init backup
connect foo <-> bar
connect foo <-> backup
addmulti 10 testfiles 1mb 1gb foo backup
action foo gitpull backup
wanted foo nothing
wanted bar anything
wanted backup anything
action bar gitpull foo
action foo dropunwanted while action bar getwanted foo

22 months agosim: fix get bug
Joey Hess [Tue, 17 Sep 2024 18:29:49 +0000 (14:29 -0400)]
sim: fix get bug

When getting from a remote, have to check that the repo doing the
getting thinks the remote contains the key, but also that the remote
actually does. Before this bug fix, it would get from a repo that used
to have the key, but that had dropped it since the last git pull.

22 months agorecord initial seed in sim log
Joey Hess [Tue, 17 Sep 2024 17:49:50 +0000 (13:49 -0400)]
record initial seed in sim log

Unless the log starts with a command that records a seed.

22 months agogit-annex sim log
Joey Hess [Tue, 17 Sep 2024 17:43:11 +0000 (13:43 -0400)]
git-annex sim log

22 months agosim: implement dropunwantedfrom
Joey Hess [Tue, 17 Sep 2024 17:35:27 +0000 (13:35 -0400)]
sim: implement dropunwantedfrom

22 months agofix ActionDropUnwanted
Joey Hess [Tue, 17 Sep 2024 15:55:57 +0000 (11:55 -0400)]
fix ActionDropUnwanted

Now tested working

22 months agosim: add missing parser for action sendwanted
Joey Hess [Tue, 17 Sep 2024 15:40:40 +0000 (11:40 -0400)]
sim: add missing parser for action sendwanted

22 months agosim: fix changing settings bug
Joey Hess [Tue, 17 Sep 2024 15:37:25 +0000 (11:37 -0400)]
sim: fix changing settings bug

22 months agoaddmulti
Joey Hess [Tue, 17 Sep 2024 15:19:59 +0000 (11:19 -0400)]
addmulti

22 months agomove pull/push/sync into getSimActionComponents
Joey Hess [Tue, 17 Sep 2024 14:50:25 +0000 (10:50 -0400)]
move pull/push/sync into getSimActionComponents

As well as being a more pleasing implementation than I managed
yesterday, this allows for those actions to be run concurrently in the
sim.

22 months agosim concurrency
Joey Hess [Tue, 17 Sep 2024 13:33:55 +0000 (09:33 -0400)]
sim concurrency

22 months agoadd
Joey Hess [Tue, 17 Sep 2024 12:31:55 +0000 (08:31 -0400)]
add

22 months agoimplement ActionPull/Pull/Sync
Joey Hess [Mon, 16 Sep 2024 20:58:03 +0000 (16:58 -0400)]
implement ActionPull/Pull/Sync

Somewhat unsatisfying implementation, but all the alternatives were
worse.

22 months agosim: add action repo sync command
Joey Hess [Mon, 16 Sep 2024 20:48:21 +0000 (16:48 -0400)]
sim: add action repo sync command

23 months agosim command fixes
Joey Hess [Thu, 12 Sep 2024 20:39:44 +0000 (16:39 -0400)]
sim command fixes

23 months agogit-annex sim command is working
Joey Hess [Thu, 12 Sep 2024 20:07:44 +0000 (16:07 -0400)]
git-annex sim command is working

Had to add Read instances to Key and NumCopies and some other similar
types. I only expect to use those in serializing a sim. Of course, this
risks that implementation changes break reading old data. For a sim,
that would not be a big problem.

23 months agoAdded a comment
mike@2d6d71f56ce2a992244350475251df87c26fe351 [Thu, 12 Sep 2024 15:40:24 +0000 (15:40 +0000)]
Added a comment

23 months agoAdded a comment: 👍 +1 for encrypting the annex on regular git remotes
nobodyinperson [Thu, 12 Sep 2024 14:51:20 +0000 (14:51 +0000)]
Added a comment: 👍 +1 for encrypting the annex on regular git remotes

23 months agoimplemented ActionDropUnwanted
Joey Hess [Thu, 12 Sep 2024 14:44:31 +0000 (10:44 -0400)]
implemented ActionDropUnwanted

Not tested yet. This emulates the same checking that is done when
dropping. Note that when dropping from a special remote it is not able
to make a locked copy.

23 months agoconvert simRepoState to use UUID as key
Joey Hess [Thu, 12 Sep 2024 14:08:50 +0000 (10:08 -0400)]
convert simRepoState to use UUID as key

23 months ago(no commit message)
m.szczepanik@8dd0314f20fa09be99ee3903d1c04a80eafbd849 [Thu, 12 Sep 2024 12:13:06 +0000 (12:13 +0000)]

23 months agoAdded a comment
mike@2d6d71f56ce2a992244350475251df87c26fe351 [Thu, 12 Sep 2024 05:22:18 +0000 (05:22 +0000)]
Added a comment

23 months agofully preserve input format of connect and disconnect commands
Joey Hess [Thu, 12 Sep 2024 01:00:51 +0000 (21:00 -0400)]
fully preserve input format of connect and disconnect commands

Just lifted the sim file as a DSL into the type level for that.

23 months agoinitial report on that addunlocked is not respected during import
yarikoptic [Wed, 11 Sep 2024 20:47:45 +0000 (20:47 +0000)]
initial report on that addunlocked is not respected during import

23 months agosim file parser and generator
Joey Hess [Wed, 11 Sep 2024 19:59:13 +0000 (15:59 -0400)]
sim file parser and generator

The generator doesn't emit the best possible connect commands,
but it does output something valid. Eg, an input like:

connect A <-> B <-> C <-> D

becomes:

connect A <-> B <-> C
connect C <-> D

Also:

connect A -> B <- C

becomes:

connect A -> B
connect C -> B

Which could be improved.

Also disconnect commands are not prettified at all, but probably there's
no reason to.

23 months agostarted on sim file parser
Joey Hess [Wed, 11 Sep 2024 15:53:25 +0000 (11:53 -0400)]
started on sim file parser

23 months agoimplemented ActionSendWanted
Joey Hess [Wed, 11 Sep 2024 15:04:48 +0000 (11:04 -0400)]
implemented ActionSendWanted

The simulation is nearly finished. Only CommandAddTree and dropping
remain to do.

23 months agoActionGetWanted working
Joey Hess [Wed, 11 Sep 2024 14:32:04 +0000 (10:32 -0400)]
ActionGetWanted working

The sim is now basically working!

23 months agosim: implement ActionGitPush and ActionGitPull
Joey Hess [Tue, 10 Sep 2024 19:37:55 +0000 (15:37 -0400)]
sim: implement ActionGitPush and ActionGitPull

These don't actually need to do any git actions, instead they just merge
the simLocations.

Had to make simLocations use a vector clock, because it is possible for
two simulated repositories to end up with different opinions about the
location of a key. Just like with real git-annex, whichever location
change was made most recently wins out.

The vector clock is simply advanced each time the simulation is run for
a step. Since there is no real parallelism in the sim, that's
sufficient.

23 months agoimplement randomAction
Joey Hess [Mon, 9 Sep 2024 21:20:13 +0000 (17:20 -0400)]
implement randomAction

23 months agoimplement CommandStep
Joey Hess [Mon, 9 Sep 2024 21:04:32 +0000 (17:04 -0400)]
implement CommandStep

and record each SimCommand in simHistory, except for CommandStep where
instead the actions that are generated are recorded.

23 months agoadd action command to git-annex sim
Joey Hess [Mon, 9 Sep 2024 20:06:45 +0000 (16:06 -0400)]
add action command to git-annex sim

step just picks a random action, and this allows finer control over what
happens in the sim

23 months agoset location logs in simulated repos
Joey Hess [Mon, 9 Sep 2024 18:52:24 +0000 (14:52 -0400)]
set location logs in simulated repos

23 months agofix removing simulated file
Joey Hess [Mon, 9 Sep 2024 18:07:52 +0000 (14:07 -0400)]
fix removing simulated file

23 months agocreate simulated files
Joey Hess [Mon, 9 Sep 2024 15:28:30 +0000 (11:28 -0400)]
create simulated files

23 months agoset descriptions for all simulated repos
Joey Hess [Mon, 9 Sep 2024 15:06:42 +0000 (11:06 -0400)]
set descriptions for all simulated repos

23 months agosimulated repository construction working
Joey Hess [Mon, 9 Sep 2024 14:59:01 +0000 (10:59 -0400)]
simulated repository construction working

23 months agofinish updateSimRepoState
Joey Hess [Mon, 9 Sep 2024 13:35:42 +0000 (09:35 -0400)]
finish updateSimRepoState

Converted maps to use UUID as key.

Also added mincopies to the sim.

23 months agomaxsize of 0 to disable
Joey Hess [Mon, 9 Sep 2024 13:32:43 +0000 (09:32 -0400)]
maxsize of 0 to disable

23 months agoimplemented cloneSimRepo
Joey Hess [Fri, 6 Sep 2024 18:23:29 +0000 (14:23 -0400)]
implemented cloneSimRepo

Started on updateSimRepoState

23 months agomore work on applySimCommand
Joey Hess [Fri, 6 Sep 2024 16:53:51 +0000 (12:53 -0400)]
more work on applySimCommand

When using an existing repo, copy over all of its config into the sim.

Added CommandTrustLevel.

Start at creating a git clone for a simulated repo, but it's not done
yet.

23 months agorethought sim a bit
Joey Hess [Fri, 6 Sep 2024 16:53:20 +0000 (12:53 -0400)]
rethought sim a bit

23 months agoinitial report on incorrect handling of empty files in adjusted branches mode
yarikoptic [Fri, 6 Sep 2024 14:01:34 +0000 (14:01 +0000)]
initial report on incorrect handling of empty files in adjusted branches mode

23 months agoprevent overwriting a repo in the simulation
Joey Hess [Thu, 5 Sep 2024 20:22:08 +0000 (16:22 -0400)]
prevent overwriting a repo in the simulation

23 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 5 Sep 2024 19:25:34 +0000 (15:25 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

23 months agoalmost finished with applySimCommand
Joey Hess [Thu, 5 Sep 2024 19:22:41 +0000 (15:22 -0400)]
almost finished with applySimCommand

Added checks that repo names are ones that have been added to the sim.

Implemented preferred content etc setting. It does not need to parse the
expression in applySimCommand, instead that can be done when running the
sim. This keeps it pure.

But, it can't be entirely pure because of CommandAddTree. So made it
return an Annex action when necessary.

Moved makeMatcher into Annex.FileMatcher in preparation for using it,
but it's not used yet. Also moved checkPreferredContentExpression.

23 months agoAdded a comment
yarikoptic [Thu, 5 Sep 2024 14:52:51 +0000 (14:52 +0000)]
Added a comment

23 months agoimplement CommandUse in Annex.Sim
Joey Hess [Thu, 5 Sep 2024 14:50:04 +0000 (10:50 -0400)]
implement CommandUse in Annex.Sim

Refactored Remote to keep it pure.

23 months agoAdded a comment: ping on this issue : how to recover?
yarikoptic [Thu, 5 Sep 2024 14:49:07 +0000 (14:49 +0000)]
Added a comment: ping on this issue : how to recover?

23 months agocomment
Joey Hess [Thu, 5 Sep 2024 13:20:38 +0000 (09:20 -0400)]
comment

23 months agostarted Annex.Sim
Joey Hess [Wed, 4 Sep 2024 19:10:39 +0000 (15:10 -0400)]
started Annex.Sim

Have most of the sim command handler, but to keep it pure while implementing
the rest will need some refactoring.

It seems likely that running the simulation itself will not be able to be
entirely pure. Preferred content evaluation runs in Annex after all.

Note that the somewhat awkward randomWords is because the i386ancient
build depends on a version of random too old to support generating a
random ByteString on its own.

23 months agodocumentation for git-annex sim
Joey Hess [Wed, 4 Sep 2024 19:03:17 +0000 (15:03 -0400)]
documentation for git-annex sim

command not implemented yet

23 months agoAdded a comment: PS
tapesafer [Wed, 4 Sep 2024 15:48:01 +0000 (15:48 +0000)]
Added a comment: PS