Skip to content
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

cmd: Make changefeed sort dir visible #2222

Merged
merged 12 commits into from
Jul 7, 2021
Merged

cmd: Make changefeed sort dir visible #2222

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9dc85af
make sort-dir field visible in changefeed info struct.
3AceShowHand Jul 4, 2021
4850d02
fix related tests.
3AceShowHand Jul 5, 2021
66e8cca
add a simple test for sort-dir field.
3AceShowHand Jul 5, 2021
88c92c0
Merge branch 'master' into make-changefeed-sort-dir-visible
3AceShowHand Jul 5, 2021
dc16111
add dir checker .
3AceShowHand Jul 6, 2021
77d53e8
do not remove new created directory.
3AceShowHand Jul 7, 2021
1905982
Merge branch 'master' into make-changefeed-sort-dir-visible
3AceShowHand Jul 7, 2021
798f826
update log.
3AceShowHand Jul 7, 2021
c7dadaa
Merge branch 'make-changefeed-sort-dir-visible' of github.com:3AceSho…
3AceShowHand Jul 7, 2021
9c72678
Merge branch 'master' into make-changefeed-sort-dir-visible
3AceShowHand Jul 7, 2021
198b3b0
print log to make debug for data-dir easier.
3AceShowHand Jul 7, 2021
6dfe200
Merge branch 'master' into make-changefeed-sort-dir-visible
ti-chi-bot Jul 7, 2021
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: 2 additions & 0 deletions cdc/kv/etcd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ func (s *etcdSuite) TestOpChangeFeedDetail(c *check.C) {
ctx := context.Background()
detail := &model.ChangeFeedInfo{
SinkURI: "root@tcp(127.0.0.1:3306)/mysql",
SortDir: "/old-version/sorter",
}
cfID := "test-op-cf"

Expand All @@ -236,6 +237,7 @@ func (s *etcdSuite) TestOpChangeFeedDetail(c *check.C) {
d, err := s.client.GetChangeFeedInfo(ctx, cfID)
c.Assert(err, check.IsNil)
c.Assert(d.SinkURI, check.Equals, detail.SinkURI)
c.Assert(d.SortDir, check.Equals, detail.SortDir)

err = s.client.LeaseGuardDeleteChangeFeedInfo(ctx, cfID, sess.Lease())
c.Assert(err, check.IsNil)
Expand Down
4 changes: 3 additions & 1 deletion cdc/model/changefeed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ type ChangeFeedInfo struct {
AdminJobType AdminJobType `json:"admin-job-type"`
Engine SortEngine `json:"sort-engine"`
// SortDir is deprecated
SortDir string `json:"-"`
// it cannot be set by user in changefeed level, any assignment to it should be ignored.
// but can be fetched for backward compatibility
SortDir string `json:"sort-dir"`

Config *config.ReplicaConfig `json:"config"`
State FeedState `json:"state"`
Expand Down
1 change: 1 addition & 0 deletions cdc/model/changefeed_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ func (s *configSuite) TestFillV1(c *check.C) {
},
StartTs: 417136892416622595,
Engine: "memory",
SortDir: ".",
Config: &config.ReplicaConfig{
CaseSensitive: true,
Filter: &config.FilterConfig{
Expand Down
25 changes: 17 additions & 8 deletions cdc/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,10 +375,8 @@ func (s *Server) initDataDir(ctx context.Context) error {
return errors.Trace(err)
}

if diskInfo.Avail < dataDirThreshold {
log.Warn(fmt.Sprintf("%s is set as data-dir (%dGB available), ticdc recommend disk for data-dir "+
"at least have %dGB available space", conf.DataDir, diskInfo.Avail, dataDirThreshold))
}
log.Info(fmt.Sprintf("%s is set as data-dir (%dGB available), ticdc recommend disk for data-dir "+
"at least have %dGB available space", conf.DataDir, diskInfo.Avail, dataDirThreshold))

return nil
}
Expand Down Expand Up @@ -441,14 +439,25 @@ func (s *Server) setUpDataDir(ctx context.Context) error {
// at the moment, only consider available disk space
func findBestDataDir(candidates []string) (result string, ok bool) {
var low uint64 = 0
for _, dir := range candidates {

checker := func(dir string) (*util.DiskInfo, error) {
if err := os.MkdirAll(dir, 0o755); err != nil {
return nil, err
}
if err := util.IsDirReadWritable(dir); err != nil {
log.Warn("try to get disk info failed", zap.String("dir", dir), zap.Error(err))
continue
return nil, err
}
info, err := util.GetDiskInfo(dir)
if err != nil {
log.Warn("try to get disk info failed", zap.String("dir", dir), zap.Error(err))
return nil, err
}
return info, err
}

for _, dir := range candidates {
info, err := checker(dir)
if err != nil {
log.Warn("check the availability of dir", zap.String("dir", dir), zap.Error(err))
continue
}
if info.Avail > low {
Expand Down