From 67ab5819f485543c74aad76e2a8e49b92be374d0 Mon Sep 17 00:00:00 2001 From: ioito Date: Tue, 24 Sep 2019 19:22:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E9=81=BF=E5=85=8D=E7=9B=91=E5=90=AC?= =?UTF-8?q?=E6=9C=AA=E8=AE=BE=E7=BD=AEmanager=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/loadbalancerlisteners.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/compute/models/loadbalancerlisteners.go b/pkg/compute/models/loadbalancerlisteners.go index 67118d1e9a..cf98b9f87b 100644 --- a/pkg/compute/models/loadbalancerlisteners.go +++ b/pkg/compute/models/loadbalancerlisteners.go @@ -231,6 +231,10 @@ func (man *SLoadbalancerListenerManager) ValidateCreateData(ctx context.Context, return nil, httperrors.NewResourceNotFoundError("failed to find region for loadbalancer %s", lb.Name) } + if len(lb.ManagerId) > 0 { + data.Set("manager_id", jsonutils.NewString(lb.ManagerId)) + } + return region.GetDriver().ValidateCreateLoadbalancerListenerData(ctx, userCred, ownerId, data, lb, backendGroupV.Model) } From 6dce97a6b6bbdfffc7f70254677c4800419c6e68 Mon Sep 17 00:00:00 2001 From: ioito Date: Tue, 24 Sep 2019 19:47:39 +0800 Subject: [PATCH 2/2] add: error log trace --- pkg/compute/regiondrivers/managedvirtual.go | 28 ++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkg/compute/regiondrivers/managedvirtual.go b/pkg/compute/regiondrivers/managedvirtual.go index c1156f5652..9de3b306c8 100644 --- a/pkg/compute/regiondrivers/managedvirtual.go +++ b/pkg/compute/regiondrivers/managedvirtual.go @@ -386,7 +386,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestDeleteLoadbalancerAcl(ctx func (self *SManagedVirtualizationRegionDriver) createLoadbalancerCertificate(ctx context.Context, userCred mcclient.TokenCredential, lbcert *models.SCachedLoadbalancerCertificate) (jsonutils.JSONObject, error) { iRegion, err := lbcert.GetIRegion() if err != nil { - return nil, err + return nil, errors.Wrapf(err, "lbcert.GetIRegion") } certificate := &cloudprovider.SLoadbalancerCertificate{ Name: lbcert.Name, @@ -395,11 +395,11 @@ func (self *SManagedVirtualizationRegionDriver) createLoadbalancerCertificate(ct } iLoadbalancerCert, err := iRegion.CreateILoadBalancerCertificate(certificate) if err != nil { - return nil, err + return nil, errors.Wrap(err, "iRegion.CreateILoadBalancerCertificate") } lbcert.SetModelManager(models.CachedLoadbalancerCertificateManager, lbcert) if err := db.SetExternalId(lbcert, userCred, iLoadbalancerCert.GetGlobalId()); err != nil { - return nil, err + return nil, errors.Wrap(err, "db.SetExternalId") } return nil, lbcert.SyncWithCloudLoadbalancerCertificate(ctx, userCred, iLoadbalancerCert, lbcert.GetOwnerId()) } @@ -665,18 +665,18 @@ func (self *SManagedVirtualizationRegionDriver) RequestCreateLoadbalancerListene cert, err := models.LoadbalancerCertificateManager.FetchById(certId) if err != nil { - return nil, err + return nil, errors.Wrapf(err, "LoadbalancerCertificateManager.FetchById(%s)", certId) } lbcert, err := models.CachedLoadbalancerCertificateManager.GetOrCreateCachedCertificate(ctx, userCred, provider, lblis, cert.(*models.SLoadbalancerCertificate)) if err != nil { - return nil, err + return nil, errors.Wrap(err, "CachedLoadbalancerCertificateManager.GetOrCreateCachedCertificate") } if len(lbcert.ExternalId) == 0 { _, err = self.createLoadbalancerCertificate(ctx, userCred, lbcert) if err != nil { - return nil, err + return nil, errors.Wrap(err, "createLoadbalancerCertificate") } } @@ -694,18 +694,18 @@ func (self *SManagedVirtualizationRegionDriver) RequestCreateLoadbalancerListene acl, err := models.LoadbalancerAclManager.FetchById(aclId) if err != nil { - return nil, err + return nil, errors.Wrap(err, "LoadbalancerAclManager.FetchById") } lbacl, err := models.CachedLoadbalancerAclManager.GetOrCreateCachedAcl(ctx, userCred, provider, lblis, acl.(*models.SLoadbalancerAcl)) if err != nil { - return nil, err + return nil, errors.Wrap(err, "CachedLoadbalancerAclManager.GetOrCreateCachedAcl") } if len(lbacl.ExternalId) == 0 { _, err = self.createLoadbalancerAcl(ctx, userCred, lbacl) if err != nil { - return nil, err + return nil, errors.Wrap(err, "createLoadbalancerAcl") } } @@ -715,7 +715,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestCreateLoadbalancerListene params, err := lblis.GetLoadbalancerListenerParams() if err != nil { - return nil, err + return nil, errors.Wrapf(err, "lblis.GetLoadbalancerListenerParams") } loadbalancer := lblis.GetLoadbalancer() if loadbalancer == nil { @@ -723,18 +723,18 @@ func (self *SManagedVirtualizationRegionDriver) RequestCreateLoadbalancerListene } iRegion, err := loadbalancer.GetIRegion() if err != nil { - return nil, err + return nil, errors.Wrap(err, "loadbalancer.GetIRegion") } iLoadbalancer, err := iRegion.GetILoadBalancerById(loadbalancer.ExternalId) if err != nil { - return nil, err + return nil, errors.Wrapf(err, "iRegion.GetILoadBalancerById(%s)", loadbalancer.ExternalId) } iListener, err := iLoadbalancer.CreateILoadBalancerListener(params) if err != nil { - return nil, err + return nil, errors.Wrap(err, "iLoadbalancer.CreateILoadBalancerListener") } if err := db.SetExternalId(lblis, userCred, iListener.GetGlobalId()); err != nil { - return nil, err + return nil, errors.Wrap(err, "db.SetExternalId") } return nil, lblis.SyncWithCloudLoadbalancerListener(ctx, userCred, loadbalancer, iListener, nil) })