-
Notifications
You must be signed in to change notification settings - Fork 4.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
improve op command by using cache return 404 if no job found to stop
- Loading branch information
1 parent
e4952b7
commit 6c6dbbe
Showing
9 changed files
with
306 additions
and
56 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,166 @@ | ||
| // Copyright 2018 The Harbor Authors. All rights reserved. | ||
|
|
||
| package opm | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "errors" | ||
| "fmt" | ||
| "sync" | ||
| "time" | ||
|
|
||
| "github.com/garyburd/redigo/redis" | ||
| "github.com/vmware/harbor/src/jobservice/logger" | ||
| "github.com/vmware/harbor/src/jobservice/models" | ||
| "github.com/vmware/harbor/src/jobservice/utils" | ||
| ) | ||
|
|
||
| const ( | ||
| commandValidTime = 5 * time.Minute | ||
| commandSweepTickerTime = 1 * time.Hour | ||
| //EventFireCommand for firing command event | ||
| EventFireCommand = "fire_command" | ||
| ) | ||
|
|
||
| type oPCommand struct { | ||
| command string | ||
| fireTime int64 | ||
| } | ||
|
|
||
| //oPCommands maintain commands list | ||
| type oPCommands struct { | ||
| lock *sync.RWMutex | ||
| commands map[string]*oPCommand | ||
| context context.Context | ||
| redisPool *redis.Pool | ||
| namespace string | ||
| stopChan chan struct{} | ||
| doneChan chan struct{} | ||
| } | ||
|
|
||
| //newOPCommands is constructor of OPCommands | ||
| func newOPCommands(ctx context.Context, ns string, redisPool *redis.Pool) *oPCommands { | ||
| return &oPCommands{ | ||
| lock: new(sync.RWMutex), | ||
| commands: make(map[string]*oPCommand), | ||
| context: ctx, | ||
| redisPool: redisPool, | ||
| namespace: ns, | ||
| stopChan: make(chan struct{}, 1), | ||
| doneChan: make(chan struct{}, 1), | ||
| } | ||
| } | ||
|
|
||
| //Start the command sweeper | ||
| func (opc *oPCommands) Start() { | ||
| go opc.loop() | ||
| logger.Info("OP commands sweeper is started") | ||
| } | ||
|
|
||
| //Stop the command sweeper | ||
| func (opc *oPCommands) Stop() { | ||
| opc.stopChan <- struct{}{} | ||
| <-opc.doneChan | ||
| } | ||
|
|
||
| //Fire command | ||
| func (opc *oPCommands) Fire(jobID string, command string) error { | ||
| if utils.IsEmptyStr(jobID) { | ||
| return errors.New("empty job ID") | ||
| } | ||
|
|
||
| if command != CtlCommandStop && command != CtlCommandCancel { | ||
| return fmt.Errorf("Unsupported command %s", command) | ||
| } | ||
|
|
||
| notification := &models.Message{ | ||
| Event: EventFireCommand, | ||
| Data: []string{jobID, command}, | ||
| } | ||
|
|
||
| rawJSON, err := json.Marshal(notification) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| conn := opc.redisPool.Get() | ||
| defer conn.Close() | ||
|
|
||
| _, err = conn.Do("PUBLISH", utils.KeyPeriodicNotification(opc.namespace), rawJSON) | ||
|
|
||
| return err | ||
| } | ||
|
|
||
| //Push command into the list | ||
| func (opc *oPCommands) Push(jobID string, command string) error { | ||
| if utils.IsEmptyStr(jobID) { | ||
| return errors.New("empty job ID") | ||
| } | ||
|
|
||
| if command != CtlCommandStop && command != CtlCommandCancel { | ||
| return fmt.Errorf("Unsupported command %s", command) | ||
| } | ||
|
|
||
| opc.lock.Lock() | ||
| defer opc.lock.Unlock() | ||
|
|
||
| opc.commands[jobID] = &oPCommand{ | ||
| command: command, | ||
| fireTime: time.Now().Unix(), | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| //Pop out the command if existing | ||
| func (opc *oPCommands) Pop(jobID string) (string, bool) { | ||
| if utils.IsEmptyStr(jobID) { | ||
| return "", false | ||
| } | ||
|
|
||
| opc.lock.RLock() | ||
| defer opc.lock.RUnlock() | ||
|
|
||
| c, ok := opc.commands[jobID] | ||
| if ok { | ||
| if time.Unix(c.fireTime, 0).Add(commandValidTime).After(time.Now()) { | ||
| delete(opc.commands, jobID) | ||
| return c.command, true | ||
| } | ||
| } | ||
|
|
||
| return "", false | ||
| } | ||
|
|
||
| func (opc *oPCommands) loop() { | ||
| defer func() { | ||
| logger.Info("OP commands is stopped") | ||
| opc.doneChan <- struct{}{} | ||
| }() | ||
|
|
||
| tk := time.NewTicker(commandSweepTickerTime) | ||
| defer tk.Stop() | ||
|
|
||
| for { | ||
| select { | ||
| case <-tk.C: | ||
| opc.sweepCommands() | ||
| case <-opc.context.Done(): | ||
| return | ||
| case <-opc.stopChan: | ||
| return | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func (opc *oPCommands) sweepCommands() { | ||
| opc.lock.Lock() | ||
| defer opc.lock.Unlock() | ||
|
|
||
| for k, v := range opc.commands { | ||
| if time.Unix(v.fireTime, 0).Add(commandValidTime).After(time.Now()) { | ||
| delete(opc.commands, k) | ||
| } | ||
| } | ||
| } |
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
Oops, something went wrong.