tracker(dm): add task name to unistore folder name (#5341)

ref #5334
pingcap · May 10, 2022 · 57c19c8 · 57c19c8
1 parent 3ecf202
commit 57c19c8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/dm/pkg/schema/tracker.go b/dm/pkg/schema/tracker.go
@@ -17,6 +17,7 @@ import (
 	"context"
 	"fmt"
 	"io/ioutil"
+	"net/url"
 	"os"
 	"strings"
 	"sync"
@@ -149,7 +150,7 @@ func NewTracker(ctx context.Context, task string, sessionCfg map[string]string,
 		}
 	}
 
-	storePath, err = ioutil.TempDir("./", "schema-tracker")
+	storePath, err = newTmpFolderForTracker(task)
 	if err != nil {
 		return nil, err
 	}
@@ -234,6 +235,10 @@ func NewTracker(ctx context.Context, task string, sessionCfg map[string]string,
 	}, nil
 }
 
+func newTmpFolderForTracker(task string) (string, error) {
+	return ioutil.TempDir("./", url.PathEscape(task)+"-tracker")
+}
+
 // Exec runs an SQL (DDL) statement.
 func (tr *Tracker) Exec(ctx context.Context, db string, sql string) error {
 	tr.se.GetSessionVars().CurrentDB = db

diff --git a/dm/pkg/schema/tracker_test.go b/dm/pkg/schema/tracker_test.go
@@ -18,6 +18,7 @@ import (
 	"database/sql"
 	"encoding/json"
 	"fmt"
+	"os"
 	"sort"
 	"testing"
 	"time"
@@ -1027,3 +1028,12 @@ func TestTrackerRecreateTables(t *testing.T) {
 		require.Equal(t, tiInfos[i], cloneTi)
 	}
 }
+
+func TestNewTmpFolderForTracker(t *testing.T) {
+	got, err := newTmpFolderForTracker("task/db01")
+	require.NoError(t, err)
+	require.Contains(t, got, "task%2Fdb01")
+	require.DirExists(t, got)
+	err = os.RemoveAll(got)
+	require.NoError(t, err)
+}
diff --git a/dm/syncer/syncer_test.go b/dm/syncer/syncer_test.go
@@ -1261,9 +1261,10 @@ func (s *testSyncerSuite) TestTrackDDL(c *C) {
 	syncer.ddlDBConn = dbconn.NewDBConn(s.cfg, conn.NewBaseConn(dbConn, &retry.FiniteRetryStrategy{}))
 	syncer.checkpoint.(*RemoteCheckPoint).dbConn = dbconn.NewDBConn(s.cfg, conn.NewBaseConn(checkPointDBConn, &retry.FiniteRetryStrategy{}))
 	syncer.schemaTracker, err = schema.NewTracker(context.Background(), s.cfg.Name, defaultTestSessionCfg, syncer.ddlDBConn)
+	c.Assert(err, IsNil)
+	defer syncer.schemaTracker.Close()
 	syncer.exprFilterGroup = NewExprFilterGroup(utils.NewSessionCtx(nil), nil)
 	c.Assert(syncer.genRouter(), IsNil)
-	c.Assert(err, IsNil)
 
 	cases := []struct {
 		sql      string
@@ -1579,6 +1580,7 @@ func (s *testSyncerSuite) TestTrackDownstreamTableWontOverwrite(c *C) {
 	syncer.downstreamTrackConn = dbconn.NewDBConn(s.cfg, conn.NewBaseConn(dbConn, &retry.FiniteRetryStrategy{}))
 	syncer.schemaTracker, err = schema.NewTracker(ctx, s.cfg.Name, defaultTestSessionCfg, syncer.downstreamTrackConn)
 	c.Assert(err, IsNil)
+	defer syncer.schemaTracker.Close()
 
 	upTable := &filter.Table{
 		Schema: "test",
@@ -1660,8 +1662,10 @@ func (s *testSyncerSuite) TestDownstreamTableHasAutoRandom(c *C) {
 		"tidb_skip_utf8_check":    "0",
 		schema.TiDBClusteredIndex: "ON",
 	}
+	c.Assert(syncer.schemaTracker.Close(), IsNil)
 	syncer.schemaTracker, err = schema.NewTracker(ctx, s.cfg.Name, sessionCfg, syncer.downstreamTrackConn)
 	c.Assert(err, IsNil)
+	defer syncer.schemaTracker.Close()
 	v, ok := syncer.schemaTracker.GetSystemVar(schema.TiDBClusteredIndex)
 	c.Assert(v, Equals, "ON")
 	c.Assert(ok, IsTrue)
@@ -1839,8 +1843,8 @@ func TestSyncerGetTableInfo(t *testing.T) {
 	syncer.ddlDBConn = dbconn.NewDBConn(cfg, baseConn)
 	syncer.downstreamTrackConn = dbconn.NewDBConn(cfg, conn.NewBaseConn(dbConn, &retry.FiniteRetryStrategy{}))
 	syncer.schemaTracker, err = schema.NewTracker(ctx, cfg.Name, defaultTestSessionCfg, syncer.downstreamTrackConn)
-	defer syncer.schemaTracker.Close()
 	require.NoError(t, err)
+	defer syncer.schemaTracker.Close()
 
 	upTable := &filter.Table{
 		Schema: "test",