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 #1568 from ioito/hotfix/qx-tenant-cache

Browse Source 
fix cache domain tenants
This commit is contained in:
yunion-ci-robot
2019-07-06 17:18:55 +08:00
committed by GitHub
parent d051b68306 856420f675
commit 7de7cf24f3
2 changed files with 61 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/tenantcache.go
+45 -2
View File
@@ -21,6 +21,8 @@ import (
"runtime/debug"
"time"
"yunion.io/x/jsonutils"
"github.com/pkg/errors"
"yunion.io/x/log"
@@ -316,13 +318,54 @@ func (tenant *STenant) GetDomainId() string {
return tenant.DomainId
}
func (manager *STenantCacheManager) FindFirstProjectOfDomain(domainId string) (*STenant, error) {
func (manager *STenantCacheManager) findFirstProjectOfDomain(domainId string) (*STenant, error) {
q := manager.Query().Equals("domain_id", domainId)
tenant := STenant{}
tenant.SetModelManager(manager, &tenant)
err := q.First(&tenant)
if err != nil {
return nil, errors.Wrap(err, "queryFirst")
return nil, err
}
return &tenant, nil
}
func (manager *STenantCacheManager) fetchDomainTenantsFromKeystone(domainId string) error {
if len(domainId) == 0 {
log.Debugf("fetch empty domain!!!!")
debug.PrintStack()
return fmt.Errorf("Empty domainId")
}
s := auth.GetAdminSession(context.Background(), consts.GetRegion(), "v1")
params := jsonutils.Marshal(map[string]string{"domain_id": domainId})
tenants, err := modules.Projects.List(s, params)
if err != nil {
return errors.Wrap(err, "Projects.List")
}
for _, tenant := range tenants.Data {
tenantId, _ := tenant.GetString("id")
tenantName, _ := tenant.GetString("name")
domainId, _ := tenant.GetString("domain_id")
domainName, _ := tenant.GetString("project_domain")
_, err = manager.Save(context.Background(), tenantId, tenantName, domainId, domainName)
if err != nil {
return err
}
}
return nil
}
func (manager *STenantCacheManager) FindFirstProjectOfDomain(domainId string) (*STenant, error) {
tenant, err := manager.findFirstProjectOfDomain(domainId)
if err != nil {
if err == sql.ErrNoRows {
err = manager.fetchDomainTenantsFromKeystone(domainId)
if err != nil {
return nil, errors.Wrap(err, "fetchDomainTenantsFromKeystone")
}
return manager.findFirstProjectOfDomain(domainId)
}
return nil, errors.Wrap(err, "findFirstProjectOfDomain.queryFirst")
}
return tenant, nil
}