cluster: fix wrong default initial-commit-ts in drainer

pingcap · Dec 16, 2021 · 8576194 · 8576194
1 parent 3523106
commit 8576194
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/pkg/cluster/ansible/service.go b/pkg/cluster/ansible/service.go
@@ -17,7 +17,6 @@ import (
 	"context"
 	"fmt"
 	"path/filepath"
-	"strconv"
 	"strings"
 	"time"
 
@@ -195,8 +194,8 @@ func parseDirs(ctx context.Context, user string, ins spec.InstanceSpec, sshTimeo
 			}
 			if strings.Contains(line, "--initial-commit-ts=") {
 				tsArg := strings.Split(line, " ")[4] // 4 whitespaces ahead
-				tmpTs, _ := strconv.Atoi(strings.TrimPrefix(tsArg, "--initial-commit-ts="))
-				newIns.CommitTS = int64(tmpTs)
+				tmpTs := strings.TrimPrefix(tsArg, "--initial-commit-ts=")
+				newIns.CommitTS = tmpTs
 			}
 		}
 		return newIns, nil

diff --git a/pkg/cluster/spec/drainer.go b/pkg/cluster/spec/drainer.go
@@ -38,7 +38,7 @@ type DrainerSpec struct {
 	DeployDir       string                 `yaml:"deploy_dir,omitempty"`
 	DataDir         string                 `yaml:"data_dir,omitempty"`
 	LogDir          string                 `yaml:"log_dir,omitempty"`
-	CommitTS        int64                  `yaml:"commit_ts,omitempty"`
+	CommitTS        string                 `yaml:"commit_ts,omitempty"`
 	Offline         bool                   `yaml:"offline,omitempty"`
 	NumaNode        string                 `yaml:"numa_node,omitempty" validate:"numa_node:editable"`
 	Config          map[string]interface{} `yaml:"config,omitempty" validate:"config:ignore"`

diff --git a/pkg/cluster/template/scripts/drainer.go b/pkg/cluster/template/scripts/drainer.go
@@ -31,7 +31,7 @@ type DrainerScript struct {
 	DataDir   string
 	LogDir    string
 	NumaNode  string
-	CommitTs  int64
+	CommitTs  string
 	Endpoints []*PDScript
 }
 
@@ -44,7 +44,7 @@ func NewDrainerScript(nodeID, ip, deployDir, dataDir, logDir string) *DrainerScr
 		DeployDir: deployDir,
 		DataDir:   dataDir,
 		LogDir:    logDir,
-		CommitTs:  -1,
+		CommitTs:  "-1",
 	}
 }
 
@@ -61,8 +61,10 @@ func (c *DrainerScript) WithNumaNode(numa string) *DrainerScript {
 }
 
 // WithCommitTs set CommitTs field of DrainerScript
-func (c *DrainerScript) WithCommitTs(ts int64) *DrainerScript {
-	c.CommitTs = ts
+func (c *DrainerScript) WithCommitTs(ts string) *DrainerScript {
+	if ts != "" {
+		c.CommitTs = ts
+	}
 	return c
 }