From 031bd4cb51e985e2557e4a9d580206791598adc5 Mon Sep 17 00:00:00 2001 From: Manan007224 Date: Thu, 8 Jul 2021 02:29:51 -0700 Subject: [PATCH] changing conf.json back changes --- examples/copydb/conf.json | 12 ++++++++---- ferry.go | 2 +- inline_verifier.go | 19 +++++++++---------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/examples/copydb/conf.json b/examples/copydb/conf.json index d4b1d1e3a..bdd0d59a9 100644 --- a/examples/copydb/conf.json +++ b/examples/copydb/conf.json @@ -22,13 +22,19 @@ }, "Databases": { - "Whitelist": ["benchmark"] + "Whitelist": ["abc"] }, "Tables": { "Blacklist": ["schema_migrations"] }, + "ForceIndexForVerification": { + "abc": { + "table1": "forced_index_name" + } + }, + "DumpStateOnSignal": true, "VerifierType": "ChecksumTable", @@ -38,7 +44,5 @@ "Custom Script 2": ["examples/copydb/s2"] }, - "DumpStateToStdoutOnError": true, - - "PeriodicallyVerifySchemaFingerPrintInterval": "1s" + "DumpStateToStdoutOnError": true } diff --git a/ferry.go b/ferry.go index 8afaf2277..07bc1e73d 100644 --- a/ferry.go +++ b/ferry.go @@ -254,7 +254,7 @@ func (f *Ferry) NewSchemaFingerPrintVerifier() (*SchemaFingerPrintVerifier, erro } periodicallyVerifyInterval, err := time.ParseDuration(f.Config.PeriodicallyVerifySchemaFingerPrintInterval) if err != nil { - return nil, fmt.Errorf("invalid MaxExpectedDowntime: %v. this error should have been caught via .Validate()", err) + return nil, fmt.Errorf("invalid PeriodicallyVerifySchemaFingerPrintInterval: %v. this error should have been caught via .Validate()", err) } return &SchemaFingerPrintVerifier{ diff --git a/inline_verifier.go b/inline_verifier.go index 4fa38ad1e..d221479a3 100644 --- a/inline_verifier.go +++ b/inline_verifier.go @@ -233,15 +233,14 @@ func (s *BinlogVerifyStore) Serialize() BinlogVerifySerializedStore { } type InlineVerifier struct { - SourceDB *sql.DB - TargetDB *sql.DB - DatabaseRewrites map[string]string - TableRewrites map[string]string - TableSchemaCache TableSchemaCache - BatchSize int - VerifyBinlogEventsInterval time.Duration - VerifiySchemaFingerPrintInterval time.Duration - MaxExpectedDowntime time.Duration + SourceDB *sql.DB + TargetDB *sql.DB + DatabaseRewrites map[string]string + TableRewrites map[string]string + TableSchemaCache TableSchemaCache + BatchSize int + VerifyBinlogEventsInterval time.Duration + MaxExpectedDowntime time.Duration StateTracker *StateTracker ErrorHandler ErrorHandler @@ -369,7 +368,6 @@ func (v *InlineVerifier) CheckFingerprintInline(tx *sql.Tx, targetSchema, target func (v *InlineVerifier) PeriodicallyVerifyBinlogEvents(ctx context.Context) { v.logger.Info("starting periodic reverifier") ticker := time.NewTicker(v.VerifyBinlogEventsInterval) - defer ticker.Stop() for { @@ -390,6 +388,7 @@ func (v *InlineVerifier) PeriodicallyVerifyBinlogEvents(ctx context.Context) { return } } + } func (v *InlineVerifier) VerifyBeforeCutover() error {