fix: update extar fields when updating status field (#24595)

Co-authored-by: Qiu Jian <qiujian@yunionyun.com>

Author: swordqiu

pkg/cloudcommon/db/statusbase.go

@@ -72,7 +72,7 @@ func (model SStatusResourceBase) GetProgress() float32 {
 }
 
 func StatusBaseSetStatus(ctx context.Context, model IStatusBaseModel, userCred mcclient.TokenCredential, status string, reason string) error {
-	return statusBaseSetStatus(ctx, model, userCred, status, reason)
+	return statusBaseSetStatus(ctx, model, userCred, status, reason, nil)
 }
 
 func statusBaseSetProgress(model IStatusBaseModel, progress float32) error {
@@ -86,13 +86,16 @@ func statusBaseSetProgress(model IStatusBaseModel, progress float32) error {
 	return nil
 }
 
-func statusBaseSetStatus(ctx context.Context, model IStatusBaseModel, userCred mcclient.TokenCredential, status string, reason string) error {
+func statusBaseSetStatus(ctx context.Context, model IStatusBaseModel, userCred mcclient.TokenCredential, status string, reason string, otherUpdates func()) error {
 	if model.GetStatus() == status {
 		return nil
 	}
 	oldStatus := model.GetStatus()
 	_, err := Update(model, func() error {
 		model.SetStatusValue(status)
+		if otherUpdates != nil {
+			otherUpdates()
+		}
 		return nil
 	})
 	if err != nil {
@@ -121,10 +124,14 @@ func statusBaseSetStatus(ctx context.Context, model IStatusBaseModel, userCred m
 }
 
 func StatusBasePerformStatus(ctx context.Context, model IStatusBaseModel, userCred mcclient.TokenCredential, input apis.PerformStatusInput) error {
+	return StatusBasePerformStatusWithOtherUpdates(ctx, model, userCred, input, nil)
+}
+
+func StatusBasePerformStatusWithOtherUpdates(ctx context.Context, model IStatusBaseModel, userCred mcclient.TokenCredential, input apis.PerformStatusInput, otherUpdates func()) error {
 	if len(input.Status) == 0 {
 		return httperrors.NewMissingParameterError("status")
 	}
-	err := statusBaseSetStatus(ctx, model, userCred, input.Status, input.Reason)
+	err := statusBaseSetStatus(ctx, model, userCred, input.Status, input.Reason, otherUpdates)
 	if err != nil {
 		return errors.Wrap(err, "statusBaseSetStatus")
 	}

pkg/cloudcommon/db/statusdomainresource.go

@@ -56,8 +56,12 @@ func (self *SStatusDomainLevelResourceBase) PerformStatus(ctx context.Context, u
 	return nil, nil
 }
 
+func (model *SStatusDomainLevelResourceBase) SetStatusWithOtherUpdates(ctx context.Context, userCred mcclient.TokenCredential, status string, reason string, otherUpdates func()) error {
+	return statusBaseSetStatus(ctx, model.GetIStatusDomainLevelModel(), userCred, status, reason, otherUpdates)
+}
+
 func (model *SStatusDomainLevelResourceBase) SetStatus(ctx context.Context, userCred mcclient.TokenCredential, status string, reason string) error {
-	return statusBaseSetStatus(ctx, model.GetIStatusDomainLevelModel(), userCred, status, reason)
+	return statusBaseSetStatus(ctx, model.GetIStatusDomainLevelModel(), userCred, status, reason, nil)
 }
 
 func (manager *SStatusDomainLevelResourceBaseManager) ValidateCreateData(

pkg/cloudcommon/db/statusinfrasresource.go

@@ -96,8 +96,12 @@ func (self *SStatusInfrasResourceBase) PerformStatus(ctx context.Context, userCr
 	return nil, nil
 }
 
+func (model *SStatusInfrasResourceBase) SetStatusWithOtherUpdates(ctx context.Context, userCred mcclient.TokenCredential, status string, reason string, otherUpdates func()) error {
+	return statusBaseSetStatus(ctx, model.GetIStatusInfrasModel(), userCred, status, reason, otherUpdates)
+}
+
 func (model *SStatusInfrasResourceBase) SetStatus(ctx context.Context, userCred mcclient.TokenCredential, status string, reason string) error {
-	return statusBaseSetStatus(ctx, model.GetIStatusInfrasModel(), userCred, status, reason)
+	return statusBaseSetStatus(ctx, model.GetIStatusInfrasModel(), userCred, status, reason, nil)
 }
 
 func (manager *SStatusInfrasResourceBaseManager) ValidateCreateData(

pkg/cloudcommon/db/statusinfrasuserresource.go

@@ -47,8 +47,12 @@ func NewStatusDomainLevelUserResourceBaseManager(dt interface{}, tableName strin
 	}
 }
 
+func (model *SStatusDomainLevelUserResourceBase) SetStatusWithOtherUpdates(ctx context.Context, userCred mcclient.TokenCredential, status string, reason string, otherUpdates func()) error {
+	return statusBaseSetStatus(ctx, model.GetIStatusDomainLevelModel(), userCred, status, reason, otherUpdates)
+}
+
 func (model *SStatusDomainLevelUserResourceBase) SetStatus(ctx context.Context, userCred mcclient.TokenCredential, status string, reason string) error {
-	return statusBaseSetStatus(ctx, model, userCred, status, reason)
+	return statusBaseSetStatus(ctx, model.GetIStatusDomainLevelModel(), userCred, status, reason, nil)
 }
 
 func (manager *SStatusDomainLevelUserResourceBaseManager) ValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, input apis.StatusDomainLevelUserResourceCreateInput) (apis.StatusDomainLevelUserResourceCreateInput, error) {

pkg/cloudcommon/db/statusstandalone.go

@@ -95,8 +95,12 @@ func (self *SStatusStandaloneResourceBase) PerformStatus(ctx context.Context, us
 	return nil, nil
 }
 
+func (model *SStatusStandaloneResourceBase) SetStatusWithOtherUpdates(ctx context.Context, userCred mcclient.TokenCredential, status string, reason string, otherUpdates func()) error {
+	return statusBaseSetStatus(ctx, model.GetIStatusStandaloneModel(), userCred, status, reason, otherUpdates)
+}
+
 func (model *SStatusStandaloneResourceBase) SetStatus(ctx context.Context, userCred mcclient.TokenCredential, status string, reason string) error {
-	return statusBaseSetStatus(ctx, model.GetIStatusStandaloneModel(), userCred, status, reason)
+	return statusBaseSetStatus(ctx, model.GetIStatusStandaloneModel(), userCred, status, reason, nil)
 }
 
 func (model *SStatusStandaloneResourceBase) SetProgress(progress float32) error {

pkg/cloudcommon/db/tablespec.go

@@ -74,7 +74,7 @@ func newTableSpec(model interface{}, tableName string, indexField string, dateFi
 			log.Errorf("NewSplitTableSpec %s %s", tableName, err)
 			return nil
 		} else {
-			log.Infof("new split table %s maxDuration %d hour maxSegements %d", tableName, maxDuration/time.Hour, maxSegments)
+			log.Debugf("table %s maxDuration %d hour maxSegements %d", tableName, maxDuration/time.Hour, maxSegments)
 		}
 	} else if len(dbName) > 0 {
 		itbl = sqlchemy.NewTableSpecFromStructWithDBName(model, tableName, dbName)