opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): sync cloud project log (#17198)

Browse Source
This commit is contained in:
屈轩
2023-05-30 22:58:11 +08:00
committed by GitHub
parent 4f4a85eaf6
commit 34bbb8777b
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/guestdrivers/managedvirtual.go
+2 -2
View File
@@ -100,7 +100,7 @@ func (self *SManagedVirtualizedGuestDriver) GetJsonDescAtHost(ctx context.Contex
provider := host.GetCloudprovider()
config.ProjectId, err = provider.SyncProject(ctx, userCred, guest.ProjectId)
if err != nil {
log.Errorf("failed to sync project %s for create %s guest %s error: %v", guest.ProjectId, provider.Provider, guest.Name, err)
logclient.AddSimpleActionLog(guest, logclient.ACT_SYNC_CLOUD_PROJECT, err, userCred, false)
}
disks, err := guest.GetDisks()
@@ -1173,7 +1173,7 @@ func (self *SManagedVirtualizedGuestDriver) RequestSyncSecgroupsOnHost(ctx conte
if provider != nil {
remoteProjectId, err = provider.SyncProject(ctx, task.GetUserCred(), guest.ProjectId)
if err != nil {
log.Errorf("failed to sync project %s for guest %s error: %v", guest.ProjectId, guest.Name, err)
logclient.AddSimpleActionLog(guest, logclient.ACT_SYNC_CLOUD_PROJECT, err, task.GetUserCred(), false)
}
}
pkg/compute/hostdrivers/managedvirtual.go
+2 -1
View File
@@ -37,6 +37,7 @@ import (
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/onecloud/pkg/mcclient/auth"
modules "yunion.io/x/onecloud/pkg/mcclient/modules/image"
"yunion.io/x/onecloud/pkg/util/logclient"
)
type SManagedVirtualizationHostDriver struct {
@@ -250,7 +251,7 @@ func (self *SManagedVirtualizationHostDriver) RequestAllocateDiskOnStorage(ctx c
}
projectId, err := _cloudprovider.SyncProject(ctx, userCred, disk.ProjectId)
if err != nil {
log.Errorf("failed to sync project for create %s disk %s error: %v", _cloudprovider.Provider, disk.GetName(), err)
logclient.AddSimpleActionLog(disk, logclient.ACT_SYNC_CLOUD_PROJECT, err, userCred, false)
}
conf := cloudprovider.DiskCreateConfig{
Name: disk.GetName(),
pkg/compute/regiondrivers/managedvirtual.go
+5 -5
View File
@@ -210,7 +210,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestCreateLoadbalancerInstanc
manager := lb.GetCloudprovider()
params.ProjectId, err = manager.SyncProject(ctx, userCred, lb.ProjectId)
if err != nil {
log.Errorf("failed to sync project %s for create %s lb %s error: %v", lb.ProjectId, manager.Provider, lb.Name, err)
logclient.AddSimpleActionLog(lb, logclient.ACT_SYNC_CLOUD_PROJECT, err, userCred, false)
}
log.Debugf("create lb with params: %s", jsonutils.Marshal(params).String())
@@ -1333,7 +1333,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestCreateDBInstance(ctx cont
_cloudprovider := dbinstance.GetCloudprovider()
desc.ProjectId, err = _cloudprovider.SyncProject(ctx, userCred, dbinstance.ProjectId)
if err != nil {
log.Errorf("failed to sync project %s for create %s rds %s error: %v", dbinstance.ProjectId, _cloudprovider.Provider, dbinstance.Name, err)
logclient.AddSimpleActionLog(dbinstance, logclient.ACT_SYNC_CLOUD_PROJECT, err, userCred, false)
}
region, err := dbinstance.GetRegion()
@@ -1495,7 +1495,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestCreateDBInstanceFromBacku
_cloudprovider := rds.GetCloudprovider()
desc.ProjectId, err = _cloudprovider.SyncProject(ctx, userCred, rds.ProjectId)
if err != nil {
log.Errorf("failed to sync project %s for create %s rds %s error: %v", rds.ProjectId, _cloudprovider.Provider, rds.Name, err)
logclient.AddSimpleActionLog(rds, logclient.ACT_SYNC_CLOUD_PROJECT, err, userCred, false)
}
region, err := rds.GetRegion()
@@ -1654,7 +1654,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestCreateElasticcache(ctx co
provider := iprovider.(*models.SCloudprovider)
params.ProjectId, err = provider.SyncProject(ctx, userCred, ec.ProjectId)
if err != nil {
log.Errorf("failed to sync project %s for create %s elastic cache %s error: %v", ec.ProjectId, provider.Provider, ec.Name, err)
logclient.AddSimpleActionLog(ec, logclient.ACT_SYNC_CLOUD_PROJECT, err, userCred, false)
}
iec, err := iRegion.CreateIElasticcaches(params)
@@ -3059,7 +3059,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestCreateNetwork(ctx context
provider := wire.GetCloudprovider()
opts.ProjectId, err = provider.SyncProject(ctx, userCred, net.ProjectId)
if err != nil {
log.Errorf("failed to sync project %s for create %s network %s error: %v", net.ProjectId, provider.Provider, net.Name, err)
logclient.AddSimpleActionLog(net, logclient.ACT_SYNC_CLOUD_PROJECT, err, userCred, false)
}
inet, err := iwire.CreateINetwork(&opts)
pkg/compute/tasks/eip_allocate_task.go
+1 -1
View File
@@ -126,7 +126,7 @@ func (self *EipAllocateTask) OnInit(ctx context.Context, obj db.IStandaloneModel
_cloudprovider := eip.GetCloudprovider()
args.ProjectId, err = _cloudprovider.SyncProject(ctx, self.GetUserCred(), eip.ProjectId)
if err != nil {
log.Errorf("failed to sync project %s for create %s eip %s error: %v", eip.ProjectId, _cloudprovider.Provider, eip.Name, err)
logclient.AddSimpleActionLog(eip, logclient.ACT_SYNC_CLOUD_PROJECT, err, self.UserCred, false)
}
iregion, err := eip.GetIRegion(ctx)
pkg/util/logclient/consts.go
+2
View File
@@ -112,6 +112,8 @@ const (
ACT_VM_SYNC_ISOLATED_DEVICE = "vm_sync_isolated_device"
ACT_CACHED_IMAGE = "cached_image"
// 同步云上项目
ACT_SYNC_CLOUD_PROJECT = "sync_cloud_project"
ACT_REBOOT = "reboot"
ACT_CHANGE_CONFIG = "change_config"