Machine endpoints #2
Conversation
- boot-installer - installer-callback - fetch-machine
Colors that that indicate certain states: - cyan: pending (boot-installer called) - blue: booting (request sent to manager) - green: booted (installer-callback called)
database.go
Outdated
| @@ -115,28 +187,220 @@ func (db *tateruDb) Poll() { | |||
| db.machinesMutex.Lock() | |||
| db.machines = machs | |||
| db.machinesMutex.Unlock() | |||
|
|
|||
| // TODO: expire old install requests? | |||
There was a problem hiding this comment.
In tateru-vsphere I use github.com/hashicorp/golang-lru
database.go
Outdated
| time.Sleep(time.Second * 30) | ||
| } | ||
| } | ||
|
|
||
| func (db *tateruDb) HandleMachinesAPI(w http.ResponseWriter, r *http.Request) { | ||
| w.Header().Add("content-type", "application/json; charset=utf-8") | ||
|
|
||
| if r.Method != "GET" { | ||
| http.Error(w, "Unsupported method", http.StatusMethodNotAllowed) | ||
| db.machinesMutex.RLock() |
There was a problem hiding this comment.
Try to limit the area where the lock is held. You don't have to bend over backwards, here you only need it over the for-loop, and not during JSON construction and data writing.
There was a problem hiding this comment.
Tried to improve mutex handling a bit in 846cb6b as well
database.go
Outdated
|
|
||
| db.machinesMutex.RLock() | ||
| b, err := json.MarshalIndent(db.machines, "", " ") | ||
| defer db.machinesMutex.RUnlock() |
database.go
Outdated
| uuid := vars["uuid"] | ||
|
|
||
| db.machinesMutex.Lock() | ||
| defer db.machinesMutex.Unlock() |
There was a problem hiding this comment.
And especially here as you do calls to other machines while holding a Read/Write lock.
Instead of reusing machinesMutex to also guard installRequests, I think you should either rename the machinesMutex to be dbMutex or, preferably, create a new installRequestsMutex.
Also, if you haven't already - consider using https://pkg.go.dev/sync#Map to avoid another mutex altogether.
Also switch to hashicorps golang-lru for storing installRequests
Add missing endpoints to make tateru work.
Some points that might require more fixes/ discussion: