Skip to content
This repository has been archived by the owner on Nov 24, 2023. It is now read-only.

HA: refactor unlock-ddl-lock and break-ddl-lock #522

Merged
merged 16 commits into from
Mar 9, 2020
Merged

HA: refactor unlock-ddl-lock and break-ddl-lock #522

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
75418cd
*: delete shard DDL info only when it exist
csuzhangxc Mar 5, 2020
83877b6
*: base implement of `unlock-ddl-lock`
csuzhangxc Mar 6, 2020
c939b6c
*: forceRemove support; add more test case
csuzhangxc Mar 6, 2020
e815784
shardddl: add test case for replace owner.
csuzhangxc Mar 6, 2020
a94a408
*: use the new unlock-ddl-lock implement
csuzhangxc Mar 6, 2020
b54d2bb
shardddl: fix support for re-entrant of source; add test case
csuzhangxc Mar 7, 2020
be86bd9
*: remove `break-ddl-lock` because it not needed now.
csuzhangxc Mar 7, 2020
a421297
tests: fix dmctl_command
csuzhangxc Mar 7, 2020
03479c5
shardddl: address comments
csuzhangxc Mar 9, 2020
642050c
Merge remote-tracking branch 'remotes/origin/master' into pessimistic…
csuzhangxc Mar 9, 2020
ba64562
Update dm/ctl/master/unlock_ddl_lock.go
csuzhangxc Mar 9, 2020
1ddb439
syncer: address comments
csuzhangxc Mar 9, 2020
95f24aa
Merge remote-tracking branch 'origin/pessimistic-lock' into pessimist…
csuzhangxc Mar 9, 2020
659648e
Merge branch 'master' into pessimistic-lock
csuzhangxc Mar 9, 2020
0ca40eb
Merge branch 'master' into pessimistic-lock
lichunzhu Mar 9, 2020
bdab79e
pessimism: fix merge
csuzhangxc Mar 9, 2020
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
1 change: 0 additions & 1 deletion dm/ctl/ctl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ func NewRootCmd() *cobra.Command {
master.NewSQLInjectCmd(),
master.NewShowDDLLocksCmd(),
master.NewUnlockDDLLockCmd(),
master.NewBreakDDLLockCmd(),
master.NewSwitchRelayMasterCmd(),
master.NewPauseRelayCmd(),
master.NewResumeRelayCmd(),
Expand Down
104 changes: 0 additions & 104 deletions dm/ctl/master/break_ddl_lock.go
View file
Open in desktop

This file was deleted.

11 changes: 5 additions & 6 deletions dm/ctl/master/unlock_ddl_lock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func NewUnlockDDLLockCmd() *cobra.Command {
Short: "forcefully unlock DDL lock",
Run: unlockDDLLockFunc,
}
cmd.Flags().StringP("owner", "o", "", "DM-worker to replace the default owner")
cmd.Flags().StringP("owner", "o", "", "source to replace the default owner")
cmd.Flags().BoolP("force-remove", "f", false, "force to remove DDL lock")
return cmd
}
Expand All @@ -52,9 +52,9 @@ func unlockDDLLockFunc(cmd *cobra.Command, _ []string) {

lockID := cmd.Flags().Arg(0)

sources, err := common.GetSourceArgs(cmd)
if err != nil {
fmt.Println(errors.ErrorStack(err))
sources, _ := common.GetSourceArgs(cmd)
if len(sources) > 0 {
fmt.Println("shoud not specify any sources")
return
}

Expand All @@ -70,11 +70,10 @@ func unlockDDLLockFunc(cmd *cobra.Command, _ []string) {
resp, err := cli.UnlockDDLLock(ctx, &pb.UnlockDDLLockRequest{
ID: lockID,
ReplaceOwner: owner,
Sources: sources,
ForceRemove: forceRemove,
})
if err != nil {
common.PrintLines("can not unlock DDL lock %s (in sources %v):\n%s", lockID, sources, errors.ErrorStack(err))
common.PrintLines("can not unlock DDL lock %s \n%s", lockID, err.Error())
return
}

Expand Down
6 changes: 6 additions & 0 deletions dm/master/election.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ func (s *Server) electionNotify(ctx context.Context) {
// retire from leader
if leaderInfo == nil {
if s.leader == oneselfLeader {
s.pessimist.Close()
s.scheduler.Close()

s.Lock()
Expand All @@ -61,6 +62,11 @@ func (s *Server) electionNotify(ctx context.Context) {
log.L().Error("scheduler do not started", zap.Error(err))
}

err = s.pessimist.Start(ctx, s.etcdClient)
if err != nil {
log.L().Error("pessimist do not started", zap.Error(err))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if start pessimist failed, do we need close scheduler and skip set leader in L71?

Copy link
Member Author

@csuzhangxc csuzhangxc Mar 9, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need a mechanism to transfer leader role to another DM-master member when any necessary components (pessimist and scheduler in currenlty) started fail later.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and close the pessimist

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need a mechanism to transfer leader role to another DM-master member when any necessary components (pessimist and scheduler in currenlty) started fail later.

ok, we can do this later

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lichunzhu you can open a issue to trace leader transfer support later.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK

}

s.Lock()
s.leader = oneselfLeader
s.closeLeaderClient()
Expand Down
41 changes: 20 additions & 21 deletions dm/master/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,6 @@ func (s *Server) Start(ctx context.Context) (err error) {
return
}

// start the shard DDL pessimist.
err = s.pessimist.Start(ctx, s.etcdClient)
if err != nil {
return
}

s.closed.Set(false) // the server started now.

s.bgFunWg.Add(1)
Expand Down Expand Up @@ -226,8 +220,6 @@ func (s *Server) Close() {
s.Lock()
defer s.Unlock()

s.pessimist.Close()

if s.election != nil {
s.election.Close()
}
Expand Down Expand Up @@ -682,6 +674,8 @@ func (s *Server) ShowDDLLocks(ctx context.Context, req *pb.ShowDDLLocksRequest)
l.Unsynced = append(l.Unsynced, worker)
}
}
sort.Strings(l.Synced)
sort.Strings(l.Unsynced)
resp.Locks = append(resp.Locks, l)
}

Expand All @@ -695,20 +689,25 @@ func (s *Server) ShowDDLLocks(ctx context.Context, req *pb.ShowDDLLocksRequest)
// TODO(csuzhangxc): implement this later.
func (s *Server) UnlockDDLLock(ctx context.Context, req *pb.UnlockDDLLockRequest) (*pb.UnlockDDLLockResponse, error) {
log.L().Info("", zap.String("lock ID", req.ID), zap.Stringer("payload", req), zap.String("request", "UnlockDDLLock"))
return &pb.UnlockDDLLockResponse{
Result: false,
Msg: "not implement",
}, nil
}

// BreakWorkerDDLLock implements MasterServer.BreakWorkerDDLLock
// TODO(csuzhangxc): implement this later.
func (s *Server) BreakWorkerDDLLock(ctx context.Context, req *pb.BreakWorkerDDLLockRequest) (*pb.BreakWorkerDDLLockResponse, error) {
log.L().Info("", zap.String("lock ID", req.RemoveLockID), zap.Stringer("payload", req), zap.String("request", "BreakWorkerDDLLock"))
return &pb.BreakWorkerDDLLockResponse{
Result: false,
Msg: "not implement",
}, nil
isLeader, needForward := s.isLeaderAndNeedForward()
if !isLeader {
if needForward {
return s.leaderClient.UnlockDDLLock(ctx, req)
}
return nil, terror.ErrMasterRequestIsNotForwardToLeader
}

resp := &pb.UnlockDDLLockResponse{
Result: true,
}
err := s.pessimist.UnlockLock(ctx, req.ID, req.ReplaceOwner, req.ForceRemove)
if err != nil {
resp.Result = false
resp.Msg = terror.Message(err)
}

return resp, nil
}

// HandleSQLs implements MasterServer.HandleSQLs
Expand Down
Loading