From 7896abbfa8f6e791d20f4ae96a27ed9f3fa33077 Mon Sep 17 00:00:00 2001 From: Julian Knutsen Date: Fri, 9 Oct 2026 18:22:08 +0000 Subject: [PATCH] ci(bazel): scope the proxied lane's shared-server projects to their own database (44 -> 34 shards) (#7436) * ci(bazel): scope the proxied lane's shared-server projects to their own database (44 -> 28 shards) //cmd/bd:bd_proxied_test spends nearly all its time in `bd init --proxied-server` against the shard's shared dolt sql-server. Measured where that goes (dolt query log): of ~2,031 statements per init, the ~220 INFORMATION_SCHEMA queries (migration guards and pre-repair probes) are ~80% of server time at a handful of databases, the 81 DOLT_COMMITs only ~0.5s. Dolt evaluates INFORMATION_SCHEMA by walking every database the session can see, so as root each init cost the server ~1.2 CPU-seconds more per database already on it (locally 6.7 CPU-s with 1 database, 21 with 11): a shard's k-th init paid for the k-1 projects before it. - proxied_shared_harness_test.go: newSharedProxiedProject now provisions the database server-side (root creates it plus a passwordless user of the same name with ALL on it and nothing else) and inits with --proxied-server-external-user, so each project's sessions see one database. newSharedProxiedRootProject keeps the old root/bd-creates-it shape for the four tests that need a server-wide privilege (DOLT_REMOTE remove, CREATE DATABASE, one compact statement); a run with the server log in test outputs showed no other denied statement. - Dropping finished databases instead was tried and rejected: a DROP DATABASE fails other sessions' in-flight INFORMATION_SCHEMA queries ("no root value found in session"), ~35 init failures per run. - No assertion changed. The bd-creates-the-database path stays covered by the root variant, the managed-local and non-shared init tests. - proxied_test_durations.json re-measured (two rbe-west runs): 19,618 -> 6,345 cost-seconds. 44 -> 28 shards, LPT-packed to ~227 per shard. rbe-west, --nocache_test_results (BEP attempt durations): before 44 shards, sum 6,063s, max 186s; scoped users at 44 shards, sum 2,337s, max 68s; at 20 shards, sum 1,950s, max 136s. Bead: ga-vnycm2.16 Co-Authored-By: Claude Opus 5.5 (1M context) * ci(bazel): proxied lane 28 -> 34 shards for a <=100s slowest shard PR CI at 28 shards (~227 packed cost each): 2,285 shard-seconds, median 78s, but max 113s; equally packed shards spread up to 1.45x the median. 34 shards (~187 each) targets a slowest shard under 100s. Bead: ga-vnycm2.16 Co-Authored-By: Claude Opus 5.5 (1M context) --------- Co-authored-by: Claude Opus 5.5 (1M context) --- .github/scripts/proxied-cmd-test-shards.txt | 430 ++++++++-------- .github/workflows/bazel.yml | 23 +- cmd/bd/BUILD.bazel | 6 +- ..._remote_remove_proxied_integration_test.go | 6 +- .../history_remote_frontdoor_matrix_test.go | 2 +- ...nance_commands_proxied_integration_test.go | 2 +- cmd/bd/proxied_shared_harness_test.go | 82 +++- ...multistatement_proxied_integration_test.go | 2 +- engdocs/CI_REQUIRED_CHECK_TOPOLOGY.md | 2 +- engdocs/TESTING.md | 4 +- scripts/ci/gen_proxied_shard_manifest.py | 7 +- scripts/ci/proxied_test_durations.json | 461 +++++++++--------- scripts/shard_manifest_test.go | 2 +- 13 files changed, 546 insertions(+), 483 deletions(-) diff --git a/.github/scripts/proxied-cmd-test-shards.txt b/.github/scripts/proxied-cmd-test-shards.txt index 195ff2c5f..42a1fc999 100644 --- a/.github/scripts/proxied-cmd-test-shards.txt +++ b/.github/scripts/proxied-cmd-test-shards.txt @@ -225,12 +225,12 @@ # # Format: # -# 44-shard split for the Bazel-only proxied-server tier +# 34-shard split for the Bazel-only proxied-server tier # (bazel-proxied in .github/workflows/bazel.yml), bin-packed # longest-processing-time-first by measured wall-time from # scripts/ci/proxied_test_durations.json (see that file for # provenance and its "relative weight, not absolute SLA" caveat). -# Regenerate with scripts/ci/gen_proxied_shard_manifest.py 44 +# Regenerate with scripts/ci/gen_proxied_shard_manifest.py 34 # --weights=duration --write after adding or removing # TestProxiedServer*/TestServerMode* functions. --write is incremental: # it keeps every already-assigned test on its current shard and only @@ -252,254 +252,244 @@ # regeneration. Add them to the generator or the durations file # instead. -44 1 TestProxiedServerDep2 -44 1 TestProxiedServerServeAddDependencies +34 1 TestProxiedServerDep2 +34 1 TestProxiedServerMolProgress +34 1 TestProxiedServerReadyClaimConcurrent +34 1 TestProxiedServerServeActivatesTheEventsJournal +34 1 TestProxiedServerServeRelease -44 2 TestProxiedServerClose2 -44 2 TestProxiedServerCount -44 2 TestProxiedServerEventsJournalOffByDefault -44 2 TestProxiedServerServeRefusesAStreamOnADisabledJournal +34 2 TestProxiedServerDepListSingleIDWarnsOnDroppedExternalEdge +34 2 TestProxiedServerGateList +34 2 TestProxiedServerList +34 2 TestProxiedServerServeRemoveDependency +34 2 TestProxiedServerUpdateC -44 3 TestProxiedServerEventsJournal -44 3 TestProxiedServerServeReadsTheJournalItJustWrote -44 3 TestProxiedServerUpdate3 -44 3 TestServerModeSharedServeGlobalReportsTheServedDatabase +34 3 TestProxiedServerAutoPrune +34 3 TestProxiedServerClose2B +34 3 TestProxiedServerEventsJournalOffByDefault +34 3 TestProxiedServerMolLastActivity +34 3 TestProxiedServerPurgeWispsPlaneRetention +34 3 TestProxiedServerServeLifecycle +34 3 TestProxiedServerStatuses -44 4 TestProxiedServerClose2B -44 4 TestProxiedServerOutageReconnectAcceptanceMatrix -44 4 TestProxiedServerServeDelete -44 4 TestProxiedServerSetState +34 4 TestProxiedServerMolStale +34 4 TestProxiedServerReadyConcurrent +34 4 TestProxiedServerServeRelatedIssues +34 4 TestProxiedServerServeSettingsWrites +34 4 TestProxiedServerShow2 +34 4 TestServerModeServeSkipsPostRunMaintenance -44 5 TestProxiedServerCreateInfraTypeRoutesToWisps -44 5 TestProxiedServerHuman -44 5 TestProxiedServerListComments -44 5 TestProxiedServerServeClaimNext +34 5 TestProxiedServerHistoryRemoteRefusalFrontDoorMatrix +34 5 TestProxiedServerInfo +34 5 TestProxiedServerNote +34 5 TestProxiedServerOutageReconnectAcceptanceMatrix +34 5 TestProxiedServerUpdate3 +34 5 TestServerModeDeferAutoWake -44 6 TestProxiedServerAssign -44 6 TestProxiedServerCompactDolt -44 6 TestProxiedServerHistory -44 6 TestProxiedServerIfRevisionGuardDelete -44 6 TestProxiedServerKV -44 6 TestProxiedServerServeStreamsTheJournalItIsWriting +34 6 TestProxiedServerPing +34 6 TestProxiedServerQuick +34 6 TestProxiedServerServeReadsTheJournalItJustWrote +34 6 TestProxiedServerSwarm +34 6 TestProxiedServerUpdate2B +34 6 TestProxiedServerWispList -44 7 TestProxiedServerBatchDefersThenDoltCommitAdvancesHeadOnce -44 7 TestProxiedServerDoltLifecycle -44 7 TestProxiedServerGateFrontDoorDirectServerProxyParity -44 7 TestProxiedServerIfRevisionGuardClose -44 7 TestProxiedServerMolDistill -44 7 TestProxiedServerPathHelpers -44 7 TestProxiedServerStorageClass -44 7 TestServerModeServe +34 7 TestProxiedServerCloseConcurrent +34 7 TestProxiedServerCreateInfraTypeRoutesToWisps +34 7 TestProxiedServerExternalCreate +34 7 TestProxiedServerIfRevisionGuardDelete +34 7 TestProxiedServerLabelC +34 7 TestProxiedServerTypesAgreeWithCreate -44 8 TestProxiedServerDelete -44 8 TestProxiedServerPourRejectsEnumViolatingVar -44 8 TestProxiedServerSQL -44 8 TestProxiedServerTag -44 8 TestProxiedServerUpdate2B +34 8 TestProxiedServerClose2 +34 8 TestProxiedServerDeleteWisp +34 8 TestProxiedServerExport +34 8 TestProxiedServerFindDuplicates +34 8 TestProxiedServerGateCheck +34 8 TestProxiedServerServeReadParity -44 9 TestProxiedServerConfigSetMany -44 9 TestProxiedServerReopen -44 9 TestProxiedServerServeClaim -44 9 TestProxiedServerUnclaimIfAssigneeParity -44 9 TestProxiedServerUpdateConcurrentAppendNotes +34 9 TestProxiedServerCloseSiblingBlockersFanIn +34 9 TestProxiedServerGateLifecycle +34 9 TestProxiedServerHistoryRemoteSupportedFrontDoorParity +34 9 TestProxiedServerIfRevisionGuardReopen +34 9 TestProxiedServerServeRefusesTheJournalWhenItIsDisabled +34 9 TestProxiedServerUpdate +34 9 TestServerModeServe -44 10 TestProxiedServerDeleteBlockedJSONSingleDoc -44 10 TestProxiedServerLink -44 10 TestProxiedServerPriority -44 10 TestProxiedServerReadyWisp -44 10 TestProxiedServerServeAddComment +34 10 TestProxiedServerContext +34 10 TestProxiedServerCreate2B +34 10 TestProxiedServerGateCheckB +34 10 TestProxiedServerServeRefusesAStreamOnADisabledJournal +34 10 TestProxiedServerTypes +34 10 TestProxiedServerUpdate2C -44 11 TestProxiedServerAutoPrune -44 11 TestProxiedServerBatchParity -44 11 TestProxiedServerContext -44 11 TestProxiedServerCreate2 -44 11 TestProxiedServerExternalMutationPolicy +34 11 TestProxiedServerBatchParity +34 11 TestProxiedServerCompactHistory +34 11 TestProxiedServerPour +34 11 TestProxiedServerQuery +34 11 TestProxiedServerReady +34 11 TestProxiedServerServeAddDependencies -44 12 TestProxiedServerExternalCreate -44 12 TestProxiedServerServeRelatedIssues -44 12 TestProxiedServerUpdate -44 12 TestProxiedServerWispList -44 12 TestServerModeTypesAgreeWithCreate +34 12 TestProxiedServerBlocked +34 12 TestProxiedServerChildren +34 12 TestProxiedServerCleanDatabases +34 12 TestProxiedServerReadyB +34 12 TestProxiedServerReadyWisp +34 12 TestProxiedServerReclaim +34 12 TestProxiedServerUnclaim -44 13 TestProxiedServerCreate -44 13 TestProxiedServerRecomputeBlocked -44 13 TestProxiedServerServeUpdate -44 13 TestProxiedServerShow2 -44 13 TestProxiedServerStale +34 13 TestProxiedServerCompactDolt +34 13 TestProxiedServerCreate2 +34 13 TestProxiedServerGraph +34 13 TestProxiedServerMolSquash +34 13 TestProxiedServerPromote +34 13 TestProxiedServerServeRefusesAStaleCheckpointWithGone -44 14 TestProxiedServerMolSquash -44 14 TestProxiedServerQuick -44 14 TestProxiedServerServeReadParity -44 14 TestProxiedServerServeRefusesAStaleCheckpointWithGone -44 14 TestProxiedServerShow2B +34 14 TestProxiedServerAssign +34 14 TestProxiedServerCloseB +34 14 TestProxiedServerDuplicates +34 14 TestProxiedServerHeartbeat +34 14 TestProxiedServerInitIfMissing +34 14 TestProxiedServerMolReadyGated -44 15 TestProxiedServerCountIncludeInfra -44 15 TestProxiedServerDeleteForceOrphans -44 15 TestProxiedServerDuplicates -44 15 TestProxiedServerLabel -44 15 TestProxiedServerServeBatchClose +34 15 TestProxiedServerDepConcurrent +34 15 TestProxiedServerImport +34 15 TestProxiedServerMoleculeFrontDoorWriteParity +34 15 TestProxiedServerReopenConcurrent +34 15 TestProxiedServerSQL -44 16 TestProxiedServerHistoryRemoteSupportedFrontDoorParity -44 16 TestProxiedServerQuery -44 16 TestProxiedServerSQLDatabaseFlag -44 16 TestProxiedServerShowB -44 16 TestProxiedServerWispCreate +34 16 TestProxiedServerBackupRefusedOnExternalTopology +34 16 TestProxiedServerCascadeParity +34 16 TestProxiedServerConfigSetMany +34 16 TestProxiedServerKV +34 16 TestProxiedServerServeCount +34 16 TestProxiedServerServeCreate +34 16 TestProxiedServerUpdateHooks -44 17 TestProxiedServerDoltRemoteRemove -44 17 TestProxiedServerImport -44 17 TestProxiedServerLint -44 17 TestProxiedServerServeEdgeCounts -44 17 TestProxiedServerStatus +34 17 TestProxiedServerDep +34 17 TestProxiedServerMultiStatementSQL +34 17 TestProxiedServerOrphans +34 17 TestProxiedServerPrime +34 17 TestProxiedServerSQLDatabaseFlag +34 17 TestProxiedServerServeModeGate -44 18 TestProxiedServerCloseConcurrent -44 18 TestProxiedServerDep2C -44 18 TestProxiedServerEdit -44 18 TestProxiedServerIfRevisionGuardUpdate -44 18 TestProxiedServerSearch +34 18 TestProxiedServerClose3 +34 18 TestProxiedServerCount +34 18 TestProxiedServerCountIncludeInfra +34 18 TestProxiedServerDoltRemoteRemove +34 18 TestProxiedServerMolShow +34 18 TestProxiedServerWispCreateRejectsEnumViolatingVar -44 19 TestProxiedServerServeClose -44 19 TestProxiedServerTypesAgreeWithCreate -44 19 TestProxiedServerUpdate2 -44 19 TestProxiedServerUpdateClosePolicy +34 19 TestProxiedServerCreate +34 19 TestProxiedServerMolCurrent +34 19 TestProxiedServerServeBatchClose +34 19 TestProxiedServerShow3 +34 19 TestServerModeTypesAgreeWithCreate -44 20 TestProxiedServerDeferAutoWake -44 20 TestProxiedServerEpic -44 20 TestProxiedServerIfRevisionGuardReopen -44 20 TestProxiedServerInitIfMissing -44 20 TestProxiedServerReopenB -44 20 TestProxiedServerUpdateIfGuards +34 20 TestProxiedServerDelete +34 20 TestProxiedServerLint +34 20 TestProxiedServerPriority +34 20 TestProxiedServerShow2B +34 20 TestProxiedServerWispGC +34 20 TestServerModeSharedServeGlobalReportsTheServedDatabase -44 21 TestProxiedServerBlocked -44 21 TestProxiedServerCleanDatabases -44 21 TestProxiedServerConfig -44 21 TestProxiedServerMolShow -44 21 TestProxiedServerPing -44 21 TestProxiedServerServeActivatesTheEventsJournal +34 21 TestProxiedServerConfig +34 21 TestProxiedServerExternalPolicyDirectParity +34 21 TestProxiedServerMoleculeFrontDoorDirectServerProxyParity +34 21 TestProxiedServerPathHelpers +34 21 TestProxiedServerPrune +34 21 TestProxiedServerServeClose +34 21 TestProxiedServerUnclaimIfAssigneeParity -44 22 TestProxiedServerCloseBeadGate -44 22 TestProxiedServerExternalPolicyDirectParity -44 22 TestProxiedServerFindDuplicates -44 22 TestProxiedServerReadyB -44 22 TestProxiedServerServeCreate +34 22 TestProxiedServerGateCreateInheritsRepoMetadata +34 22 TestProxiedServerRecomputeBlocked +34 22 TestProxiedServerServeEdgeCounts +34 22 TestProxiedServerTag +34 22 TestProxiedServerUpdateB +34 22 TestProxiedServerUpdateConcurrentMetadata -44 23 TestProxiedServerCloseSiblingBlockersFanIn -44 23 TestProxiedServerMoleculeFrontDoorDirectServerProxyParity -44 23 TestProxiedServerPour -44 23 TestProxiedServerShow3 -44 23 TestProxiedServerUpdateConcurrentClaim +34 23 TestProxiedServerDep2B +34 23 TestProxiedServerIfRevisionGuardUpdate +34 23 TestProxiedServerListWatchCountsTheOffsetIntoMaxRows +34 23 TestProxiedServerMolBurn +34 23 TestProxiedServerServeUpdate +34 23 TestProxiedServerUpdateConcurrentClaim +34 23 TestProxiedServerUpdateWisp -44 24 TestProxiedServerLabelC -44 24 TestProxiedServerMemory -44 24 TestProxiedServerMolStale -44 24 TestProxiedServerServeUpdateClaim -44 24 TestProxiedServerSwarm +34 24 TestProxiedServerDeleteBlockedJSONSingleDoc +34 24 TestProxiedServerDeleteForceOrphans +34 24 TestProxiedServerHuman +34 24 TestProxiedServerIfRevisionGuardAssign +34 24 TestProxiedServerListComments +34 24 TestProxiedServerListSortRetiresTheWalk +34 24 TestProxiedServerShowWatch +34 24 TestProxiedServerUpdateIfGuards -44 25 TestProxiedServerHeartbeat -44 25 TestProxiedServerMolLastActivity -44 25 TestProxiedServerReassignFence -44 25 TestProxiedServerStatuses -44 25 TestProxiedServerUpdateWisp +34 25 TestProxiedServerInitExplicitBeadsDirIsAuthoritative +34 25 TestProxiedServerSetState +34 25 TestProxiedServerShow +34 25 TestProxiedServerShowB +34 25 TestProxiedServerStale +34 25 TestProxiedServerWispCreate -44 26 TestProxiedServerGraph -44 26 TestProxiedServerMolBond -44 26 TestProxiedServerServeReadRevision -44 26 TestProxiedServerTodo -44 26 TestProxiedServerUpdateHooks +34 26 TestProxiedServerDeferAutoWake +34 26 TestProxiedServerExternalMutationPolicy +34 26 TestProxiedServerReopenB +34 26 TestProxiedServerSearch +34 26 TestProxiedServerServeClaim +34 26 TestProxiedServerShow3B -44 27 TestProxiedServerCreate2B -44 27 TestProxiedServerGateList -44 27 TestProxiedServerGatedRendering -44 27 TestProxiedServerReopenConcurrent -44 27 TestProxiedServerSQLStatementRouting +34 27 TestProxiedServerDeferUndefer +34 27 TestProxiedServerGatedRendering +34 27 TestProxiedServerHistory +34 27 TestProxiedServerLabel +34 27 TestProxiedServerLabelB +34 27 TestProxiedServerUpdateClosePolicy -44 28 TestProxiedServerComment -44 28 TestProxiedServerMolProgress -44 28 TestProxiedServerServeCount -44 28 TestProxiedServerServeRemoveDependency -44 28 TestProxiedServerUpdateB +34 28 TestProxiedServerDep2C +34 28 TestProxiedServerDoltLifecycle +34 28 TestProxiedServerReady2 +34 28 TestProxiedServerReassignFence +34 28 TestProxiedServerSQLStatementRouting +34 28 TestProxiedServerServeClaimNext +34 28 TestProxiedServerUpdateConcurrentAppendNotes -44 29 TestProxiedServerCreate2C -44 29 TestProxiedServerDep -44 29 TestProxiedServerDepConcurrent -44 29 TestProxiedServerServeSettingsWrites -44 29 TestProxiedServerWispCreateRejectsEnumViolatingVar +34 29 TestProxiedServerGateFrontDoorDirectServerProxyParity +34 29 TestProxiedServerMolDistill +34 29 TestProxiedServerReopen +34 29 TestProxiedServerServeDelete +34 29 TestProxiedServerState -44 30 TestProxiedServerDepListSingleIDWarnsOnDroppedExternalEdge -44 30 TestProxiedServerInfo -44 30 TestProxiedServerPrime -44 30 TestProxiedServerUpdateC -44 30 TestServerModeServeSkipsPostRunMaintenance +34 30 TestProxiedServerDeleteConcurrent +34 30 TestProxiedServerReadyC +34 30 TestProxiedServerServeAddComment +34 30 TestProxiedServerStatus +34 30 TestProxiedServerTodo +34 30 TestProxiedServerUpdate2 -44 31 TestProxiedServerCleanDatabasesPurgeDropped -44 31 TestProxiedServerGateLifecycle -44 31 TestProxiedServerPurgeWispsPlaneRetention -44 31 TestProxiedServerShow3B -44 31 TestServerModeDeferAutoWake +34 31 TestProxiedServerCloseBeadGate +34 31 TestProxiedServerComment +34 31 TestProxiedServerConfigB +34 31 TestProxiedServerEventsJournal +34 31 TestProxiedServerIfRevisionGuardClose +34 31 TestProxiedServerMolBond -44 32 TestProxiedServerClose3 -44 32 TestProxiedServerGC -44 32 TestProxiedServerList -44 32 TestProxiedServerReadyConcurrent -44 32 TestProxiedServerServeModeGate +34 32 TestProxiedServerCleanDatabasesPurgeDropped +34 32 TestProxiedServerConfigConcurrent +34 32 TestProxiedServerDepB +34 32 TestProxiedServerServeStreamsTheJournalItIsWriting +34 32 TestProxiedServerServeUpdateClaim +34 32 TestProxiedServerStorageClass -44 33 TestProxiedServerDeferUndefer -44 33 TestProxiedServerDepB -44 33 TestProxiedServerInitExplicitBeadsDirIsAuthoritative -44 33 TestProxiedServerMolBurn -44 33 TestProxiedServerOrphans +34 33 TestProxiedServerBatchDefersThenDoltCommitAdvancesHeadOnce +34 33 TestProxiedServerClose +34 33 TestProxiedServerGC +34 33 TestProxiedServerMemory +34 33 TestProxiedServerPourRejectsEnumViolatingVar +34 33 TestProxiedServerRelate -44 34 TestProxiedServerChildren -44 34 TestProxiedServerHistoryRemoteRefusalFrontDoorMatrix -44 34 TestProxiedServerPromote -44 34 TestProxiedServerServeRelease -44 34 TestProxiedServerUpdate2C - -44 35 TestProxiedServerConfigConcurrent -44 35 TestProxiedServerReady2 -44 35 TestProxiedServerShow - -44 36 TestProxiedServerDep2B -44 36 TestProxiedServerGateCreateInheritsRepoMetadata -44 36 TestProxiedServerServeRefusesTheJournalWhenItIsDisabled -44 36 TestProxiedServerWispGC - -44 37 TestProxiedServerDeleteWisp -44 37 TestProxiedServerNote -44 37 TestProxiedServerReady -44 37 TestProxiedServerShowWatch - -44 38 TestProxiedServerBackupRefusedOnExternalTopology -44 38 TestProxiedServerCascadeParity -44 38 TestProxiedServerClose4 -44 38 TestProxiedServerReadyClaimConcurrent -44 38 TestProxiedServerReclaim - -44 39 TestProxiedServerGateCheck -44 39 TestProxiedServerLabelB -44 39 TestProxiedServerMoleculeFrontDoorWriteParity - -44 40 TestProxiedServerDeleteConcurrent -44 40 TestProxiedServerIfRevisionGuardAssign -44 40 TestProxiedServerReadyC -44 40 TestProxiedServerRelate - -44 41 TestProxiedServerMolCurrent -44 41 TestProxiedServerPrune -44 41 TestProxiedServerTypes -44 41 TestProxiedServerUnclaim - -44 42 TestProxiedServerClose -44 42 TestProxiedServerCompactHistory -44 42 TestProxiedServerState -44 42 TestProxiedServerUpdateConcurrentMetadata - -44 43 TestProxiedServerCloseB -44 43 TestProxiedServerConfigB -44 43 TestProxiedServerMultiStatementSQL - -44 44 TestProxiedServerExport -44 44 TestProxiedServerGateCheckB -44 44 TestProxiedServerListSortRetiresTheWalk -44 44 TestProxiedServerListWatchCountsTheOffsetIntoMaxRows -44 44 TestProxiedServerMolReadyGated -44 44 TestProxiedServerServeLifecycle +34 34 TestProxiedServerClose4 +34 34 TestProxiedServerCreate2C +34 34 TestProxiedServerEdit +34 34 TestProxiedServerEpic +34 34 TestProxiedServerLink +34 34 TestProxiedServerServeReadRevision diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml index 5922cf041..1be23c9fa 100644 --- a/.github/workflows/bazel.yml +++ b/.github/workflows/bazel.yml @@ -1732,8 +1732,8 @@ jobs: # Like pr-risk.yml's proxied-server tier, "Test (Proxied Dolt Cmd N/15)", # as --config=doltserver-proxied: //cmd/bd:bd_proxied_test runs the shard # script, so shard k runs exactly that manifest entry's tests. This lane - # runs 44 shards of its own (.github/scripts/proxied-cmd-test-shards.txt's - # duration-balanced 44-block; see scripts/ci/proxied_test_durations.json), + # runs 34 shards of its own (.github/scripts/proxied-cmd-test-shards.txt's + # duration-balanced 34-block; see scripts/ci/proxied_test_durations.json), # not the legacy jobs' 15 — shard k here is not the same split as their # shard k. Same build as --config=doltserver (race bd_test, non-race # bd_for_tests), shared with bazel-doltserver through the remote cache. @@ -1793,15 +1793,16 @@ jobs: fi # Remote: each shard's Go timeout is its job's 15m, 1200s Bazel cap, - # plus a compile. The 44-shard block is LPT-packed by + # plus a compile. The 34-shard block is LPT-packed by # scripts/ci/proxied_test_durations.json, a rbe-west capture of each - # top-level test's summed leaf-test time (see its header). Packed to - # <=430 cost-seconds per shard, and a shard's wall time ran ~0.3x its - # packed cost on the lane's executors (-test.parallel=4), so shards - # are expected around 100-150s. Nearly all of that is `bd init - # --proxied-server` against the shard's dolt sql-server, ~one per - # subtest; a shard running far longer than its packed cost is worth - # comparing against this job's recent history before assuming a hang. + # top-level test's summed leaf-test time (see its header), to ~187 + # cost-seconds per shard; shards are expected around 55-95s (the same + # packed cost has run up to 1.45x the median wall time). Nearly + # all of that is `bd init --proxied-server` against the shard's dolt + # sql-server, ~one per subtest, each as a user scoped to its own + # database (cmd/bd/proxied_shared_harness_test.go); a shard running far + # longer is worth comparing against this job's recent history before + # assuming a hang. - name: bazel test //... --config=doltserver-proxied id: test timeout-minutes: 25 @@ -1830,7 +1831,7 @@ jobs: run: >- python3 tools/bazel/check_shard_coverage.py --bep "$RUNNER_TEMP/bazel-bep.json" - --suite //cmd/bd:bd_proxied_test .github/scripts/proxied-test-shard.sh 44 + --suite //cmd/bd:bd_proxied_test .github/scripts/proxied-test-shard.sh 34 - name: Upload test logs if: ${{ failure() && steps.test.outcome != 'skipped' }} diff --git a/cmd/bd/BUILD.bazel b/cmd/bd/BUILD.bazel index 6dc8c19db..f725268ee 100644 --- a/cmd/bd/BUILD.bazel +++ b/cmd/bd/BUILD.bazel @@ -1443,8 +1443,8 @@ sh_test( tags = ["embedded"], ) -# Runs 44 Bazel shards against the TestProxiedServer*/TestServerMode* -# functions, assigned by the manifest's 44-shard block (duration-balanced; +# Runs 34 Bazel shards against the TestProxiedServer*/TestServerMode* +# functions, assigned by the manifest's 34-shard block (duration-balanced; # see scripts/ci/proxied_test_durations.json), against this configuration's # (race) bd_test with BEADS_TEST_PROXIED_SERVER=1 and the non-race # bd_for_tests as the subprocess binary. This is a *different* shard count @@ -1501,7 +1501,7 @@ sh_test( # 192-core worker). "GOMAXPROCS": "4", }, - shard_count = 44, + shard_count = 34, tags = ["dolt-server-proxied"], ) diff --git a/cmd/bd/dolt_remote_remove_proxied_integration_test.go b/cmd/bd/dolt_remote_remove_proxied_integration_test.go index 77fb06592..ca589fbb4 100644 --- a/cmd/bd/dolt_remote_remove_proxied_integration_test.go +++ b/cmd/bd/dolt_remote_remove_proxied_integration_test.go @@ -36,7 +36,7 @@ func TestProxiedServerDoltRemoteRemove(t *testing.T) { t.Run("removes_existing_remote", func(t *testing.T) { t.Parallel() - p := newSharedProxiedProject(t, bd, "prr1") + p := newSharedProxiedRootProject(t, bd, "prr1") seedRemote(t, p, "backup", "https://doltremoteapi.dolthub.com/org/backup") out, err := bdProxiedRun(t, bd, p.dir, "dolt", "remote", "remove", "backup") @@ -53,7 +53,7 @@ func TestProxiedServerDoltRemoteRemove(t *testing.T) { t.Run("json_output", func(t *testing.T) { t.Parallel() - p := newSharedProxiedProject(t, bd, "prr2") + p := newSharedProxiedRootProject(t, bd, "prr2") seedRemote(t, p, "backup", "https://doltremoteapi.dolthub.com/org/backup") out, err := bdProxiedRun(t, bd, p.dir, "dolt", "remote", "remove", "--json", "backup") @@ -82,7 +82,7 @@ func TestProxiedServerDoltRemoteRemove(t *testing.T) { t.Run("nonexistent_remote_errors", func(t *testing.T) { t.Parallel() - p := newSharedProxiedProject(t, bd, "prr3") + p := newSharedProxiedRootProject(t, bd, "prr3") out, err := bdProxiedRun(t, bd, p.dir, "dolt", "remote", "remove", "ghost") if err == nil { t.Fatalf("expected error removing nonexistent remote, got:\n%s", out) diff --git a/cmd/bd/history_remote_frontdoor_matrix_test.go b/cmd/bd/history_remote_frontdoor_matrix_test.go index 8941651af..2a6f33ea2 100644 --- a/cmd/bd/history_remote_frontdoor_matrix_test.go +++ b/cmd/bd/history_remote_frontdoor_matrix_test.go @@ -357,7 +357,7 @@ func TestProxiedServerHistoryRemoteSupportedFrontDoorParity(t *testing.T) { }}, {"external-tcp", func(t *testing.T) proxiedProject { requireProxiedServerEnv(t) - return newSharedProxiedProject(t, bd, "hs_tcp") + return newSharedProxiedRootProject(t, bd, "hs_tcp") }}, } { t.Run(tc.name, func(t *testing.T) { diff --git a/cmd/bd/maintenance_commands_proxied_integration_test.go b/cmd/bd/maintenance_commands_proxied_integration_test.go index 68fa7d3bf..549d8d2a3 100644 --- a/cmd/bd/maintenance_commands_proxied_integration_test.go +++ b/cmd/bd/maintenance_commands_proxied_integration_test.go @@ -183,7 +183,7 @@ func TestProxiedServerCompactHistory(t *testing.T) { requireSharedProxiedServer(t) t.Parallel() bd := buildEmbeddedBD(t) - p := newSharedProxiedProject(t, bd, "cphist") + p := newSharedProxiedRootProject(t, bd, "cphist") for _, title := range []string{"keep-alpha", "keep-beta", "keep-gamma"} { bdProxiedCreate(t, bd, p.dir, title, "--type", "task") diff --git a/cmd/bd/proxied_shared_harness_test.go b/cmd/bd/proxied_shared_harness_test.go index cbaf3c5dd..2d34fbfee 100644 --- a/cmd/bd/proxied_shared_harness_test.go +++ b/cmd/bd/proxied_shared_harness_test.go @@ -3,13 +3,17 @@ package main import ( + "context" + "database/sql" "fmt" "os" "strconv" "sync" "sync/atomic" "testing" + "time" + "github.com/steveyegge/beads/internal/storage/doltutil" "github.com/steveyegge/beads/internal/testutil" ) @@ -55,22 +59,88 @@ func uniqueProxiedDatabase() string { return fmt.Sprintf("bdtest_%d", sharedProxiedDBSeq.Add(1)) } -func sharedProxiedInitArgs(t *testing.T, extraInitArgs ...string) (string, []string) { +// sharedProxiedCredential is who a shared-server project's `bd init` (and so +// its proxy) connects to the shard's dolt sql-server as. +type sharedProxiedCredential int + +const ( + // sharedProxiedScopedUser: the default. The database is provisioned + // server-side and the project connects as a user that can see only it + // (see provisionSharedProxiedDatabase). + sharedProxiedScopedUser sharedProxiedCredential = iota + // sharedProxiedRoot: the project connects as root and `bd init` creates + // the database itself. Only for tests that need a server-wide privilege + // (CALL DOLT_REMOTE, creating another database); each such init pays for + // every database on the server. + sharedProxiedRoot +) + +func sharedProxiedInitArgs(t *testing.T, cred sharedProxiedCredential, extraInitArgs ...string) (string, []string) { t.Helper() port := requireSharedProxiedServer(t) database := uniqueProxiedDatabase() - args := append([]string{ + args := []string{ "--database", database, "--proxied-server-external-host", "127.0.0.1", "--proxied-server-external-port", strconv.Itoa(port), - }, extraInitArgs...) - return database, args + } + if cred == sharedProxiedScopedUser { + provisionSharedProxiedDatabase(t, port, database) + args = append(args, "--proxied-server-external-user", database) + } + return database, append(args, extraInitArgs...) +} + +// provisionSharedProxiedDatabase provisions database on the shard's shared +// dolt sql-server the way a server that provisions databases server-side +// does: root creates the empty database and a passwordless user of the same +// name with ALL on it and nothing else, and the project connects as that user +// (--proxied-server-external-user). +// +// The scoping is what keeps a shard's inits from slowing each other down. +// Dolt answers an INFORMATION_SCHEMA query by walking every database the +// session can see, and `bd init`'s migration chain issues ~220 of them, so as +// root each init cost the server ~1.2 CPU-seconds more per database already on +// it: a shard's k-th init paid for the k-1 projects before it. A user that can +// see one database pays for one. Dropping finished projects' databases instead +// is not an option: a DROP DATABASE fails other sessions' in-flight +// INFORMATION_SCHEMA queries ("no root value found in session"). +func provisionSharedProxiedDatabase(t *testing.T, port int, database string) { + t.Helper() + dsn := doltutil.ServerDSN{Host: "127.0.0.1", Port: port, User: "root"}.String() + db, err := sql.Open("mysql", dsn) + if err != nil { + t.Fatalf("provisioning %s: opening the shared server: %v", database, err) + } + defer db.Close() + ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) + defer cancel() + // database is uniqueProxiedDatabase's bdtest_: safe to splice. + for _, stmt := range []string{ + fmt.Sprintf("CREATE DATABASE `%s`", database), + fmt.Sprintf("CREATE USER '%s'@'%%'", database), + fmt.Sprintf("GRANT ALL ON `%s`.* TO '%s'@'%%'", database, database), + } { + if _, err := db.ExecContext(ctx, stmt); err != nil { + t.Fatalf("provisioning %s: %s: %v", database, stmt, err) + } + } } func newSharedProxiedProject(t *testing.T, bd, prefix string, extraInitArgs ...string) proxiedProject { t.Helper() - database, args := sharedProxiedInitArgs(t, extraInitArgs...) + database, args := sharedProxiedInitArgs(t, sharedProxiedScopedUser, extraInitArgs...) + p := bdProxiedInit(t, bd, prefix, args...) + p.database = database + return p +} + +// newSharedProxiedRootProject is newSharedProxiedProject connecting as root +// (sharedProxiedRoot), for a test that needs a server-wide privilege. +func newSharedProxiedRootProject(t *testing.T, bd, prefix string, extraInitArgs ...string) proxiedProject { + t.Helper() + database, args := sharedProxiedInitArgs(t, sharedProxiedRoot, extraInitArgs...) p := bdProxiedInit(t, bd, prefix, args...) p.database = database return p @@ -78,7 +148,7 @@ func newSharedProxiedProject(t *testing.T, bd, prefix string, extraInitArgs ...s func newSharedProxiedProjectWithHooks(t *testing.T, bd, prefix string, hooks map[string]string, extraInitArgs ...string) proxiedProject { t.Helper() - database, args := sharedProxiedInitArgs(t, extraInitArgs...) + database, args := sharedProxiedInitArgs(t, sharedProxiedScopedUser, extraInitArgs...) p := bdProxiedInitWithHooks(t, bd, prefix, hooks, args...) p.database = database return p diff --git a/cmd/bd/sql_multistatement_proxied_integration_test.go b/cmd/bd/sql_multistatement_proxied_integration_test.go index 0f5736a3b..54eccfe63 100644 --- a/cmd/bd/sql_multistatement_proxied_integration_test.go +++ b/cmd/bd/sql_multistatement_proxied_integration_test.go @@ -79,7 +79,7 @@ func TestProxiedServerMultiStatementSQL(t *testing.T) { func TestProxiedServerSQLDatabaseFlag(t *testing.T) { bd := buildEmbeddedBD(t) - p := newSharedProxiedProject(t, bd, "df") + p := newSharedProxiedRootProject(t, bd, "df") // Stand up a second database with a table, alongside the project database. // The server is shared, so the name derives from the project's unique one. diff --git a/engdocs/CI_REQUIRED_CHECK_TOPOLOGY.md b/engdocs/CI_REQUIRED_CHECK_TOPOLOGY.md index 93ec7f4cd..68b9aeee6 100644 --- a/engdocs/CI_REQUIRED_CHECK_TOPOLOGY.md +++ b/engdocs/CI_REQUIRED_CHECK_TOPOLOGY.md @@ -1041,7 +1041,7 @@ Required` requires them to have run remotely and passed. frozen 20-shard block was the retired `test-embedded-cmd` jobs' split, F1), `//internal/storage/embeddeddolt:embeddeddolt_embedded_test` (20; the frozen 5-shard block was `test-embedded-storage`'s, F1), - `//cmd/bd:bd_proxied_test` (44; the frozen 15-shard block was + `//cmd/bd:bd_proxied_test` (34; the frozen 15-shard block was `test-proxied-cmd`'s, F2) and `//internal/storage/dolt:dolt_server_full_test` (16) to have run exactly the tests its shard script lists (list-only mode, minus diff --git a/engdocs/TESTING.md b/engdocs/TESTING.md index 2f293a23b..65f838f42 100644 --- a/engdocs/TESTING.md +++ b/engdocs/TESTING.md @@ -42,7 +42,7 @@ Each lane, as bazel.yml runs it (add your `--config=fork-cache` or | Dolt server (`bazel-doltserver`) | `bazel test //... --config=doltserver` | Starts its own `dolt sql-server` from the pinned binary; no docker. | | cmd/bd Dolt server (`bazel-cmd-dolt`) | `bazel test //cmd/bd:bd_dolt_server_test --config=doltserver-cmd` | 32 shards of the integration-tagged cmd/bd suite (the slowest tests pinned to 16 of them). | | Embedded Dolt (`bazel-embedded`) | `bazel test //... --config=embedded` | Remote execution only in CI; locally it is slow. | -| Proxied server (`bazel-proxied`) | `bazel test //... --config=doltserver-proxied` | Remote execution only: 44 shards, each with a Dolt server. | +| Proxied server (`bazel-proxied`) | `bazel test //... --config=doltserver-proxied` | Remote execution only: 34 shards, each with a Dolt server. | | Server-Dolt storage (`bazel-server-storage`) | `bazel test //... --config=doltserver-integration` | Remote execution only. | | Docs | `make check-docs` | `//test/docsync:docsync_test` and `//scripts/repochecks:doc_freshness_test` in the test lane's configuration, then `scripts/check-doc-flags.sh` against the pinned release. | @@ -184,7 +184,7 @@ builds with the integration tag like `--config=integration`. Each shard runs its CI job's shard script, so for `--config=doltserver-integration` Bazel shard k runs the tests of job k+1 (both split the manifest's 16-shard block the same way). `--config=doltserver-proxied`'s `bd_proxied_test` instead -runs the manifest's own 44-shard block — bin-packed by measured duration, +runs the manifest's own 34-shard block — bin-packed by measured duration, not the legacy jobs' 15-shard, bd-init-cost-proxy block — so shard k there is not job k+1's tests; it is a different split of the same tests. diff --git a/scripts/ci/gen_proxied_shard_manifest.py b/scripts/ci/gen_proxied_shard_manifest.py index 0a099e0f9..ecac80c89 100644 --- a/scripts/ci/gen_proxied_shard_manifest.py +++ b/scripts/ci/gen_proxied_shard_manifest.py @@ -56,7 +56,7 @@ name coverage. The manifest file holds more than one block (one per total_shards value in use): the legacy, frozen 15-shard block pr-risk.yml/main.yml's jobs read, and -the Bazel-only lane's own block (44 shards since 2026-10-09). By default this prints +the Bazel-only lane's own block (34 shards since 2026-10-09). By default this prints only the requested total's block to stdout, which is NOT safe to redirect straight into the manifest file (`gen... 30 > file` deletes every other block). Use --write to update the file in place instead: it replaces only @@ -81,6 +81,9 @@ import sys default_manifest_path = '.github/scripts/proxied-cmd-test-shards.txt' func_re = re.compile(r'^func (Test(?:ProxiedServer|ServerMode)[A-Za-z0-9_]+)\(') +# A shared-server bd init: newSharedProxiedProject(WithHooks) or the root +# variant, newSharedProxiedRootProject. +shared_init_re = re.compile(r'newSharedProxied(?:Root)?Project') def discover_inits_cost(): @@ -98,7 +101,7 @@ def discover_inits_cost(): elif ln.startswith('func '): cur = None if cur: - costs[cur] += ln.count('newSharedProxiedProject') + costs[cur] += len(shared_init_re.findall(ln)) for k in costs: costs[k] = max(costs[k], 1) return costs diff --git a/scripts/ci/proxied_test_durations.json b/scripts/ci/proxied_test_durations.json index 27297aae8..fa22729c8 100644 --- a/scripts/ci/proxied_test_durations.json +++ b/scripts/ci/proxied_test_durations.json @@ -3,35 +3,34 @@ "Measured on rbe-west, the lane's own remote executors (instance oss), on", "2026-10-09: two `bazel test //cmd/bd:bd_proxied_test", "--config=doltserver-proxied --nocache_test_results` runs, one against the", - "then-committed 30-shard block and one against a 40-shard repack, so every", - "discovered test ran exactly once per run, with the lane's -test.parallel=4", - "and GOMAXPROCS=4. Both passed.", + "then-committed 44-shard block and one against a 20-shard repack, both", + "with the shared harness's database-scoped users", + "(cmd/bd/proxied_shared_harness_test.go), so every discovered test ran", + "exactly once per run, with the lane's -test.parallel=4 and GOMAXPROCS=4.", + "Both passed.", "", "Each value is a top-level test's serial-equivalent cost: the sum of the", " of every leaf test under it (a subtest with no subtests of", "its own; the test itself when it has none), each leaf averaged over the", - "two runs. It is NOT , which the previous (local) capture", - "used: for a t.Parallel test that attribute runs from the test's first RUN", - "line to its last PASS line, so it also counts the time the test sat paused", - "behind its shard's other tests. That made a cheap test that happened to", - "wait look as heavy as the shard, which is why the previous 30-shard block,", - "packed to ~360s per shard on paper, ran 38-286s per shard in CI. Leaves,", - "not direct subtests, because a parallel group's own is 0.", + "two runs. It is NOT : for a t.Parallel test that", + "attribute runs from the test's first RUN line to its last PASS line, so it", + "also counts the time the test sat paused behind its shard's other tests.", + "Leaves, not direct subtests, because a parallel group's own is 0.", "", - "A shard's remote wall time came out at about 0.3x its packed cost (four", - "subtests run at once): correlation 0.90 over the 30-shard run (19,224", - "cost-seconds, 5,671 shard-seconds of wall time); the 40-shard run's", - "shards ran 71-162s, apart from one that held two then-unsplit tests whose", - "cost the first capture had missed.", + "Nearly all of a test's cost is `bd init --proxied-server` against the", + "shard's dolt sql-server, ~one per subtest. Before the scoped users each", + "init also paid for every database already on the server (Dolt walks every", + "database the session can see for each of the ~220 INFORMATION_SCHEMA", + "queries in the migration chain), so a test's cost depended on how many", + "projects its shard had created before it; the previous capture totalled", + "19,618 cost-seconds over the same tests, this one 6,345.", "", - "The cost is almost all `bd init --proxied-server` against the shared dolt", - "sql-server: each init issues ~2,000 statements (81 DOLT_COMMITs) and costs", - "the server ~6-12 CPU-seconds, and most subtests run one init. A top-level", - "test with ~20 single-init subtests therefore cost 600-920 and ran for up", - "to ~350s alone, which no shard count can pack under that. The fifteen", - "heaviest were split into two or three top-level functions", - "(TestProxiedServerUpdate, -UpdateB, -UpdateC, ...); a split function's", - "entry is the sum of the leaves it now holds.", + "A shard's remote wall time came out at about 0.33x its packed cost (four", + "subtests run at once), with a wide spread between equally packed shards:", + "a 20-shard repack (~335 per shard) ran median 113s, max 136s; a 28-shard", + "repack (~227) ran median 78s, max 113s in PR CI. Size the shard count for", + "the slowest shard, not the median.", "", "`seconds_per_init_fallback` is the sum of all costs over the sum of all", "inits (discover_inits_cost()), used only for a test with no entry yet.", @@ -40,215 +39,215 @@ "top-level test's leaf s from every shard's", "bazel-testlogs/cmd/bd/bd_proxied_test/shard_*/test.xml." ], - "seconds_per_init_fallback": 29.5374, + "seconds_per_init_fallback": 9.9294, "tests": { - "TestProxiedServerAssign": 55.49, - "TestProxiedServerAutoPrune": 6.71, - "TestProxiedServerBackupRefusedOnExternalTopology": 0.45, - "TestProxiedServerBatchDefersThenDoltCommitAdvancesHeadOnce": 10.13, - "TestProxiedServerBatchParity": 64.1, - "TestProxiedServerBlocked": 49.25, - "TestProxiedServerCascadeParity": 167.07, - "TestProxiedServerChildren": 12.43, - "TestProxiedServerCleanDatabases": 1.02, - "TestProxiedServerCleanDatabasesPurgeDropped": 2.23, - "TestProxiedServerClose": 223.82, - "TestProxiedServerClose2": 379.25, - "TestProxiedServerClose2B": 372.47, - "TestProxiedServerClose3": 253.62, - "TestProxiedServerClose4": 236.01, - "TestProxiedServerCloseB": 199.51, - "TestProxiedServerCloseBeadGate": 85.6, - "TestProxiedServerCloseConcurrent": 39.05, - "TestProxiedServerCloseSiblingBlockersFanIn": 45.72, - "TestProxiedServerComment": 101.7, - "TestProxiedServerCompactDolt": 0.15, - "TestProxiedServerCompactHistory": 2.27, - "TestProxiedServerConfig": 281.3, - "TestProxiedServerConfigB": 221.92, - "TestProxiedServerConfigConcurrent": 21.07, - "TestProxiedServerConfigSetMany": 56.32, - "TestProxiedServerContext": 30.68, - "TestProxiedServerCount": 29.54, - "TestProxiedServerCountIncludeInfra": 7.0, - "TestProxiedServerCreate": 35.39, - "TestProxiedServerCreate2": 313.1, - "TestProxiedServerCreate2B": 266.11, - "TestProxiedServerCreate2C": 115.17, - "TestProxiedServerCreateInfraTypeRoutesToWisps": 54.19, - "TestProxiedServerDeferAutoWake": 10.55, - "TestProxiedServerDeferUndefer": 23.62, - "TestProxiedServerDelete": 30.3, - "TestProxiedServerDeleteBlockedJSONSingleDoc": 16.89, - "TestProxiedServerDeleteConcurrent": 19.41, - "TestProxiedServerDeleteForceOrphans": 34.51, - "TestProxiedServerDeleteWisp": 4.98, - "TestProxiedServerDep": 265.67, - "TestProxiedServerDep2": 421.17, - "TestProxiedServerDep2B": 245.92, - "TestProxiedServerDep2C": 287.95, - "TestProxiedServerDepB": 252.49, - "TestProxiedServerDepConcurrent": 29.34, - "TestProxiedServerDepListSingleIDWarnsOnDroppedExternalEdge": 23.65, - "TestProxiedServerDoltLifecycle": 0.19, - "TestProxiedServerDoltRemoteRemove": 79.1, - "TestProxiedServerDuplicates": 76.36, - "TestProxiedServerEdit": 19.49, - "TestProxiedServerEpic": 47.73, - "TestProxiedServerEventsJournal": 6.01, - "TestProxiedServerEventsJournalOffByDefault": 5.45, - "TestProxiedServerExport": 18.56, - "TestProxiedServerExternalCreate": 5.6, - "TestProxiedServerExternalMutationPolicy": 15.57, - "TestProxiedServerExternalPolicyDirectParity": 8.37, - "TestProxiedServerFindDuplicates": 51.33, - "TestProxiedServerGC": 5.82, - "TestProxiedServerGateCheck": 171.29, - "TestProxiedServerGateCheckB": 205.0, - "TestProxiedServerGateCreateInheritsRepoMetadata": 4.94, - "TestProxiedServerGateFrontDoorDirectServerProxyParity": 22.23, - "TestProxiedServerGateLifecycle": 124.1, - "TestProxiedServerGateList": 48.97, - "TestProxiedServerGatedRendering": 9.09, - "TestProxiedServerGraph": 8.3, - "TestProxiedServerHeartbeat": 11.7, - "TestProxiedServerHistory": 7.88, - "TestProxiedServerHistoryRemoteRefusalFrontDoorMatrix": 26.2, - "TestProxiedServerHistoryRemoteSupportedFrontDoorParity": 5.58, - "TestProxiedServerHuman": 358.37, - "TestProxiedServerIfRevisionGuardAssign": 0.66, - "TestProxiedServerIfRevisionGuardClose": 0.82, - "TestProxiedServerIfRevisionGuardDelete": 0.81, - "TestProxiedServerIfRevisionGuardReopen": 1.48, - "TestProxiedServerIfRevisionGuardUpdate": 0.65, - "TestProxiedServerImport": 288.64, - "TestProxiedServerInfo": 6.0, - "TestProxiedServerInitExplicitBeadsDirIsAuthoritative": 12.59, - "TestProxiedServerInitIfMissing": 0.45, - "TestProxiedServerKV": 340.45, - "TestProxiedServerLabel": 298.09, - "TestProxiedServerLabelB": 234.22, - "TestProxiedServerLabelC": 271.95, - "TestProxiedServerLink": 62.35, - "TestProxiedServerLint": 6.67, - "TestProxiedServerList": 131.93, - "TestProxiedServerListComments": 1.97, - "TestProxiedServerListSortRetiresTheWalk": 0.23, - "TestProxiedServerListWatchCountsTheOffsetIntoMaxRows": 0.83, - "TestProxiedServerMemory": 90.84, - "TestProxiedServerMolBond": 267.25, - "TestProxiedServerMolBurn": 135.47, - "TestProxiedServerMolCurrent": 177.89, - "TestProxiedServerMolDistill": 55.5, - "TestProxiedServerMolLastActivity": 52.81, - "TestProxiedServerMolProgress": 41.09, - "TestProxiedServerMolReadyGated": 202.08, - "TestProxiedServerMolShow": 83.77, - "TestProxiedServerMolSquash": 73.31, - "TestProxiedServerMolStale": 52.8, - "TestProxiedServerMoleculeFrontDoorDirectServerProxyParity": 2.14, - "TestProxiedServerMoleculeFrontDoorWriteParity": 21.32, - "TestProxiedServerMultiStatementSQL": 7.5, - "TestProxiedServerNote": 21.92, - "TestProxiedServerOrphans": 4.25, - "TestProxiedServerOutageReconnectAcceptanceMatrix": 36.22, + "TestProxiedServerAssign": 16.45, + "TestProxiedServerAutoPrune": 8.6, + "TestProxiedServerBackupRefusedOnExternalTopology": 0.38, + "TestProxiedServerBatchDefersThenDoltCommitAdvancesHeadOnce": 8.01, + "TestProxiedServerBatchParity": 30.55, + "TestProxiedServerBlocked": 29.31, + "TestProxiedServerCascadeParity": 48.81, + "TestProxiedServerChildren": 9.53, + "TestProxiedServerCleanDatabases": 0.81, + "TestProxiedServerCleanDatabasesPurgeDropped": 2.22, + "TestProxiedServerClose": 68.94, + "TestProxiedServerClose2": 104.58, + "TestProxiedServerClose2B": 113.92, + "TestProxiedServerClose3": 50.47, + "TestProxiedServerClose4": 69.47, + "TestProxiedServerCloseB": 48.63, + "TestProxiedServerCloseBeadGate": 16.14, + "TestProxiedServerCloseConcurrent": 36.83, + "TestProxiedServerCloseSiblingBlockersFanIn": 25.27, + "TestProxiedServerComment": 24.83, + "TestProxiedServerCompactDolt": 0.2, + "TestProxiedServerCompactHistory": 1.86, + "TestProxiedServerConfig": 85.93, + "TestProxiedServerConfigB": 67.56, + "TestProxiedServerConfigConcurrent": 14.05, + "TestProxiedServerConfigSetMany": 12.34, + "TestProxiedServerContext": 9.81, + "TestProxiedServerCount": 8.05, + "TestProxiedServerCountIncludeInfra": 3.19, + "TestProxiedServerCreate": 22.17, + "TestProxiedServerCreate2": 94.47, + "TestProxiedServerCreate2B": 98.11, + "TestProxiedServerCreate2C": 70.34, + "TestProxiedServerCreateInfraTypeRoutesToWisps": 22.11, + "TestProxiedServerDeferAutoWake": 3.47, + "TestProxiedServerDeferUndefer": 9.21, + "TestProxiedServerDelete": 10.21, + "TestProxiedServerDeleteBlockedJSONSingleDoc": 9.34, + "TestProxiedServerDeleteConcurrent": 11.56, + "TestProxiedServerDeleteForceOrphans": 6.2, + "TestProxiedServerDeleteWisp": 4.71, + "TestProxiedServerDep": 91.86, + "TestProxiedServerDep2": 131.93, + "TestProxiedServerDep2B": 57.41, + "TestProxiedServerDep2C": 75.41, + "TestProxiedServerDepB": 67.92, + "TestProxiedServerDepConcurrent": 19.74, + "TestProxiedServerDepListSingleIDWarnsOnDroppedExternalEdge": 8.32, + "TestProxiedServerDoltLifecycle": 0.13, + "TestProxiedServerDoltRemoteRemove": 90.8, + "TestProxiedServerDuplicates": 22.36, + "TestProxiedServerEdit": 9.97, + "TestProxiedServerEpic": 8.17, + "TestProxiedServerEventsJournal": 4.62, + "TestProxiedServerEventsJournalOffByDefault": 5.95, + "TestProxiedServerExport": 14.47, + "TestProxiedServerExternalCreate": 4.62, + "TestProxiedServerExternalMutationPolicy": 8.86, + "TestProxiedServerExternalPolicyDirectParity": 6.31, + "TestProxiedServerFindDuplicates": 22.0, + "TestProxiedServerGC": 2.77, + "TestProxiedServerGateCheck": 38.27, + "TestProxiedServerGateCheckB": 41.55, + "TestProxiedServerGateCreateInheritsRepoMetadata": 2.72, + "TestProxiedServerGateFrontDoorDirectServerProxyParity": 17.87, + "TestProxiedServerGateLifecycle": 40.73, + "TestProxiedServerGateList": 20.14, + "TestProxiedServerGatedRendering": 4.95, + "TestProxiedServerGraph": 4.6, + "TestProxiedServerHeartbeat": 4.61, + "TestProxiedServerHistory": 3.5, + "TestProxiedServerHistoryRemoteRefusalFrontDoorMatrix": 21.43, + "TestProxiedServerHistoryRemoteSupportedFrontDoorParity": 6.74, + "TestProxiedServerHuman": 79.25, + "TestProxiedServerIfRevisionGuardAssign": 0.47, + "TestProxiedServerIfRevisionGuardClose": 0.67, + "TestProxiedServerIfRevisionGuardDelete": 0.59, + "TestProxiedServerIfRevisionGuardReopen": 1.39, + "TestProxiedServerIfRevisionGuardUpdate": 0.79, + "TestProxiedServerImport": 92.69, + "TestProxiedServerInfo": 2.71, + "TestProxiedServerInitExplicitBeadsDirIsAuthoritative": 9.07, + "TestProxiedServerInitIfMissing": 0.39, + "TestProxiedServerKV": 91.89, + "TestProxiedServerLabel": 75.59, + "TestProxiedServerLabelB": 60.23, + "TestProxiedServerLabelC": 105.9, + "TestProxiedServerLink": 26.12, + "TestProxiedServerLint": 2.66, + "TestProxiedServerList": 35.23, + "TestProxiedServerListComments": 0.81, + "TestProxiedServerListSortRetiresTheWalk": 0.08, + "TestProxiedServerListWatchCountsTheOffsetIntoMaxRows": 0.44, + "TestProxiedServerMemory": 26.25, + "TestProxiedServerMolBond": 72.46, + "TestProxiedServerMolBurn": 29.07, + "TestProxiedServerMolCurrent": 89.43, + "TestProxiedServerMolDistill": 23.19, + "TestProxiedServerMolLastActivity": 35.41, + "TestProxiedServerMolProgress": 34.63, + "TestProxiedServerMolReadyGated": 93.82, + "TestProxiedServerMolShow": 24.26, + "TestProxiedServerMolSquash": 45.59, + "TestProxiedServerMolStale": 36.09, + "TestProxiedServerMoleculeFrontDoorDirectServerProxyParity": 1.62, + "TestProxiedServerMoleculeFrontDoorWriteParity": 23.11, + "TestProxiedServerMultiStatementSQL": 5.6, + "TestProxiedServerNote": 9.88, + "TestProxiedServerOrphans": 1.81, + "TestProxiedServerOutageReconnectAcceptanceMatrix": 36.12, "TestProxiedServerPathHelpers": 0.0, - "TestProxiedServerPing": 0.76, - "TestProxiedServerPour": 90.63, - "TestProxiedServerPourRejectsEnumViolatingVar": 16.32, - "TestProxiedServerPrime": 120.62, - "TestProxiedServerPriority": 29.69, - "TestProxiedServerPromote": 137.81, - "TestProxiedServerPrune": 229.41, - "TestProxiedServerPurgeWispsPlaneRetention": 27.89, - "TestProxiedServerQuery": 32.83, - "TestProxiedServerQuick": 32.66, - "TestProxiedServerReady": 237.31, - "TestProxiedServerReady2": 159.52, - "TestProxiedServerReadyB": 279.25, - "TestProxiedServerReadyC": 232.74, - "TestProxiedServerReadyClaimConcurrent": 21.86, - "TestProxiedServerReadyConcurrent": 14.36, - "TestProxiedServerReadyWisp": 315.55, - "TestProxiedServerReassignFence": 92.12, - "TestProxiedServerReclaim": 1.41, - "TestProxiedServerRecomputeBlocked": 69.58, - "TestProxiedServerRelate": 174.16, - "TestProxiedServerReopen": 317.88, - "TestProxiedServerReopenB": 283.24, - "TestProxiedServerReopenConcurrent": 100.49, - "TestProxiedServerSQL": 4.56, - "TestProxiedServerSQLDatabaseFlag": 14.98, - "TestProxiedServerSQLStatementRouting": 2.61, - "TestProxiedServerSearch": 79.86, - "TestProxiedServerServeActivatesTheEventsJournal": 10.7, - "TestProxiedServerServeAddComment": 3.85, - "TestProxiedServerServeAddDependencies": 7.7, - "TestProxiedServerServeBatchClose": 14.42, - "TestProxiedServerServeClaim": 13.9, - "TestProxiedServerServeClaimNext": 12.27, - "TestProxiedServerServeClose": 21.8, - "TestProxiedServerServeCount": 15.2, - "TestProxiedServerServeCreate": 2.62, - "TestProxiedServerServeDelete": 5.64, - "TestProxiedServerServeEdgeCounts": 15.27, - "TestProxiedServerServeLifecycle": 0.03, - "TestProxiedServerServeModeGate": 23.75, - "TestProxiedServerServeReadParity": 6.26, - "TestProxiedServerServeReadRevision": 3.59, - "TestProxiedServerServeReadsTheJournalItJustWrote": 14.23, - "TestProxiedServerServeRefusesAStaleCheckpointWithGone": 14.62, - "TestProxiedServerServeRefusesAStreamOnADisabledJournal": 14.96, - "TestProxiedServerServeRefusesTheJournalWhenItIsDisabled": 13.62, - "TestProxiedServerServeRelatedIssues": 14.9, - "TestProxiedServerServeRelease": 4.5, - "TestProxiedServerServeRemoveDependency": 5.12, - "TestProxiedServerServeSettingsWrites": 5.08, - "TestProxiedServerServeStreamsTheJournalItIsWriting": 21.99, - "TestProxiedServerServeUpdate": 14.38, - "TestProxiedServerServeUpdateClaim": 4.97, - "TestProxiedServerSetState": 14.99, - "TestProxiedServerShow": 246.84, - "TestProxiedServerShow2": 304.16, - "TestProxiedServerShow2B": 302.98, - "TestProxiedServerShow3": 276.05, - "TestProxiedServerShow3B": 261.07, - "TestProxiedServerShowB": 297.04, - "TestProxiedServerShowWatch": 164.7, - "TestProxiedServerStale": 6.27, - "TestProxiedServerState": 189.5, - "TestProxiedServerStatus": 40.45, - "TestProxiedServerStatuses": 2.26, - "TestProxiedServerStorageClass": 337.81, - "TestProxiedServerSwarm": 8.38, - "TestProxiedServerTag": 55.84, - "TestProxiedServerTodo": 96.61, - "TestProxiedServerTypes": 4.25, - "TestProxiedServerTypesAgreeWithCreate": 37.25, - "TestProxiedServerUnclaim": 16.93, - "TestProxiedServerUnclaimIfAssigneeParity": 35.25, - "TestProxiedServerUpdate": 306.84, - "TestProxiedServerUpdate2": 285.3, - "TestProxiedServerUpdate2B": 321.6, - "TestProxiedServerUpdate2C": 247.7, - "TestProxiedServerUpdate3": 375.23, - "TestProxiedServerUpdateB": 265.81, - "TestProxiedServerUpdateC": 265.62, - "TestProxiedServerUpdateClosePolicy": 82.95, - "TestProxiedServerUpdateConcurrentAppendNotes": 7.13, - "TestProxiedServerUpdateConcurrentClaim": 12.38, - "TestProxiedServerUpdateConcurrentMetadata": 11.36, - "TestProxiedServerUpdateHooks": 52.36, - "TestProxiedServerUpdateIfGuards": 83.41, - "TestProxiedServerUpdateWisp": 268.08, - "TestProxiedServerWispCreate": 78.86, - "TestProxiedServerWispCreateRejectsEnumViolatingVar": 13.68, - "TestProxiedServerWispGC": 164.43, - "TestProxiedServerWispList": 65.42, - "TestServerModeDeferAutoWake": 11.69, - "TestServerModeServe": 0.04, - "TestServerModeServeSkipsPostRunMaintenance": 13.74, - "TestServerModeSharedServeGlobalReportsTheServedDatabase": 34.13, - "TestServerModeTypesAgreeWithCreate": 36.55 + "TestProxiedServerPing": 0.27, + "TestProxiedServerPour": 42.98, + "TestProxiedServerPourRejectsEnumViolatingVar": 10.18, + "TestProxiedServerPrime": 49.46, + "TestProxiedServerPriority": 8.17, + "TestProxiedServerPromote": 24.66, + "TestProxiedServerPrune": 56.2, + "TestProxiedServerPurgeWispsPlaneRetention": 20.91, + "TestProxiedServerQuery": 9.29, + "TestProxiedServerQuick": 21.8, + "TestProxiedServerReady": 96.02, + "TestProxiedServerReady2": 61.85, + "TestProxiedServerReadyB": 43.87, + "TestProxiedServerReadyC": 74.0, + "TestProxiedServerReadyClaimConcurrent": 7.96, + "TestProxiedServerReadyConcurrent": 9.66, + "TestProxiedServerReadyWisp": 95.28, + "TestProxiedServerReassignFence": 31.82, + "TestProxiedServerReclaim": 0.52, + "TestProxiedServerRecomputeBlocked": 56.46, + "TestProxiedServerRelate": 70.72, + "TestProxiedServerReopen": 66.48, + "TestProxiedServerReopenB": 59.36, + "TestProxiedServerReopenConcurrent": 48.76, + "TestProxiedServerSQL": 2.47, + "TestProxiedServerSQLDatabaseFlag": 13.98, + "TestProxiedServerSQLStatementRouting": 1.43, + "TestProxiedServerSearch": 33.73, + "TestProxiedServerServeActivatesTheEventsJournal": 9.88, + "TestProxiedServerServeAddComment": 1.6, + "TestProxiedServerServeAddDependencies": 5.68, + "TestProxiedServerServeBatchClose": 4.48, + "TestProxiedServerServeClaim": 5.07, + "TestProxiedServerServeClaimNext": 9.38, + "TestProxiedServerServeClose": 13.13, + "TestProxiedServerServeCount": 7.19, + "TestProxiedServerServeCreate": 1.13, + "TestProxiedServerServeDelete": 3.95, + "TestProxiedServerServeEdgeCounts": 10.32, + "TestProxiedServerServeLifecycle": 0.05, + "TestProxiedServerServeModeGate": 23.65, + "TestProxiedServerServeReadParity": 3.51, + "TestProxiedServerServeReadRevision": 3.24, + "TestProxiedServerServeReadsTheJournalItJustWrote": 16.7, + "TestProxiedServerServeRefusesAStaleCheckpointWithGone": 16.72, + "TestProxiedServerServeRefusesAStreamOnADisabledJournal": 7.45, + "TestProxiedServerServeRefusesTheJournalWhenItIsDisabled": 12.84, + "TestProxiedServerServeRelatedIssues": 7.45, + "TestProxiedServerServeRelease": 1.96, + "TestProxiedServerServeRemoveDependency": 3.87, + "TestProxiedServerServeSettingsWrites": 1.94, + "TestProxiedServerServeStreamsTheJournalItIsWriting": 24.92, + "TestProxiedServerServeUpdate": 7.19, + "TestProxiedServerServeUpdateClaim": 5.33, + "TestProxiedServerSetState": 4.87, + "TestProxiedServerShow": 77.15, + "TestProxiedServerShow2": 110.3, + "TestProxiedServerShow2B": 88.13, + "TestProxiedServerShow3": 53.11, + "TestProxiedServerShow3B": 77.05, + "TestProxiedServerShowB": 59.27, + "TestProxiedServerShowWatch": 58.3, + "TestProxiedServerStale": 3.77, + "TestProxiedServerState": 74.91, + "TestProxiedServerStatus": 7.78, + "TestProxiedServerStatuses": 1.42, + "TestProxiedServerStorageClass": 72.09, + "TestProxiedServerSwarm": 4.54, + "TestProxiedServerTag": 24.55, + "TestProxiedServerTodo": 24.62, + "TestProxiedServerTypes": 2.06, + "TestProxiedServerTypesAgreeWithCreate": 16.18, + "TestProxiedServerUnclaim": 6.9, + "TestProxiedServerUnclaimIfAssigneeParity": 23.02, + "TestProxiedServerUpdate": 99.24, + "TestProxiedServerUpdate2": 66.73, + "TestProxiedServerUpdate2B": 106.27, + "TestProxiedServerUpdate2C": 27.48, + "TestProxiedServerUpdate3": 108.59, + "TestProxiedServerUpdateB": 84.72, + "TestProxiedServerUpdateC": 118.83, + "TestProxiedServerUpdateClosePolicy": 34.08, + "TestProxiedServerUpdateConcurrentAppendNotes": 6.24, + "TestProxiedServerUpdateConcurrentClaim": 9.59, + "TestProxiedServerUpdateConcurrentMetadata": 8.05, + "TestProxiedServerUpdateHooks": 24.63, + "TestProxiedServerUpdateIfGuards": 31.82, + "TestProxiedServerUpdateWisp": 81.79, + "TestProxiedServerWispCreate": 33.64, + "TestProxiedServerWispCreateRejectsEnumViolatingVar": 10.52, + "TestProxiedServerWispGC": 56.11, + "TestProxiedServerWispList": 36.71, + "TestServerModeDeferAutoWake": 8.1, + "TestServerModeServe": 0.03, + "TestServerModeServeSkipsPostRunMaintenance": 20.92, + "TestServerModeSharedServeGlobalReportsTheServedDatabase": 21.54, + "TestServerModeTypesAgreeWithCreate": 17.63 } } diff --git a/scripts/shard_manifest_test.go b/scripts/shard_manifest_test.go index 9d1867f6b..c0c61c9aa 100644 --- a/scripts/shard_manifest_test.go +++ b/scripts/shard_manifest_test.go @@ -220,7 +220,7 @@ func TestShardScriptsListOnlyRealTests(t *testing.T) { } } -// S3: the Bazel-only 44-shard block is not frozen like the legacy 15-shard +// S3: the Bazel-only 34-shard block is not frozen like the legacy 15-shard // block (TestShardScriptsListOnlyRealTests's B1 fix catches outright // corruption, but not a committed block that has drifted from the currently // discovered TestProxiedServer*/TestServerMode* test set, e.g. a test added,