* fix(dolt): git-remote tests need a sql-server that shares their filesystem
The four git-remote tests that push through the store API fail on every run
of the new test-server-storage-full lane (#5836), which is what has the
merge pipeline stalled: shards 1, 9, 10 and 15 all die with
the remote: origin 'git+file:///tmp/embedded-git-remote-test-*/remote.git'
could not be accessed; fatal: ... does not appear to be a git repository
setupEmbeddedGitRemote dates from when this package had an in-process
embedded engine. store.go now hardcodes serverMode:true, so New() connects
to the suite's shared Dolt server — which TestMain runs in a Docker
container whose only mount is the image's own /var/lib/dolt. CALL DOLT_PUSH
executes inside that container, so the host bare repo the test just created
does not exist for it, and neither does the store's own Path (which is why
TestGitRemotePushSkipsUserPrePushHook cannot find its cache mirror and
TestGitRemoteSyncRoundTrip's clone comes up empty). The dolt credential
hints in the log are generic advice, not a credential problem — nothing
here needs a credential.
Give these tests their own local dolt sql-server rooted at the store's data
directory, the arrangement TestGitRemoteExternalServerRouting,
TestSQLRemotePersistsAcrossExternalServerRestart and
TestCredentialCLIRoutingE2E already use. The server is spawned with
doltserver.ServerSpawnEnv(), the same environment bd gives the server it
starts: a `dolt` CLI command run against a directory a sql-server already
serves is proxied to that server, so the git subprocess is spawned by the
server and the CLI-side guards (git tracing, core.hooksPath) only take
effect if the server carries them too.
Two consequences fall out and are fixed here:
- The setup now takes a genesis CommitAll. Commit() deliberately skips
config (GH#2455), so issue_prefix stayed dirty forever: Pull() refuses
to auto-commit a dirty internal config key, and a peer cloning the
database got no prefix at all. The CLI sibling setupGitRemote has
always done this with DOLT_COMMIT('-Am', 'Genesis: schema and config').
- The gate is testutil.RequireDoltBinary rather than skipIfNoDolt: these
tests no longer need the shared container, only dolt and git, so
requiring the container would be a skip for no reason.
Setup asserts <Path>/<db>/.dolt exists on this filesystem, so if the store
ever drifts back onto a containerized server these tests fail loudly
instead of quietly testing nothing.
Verified against the real shard script on a live Dolt server: shard 1 goes
from 1 failure to 0, shard 9 from 1 to 0.
* test(dolt): pin what TestCreateIssueAfterPull's Pull actually delivered
Shard 1 still fails in CI after the topology fix, now at the last assertion:
'GetIssue(ai-clone-001) failed: not found'. Deterministic across two CI runs,
not reproducible locally on dolt 2.1.8 or 2.3.1 (the whole shard is green
here). The end-of-test assertion cannot distinguish 'Pull() reported success
but merged nothing' from 'Pull() delivered the row and the post-pull
CreateIssue dropped it', which are different bugs in different places.
Assert immediately after Pull, before the post-pull write, so the CI failure
names which one it is.
* fix(ci): pin the Dolt CLI — 2.3.0 broke DOLT_RESET on fresh databases
Test (Server Dolt Full Suite 12/16) has been failing on a coin flip with
TestFreshBootstrapHealIncarnation/exact_creator_heals_its_interrupted_bootstrap
creator-authorized migration: schema migration: pending schema migrations
alter pre-existing dirty tables: issues; run 'bd dolt commit' ... (#4566)
schema: fresh-bootstrap reset: Error 1105 (HY000): context canceled
That second line is the whole story, and it is not a beads bug. The heal was
authorized and its capability consumed; what failed is the
CALL DOLT_RESET('--hard') in schema.MigrateUpWithLock. Dolt 2.3.0 regressed
that procedure: roughly one freshly created database in twenty comes up with
it permanently unusable, answering "Error 1105 (HY000): context canceled" to
every session, from any connection, for the life of the server process. It is
not transient and not load-related — a beads-free probe that only does
CREATE DATABASE followed immediately by the procedure reproduces it:
dolt 2.1.8 0/40 databases broken
dolt 2.2.0 0/60
dolt 2.3.0 3/60
dolt 2.3.1 3/100
Every workflow installed the CLI by piping dolthub/dolt's releases/latest
install.sh, so the binary under test changed the moment 2.3.x shipped —
while internal/testutil/testdoltcommon.go had the sql-server container pinned
at 2.2.0 the whole time. Server-mode tests run both halves at once against the
same databases, so the suite was exercising a Dolt pair no release ever
shipped. Pin the CLI to the container's release and keep the two locked
together:
- scripts/ci/install-dolt.sh installs a pinned Dolt, verifies `dolt version`
on PATH actually resolves to it, and records the per-version measurements
and the criterion for raising the pin.
- All 25 install sites across six workflows route through it.
- TestWorkflowsInstallPinnedDolt rejects any reintroduction of
releases/latest; TestPinnedDoltCLIMatchesContainerImage fails when the CLI
pin, DoltDockerImage and pull-dolt-image.sh disagree.
The test itself is unchanged in what it asserts. It gains one preflight probe:
before exercising the heal it checks that this server can hard-reset the
database it just created, so a broken Dolt is named as such instead of
surfacing as the generic #4566 refusal — which reads like a beads defect and
sends the reader to "run 'bd dolt commit'", advice that cannot work when the
reset the heal needs is the thing that is broken. On a pristine database the
probe is a no-op, and over 60 fresh databases a successful first reset never
broke a later one.
Verification: 48 runs of the test (6 workers x 8) and two full shard-12 runs
on the pinned 2.2.0, zero failures. Same binary on 2.3.1: 3 of 24 runs still
fail, now in 0.04s with the explicit diagnosis instead of 1s in with the
misleading one.
Beyond this test: bd dolt compact, bd dolt flatten and mergesettle's rollback
all issue DOLT_RESET('--hard'), so they are unreliable for real users on any
Dolt 2.3.x server. That needs an upstream report; pinning CI does not fix it.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>