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 #3521 from swordqiu/hotfix/qj-baremetal-storagecache-create-register-failure

Browse Source 
fix: baremetal failed to register due to duplicate storagecache
This commit is contained in:
yunion-ci-robot
2019-11-08 10:29:15 +08:00
committed by GitHub
parent 8b4d1d821b 251f070318
commit 2e821e4d8a
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/agent/agent.go
+17 -5
View File
@@ -28,6 +28,7 @@ import (
"yunion.io/x/onecloud/pkg/hostman/storageman"
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/onecloud/pkg/mcclient/modules"
"yunion.io/x/onecloud/pkg/util/httputils"
)
type IAgent interface {
@@ -284,19 +285,30 @@ func (agent *SBaseAgent) createOrUpdateBaremetalAgent(session *mcclient.ClientSe
agent.AgentName = agentName
storageCacheId, _ := cloudObj.GetString("storagecache_id")
if len(storageCacheId) > 0 {
err = agent.updateStorageCache(session, storageCacheId)
if err != nil {
if httputils.ErrorCode(errors.Cause(err)) == 404 {
storageCacheId = ""
} else {
return err
}
}
}
if len(storageCacheId) == 0 {
storageCacheId, err = agent.createStorageCache(session)
if err != nil {
return err
}
_, err = agent.updateBaremetalAgent(session, agentId, storageCacheId)
cloudObj, err = agent.updateBaremetalAgent(session, agentId, storageCacheId)
if err != nil {
return err
}
} else {
err = agent.updateStorageCache(session, storageCacheId)
if err != nil {
return err
newStorageCacheId, _ := cloudObj.GetString("storagecache_id")
if newStorageCacheId != storageCacheId {
// cleanup the newly created storagecache
modules.Storagecaches.Delete(session, storageCacheId, nil)
return errors.Error("agent not support storagecache_id, region might not be up-to-date")
}
}
agent.CacheManager = storageman.NewLocalImageCacheManager(agent.IAgent(), agent.CachePath, storageCacheId)