commit federation peer metadata before sync (#4190)

Commit federation_peers writes from add-peer and auto-commit pending non-config changes before sync fetch/merge, matching PullFrom behavior.

Refs gastownhall/beads #3852

_codex-gpt-5.5-medium on behalf of matt wilkie_
This commit is contained in:
matt wilkie 2026-06-19 14:53:15 -07:00 • committed by GitHub
commit 352bdb3c25
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 69 additions and 1 deletions

View file

@ -297,7 +297,7 @@ func (s *DoltStore) AddFederationPeer(ctx context.Context, peer *storage.Federat
return fmt.Errorf("failed to add federation peer: %w", err)
}
// Also add the Dolt remote
// Also add the Dolt remote.
if err := s.AddRemote(ctx, peer.Name, peer.RemoteURL); err != nil {
// Ignore "remote already exists" errors
if !strings.Contains(err.Error(), "already exists") {
@ -305,6 +305,10 @@ func (s *DoltStore) AddFederationPeer(ctx context.Context, peer *storage.Federat
}
}
if err := s.doltAddAndCommit(ctx, []string{"federation_peers"}, "federation: add peer "+peer.Name); err != nil {
return fmt.Errorf("failed to commit federation peer: %w", err)
}
return nil
}

View file

@ -311,6 +311,17 @@ func (s *DoltStore) Sync(ctx context.Context, peer string, strategy string) (*Sy
StartTime: time.Now(),
}
// Match PullFrom: federation metadata writes such as add-peer must not
// leave the working set dirty before fetch/merge.
if !s.readOnly {
if err := s.Commit(ctx, "auto-commit before sync"); err != nil {
if !isDoltNothingToCommit(err) {
result.Error = fmt.Errorf("failed to commit pending changes before sync: %w", err)
return result, result.Error
}
}
}
// Step 1: Fetch from peer
if err := s.Fetch(ctx, peer); err != nil {
result.Error = fmt.Errorf("fetch failed: %w", err)

View file

@ -9,6 +9,7 @@ import (
"testing"
"time"
"github.com/steveyegge/beads/internal/storage"
"github.com/steveyegge/beads/internal/types"
)
@ -385,6 +386,58 @@ func TestFederationSyncStatus(t *testing.T) {
}
}
func TestFederationSyncCommitsPendingPeerMetadataBeforeFetch(t *testing.T) {
skipIfNoDolt(t)
ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
defer cancel()
store, cleanup := setupTestStore(t)
defer cleanup()
peer := &storage.FederationPeer{
Name: "peer-metadata-sync",
RemoteURL: "file:///tmp/beads-no-such-federation-peer",
Sovereignty: "T2",
}
if err := store.AddFederationPeer(ctx, peer); err != nil {
t.Fatalf("add federation peer: %v", err)
}
if federationStatusHasTable(t, ctx, store, "federation_peers") {
t.Fatal("add-peer should commit federation_peers metadata")
}
if _, err := store.db.ExecContext(ctx,
"UPDATE federation_peers SET sovereignty = ? WHERE name = ?", "T3", peer.Name,
); err != nil {
t.Fatalf("dirty federation peer metadata: %v", err)
}
if !federationStatusHasTable(t, ctx, store, "federation_peers") {
t.Fatal("expected direct federation_peers update to dirty the working set")
}
_, err := store.Sync(ctx, peer.Name, "")
if err == nil {
t.Fatal("expected sync to fail for nonexistent file remote")
}
if federationStatusHasTable(t, ctx, store, "federation_peers") {
t.Fatal("sync should commit pending federation_peers metadata before fetch/merge")
}
}
func federationStatusHasTable(t *testing.T, ctx context.Context, store *DoltStore, table string) bool {
t.Helper()
var count int
if err := store.db.QueryRowContext(ctx,
"SELECT COUNT(*) FROM dolt_status WHERE table_name = ?", table,
).Scan(&count); err != nil {
t.Fatalf("query dolt_status for %s: %v", table, err)
}
return count > 0
}
// TestFederationPushPullMethods tests PushTo and PullFrom
func TestFederationPushPullMethods(t *testing.T) {
skipIfNoDolt(t)