webnet/tailscale
1
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

tka: Revert "improve logging for Compact and Commit operations"

Browse Source 
This reverts commit b25920dfc0.

The `log.Printf` messages are causing panics in corp, in particular:

> panic: please use tailscale.com/logger.Logf instead of the log package

Fixing the TKA code to plumb through a logger properly is going to be
a hassle, so for now remove these logs to unblock merges to corp.

Updates tailscale/corp#39455

Signed-off-by: Alex Chan <alexc@tailscale.com>
This commit is contained in:
Alex Chan
2026-04-10 17:00:49 +01:00
committed by Alex Chan
parent 1ff369a261
commit 399f048332
2 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tka/tailchonk.go
-6
View File
@@ -597,9 +597,6 @@ func (c *FS) CommitVerifiedAUMs(updates []AUM) error {
for i, aum := range updates { for i, aum := range updates {
h := aum.Hash() h := aum.Hash()
err := c.commit(h, func(info *fsHashInfo) { err := c.commit(h, func(info *fsHashInfo) {
if info.PurgedUnix > 0 {
log.Printf("tka: CommitVerifiedAUMs: committing previously-deleted AUM %s", h.String())
}
info.PurgedUnix = 0 // just in-case it was set for some reason info.PurgedUnix = 0 // just in-case it was set for some reason
info.AUM = &aum info.AUM = &aum
}) })
@@ -976,8 +973,5 @@ func Compact(storage CompactableChonk, head AUMHash, opts CompactionOptions) (la
if err := storage.SetLastActiveAncestor(lastActiveAncestor); err != nil { if err := storage.SetLastActiveAncestor(lastActiveAncestor); err != nil {
return AUMHash{}, err return AUMHash{}, err
} }
if len(toDelete) > 0 {
log.Printf("tka compaction: purging %d AUM(s) [%q]", len(toDelete), toDelete)
}
return lastActiveAncestor, storage.PurgeAUMs(toDelete) return lastActiveAncestor, storage.PurgeAUMs(toDelete)
} }
tka/tka.go
-7
View File
@@ -10,7 +10,6 @@ import (
"bytes" "bytes"
"errors" "errors"
"fmt" "fmt"
"log"
"os" "os"
"sort" "sort"
@@ -557,8 +556,6 @@ func Bootstrap(storage Chonk, bootstrap AUM) (*Authority, error) {
// Everything looks good, write it to storage. // Everything looks good, write it to storage.
if err := storage.CommitVerifiedAUMs([]AUM{bootstrap}); err != nil { if err := storage.CommitVerifiedAUMs([]AUM{bootstrap}); err != nil {
return nil, fmt.Errorf("commit: %v", err) return nil, fmt.Errorf("commit: %v", err)
} else {
log.Printf("tka.Bootstrap: successfully committed bootstrap AUM (%s)", bootstrap.Hash())
} }
if err := storage.SetLastActiveAncestor(bootstrap.Hash()); err != nil { if err := storage.SetLastActiveAncestor(bootstrap.Hash()); err != nil {
return nil, fmt.Errorf("set ancestor: %v", err) return nil, fmt.Errorf("set ancestor: %v", err)
@@ -590,7 +587,6 @@ func (a *Authority) InformIdempotent(storage Chonk, updates []AUM) (Authority, e
} }
stateAt := make(map[AUMHash]State, len(updates)+1) stateAt := make(map[AUMHash]State, len(updates)+1)
toCommit := make([]AUM, 0, len(updates)) toCommit := make([]AUM, 0, len(updates))
toCommitHashes := make([]AUMHash, 0, len(updates))
prevHash := a.Head() prevHash := a.Head()
// The state at HEAD is the current state of the authority. It's likely // The state at HEAD is the current state of the authority. It's likely
@@ -640,13 +636,10 @@ func (a *Authority) InformIdempotent(storage Chonk, updates []AUM) (Authority, e
} }
prevHash = hash prevHash = hash
toCommit = append(toCommit, update) toCommit = append(toCommit, update)
toCommitHashes = append(toCommitHashes, update.Hash())
} }
if err := storage.CommitVerifiedAUMs(toCommit); err != nil { if err := storage.CommitVerifiedAUMs(toCommit); err != nil {
return Authority{}, fmt.Errorf("commit: %v", err) return Authority{}, fmt.Errorf("commit: %v", err)
} else {
log.Printf("tka.CommitVerifiedAUMs: successfully committed %d AUMs: %v", len(toCommit), toCommitHashes)
} }
if isHeadChain { if isHeadChain {