Merge pull request #11054 from ioito/automated-cherry-pick-of-#11053-upstream-release-3.7

Automated cherry pick of #11053: fix(region): optimized sku sched clear

pkg/compute/models/cloudsync.go

@@ -153,11 +153,6 @@ func syncRegionSkus(ctx context.Context, userCred mcclient.TokenCredential, loca
 			// logSyncFailed(provider, task, msg)
 			return
 		}
-
-		_, err = modules.SchedManager.SyncSku(auth.GetAdminSession(ctx, options.Options.Region, ""), false)
-		if err != nil {
-			log.Errorf("SchedManager SyncSku %s", err)
-		}
 	}
 
 	if localRegion.GetDriver().IsSupportedElasticcache() {

pkg/compute/models/skus.go

@@ -1257,6 +1257,13 @@ func (manager *SServerSkuManager) SyncServerSkus(ctx context.Context, userCred m
 			syncResult.Add()
 		}
 	}
+
+	// notfiy sched manager
+	_, err = modules.SchedManager.SyncSku(auth.GetAdminSession(ctx, options.Options.Region, ""), false)
+	if err != nil {
+		log.Errorf("SchedManager SyncSku %s", err)
+	}
+
 	return syncResult
 }
 

pkg/compute/models/skus_tools.go

@@ -479,12 +479,6 @@ func SyncServerSkusByRegion(ctx context.Context, userCred mcclient.TokenCredenti
 	notes := fmt.Sprintf("SyncServerSkusByRegion %s result: %s", region.Name, result.Result())
 	log.Infof(notes)
 
-	// notfiy sched manager
-	_, err = modules.SchedManager.SyncSku(auth.GetAdminSession(ctx, options.Options.Region, ""), false)
-	if err != nil {
-		log.Errorf("SchedManager SyncSku %s", err)
-	}
-
 	return result
 }