mirror of
https://github.com/aptly-dev/aptly.git
synced 2026-06-22 08:10:52 +00:00
Nick Bozhenko
1693863499
PROBLEM: - Pod crashes with "fatal error: concurrent map writes" during S3 publications - Root cause: pathCache map in PublishedStorage accessed without synchronization - Occurs during concurrent LinkFromPool operations in S3 publishing SOLUTION: - Add sync.RWMutex to PublishedStorage struct for thread-safe map access - Implement double-check locking pattern for cache initialization - Protect all map operations (read/write/delete) with appropriate locks CHANGES: - s3/public.go: Add pathCacheMutex field and protect all map operations * Cache initialization with double-check locking in LinkFromPool * Read operations protected with RLock/RUnlock * Write operations protected with Lock/Unlock * Delete operations in Remove() and RemoveDirs() protected IMPACT: - Eliminates concurrent map writes panic - Prevents pod crashes during S3 publications - Maintains performance with minimal synchronization overhead - Uses read-write locks allowing concurrent reads while serializing writes
72 lines
1.5 KiB
Go
72 lines
1.5 KiB
Go
package utils
|
|
|
|
import (
|
|
"io"
|
|
"os"
|
|
"strings"
|
|
"syscall"
|
|
"time"
|
|
|
|
"github.com/rs/zerolog"
|
|
"github.com/rs/zerolog/log"
|
|
"golang.org/x/term"
|
|
)
|
|
|
|
// RunningOnTerminal checks whether stdout is terminal
|
|
func RunningOnTerminal() bool {
|
|
return term.IsTerminal(syscall.Stdout)
|
|
}
|
|
|
|
type LogWriter struct {
|
|
Logger zerolog.Logger
|
|
}
|
|
|
|
func (lw LogWriter) Write(bs []byte) (int, error) {
|
|
return lw.Logger.With().Str("level", "info").Logger().Write(bs)
|
|
}
|
|
|
|
func SetupJSONLogger(levelStr string, w io.Writer) {
|
|
zerolog.MessageFieldName = "message"
|
|
zerolog.LevelFieldName = "level"
|
|
|
|
var tsHook timestampHook
|
|
log.Logger = zerolog.New(w).
|
|
Hook(&tsHook).
|
|
Level(GetLogLevelOrDebug(levelStr))
|
|
}
|
|
|
|
func SetupDefaultLogger(levelStr string) {
|
|
zerolog.MessageFieldName = "message"
|
|
zerolog.LevelFieldName = "level"
|
|
|
|
log.Logger = zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr,
|
|
FormatTimestamp: func(_ interface{}) string { return "" },
|
|
NoColor: !RunningOnTerminal(),
|
|
}).Level(GetLogLevelOrDebug(levelStr))
|
|
}
|
|
|
|
func GetLogLevelOrDebug(levelStr string) zerolog.Level {
|
|
levelStr = strings.ToLower(levelStr)
|
|
if levelStr == "warning" {
|
|
levelStr = "warn"
|
|
}
|
|
|
|
var level zerolog.Level
|
|
|
|
err := level.UnmarshalText([]byte(levelStr))
|
|
if err == nil {
|
|
return level
|
|
}
|
|
|
|
log.Warn().Msgf("Unknown log level '%s', defaulting to debug", levelStr)
|
|
return zerolog.DebugLevel
|
|
}
|
|
|
|
type timestampHook struct{}
|
|
|
|
func (h *timestampHook) Run(e *zerolog.Event, _ zerolog.Level, _ string) {
|
|
t := time.Now()
|
|
ts := t.Format(time.RFC3339)
|
|
e.Str("time", ts)
|
|
}
|