opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-08-30 17:13:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10613 from swordqiu/automated-cherry-pick-of-#10612-upstream-release-3.7

Browse Source 
Automated cherry pick of #10612: fix(region): add usage cache, speedup response
This commit is contained in:
Zexi Li
2021-04-05 00:55:18 +08:00
committed by GitHub
parent 2e2f995d98 c2d3355ba6
commit 4b4349fe7d
3 changed files with 106 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/climc/shell/compute/usages.go
+5
View File
@@ -32,6 +32,8 @@ type GeneralUsageOptions struct {
CloudEnv string `help:"show usage of specified cloudenv" choices:"public|private|onpremise"`
Scope string `help:"show usage of specified privilege scope" choices:"system|domain|project"`
Refresh bool `help:"force refresh usage statistics"`
}
func fetchHostTypeOptions(args *GeneralUsageOptions) *jsonutils.JSONDict {
@@ -48,6 +50,9 @@ func fetchHostTypeOptions(args *GeneralUsageOptions) *jsonutils.JSONDict {
if len(args.CloudEnv) > 0 {
params.Add(jsonutils.NewString(args.CloudEnv), "cloud_env")
}
if args.Refresh {
params.Add(jsonutils.JSONTrue, "refresh")
}
return params
}
pkg/compute/usages/cache.go
+85
View File
@@ -0,0 +1,85 @@
// Copyright 2019 Yunion
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package usages
import (
"time"
"yunion.io/x/jsonutils"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/onecloud/pkg/util/hashcache"
"yunion.io/x/onecloud/pkg/util/rbacutils"
)
var (
usageCache = hashcache.NewCache(1024, time.Second*300) // 5 minutes, 1024 buckets cache
)
func getCacheKey(
scope rbacutils.TRbacScope,
userCred mcclient.IIdentityProvider,
isOwner bool,
rangeObjs []db.IStandaloneModel,
hostTypes []string,
providers []string,
brands []string,
cloudEnv string,
includeSystem bool,
) string {
type RangeObject struct {
Resource string `json:"resource"`
Id string `json:"id"`
}
type KeyStruct struct {
Scope rbacutils.TRbacScope `json:"scope"`
Domain string `json:"domain"`
Project string `json:"project"`
IsOwner bool `json:"is_owner"`
Ranges []RangeObject `json:"ranges"`
HostTypes []string `json:"host_types"`
Providers []string `json:"providers"`
Brands []string `json:"brands"`
CloudEnv string `json:"cloud_env"`
System bool `json:"system"`
}
key := KeyStruct{}
key.Scope = scope
switch scope {
case rbacutils.ScopeSystem:
case rbacutils.ScopeDomain:
key.Domain = userCred.GetProjectDomainId()
case rbacutils.ScopeProject:
key.Project = userCred.GetProjectId()
}
if isOwner {
key.IsOwner = true
}
for _, obj := range rangeObjs {
robj := RangeObject{
Resource: obj.Keyword(),
Id: obj.GetId(),
}
key.Ranges = append(key.Ranges, robj)
}
key.HostTypes = hostTypes
key.Providers = providers
key.Brands = brands
key.CloudEnv = cloudEnv
key.System = includeSystem
jsonObj := jsonutils.Marshal(key)
return jsonObj.QueryString()
}
pkg/compute/usages/handler.go
+16 -3
View File
@@ -122,11 +122,21 @@ func rangeObjHandler(
if obj != nil {
rangeObjs = []db.IStandaloneModel{obj}
}
refresh := json.QueryBoolean(query, "refresh", false)
key := getCacheKey(scope, ownerId, isOwner, rangeObjs, hostTypes, providers, brands, cloudEnv, includeSystem)
if !refresh {
cached := usageCache.Get(key)
if cached != nil {
response(w, cached)
return
}
}
usage, err := reporter(scope, ownerId, isOwner, rangeObjs, hostTypes, providers, brands, cloudEnv, includeSystem)
if err != nil {
httperrors.GeneralServerError(ctx, w, err)
return
}
usageCache.AtomicSet(key, usage)
response(w, usage)
}
}
@@ -466,21 +476,24 @@ func ReportGeneralUsage(
) (count Usage, err error) {
count = make(map[string]interface{})
if scope == rbacutils.ScopeSystem || isOwner {
// if scope == rbacutils.ScopeSystem || isOwner {
if scope == rbacutils.ScopeSystem {
count, err = getSystemGeneralUsage(userCred, rangeObjs, hostTypes, providers, brands, cloudEnv, includeSystem)
if err != nil {
return
}
}
if scope.HigherEqual(rbacutils.ScopeDomain) && len(userCred.GetProjectDomainId()) > 0 {
// if scope.HigherEqual(rbacutils.ScopeDomain) && len(userCred.GetProjectDomainId()) > 0 {
if scope == rbacutils.ScopeDomain && len(userCred.GetProjectDomainId()) > 0 {
commonUsage, err := getDomainGeneralUsage(rbacutils.ScopeDomain, userCred, rangeObjs, hostTypes, providers, brands, cloudEnv)
if err == nil {
count.Include(commonUsage)
}
}
if scope.HigherEqual(rbacutils.ScopeProject) && len(userCred.GetProjectId()) > 0 {
// if scope.HigherEqual(rbacutils.ScopeProject) && len(userCred.GetProjectId()) > 0 {
if scope == rbacutils.ScopeProject && len(userCred.GetProjectId()) > 0 {
commonUsage, err := getProjectGeneralUsage(rbacutils.ScopeProject, userCred, rangeObjs, hostTypes, providers, brands, cloudEnv)
if err == nil {
count.Include(commonUsage)