This repository has been archived by the owner on Aug 21, 2023. It is now read-only.
fix consistency bug #128
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| #!/bin/sh | ||
|
|
||
| set -eu | ||
| cur=$(cd `dirname $0`; pwd) | ||
|
|
||
| DB_NAME="mysql_consistency" | ||
| TABLE_NAME="t" | ||
|
|
||
| # drop database on mysql | ||
| run_sql "drop database if exists \`$DB_NAME\`;" | ||
|
|
||
| # build data on mysql | ||
| run_sql "create database $DB_NAME;" | ||
| run_sql "create table $DB_NAME.$TABLE_NAME (a int(255));" | ||
|
|
||
| # insert 100 records | ||
| run_sql "insert into $DB_NAME.$TABLE_NAME values $(seq -s, 100 | sed 's/,*$//g' | sed "s/[0-9]*/('1')/g");" | ||
|
|
||
| # dumping with consistency flush | ||
| export DUMPLING_TEST_DATABASE=$DB_NAME | ||
| export GO_FAILPOINTS="github.com/pingcap/dumpling/v4/export/ConsistencyCheck=return(\"5s\")" | ||
| run_dumpling & | ||
| # wait dumpling process to start to sleep | ||
| sleep 2 | ||
|
|
||
| # record metadata info | ||
| metadata=`run_sql "show master status;"` | ||
| metaLog=`echo $metadata | awk -F 'File:' '{print $2}' | awk '{print $1}'` | ||
| metaPos=`echo $metadata | awk -F 'Position:' '{print $2}' | awk '{print $1}'` | ||
| metaGTID=`echo $metadata | awk -F 'Executed_Gtid_Set:' '{print $2}' | awk '{print $1}'` | ||
| # insert 100 more records, test whether dumpling will dump these data out | ||
| run_sql "insert into $DB_NAME.$TABLE_NAME values $(seq -s, 100 | sed 's/,*$//g' | sed "s/[0-9]*/('1')/g");" | ||
|
|
||
| wait | ||
|
|
||
| # check data record count | ||
| cnt=`grep -o "(1)" ${DUMPLING_OUTPUT_DIR}/${DB_NAME}.${TABLE_NAME}.0.sql|wc -l` | ||
| echo "1st records count is ${cnt}" | ||
| [ $cnt = 100 ] | ||
|
|
||
| # check metadata | ||
| echo "metaLog: $metaLog" | ||
| echo "metaPos: $metaPos" | ||
| echo "metaGTID: $metaGTID" | ||
| if [ $metaLog != "" ]; then | ||
| [ `grep -o "Log: $metaLog" ${DUMPLING_OUTPUT_DIR}/metadata|wc -l` ] | ||
| fi | ||
| if [ $metaPos != "" ]; then | ||
| [ `grep -o "Pos: $metaPos" ${DUMPLING_OUTPUT_DIR}/metadata|wc -l` ] | ||
| fi | ||
| if [ $metaGTID != "" ]; then | ||
| [ `grep -o "GTID: $metaGTID" ${DUMPLING_OUTPUT_DIR}/metadata|wc -l` ] | ||
| fi | ||
|
|
||
| # test dumpling normally | ||
| export GO_FAILPOINTS="" | ||
| run_dumpling | ||
| cnt=`grep -o "(1)" ${DUMPLING_OUTPUT_DIR}/${DB_NAME}.${TABLE_NAME}.0.sql|wc -l` | ||
| echo "2nd records count is ${cnt}" | ||
| [ $cnt = 200 ] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| package export | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "strings" | ||
|
|
||
|
|
@@ -27,19 +28,21 @@ func (s *testConsistencySuite) TestConsistencyController(c *C) { | |
| db, mock, err := sqlmock.New() | ||
| c.Assert(err, IsNil) | ||
| defer db.Close() | ||
| ctx, cancel := context.WithCancel(context.Background()) | ||
| defer cancel() | ||
| conf := DefaultConfig() | ||
| resultOk := sqlmock.NewResult(0, 1) | ||
|
|
||
| conf.Consistency = "none" | ||
| ctrl, _ := NewConsistencyController(ctx, conf, db) | ||
| _, ok := ctrl.(*ConsistencyNone) | ||
| c.Assert(ok, IsTrue) | ||
| s.assertLifetimeErrNil(ctrl, c) | ||
|
|
||
| conf.Consistency = "flush" | ||
| mock.ExpectExec("FLUSH TABLES WITH READ LOCK").WillReturnResult(resultOk) | ||
| mock.ExpectExec("UNLOCK TABLES").WillReturnResult(resultOk) | ||
| ctrl, _ = NewConsistencyController(ctx, conf, db) | ||
| _, ok = ctrl.(*ConsistencyFlushTableWithReadLock) | ||
| c.Assert(ok, IsTrue) | ||
| s.assertLifetimeErrNil(ctrl, c) | ||
|
|
@@ -49,7 +52,7 @@ func (s *testConsistencySuite) TestConsistencyController(c *C) { | |
|
|
||
| conf.Consistency = "snapshot" | ||
| conf.ServerInfo.ServerType = ServerTypeTiDB | ||
| ctrl, _ = NewConsistencyController(ctx, conf, db) | ||
| _, ok = ctrl.(*ConsistencyNone) | ||
| c.Assert(ok, IsTrue) | ||
| s.assertLifetimeErrNil(ctrl, c) | ||
|
|
@@ -62,7 +65,7 @@ func (s *testConsistencySuite) TestConsistencyController(c *C) { | |
| mock.ExpectExec("LOCK TABLES").WillReturnResult(resultOk) | ||
| } | ||
| mock.ExpectExec("UNLOCK TABLES").WillReturnResult(resultOk) | ||
| ctrl, _ = NewConsistencyController(ctx, conf, db) | ||
| _, ok = ctrl.(*ConsistencyLockDumpingTables) | ||
| c.Assert(ok, IsTrue) | ||
| s.assertLifetimeErrNil(ctrl, c) | ||
|
|
@@ -96,31 +99,33 @@ func (s *testConsistencySuite) TestConsistencyControllerError(c *C) { | |
| db, mock, err := sqlmock.New() | ||
| c.Assert(err, IsNil) | ||
| defer db.Close() | ||
| ctx, cancel := context.WithCancel(context.Background()) | ||
| defer cancel() | ||
| conf := DefaultConfig() | ||
|
|
||
| conf.Consistency = "invalid_str" | ||
| _, err = NewConsistencyController(ctx, conf, db) | ||
| c.Assert(err, NotNil) | ||
| c.Assert(strings.Contains(err.Error(), "invalid consistency option"), IsTrue) | ||
|
|
||
| // snapshot consistency is only available in TiDB | ||
| conf.Consistency = "snapshot" | ||
| conf.ServerInfo.ServerType = ServerTypeUnknown | ||
| _, err = NewConsistencyController(ctx, conf, db) | ||
| c.Assert(err, NotNil) | ||
|
|
||
| // flush consistency is unavailable in TiDB | ||
| conf.Consistency = "flush" | ||
| conf.ServerInfo.ServerType = ServerTypeTiDB | ||
| ctrl, _ := NewConsistencyController(ctx, conf, db) | ||
| err = ctrl.Setup() | ||
| c.Assert(err, NotNil) | ||
|
|
||
| // lock table fail | ||
| conf.Consistency = "lock" | ||
| conf.Tables = NewDatabaseTables().AppendTables("db", "t") | ||
| mock.ExpectExec("LOCK TABLE").WillReturnError(errors.New("")) | ||
| ctrl, _ = NewConsistencyController(ctx, conf, db) | ||
| err = ctrl.Setup() | ||
| c.Assert(err, NotNil) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -10,6 +10,7 @@ import ( | |||||||||||||||||||||
| "github.com/pingcap/dumpling/v4/log" | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| _ "github.com/go-sql-driver/mysql" | ||||||||||||||||||||||
| "github.com/pingcap/failpoint" | ||||||||||||||||||||||
| pd "github.com/pingcap/pd/v4/client" | ||||||||||||||||||||||
| "go.uber.org/zap" | ||||||||||||||||||||||
| "golang.org/x/sync/errgroup" | ||||||||||||||||||||||
|
|
@@ -133,7 +134,7 @@ func Dump(pCtx context.Context, conf *Config) (err error) { | |||||||||||||||||||||
| conn.Close() | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| conCtrl, err := NewConsistencyController(ctx, conf, pool) | ||||||||||||||||||||||
| if err != nil { | ||||||||||||||||||||||
| return err | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
|
|
@@ -146,10 +147,6 @@ func Dump(pCtx context.Context, conf *Config) (err error) { | |||||||||||||||||||||
| return err | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| // for other consistencies, we should get table list after consistency is set up and GlobalMetaData is cached | ||||||||||||||||||||||
| // for other consistencies, record snapshot after whole tables are locked. The recorded meta info is exactly the locked snapshot. | ||||||||||||||||||||||
| if conf.Consistency != "lock" { | ||||||||||||||||||||||
|
|
@@ -165,6 +162,20 @@ func Dump(pCtx context.Context, conf *Config) (err error) { | |||||||||||||||||||||
| connectPool.releaseConn(conn) | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| if err = conCtrl.TearDown(); err != nil { | ||||||||||||||||||||||
| return err | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| failpoint.Inject("ConsistencyCheck", func(val failpoint.Value) { | ||||||||||||||||||||||
| interval, err := time.ParseDuration(val.(string)) | ||||||||||||||||||||||
| if err != nil { | ||||||||||||||||||||||
| log.Warn("inject failpoint ConsistencyCheck failed", zap.Reflect("value", val), zap.Error(err)) | ||||||||||||||||||||||
| } else { | ||||||||||||||||||||||
| log.Info("start to sleep for failpoint ConsistencyCheck", zap.Duration("sleepTime", interval)) | ||||||||||||||||||||||
| time.Sleep(interval) | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
| }) | ||||||||||||||||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||||||||||||||||
|
|
||||||||||||||||||||||
| var writer Writer | ||||||||||||||||||||||
| switch strings.ToLower(conf.FileType) { | ||||||||||||||||||||||
| case "sql": | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -164,6 +164,7 @@ func SelectAllFromTable(conf *Config, db *sql.Conn, database, table string) (Tab | |
| } | ||
|
|
||
| func SelectFromSql(conf *Config, db *sql.Conn) (TableDataIR, error) { | ||
| log.Info("dump data from sql", zap.String("sql", conf.Sql)) | ||
| rows, err := db.QueryContext(context.Background(), conf.Sql) | ||
| if err != nil { | ||
| return nil, withStack(errors.WithMessage(err, conf.Sql)) | ||
|
|
@@ -295,18 +296,18 @@ func GetUniqueIndexName(db *sql.Conn, database, table string) (string, error) { | |
| return colName, nil | ||
| } | ||
|
|
||
| func FlushTableWithReadLock(db *sql.Conn) error { | ||
| _, err := db.ExecContext(context.Background(), "FLUSH TABLES WITH READ LOCK") | ||
|
There was a problem hiding this comment. Please avoiding There was a problem hiding this comment. addressed, PTAL again |
||
| return withStack(err) | ||
| } | ||
|
|
||
| func LockTables(db *sql.Conn, database, table string) error { | ||
| _, err := db.ExecContext(context.Background(), fmt.Sprintf("LOCK TABLES `%s`.`%s` READ", escapeString(database), escapeString(table))) | ||
| return withStack(err) | ||
| } | ||
|
|
||
| func UnlockTables(db *sql.Conn) error { | ||
| _, err := db.ExecContext(context.Background(), "UNLOCK TABLES") | ||
| return withStack(err) | ||
| } | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.