Merge pull request #18525 from ioito/automated-cherry-pick-of-#18524-upstream-release-3.11

Automated cherry pick of #18524: fix(region): skip vm eip not found error log
This commit is contained in:
Zexi Li
2023-11-01 10:13:46 +08:00
committed by GitHub
+4 -1
View File
@@ -1120,7 +1120,10 @@ func syncVMPeripherals(
account, _ := provider.GetCloudaccount()
if account == nil || account.IsNotSkipSyncResource(ElasticipManager) {
err = syncVMEip(ctx, userCred, provider, local, remote)
if err != nil && errors.Cause(err) != cloudprovider.ErrNotSupported && errors.Cause(err) != cloudprovider.ErrNotImplemented {
if err != nil &&
errors.Cause(err) != cloudprovider.ErrNotSupported &&
errors.Cause(err) != cloudprovider.ErrNotImplemented &&
errors.Cause(err) != cloudprovider.ErrNotFound {
logclient.AddSimpleActionLog(local, logclient.ACT_CLOUD_SYNC, errors.Wrapf(err, "syncVMEip"), userCred, false)
}
}