opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 15:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.6.0 -> release/2.7.0

Browse Source 
* commit '4eb314ab5ea31d04b11e9dda35aa20d9afd5da3c':
  disable host reset iptables
  fix delete disk panic
This commit is contained in:
邱剑
2019-02-27 16:10:04 +08:00
parent 33f272eab3 4eb314ab5e
commit d700cb0162
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/disks.go
+2 -1
View File
@@ -1395,7 +1395,8 @@ func (self *SDisk) PerformPurge(ctx context.Context, userCred mcclient.TokenCred
}
func (self *SDisk) CustomizeDelete(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) error {
if self.GetCloudprovider().Provider == CLOUD_PROVIDER_HUAWEI && self.GetSnapshotCount() > 0 {
provider := self.GetCloudprovider()
if provider != nil && provider.Provider == CLOUD_PROVIDER_HUAWEI && self.GetSnapshotCount() > 0 {
return httperrors.NewForbiddenError("not allow to delete. Virtual disk must not have snapshots")
}
pkg/hostman/hostinfo/hostinfo.go
+4 -4
View File
@@ -228,10 +228,10 @@ func (h *SHostInfo) prepareEnv() error {
return err
}
err = h.resetIptables()
if err != nil {
return err
}
// err = h.resetIptables()
// if err != nil {
// return err
// }
if options.HostOptions.EnableKsm {
h.EnableKsm(900)