opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1635 from swordqiu/hotfix/qj-prevent-quota-list-timeout

Browse Source 
fix: possible reduce timeout for quota list
This commit is contained in:
yunion-ci-robot
2019-07-10 11:54:54 +08:00
committed by GitHub
parent 06573f0fc8 c56e6c32e7
commit 6abe2a64b3
4 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/quotas/handler.go
+6 -3
View File
@@ -466,7 +466,8 @@ func (manager *SQuotaBaseManager) listQuotas(ctx context.Context, targetDomainId
if len(projectId) > 0 {
quota.Set("tenant_id", jsonutils.NewString(projectId))
quota.Set("domain_id", jsonutils.NewString(domainId))
project, err := db.TenantCacheManager.FetchTenantById(ctx, projectId)
// fetch without cache expiration check
project, err := db.TenantCacheManager.FetchTenantByIdWithoutExpireCheck(ctx, projectId)
if err != nil {
return nil, err
}
@@ -474,7 +475,8 @@ func (manager *SQuotaBaseManager) listQuotas(ctx context.Context, targetDomainId
quota.Set("project_domain", jsonutils.NewString(project.Domain))
} else {
quota.Set("domain_id", jsonutils.NewString(domainId))
domain, err := db.TenantCacheManager.FetchDomainById(ctx, domainId)
// fetch without cache expiration check
domain, err := db.TenantCacheManager.FetchDomainByIdWithoutExpireCheck(ctx, domainId)
if err != nil {
return nil, err
}
@@ -497,7 +499,8 @@ func (manager *SQuotaBaseManager) listQuotas(ctx context.Context, targetDomainId
return nil, httperrors.NewInternalServerError("query domain initial quotas %s", err)
}
quota.Set("domain_id", jsonutils.NewString(targetDomainId))
domain, err := db.TenantCacheManager.FetchDomainById(ctx, targetDomainId)
// fetch without cache expiration check
domain, err := db.TenantCacheManager.FetchDomainByIdWithoutExpireCheck(ctx, targetDomainId)
if err != nil {
return nil, err
}
pkg/cloudcommon/db/tenantcache.go
+24 -8
View File
@@ -97,7 +97,7 @@ func (manager *STenantCacheManager) updateTenantCache(userCred mcclient.TokenCre
userCred.GetProjectDomainId(), userCred.GetProjectDomain())
}
func (manager *STenantCacheManager) fetchTenant(ctx context.Context, idStr string, isDomain bool, filter func(q *sqlchemy.SQuery) *sqlchemy.SQuery) (*STenant, error) {
func (manager *STenantCacheManager) fetchTenant(ctx context.Context, idStr string, isDomain bool, noExpireCheck bool, filter func(q *sqlchemy.SQuery) *sqlchemy.SQuery) (*STenant, error) {
q := manager.Query()
if isDomain {
q = q.Equals("domain_id", identityapi.KeystoneDomainRoot)
@@ -114,7 +114,7 @@ func (manager *STenantCacheManager) fetchTenant(ctx context.Context, idStr strin
return nil, errors.Wrap(err, "query")
} else if tobj != nil {
tenant := tobj.(*STenant)
if !tenant.IsExpired() {
if noExpireCheck || !tenant.IsExpired() {
return tenant, nil
}
}
@@ -137,7 +137,7 @@ func (t *STenant) IsExpired() bool {
}
func (manager *STenantCacheManager) FetchTenantByIdOrName(ctx context.Context, idStr string) (*STenant, error) {
return manager.fetchTenant(ctx, idStr, false, func(q *sqlchemy.SQuery) *sqlchemy.SQuery {
return manager.fetchTenant(ctx, idStr, false, false, func(q *sqlchemy.SQuery) *sqlchemy.SQuery {
if stringutils2.IsUtf8(idStr) {
return q.Equals("name", idStr)
} else {
@@ -150,13 +150,21 @@ func (manager *STenantCacheManager) FetchTenantByIdOrName(ctx context.Context, i
}
func (manager *STenantCacheManager) FetchTenantById(ctx context.Context, idStr string) (*STenant, error) {
return manager.fetchTenant(ctx, idStr, false, func(q *sqlchemy.SQuery) *sqlchemy.SQuery {
return manager.fetchTenantById(ctx, idStr, false)
}
func (manager *STenantCacheManager) FetchTenantByIdWithoutExpireCheck(ctx context.Context, idStr string) (*STenant, error) {
return manager.fetchTenantById(ctx, idStr, false)
}
func (manager *STenantCacheManager) fetchTenantById(ctx context.Context, idStr string, noExpireCheck bool) (*STenant, error) {
return manager.fetchTenant(ctx, idStr, false, noExpireCheck, func(q *sqlchemy.SQuery) *sqlchemy.SQuery {
return q.Filter(sqlchemy.Equals(q.Field("id"), idStr))
})
}
func (manager *STenantCacheManager) FetchTenantByName(ctx context.Context, idStr string) (*STenant, error) {
return manager.fetchTenant(ctx, idStr, false, func(q *sqlchemy.SQuery) *sqlchemy.SQuery {
return manager.fetchTenant(ctx, idStr, false, false, func(q *sqlchemy.SQuery) *sqlchemy.SQuery {
return q.Filter(sqlchemy.Equals(q.Field("name"), idStr))
})
}
@@ -185,7 +193,7 @@ func (manager *STenantCacheManager) fetchTenantFromKeystone(ctx context.Context,
}
func (manager *STenantCacheManager) FetchDomainByIdOrName(ctx context.Context, idStr string) (*STenant, error) {
return manager.fetchTenant(ctx, idStr, true, func(q *sqlchemy.SQuery) *sqlchemy.SQuery {
return manager.fetchTenant(ctx, idStr, true, false, func(q *sqlchemy.SQuery) *sqlchemy.SQuery {
if stringutils2.IsUtf8(idStr) {
return q.Equals("name", idStr)
} else {
@@ -198,13 +206,21 @@ func (manager *STenantCacheManager) FetchDomainByIdOrName(ctx context.Context, i
}
func (manager *STenantCacheManager) FetchDomainById(ctx context.Context, idStr string) (*STenant, error) {
return manager.fetchTenant(ctx, idStr, true, func(q *sqlchemy.SQuery) *sqlchemy.SQuery {
return manager.fetchDomainById(ctx, idStr, false)
}
func (manager *STenantCacheManager) FetchDomainByIdWithoutExpireCheck(ctx context.Context, idStr string) (*STenant, error) {
return manager.fetchDomainById(ctx, idStr, true)
}
func (manager *STenantCacheManager) fetchDomainById(ctx context.Context, idStr string, noExpireCheck bool) (*STenant, error) {
return manager.fetchTenant(ctx, idStr, true, noExpireCheck, func(q *sqlchemy.SQuery) *sqlchemy.SQuery {
return q.Filter(sqlchemy.Equals(q.Field("id"), idStr))
})
}
func (manager *STenantCacheManager) FetchDomainByName(ctx context.Context, idStr string) (*STenant, error) {
return manager.fetchTenant(ctx, idStr, true, func(q *sqlchemy.SQuery) *sqlchemy.SQuery {
return manager.fetchTenant(ctx, idStr, true, false, func(q *sqlchemy.SQuery) *sqlchemy.SQuery {
return q.Filter(sqlchemy.Equals(q.Field("name"), idStr))
})
}
pkg/compute/models/disks.go
+6 -1
View File
@@ -1324,7 +1324,7 @@ func (manager *SDiskManager) newFromCloudDisk(ctx context.Context, userCred mccl
return &disk, nil
}
func totalDiskSize(scope rbacutils.TRbacScope, ownerId mcclient.IIdentityProvider, active tristate.TriState, ready tristate.TriState, includeSystem bool) int {
func totalDiskSize(scope rbacutils.TRbacScope, ownerId mcclient.IIdentityProvider, active tristate.TriState, ready tristate.TriState, includeSystem bool, pendingDelete bool) int {
disks := DiskManager.Query().SubQuery()
q := disks.Query(sqlchemy.SUM("total", disks.Field("disk_size")))
if !active.IsNone() {
@@ -1358,6 +1358,11 @@ func totalDiskSize(scope rbacutils.TRbacScope, ownerId mcclient.IIdentityProvide
q = q.Filter(sqlchemy.OR(sqlchemy.IsNull(disks.Field("is_system")),
sqlchemy.IsFalse(disks.Field("is_system"))))
}
if pendingDelete {
q = q.Filter(sqlchemy.IsTrue(disks.Field("pending_deleted")))
} else {
q = q.Filter(sqlchemy.OR(sqlchemy.IsNull(disks.Field("pending_deleted")), sqlchemy.IsFalse(disks.Field("pending_deleted"))))
}
row := q.Row()
size := sql.NullInt64{}
pkg/compute/models/quotas.go
+1 -1
View File
@@ -90,7 +90,7 @@ func (self *SQuota) FetchSystemQuota(scope rbacutils.TRbacScope, ownerId mcclien
}
func (self *SQuota) FetchUsage(ctx context.Context, scope rbacutils.TRbacScope, ownerId mcclient.IIdentityProvider, name []string) error {
diskSize := totalDiskSize(scope, ownerId, tristate.None, tristate.None, false)
diskSize := totalDiskSize(scope, ownerId, tristate.None, tristate.None, false, false)
net := totalGuestNicCount(scope, ownerId, nil, false)
lbnic, _ := totalLBNicCount(scope, ownerId)
// net := WireManager.TotalCount(nil, nil, nil, "", scope, ownerId)