luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

lots of comment/log fixes

This commit is contained in:
Michael Schurter 2018-08-22 10:18:49 -07:00
parent 5749ede04e
commit 4236255686
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/client.go
View File

@ -1889,7 +1889,7 @@ func (c *Client) updateAlloc(update *structs.Allocation) {
// Update local copy of alloc
if err := c.stateDB.PutAllocation(update); err != nil {
c.logger.Printf("[ERR] client: dropping alloc update. Unable to persist locally: %q", update.ID)
c.logger.Printf("[ERR] client: error persisting updated alloc locally: %q", update.ID)
}
// Update alloc runner

20
client/state/state_database.go
View File

@ -54,12 +54,13 @@ func GetStateDBFactory(devMode bool) NewStateDBFunc {
}
// BoltStateDB persists and restores Nomad client state in a boltdb. All
// methods are safe for concurrent access. Create via NewStateDB by setting
// devMode=false.
// methods are safe for concurrent access.
type BoltStateDB struct {
db *boltdd.DB
}
// NewBoltStateDB creates or opens an existing boltdb state file or returns an
// error.
func NewBoltStateDB(stateDir string) (StateDB, error) {
// Create or open the boltdb state database
db, err := boltdd.Open(filepath.Join(stateDir, "state.db"), 0600, nil)
@ -121,13 +122,13 @@ func (s *BoltStateDB) getAllAllocations(tx *boltdd.Tx) ([]*structs.Allocation, m
continue
}
var allocState allocEntry
if err := allocBkt.Get(allocKey, &allocState); err != nil {
errs[allocID] = fmt.Errorf("failed to decode alloc %v", err)
var ae allocEntry
if err := allocBkt.Get(allocKey, &ae); err != nil {
errs[allocID] = fmt.Errorf("failed to decode alloc: %v", err)
continue
}
allocs = append(allocs, allocState.Alloc)
allocs = append(allocs, ae.Alloc)
}
return allocs, errs
@ -157,7 +158,6 @@ func (s *BoltStateDB) PutAllocation(alloc *structs.Allocation) error {
}
// GetTaskRunnerState restores TaskRunner specific state.
//TODO wrap in a single struct?
func (s *BoltStateDB) GetTaskRunnerState(allocID, taskName string) (*trstate.LocalState, *structs.TaskState, error) {
var ls trstate.LocalState
var ts structs.TaskState
@ -169,7 +169,6 @@ func (s *BoltStateDB) GetTaskRunnerState(allocID, taskName string) (*trstate.Loc
}
// Restore Local State
//XXX set persisted hash to avoid immediate write on first use?
if err := bkt.Get(taskLocalStateKey, &ls); err != nil {
return fmt.Errorf("failed to read local task runner state: %v", err)
}
@ -179,10 +178,6 @@ func (s *BoltStateDB) GetTaskRunnerState(allocID, taskName string) (*trstate.Loc
return fmt.Errorf("failed to read task state: %v", err)
}
// XXX if driver has task {
// tr.restoreDriver()
// }
return nil
})
@ -195,7 +190,6 @@ func (s *BoltStateDB) GetTaskRunnerState(allocID, taskName string) (*trstate.Loc
}
// PutTaskRunnerLocalState stores TaskRunner's LocalState or returns an error.
// It is up to the caller to serialize the state to bytes.
func (s *BoltStateDB) PutTaskRunnerLocalState(allocID, taskName string, val interface{}) error {
return s.db.Update(func(tx *boltdd.Tx) error {
taskBkt, err := getTaskBucket(tx, allocID, taskName)

2
helper/boltdd/boltdd.go
View File

@ -148,7 +148,7 @@ func (tx *Tx) Writable() bool {
return tx.btx.Writable()
}
// BoltTx returns the unerlying bolt.Tx
// BoltTx returns the underlying bolt.Tx.
func (tx *Tx) BoltTx() *bolt.Tx {
return tx.btx
}