scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-10-07 19:37:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

change lock order

Browse source
This commit is contained in:
Samir Patel 2021-05-29 21:03:43 -05:00 • committed by Samir Patel
parent 20b721ad9d
commit 017d012d51
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
api.go
View file

@ -948,11 +948,13 @@ func (api *API) Usage(ctx context.Context, remote bool) (map[string]NodeUsage, e
span, _ := tracing.StartSpanFromContext(ctx, "API.Usage")
defer span.Finish()
fmt.Println("Usage")
api.usageCache.muRead.Lock()
defer api.usageCache.muRead.Unlock()
lastUpdated := api.usageCache.lastUpdated
api.usageCache.muRead.Unlock()
var t time.Time
if api.usageCache.lastUpdated == t {
if lastUpdated == t {
api.calculateUsage()
}
@ -1032,13 +1034,18 @@ func (api *API) calculateUsage() {
},
LastUpdated: lastUpdated,
}
fmt.Println("calculate - before read lock")
api.usageCache.muRead.Lock()
fmt.Println("calculate - after read lock")
api.usageCache.data = make(map[string]NodeUsage)
api.usageCache.data[api.server.nodeID] = nodeUsage
api.usageCache.lastUpdated = lastUpdated
api.usageCache.muRead.Unlock()
fmt.Println("calculate - after read unlock")
}
fmt.Println("calculate - before wg done")
api.server.wg.Done()
fmt.Println("calculate - after wg done")
}
// Periodically calculates disk usage
@ -1049,6 +1056,7 @@ func (api *API) RefreshUsageCache(refresh time.Duration, trigger chan bool) {
resetTrigger: trigger,
}
for {
fmt.Println("Refresh Usage Cache - Loop")
api.calculateUsage()
select {
case <-trigger: