6bdbeed319
Fix a case where `node.StatusUpdatedAt` was manipulated directly in memory. This ensures that StatusUpdatedAt is set in raft layer, and ensures that the field is updated when node drain/eligibility is updated too.
57 lines
1.8 KiB
Go
57 lines
1.8 KiB
Go
package nomad
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/hashicorp/nomad/nomad/structs"
|
|
)
|
|
|
|
// drainerShim implements the drainer.RaftApplier interface required by the
|
|
// NodeDrainer.
|
|
type drainerShim struct {
|
|
s *Server
|
|
}
|
|
|
|
func (d drainerShim) NodesDrainComplete(nodes []string, event *structs.NodeEvent) (uint64, error) {
|
|
args := &structs.BatchNodeUpdateDrainRequest{
|
|
Updates: make(map[string]*structs.DrainUpdate, len(nodes)),
|
|
NodeEvents: make(map[string]*structs.NodeEvent, len(nodes)),
|
|
WriteRequest: structs.WriteRequest{Region: d.s.config.Region},
|
|
UpdatedAt: time.Now().Unix(),
|
|
}
|
|
|
|
update := &structs.DrainUpdate{}
|
|
for _, node := range nodes {
|
|
args.Updates[node] = update
|
|
if event != nil {
|
|
args.NodeEvents[node] = event
|
|
}
|
|
}
|
|
|
|
resp, index, err := d.s.raftApply(structs.BatchNodeUpdateDrainRequestType, args)
|
|
return d.convertApplyErrors(resp, index, err)
|
|
}
|
|
|
|
func (d drainerShim) AllocUpdateDesiredTransition(allocs map[string]*structs.DesiredTransition, evals []*structs.Evaluation) (uint64, error) {
|
|
args := &structs.AllocUpdateDesiredTransitionRequest{
|
|
Allocs: allocs,
|
|
Evals: evals,
|
|
WriteRequest: structs.WriteRequest{Region: d.s.config.Region},
|
|
}
|
|
resp, index, err := d.s.raftApply(structs.AllocUpdateDesiredTransitionRequestType, args)
|
|
return d.convertApplyErrors(resp, index, err)
|
|
}
|
|
|
|
// convertApplyErrors parses the results of a raftApply and returns the index at
|
|
// which it was applied and any error that occurred. Raft Apply returns two
|
|
// separate errors, Raft library errors and user returned errors from the FSM.
|
|
// This helper, joins the errors by inspecting the applyResponse for an error.
|
|
func (d drainerShim) convertApplyErrors(applyResp interface{}, index uint64, err error) (uint64, error) {
|
|
if applyResp != nil {
|
|
if fsmErr, ok := applyResp.(error); ok && fsmErr != nil {
|
|
return index, fsmErr
|
|
}
|
|
}
|
|
return index, err
|
|
}
|