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 #8468 from ioito/hotfix/qx-rds-fix

Browse Source 
fix: qcloud 5.5 single zone
This commit is contained in:
yunion-ci-robot
2020-10-23 20:18:17 +08:00
committed by GitHub
parent 9822abac3a 9a03bf17ce
commit 8ea168a6e8
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/dbinstances.go
+9
View File
@@ -273,6 +273,15 @@ func (man *SDBInstanceManager) QueryDistinctExtraField(q *sqlchemy.SQuery, field
return q, httperrors.ErrNotFound
}
func (manager *SDBInstanceManager) BatchCreateValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) {
input := api.DBInstanceCreateInput{}
err := data.Unmarshal(&input)
if err != nil {
return nil, errors.Wrapf(err, "data.Unmarshal")
}
return manager.ValidateCreateData(ctx, userCred, ownerId, query, input)
}
func (man *SDBInstanceManager) ValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, input api.DBInstanceCreateInput) (*jsonutils.JSONDict, error) {
data := input.JSON(input)
networkV := validators.NewModelIdOrNameValidator("network", "network", ownerId)
pkg/multicloud/qcloud/rds_mysql.go
+3
View File
@@ -758,6 +758,9 @@ func (self *SRegion) CreateMySQLDBInstance(opts *cloudprovider.SManagedDBInstanc
params["BackupZone"] = opts.Zone3
}
}
if opts.EngineVersion == "5.5" { // 5.5 不支持多可用区部署
params["DeployMode"] = "0"
}
params["ClientToken"] = utils.GenRequestId(20)
resp, err := self.cdbRequest(action, params)
if err != nil {