Skip to content

data_validator: initialize the metrics in Start() instead of constructor #12603

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

Open
kennytm wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −1
Open

data_validator: initialize the metrics in Start() instead of constructor #12603

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion dm/syncer/data_validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@ func NewContinuousDataValidator(cfg *config.SubTaskConfig, syncerObj *Syncer, st
cfg: cfg,
syncer: syncerObj,
startWithSubtask: startWithSubtask,
vmetric: metrics.NewValidatorMetrics(cfg.Name, cfg.SourceID),
}
v.L = log.With(zap.String("task", cfg.Name), zap.String("unit", "continuous validator"))

Expand Down Expand Up @@ -268,6 +267,7 @@ func (v *DataValidator) initialize() error {
v.ctx, v.cancel = context.WithCancel(context.Background())
v.tctx = tcontext.NewContext(v.ctx, v.L)
v.reset()
v.vmetric = metrics.NewValidatorMetrics(v.cfg.Name, v.cfg.SourceID)

newCtx, cancelFunc := v.tctx.WithTimeout(unit.DefaultInitTimeout)
defer cancelFunc()
Expand Down
11 changes: 11 additions & 0 deletions dm/syncer/data_validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,12 @@ func TestValidatorStartStopAndInitialize(t *testing.T) {

// validator already running
validator := NewContinuousDataValidator(cfg, syncerObj, false)
require.Nil(t, validator.vmetric)
validator.stage = pb.Stage_Running
validator.Start(pb.Stage_InvalidStage)
// if validator already running, Start will return immediately, so we check validator.ctx which has not initialized.
require.Nil(t, validator.ctx)
require.Nil(t, validator.vmetric)

// failed to init
cfg.From = dbconfig.DBConfig{
Expand All @@ -133,13 +135,22 @@ func TestValidatorStartStopAndInitialize(t *testing.T) {

// normal start & stop
validator = NewContinuousDataValidator(cfg, syncerObj, false)
require.Nil(t, validator.vmetric)
validator.persistHelper.schemaInitialized.Store(true)
validator.Start(pb.Stage_Running)
defer validator.Stop() // in case assert failed before Stop
require.NotNil(t, validator.vmetric)
firstMetric := validator.vmetric
require.Equal(t, pb.Stage_Running, validator.Stage())
require.True(t, validator.Started())
validator.Stop()
require.Equal(t, pb.Stage_Stopped, validator.Stage())
validator.Start(pb.Stage_Running)
require.Equal(t, pb.Stage_Running, validator.Stage())
require.NotNil(t, validator.vmetric)
require.NotSame(t, firstMetric, validator.vmetric)
validator.Stop()
require.Equal(t, pb.Stage_Stopped, validator.Stage())

// stop before start, should not panic
validator = NewContinuousDataValidator(cfg, syncerObj, false)
Expand Down