Merge #148218

craig[bot] · Dedej-Bergin · craig[bot] · commit 7b71d9373bc6 · 2025-06-12T19:44:10.000Z
148218: sql: revert unredact error in temp object cleanup r=Dedej-Bergin a=Dedej-Bergin Removed the `redact.Safe(err)` added in this PR: #148037. Informs: #146588 Release note: None Co-authored-by: Bergin Dedej <bergin.dedej@cockroachlabs.com>
diff --git a/pkg/sql/temporary_schema.go b/pkg/sql/temporary_schema.go
@@ -627,7 +627,7 @@ func (c *TemporaryObjectCleaner) Start(ctx context.Context, stopper *stop.Stoppe
 			select {
 			case <-nextTickCh:
 				if err := c.doTemporaryObjectCleanup(ctx, stopper.ShouldQuiesce()); err != nil {
-					log.Warningf(ctx, "failed to clean temp objects: %v", redact.Safe(err))
+					log.Warningf(ctx, "failed to clean temp objects: %v", err)
 				}
 			case <-stopper.ShouldQuiesce():
 				return

Original file line number	Diff line number	Diff line change
`@@ -627,7 +627,7 @@ func (c TemporaryObjectCleaner) Start(ctx context.Context, stopper stop.Stoppe`
`627`	`627`	`select {`
`628`	`628`	`case <-nextTickCh:`
`629`	`629`	`if err := c.doTemporaryObjectCleanup(ctx, stopper.ShouldQuiesce()); err != nil {`
`630`		`- log.Warningf(ctx, "failed to clean temp objects: %v", redact.Safe(err))`
	`630`	`+ log.Warningf(ctx, "failed to clean temp objects: %v", err)`
`631`	`631`	`}`
`632`	`632`	`case <-stopper.ShouldQuiesce():`
`633`	`633`	`return`