kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-07 02:45:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

autopilot: correctly return errors within state functions. (#12714)

Browse Source
This commit is contained in:
James Rasell
2022-04-21 08:54:50 +02:00
committed by GitHub
parent 7f1b838abb
commit 61ec5f0456
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
nomad/state/autopilot.go
View File

@@ -49,10 +49,11 @@ func (s *StateStore) AutopilotSetConfig(index uint64, config *structs.AutopilotC
tx := s.db.WriteTxn(index)
defer tx.Abort()
s.autopilotSetConfigTxn(index, tx, config)
if err := s.autopilotSetConfigTxn(index, tx, config); err != nil {
return err
}
tx.Commit()
return nil
return tx.Commit()
}
// AutopilotCASConfig is used to try updating the Autopilot configuration with a
@@ -76,10 +77,12 @@ func (s *StateStore) AutopilotCASConfig(index, cidx uint64, config *structs.Auto
return false, nil
}
s.autopilotSetConfigTxn(index, tx, config)
if err := s.autopilotSetConfigTxn(index, tx, config); err != nil {
return false, err
}
tx.Commit()
return true, nil
err = tx.Commit()
return err == nil, err
}
func (s *StateStore) autopilotSetConfigTxn(idx uint64, tx *txn, config *structs.AutopilotConfig) error {