Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(logging): Add startup logging for shard counts (#25378) #25507

Merged
merged 4 commits into from
Nov 1, 2024
Merged

feat(logging): Add startup logging for shard counts (#25378) #25507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4bcf913
feat(logging): Add startup logging for shard counts (#25378)
devanbenz Oct 31, 2024
1899b3c
fix: resolve some leftover errors for cherry pick
devanbenz Oct 31, 2024
1055d54
fix: Remove leftover channel closure from pr merge
devanbenz Oct 31, 2024
5c570c0
fix: static code checking and formatting
devanbenz Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions cmd/influxd/run/startup_logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package run

import (
"fmt"
"sync/atomic"

"go.uber.org/zap"
)

type StartupProgressLogger struct {
shardsCompleted atomic.Uint64
shardsTotal atomic.Uint64
logger *zap.Logger
}

func NewStartupProgressLogger(logger *zap.Logger) *StartupProgressLogger {
return &StartupProgressLogger{
logger: logger,
}
}

func (s *StartupProgressLogger) AddShard() {
s.shardsTotal.Add(1)
}

func (s *StartupProgressLogger) CompletedShard() {
shardsCompleted := s.shardsCompleted.Add(1)
totalShards := s.shardsTotal.Load()

percentShards := float64(shardsCompleted) / float64(totalShards) * 100
s.logger.Info(fmt.Sprintf("Finished loading shard, current progress %.1f%% shards (%d / %d).", percentShards, shardsCompleted, totalShards))
}
4 changes: 4 additions & 0 deletions storage/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"time"

"github.com/influxdata/influxdb/v2"
"github.com/influxdata/influxdb/v2/cmd/influxd/run"
"github.com/influxdata/influxdb/v2/influxql/query"
"github.com/influxdata/influxdb/v2/kit/platform"
errors2 "github.com/influxdata/influxdb/v2/kit/platform/errors"
Expand Down Expand Up @@ -167,6 +168,9 @@ func (e *Engine) WithLogger(log *zap.Logger) {
if e.precreatorService != nil {
e.precreatorService.WithLogger(log)
}

sl := run.NewStartupProgressLogger(e.logger)
e.tsdbStore.WithStartupMetrics(sl)
}

// PrometheusCollectors returns all the prometheus collectors associated with
Expand Down
Loading