From e2c34e01dcfa12a7bce4c774d5d4e4a4c4dc7692 Mon Sep 17 00:00:00 2001
From: Brendan Kellam <brendan@sourcebot.dev>
Date: Thu, 10 Sep 2026 13:32:09 -0700
Subject: [PATCH] fix: improve shard publish error logging

---
 index/builder.go      | 32 +++++++++++++++++++++++++++-----
 index/builder_test.go | 26 ++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/index/builder.go b/index/builder.go
index 41e89682a..5ccfeecb7 100644
--- a/index/builder.go
+++ b/index/builder.go
@@ -669,6 +669,11 @@ func (b *Builder) Finish() error {
 
 	b.flush()
 	b.building.Wait()
+	recordBuildError := func(err error) {
+		if err != nil && b.buildError == nil {
+			b.buildError = err
+		}
+	}
 
 	if b.buildError != nil {
 		for tmp := range b.finishedShards {
@@ -766,7 +771,7 @@ func (b *Builder) Finish() error {
 		for _, name := range oldShards {
 			paths, err := IndexFilePaths(name)
 			if err != nil {
-				b.buildError = fmt.Errorf("failed to find old paths for %s: %w", name, err)
+				recordBuildError(fmt.Errorf("failed to find old paths for %s: %w", name, err))
 			}
 			for _, p := range paths {
 				toDelete[p] = struct{}{}
@@ -776,7 +781,16 @@ func (b *Builder) Finish() error {
 
 	for tmp, final := range artifactPaths {
 		if err := os.Rename(tmp, final); err != nil {
-			b.buildError = err
+			log.Printf(
+				"failed to publish shard: rename %q to %q: %T: %v; temporary path: %s; final path: %s",
+				tmp,
+				final,
+				err,
+				err,
+				fileState(tmp),
+				fileState(final),
+			)
+			recordBuildError(fmt.Errorf("publishing shard: rename %q to %q: %w", tmp, final, err))
 			continue
 		}
 
@@ -791,19 +805,27 @@ func (b *Builder) Finish() error {
 			if !strings.HasSuffix(p, ".zoekt") {
 				continue
 			}
-			err := SetTombstone(p, b.opts.RepositoryDescription.ID)
-			b.buildError = err
+			recordBuildError(SetTombstone(p, b.opts.RepositoryDescription.ID))
 			continue
 		}
 		log.Printf("removing old shard file: %s", p)
 		if err := os.Remove(p); err != nil {
-			b.buildError = err
+			recordBuildError(fmt.Errorf("removing old shard file %q: %w", p, err))
 		}
 	}
 
 	return b.buildError
 }
 
+func fileState(path string) string {
+	info, err := os.Lstat(path)
+	if err != nil {
+		return fmt.Sprintf("stat error: %v", err)
+	}
+
+	return fmt.Sprintf("mode=%s size=%d modtime=%s", info.Mode(), info.Size(), info.ModTime().Format(time.RFC3339Nano))
+}
+
 // BranchNamesEqual compares the given zoekt.RepositoryBranch slices, and returns true
 // iff both slices specify the same set of branch names in the same order.
 func BranchNamesEqual(a, b []zoekt.RepositoryBranch) bool {
diff --git a/index/builder_test.go b/index/builder_test.go
index f4eb5d0c8..2ddf6876f 100644
--- a/index/builder_test.go
+++ b/index/builder_test.go
@@ -97,6 +97,32 @@ func TestBuildv16(t *testing.T) {
 	}
 }
 
+func TestBuilderFinishPreservesShardPublishError(t *testing.T) {
+	indexDir := t.TempDir()
+	opts := Options{
+		IndexDir: indexDir,
+		RepositoryDescription: zoekt.Repository{
+			Name: "repo",
+		},
+		DisableCTags: true,
+	}
+
+	b, err := NewBuilder(opts)
+	require.NoError(t, err)
+	require.NoError(t, b.AddFile("main.go", []byte("package main")))
+
+	// A non-empty directory at the final shard path makes both publishing the
+	// new shard and cleaning up the apparent old shard fail. The publish error
+	// is the useful root cause and must not be overwritten by the cleanup error.
+	finalPath := b.opts.shardName(0)
+	require.NoError(t, os.Mkdir(finalPath, 0o755))
+	require.NoError(t, os.WriteFile(filepath.Join(finalPath, "keep"), nil, 0o644))
+
+	err = b.Finish()
+	require.ErrorContains(t, err, "publishing shard")
+	require.ErrorContains(t, err, finalPath)
+}
+
 func TestFlags(t *testing.T) {
 	cases := []struct {
 		args []string