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

Jump to bottom

receive: Fixed small options race; Removed unused StartTime feature. #2816

Merged
merged 1 commit into from
Jun 29, 2020
Merged

receive: Fixed small options race; Removed unused StartTime feature. #2816

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
142 changes: 58 additions & 84 deletions pkg/receive/multitsdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,18 @@ import (
"os"
"path"
"sync"
"time"

"github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/level"
"github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/model"
"github.com/prometheus/prometheus/pkg/labels"
"github.com/prometheus/prometheus/storage"
"github.com/prometheus/prometheus/tsdb"
terrors "github.com/prometheus/prometheus/tsdb/errors"
"github.com/thanos-io/thanos/pkg/block/metadata"
"github.com/thanos-io/thanos/pkg/component"
"github.com/thanos-io/thanos/pkg/objstore"
"github.com/thanos-io/thanos/pkg/runutil"
"github.com/thanos-io/thanos/pkg/shipper"
"github.com/thanos-io/thanos/pkg/store"
"golang.org/x/sync/errgroup"
Expand Down Expand Up @@ -72,8 +69,6 @@ func NewMultiTSDB(
}

type tenant struct {
tsdbOpts *tsdb.Options

readyS *ReadyStorage
tsdb *tsdb.DB
storeTSDB *store.TSDBStore
Expand All @@ -82,11 +77,10 @@ type tenant struct {
mtx *sync.RWMutex
}

func newTenant(tsdbOpts *tsdb.Options) *tenant {
func newTenant() *tenant {
return &tenant{
tsdbOpts: tsdbOpts,
readyS: &ReadyStorage{},
mtx: &sync.RWMutex{},
readyS: &ReadyStorage{},
mtx: &sync.RWMutex{},
}
}

Expand All @@ -113,7 +107,7 @@ func (t *tenant) db() *tsdb.DB {
}

func (t *tenant) set(storeTSDB *store.TSDBStore, tenantTSDB *tsdb.DB, ship *shipper.Shipper) {
t.readyS.Set(tenantTSDB, int64(2*time.Duration(t.tsdbOpts.MinBlockDuration).Seconds()*1000))
t.readyS.Set(tenantTSDB)
t.mtx.Lock()
t.tsdb = tenantTSDB
t.storeTSDB = storeTSDB
Expand Down Expand Up @@ -220,6 +214,47 @@ func (t *MultiTSDB) TSDBStores() map[string]*store.TSDBStore {
return res
}

func (t *MultiTSDB) startTSDB(logger log.Logger, tenantID string, tenant *tenant) error {
reg := prometheus.WrapRegistererWith(prometheus.Labels{"tenant": tenantID}, t.reg)
lbls := append(t.labels, labels.Label{Name: t.tenantLabelName, Value: tenantID})
dataDir := path.Join(t.dataDir, tenantID)

opts := *t.tsdbOpts
s, err := tsdb.Open(
dataDir,
logger,
&UnRegisterer{Registerer: reg},
&opts,
)
if err != nil {
t.mtx.Lock()
delete(t.tenants, tenantID)
t.mtx.Unlock()
return err
}

var ship *shipper.Shipper
if t.bucket != nil {
ship = shipper.New(
logger,
reg,
dataDir,
t.bucket,
func() labels.Labels { return lbls },
metadata.ReceiveSource,
t.allowOutOfOrderUpload,
)
}
tenant.set(store.NewTSDBStore(
logger,
reg,
s,
component.Receive,
lbls,
), s, ship)

return nil
}
func (t *MultiTSDB) getOrLoadTenant(tenantID string, blockingStart bool) (*tenant, error) {
// Fast path, as creating tenants is a very rare operation.
t.mtx.RLock()
Expand All @@ -239,68 +274,20 @@ func (t *MultiTSDB) getOrLoadTenant(tenantID string, blockingStart bool) (*tenan
return tenant, nil
}

tenant = newTenant(t.tsdbOpts)
tenant = newTenant()
t.tenants[tenantID] = tenant
t.mtx.Unlock()

var err error
startTSDB := func() {
reg := prometheus.WrapRegistererWith(prometheus.Labels{
"tenant": tenantID,
}, t.reg)
logger := log.With(t.logger, "tenant", tenantID)
lbls := append(t.labels, labels.Label{Name: t.tenantLabelName, Value: tenantID})
dataDir := path.Join(t.dataDir, tenantID)

var ship *shipper.Shipper
if t.bucket != nil {
ship = shipper.New(
logger,
reg,
dataDir,
t.bucket,
func() labels.Labels { return lbls },
metadata.ReceiveSource,
t.allowOutOfOrderUpload,
)
}

s, err := tsdb.Open(
dataDir,
logger,
&UnRegisterer{Registerer: reg},
t.tsdbOpts,
)

// Assign to outer error to report in blocking case.
if err != nil {
level.Error(logger).Log("msg", "failed to open tsdb", "err", err)
t.mtx.Lock()
delete(t.tenants, tenantID)
t.mtx.Unlock()
runutil.CloseWithLogOnErr(logger, s, "failed to close tsdb")
return
}

tenant.set(
store.NewTSDBStore(
logger,
reg,
s,
component.Receive,
lbls,
),
s,
ship,
)
}
logger := log.With(t.logger, "tenant", tenantID)
if !blockingStart {
go startTSDB()
go func() {
if err := t.startTSDB(logger, tenantID, tenant); err != nil {
level.Error(logger).Log("msg", "failed to start tsdb asynchronously", "err", err)
}
}()
return tenant, nil
}

startTSDB()
return tenant, err
return tenant, t.startTSDB(logger, tenantID, tenant)
}

func (t *MultiTSDB) TenantAppendable(tenantID string) (Appendable, error) {
Expand All @@ -323,11 +310,11 @@ type ReadyStorage struct {
}

// Set the storage.
func (s *ReadyStorage) Set(db *tsdb.DB, startTimeMargin int64) {
func (s *ReadyStorage) Set(db *tsdb.DB) {
s.mtx.Lock()
defer s.mtx.Unlock()

s.a = &adapter{db: db, startTimeMargin: startTimeMargin}
s.a = &adapter{db: db}
}

// Get the storage.
Expand All @@ -347,10 +334,7 @@ func (s *ReadyStorage) get() *adapter {

// StartTime implements the Storage interface.
func (s *ReadyStorage) StartTime() (int64, error) {
if x := s.get(); x != nil {
return x.StartTime()
}
return int64(model.Latest), ErrNotReady
return 0, errors.New("not implemented")
}

// Querier implements the Storage interface.
Expand Down Expand Up @@ -379,22 +363,12 @@ func (s *ReadyStorage) Close() error {

// adapter implements a storage.Storage around TSDB.
type adapter struct {
db *tsdb.DB
startTimeMargin int64
db *tsdb.DB
}

// StartTime implements the Storage interface.
func (a adapter) StartTime() (int64, error) {
var startTime int64

if len(a.db.Blocks()) > 0 {
startTime = a.db.Blocks()[0].Meta().MinTime
} else {
startTime = time.Now().Unix() * 1000
}

// Add a safety margin as it may take a few minutes for everything to spin up.
return startTime + a.startTimeMargin, nil
return 0, errors.New("not implemented")
}

func (a adapter) Querier(ctx context.Context, mint, maxt int64) (storage.Querier, error) {
Expand Down