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

fix(region): guest sync log (#17828)

Browse Source
This commit is contained in:
屈轩
2023-08-24 03:11:34 +08:00
committed by GitHub
parent 4b5e211ab9
commit 4429886ef9
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/cloudsync.go
+9 -8
View File
@@ -33,6 +33,7 @@ import (
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/onecloud/pkg/mcclient/auth"
"yunion.io/x/onecloud/pkg/mcclient/modules/scheduler"
"yunion.io/x/onecloud/pkg/util/logclient"
)
type SSyncableBaseResource struct {
@@ -1030,23 +1031,23 @@ func syncVMPeripherals(
driver cloudprovider.ICloudProvider,
) {
err := syncVMNics(ctx, userCred, provider, host, local, remote)
if err != nil {
log.Errorf("syncVMNics error %s", err)
if err != nil && errors.Cause(err) != cloudprovider.ErrNotSupported && errors.Cause(err) != cloudprovider.ErrNotImplemented {
logclient.AddSimpleActionLog(local, logclient.ACT_CLOUD_SYNC, errors.Wrapf(err, "syncVMNics"), userCred, false)
}
err = syncVMDisks(ctx, userCred, provider, driver, host, local, remote)
if err != nil {
log.Errorf("syncVMDisks error %s", err)
if err != nil && errors.Cause(err) != cloudprovider.ErrNotSupported && errors.Cause(err) != cloudprovider.ErrNotImplemented {
logclient.AddSimpleActionLog(local, logclient.ACT_CLOUD_SYNC, errors.Wrapf(err, "syncVMDisks"), userCred, false)
}
account, _ := provider.GetCloudaccount()
if account == nil || account.IsNotSkipSyncResource(ElasticipManager) {
err = syncVMEip(ctx, userCred, provider, local, remote)
if err != nil {
log.Errorf("syncVMEip error %s", err)
if err != nil && errors.Cause(err) != cloudprovider.ErrNotSupported && errors.Cause(err) != cloudprovider.ErrNotImplemented {
logclient.AddSimpleActionLog(local, logclient.ACT_CLOUD_SYNC, errors.Wrapf(err, "syncVMEip"), userCred, false)
}
}
err = syncVMSecgroups(ctx, userCred, provider, local, remote)
if err != nil {
log.Errorf("syncVMSecgroups error %s", err)
if err != nil && errors.Cause(err) != cloudprovider.ErrNotSupported && errors.Cause(err) != cloudprovider.ErrNotImplemented {
logclient.AddSimpleActionLog(local, logclient.ACT_CLOUD_SYNC, errors.Wrapf(err, "syncVMSecgroups"), userCred, false)
}
result := local.SyncInstanceSnapshots(ctx, userCred, provider)
if result.IsError() {