Harden bootstrap pack close ownership · Entire
Harden bootstrap pack close ownership
a05bee4→main·
Soph·3mo ago·2 files·+119 added/-0 removed
Sessions
1b15c3c23d6cView transcript
[?
Can you take a look at the go code (wasm) in /Users/soph/Work/entire/devenv/entire-io-worktree1 based a bit on that I wonder if something like this can be build:Codex·GPT-5.4·1 step](/content/gh/entireio/git-sync/session/019d6d29-8cf7-7fe3-adc9-8c3e4d9d5603#timeline-1b15c3c23d6c/index.html)
Changes
2
internal/strategy/bootstrap
Mbootstrap.go+32
Mbootstrap_test.go+87
13 unmodified lines
14
15
16
17
18
19
20
95 unmodified lines
116
117
118
119
120
121
122
123
124
125
126
127
120 unmodified lines
248
249
250
251
252
253
254
255
256
257
258
259
260
38 unmodified lines
299
300
301
302
303
304
305
306
307
308
309
310
311
348 unmodified lines
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
13 unmodified lines
"regexp"
"strconv"
"strings"
"sync"
git "github.com/go-git/go-git/v6"
"github.com/go-git/go-git/v6/plumbing"
95 unmodified lines
return result, fmt.Errorf("fetch source pack: %w", err)
}
packReader = gitproto.LimitPackReader(packReader, p.MaxPackBytes)
packReader = closeOnce(packReader)
p.log("bootstrap pushing refs to target", "ref_count", len(plans))
cmds := gitproto.ToPushCommands(convert.PlansToPushPlans(plans))
pushErr := p.TargetPusher.PushPack(ctx, cmds, packReader)
_ = packReader.Close()
if pushErr != nil {
autoBatch, ok := autoBatchMaxPackBytes(p, pushErr)
if !ok {
120 unmodified lines
if err != nil {
return result, fmt.Errorf("fetch source batch pack for %s: %w", batch.Plan.TargetRef, err)
}
packReader = closeOnce(packReader)
cmds := gitproto.ToPushCommands(convert.PlansToPushPlans(stagePlans))
if err := p.TargetPusher.PushPack(ctx, cmds, packReader); err != nil {
_ = packReader.Close()
return result, fmt.Errorf("push bootstrap batch for %s: %w", batch.Plan.TargetRef, err)
}
_ = packReader.Close()
p.log("bootstrap batch checkpoint complete",
"branch", batch.Plan.TargetRef.String(),
"batch", idx+1,
38 unmodified lines
}
} else {
packReader = gitproto.LimitPackReader(packReader, p.MaxPackBytes)
packReader = closeOnce(packReader)
cmds := gitproto.ToPushCommands(convert.PlansToPushPlans(tagPlans))
if err := p.TargetPusher.PushPack(ctx, cmds, packReader); err != nil {
_ = packReader.Close()
return result, fmt.Errorf("push bootstrap tags: %w", err)
}
_ = packReader.Close()
}
}
348 unmodified lines
}
type closeOnceReadCloser struct {
io.ReadCloser
once sync.Once
}
func (c *closeOnceReadCloser) Close() error {
var err error
c.once.Do(func() {
err = c.ReadCloser.Close()
})
return err
}
func closeOnce(rc io.ReadCloser) io.ReadCloser {
if rc == nil {
return nil
}
if _, ok := rc.(*closeOnceReadCloser); ok {
return rc
}
return &closeOnceReadCloser{ReadCloser: rc}
}
Minternal/strategy/bootstrap/bootstrap.go+32
7 unmodified lines
8
9
10
11
12
13
14
448 unmodified lines
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
7 unmodified lines
"io"
"net/http"
"net/http/httptest"
"strings"
"testing"
"time"
448 unmodified lines
}
}
func TestExecuteOneShotClosesPackWhenPusherDoesNot(t *testing.T) {
mainRef := plumbing.NewBranchReferenceName("main")
mainHash := plumbing.NewHash("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
pack := &trackingReadCloser{Reader: bytes.NewReader([]byte("PACK"))}
_, err := Execute(context.Background(), Params{
SourceService: fakeBootstrapSource{
fetchPack: func(_ context.Context, _ *gitproto.Conn, _ map[plumbing.ReferenceName]gitproto.DesiredRef, _ map[plumbing.ReferenceName]plumbing.Hash) (io.ReadCloser, error) {
return pack, nil
},
},
TargetPusher: fakeBootstrapPusher{
pushPack: func(_ context.Context, _ []gitproto.PushCommand, _ io.ReadCloser) error {
return nil
},
},
DesiredRefs: map[plumbing.ReferenceName]planner.DesiredRef{
mainRef: {
SourceRef: mainRef,
TargetRef: mainRef,
SourceHash: mainHash,
Kind: planner.RefKindBranch,
},
},
}, "empty target")
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if !pack.closed {
t.Fatal("expected strategy to close pack after successful push")
}
}
func TestExecuteBatchedClosesCheckpointPackOnPushError(t *testing.T) {
mainRef := plumbing.NewBranchReferenceName("main")
hashes := makeLinearCommitChain(t, 1)
pack := &trackingReadCloser{Reader: bytes.NewReader([]byte("PACK"))}
packFetches := 0
_, err := Execute(context.Background(), Params{
SourceService: fakeBootstrapSource{
fetchCommitGraph: func(_ context.Context, store storer.Storer, _ *gitproto.Conn, _ gitproto.DesiredRef) error {
writeLinearCommitChain(t, store, 1)
return nil
},
fetchPack: func(_ context.Context, _ *gitproto.Conn, desired map[plumbing.ReferenceName]gitproto.DesiredRef, _ map[plumbing.ReferenceName]plumbing.Hash) (io.ReadCloser, error) {
packFetches++
for _, ref := range desired {
if ref.SourceHash == hashes[len(hashes)-1] {
if packFetches == 1 {
return io.NopCloser(bytes.NewReader(nil)), nil
}
return pack, nil
}
}
return io.NopCloser(bytes.NewReader(nil)), nil
},
},
TargetPusher: fakeBootstrapPusher{
pushPack: func(_ context.Context, _ []gitproto.PushCommand, _ io.ReadCloser) error {
return errors.New("boom")
},
},
DesiredRefs: map[plumbing.ReferenceName]planner.DesiredRef{
mainRef: {
SourceRef: mainRef,
TargetRef: mainRef,
SourceHash: hashes[len(hashes)-1],
Kind: planner.RefKindBranch,
Label: "main",
},
},
TargetRefs: map[plumbing.ReferenceName]plumbing.Hash{},
BatchMaxPack: 1,
}, "empty target")
if err == nil || !strings.Contains(err.Error(), "push bootstrap batch") {
t.Fatalf("unexpected error: %v", err)
}
if packFetches < 2 {
t.Fatalf("expected separate probe and execution fetches, got %d", packFetches)
}
if !pack.closed {
t.Fatal("expected strategy to close checkpoint pack on push error")
}
}
func TestExecuteRequiresTargetPusherBeforeFetch(t *testing.T) {
mainRef := plumbing.NewBranchReferenceName("main")
mainHash := plumbing.NewHash("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb")