diff --git a/pkg/apis/compute/cachedimages_const.go b/pkg/apis/compute/cachedimages_const.go index 4c2628f4e1..6d59f2a137 100644 --- a/pkg/apis/compute/cachedimages_const.go +++ b/pkg/apis/compute/cachedimages_const.go @@ -19,7 +19,6 @@ const ( CACHED_IMAGE_STATUS_SAVING = "saving" CACHED_IMAGE_STATUS_CACHING = "caching" CACHED_IMAGE_STATUS_ACTIVE = "active" - CACHED_IMAGE_STATUS_READY = "ready" CACHED_IMAGE_STATUS_DELETING = "deleting" CACHED_IMAGE_STATUS_CACHE_FAILED = "cache_fail" diff --git a/pkg/compute/guestdrivers/esxi.go b/pkg/compute/guestdrivers/esxi.go index 4ab8dc4fd1..2ef110797f 100644 --- a/pkg/compute/guestdrivers/esxi.go +++ b/pkg/compute/guestdrivers/esxi.go @@ -173,7 +173,7 @@ func (self *SESXiGuestDriver) GetJsonDescAtHost(ctx context.Context, userCred mc if img.ImageType != cloudprovider.CachedImageTypeSystem { return desc } - sciSubQ := models.StoragecachedimageManager.Query("storagecache_id").Equals("cachedimage_id", templateId).Equals("status", api.CACHED_IMAGE_STATUS_READY).SubQuery() + sciSubQ := models.StoragecachedimageManager.Query("storagecache_id").Equals("cachedimage_id", templateId).Equals("status", api.CACHED_IMAGE_STATUS_ACTIVE).SubQuery() scQ := models.StoragecacheManager.Query().In("id", sciSubQ) storageCaches := make([]models.SStoragecache, 0, 1) err = db.FetchModelObjects(models.StoragecacheManager, scQ, &storageCaches) diff --git a/pkg/compute/hostdrivers/managedvirtual.go b/pkg/compute/hostdrivers/managedvirtual.go index f3e421b548..d939130cc9 100644 --- a/pkg/compute/hostdrivers/managedvirtual.go +++ b/pkg/compute/hostdrivers/managedvirtual.go @@ -182,7 +182,7 @@ func (self *SManagedVirtualizationHostDriver) RequestSaveUploadImageOnHost(ctx c osType, _ := params.GetString("properties", "os_type") scimg := models.StoragecachedimageManager.Register(ctx, task.GetUserCred(), iStoragecache.GetId(), imageId, "") - if scimg.Status != api.CACHED_IMAGE_STATUS_READY { + if scimg.Status != api.CACHED_IMAGE_STATUS_ACTIVE { scimg.SetStatus(task.GetUserCred(), api.CACHED_IMAGE_STATUS_CACHING, "request_prepare_save_disk_on_host") } iImage, err := iStoragecache.CreateIImage(snapshot.GetId(), fmt.Sprintf("Image-%s", imageId), osType, "") @@ -208,7 +208,7 @@ func (self *SManagedVirtualizationHostDriver) RequestSaveUploadImageOnHost(ctx c if err := snapshot.Delete(); err != nil { log.Errorf("Delete snapshot %s failed: %v", snapshot.GetId(), err) } - scimg.SetStatus(task.GetUserCred(), api.CACHED_IMAGE_STATUS_READY, "") + scimg.SetStatus(task.GetUserCred(), api.CACHED_IMAGE_STATUS_ACTIVE, "") return result, nil }) return nil diff --git a/pkg/compute/models/cachedimages.go b/pkg/compute/models/cachedimages.go index 82fcde3d9c..dc5920eedd 100644 --- a/pkg/compute/models/cachedimages.go +++ b/pkg/compute/models/cachedimages.go @@ -412,7 +412,7 @@ func (self *SCachedimage) ChooseSourceStoragecacheInRange(hostType string, exclu Join(hostStorage, sqlchemy.Equals(hostStorage.Field("storage_id"), storage.Field("id"))). Join(host, sqlchemy.Equals(hostStorage.Field("host_id"), host.Field("id"))). Filter(sqlchemy.Equals(storageCachedImage.Field("cachedimage_id"), self.Id)). - Filter(sqlchemy.Equals(storageCachedImage.Field("status"), api.CACHED_IMAGE_STATUS_READY)). + Filter(sqlchemy.Equals(storageCachedImage.Field("status"), api.CACHED_IMAGE_STATUS_ACTIVE)). Filter(sqlchemy.Equals(host.Field("status"), api.HOST_STATUS_RUNNING)). Filter(sqlchemy.IsTrue(host.Field("enabled"))). Filter(sqlchemy.Equals(host.Field("host_status"), api.HOST_ONLINE)). @@ -580,7 +580,7 @@ func (image *SCachedimage) getValidStoragecache() []SStoragecache { q = q.Filter(sqlchemy.In(providers.Field("status"), api.CLOUD_PROVIDER_VALID_STATUS)) q = q.Filter(sqlchemy.In(providers.Field("health_status"), api.CLOUD_PROVIDER_VALID_HEALTH_STATUS)) q = q.Filter(sqlchemy.Equals(storagecacheimages.Field("cachedimage_id"), image.Id)) - q = q.Filter(sqlchemy.Equals(storagecacheimages.Field("status"), api.CACHED_IMAGE_STATUS_READY)) + q = q.Filter(sqlchemy.Equals(storagecacheimages.Field("status"), api.CACHED_IMAGE_STATUS_ACTIVE)) caches := make([]SStoragecache, 0) err := db.FetchModelObjects(StoragecacheManager, q, &caches) @@ -620,7 +620,7 @@ func (image *SCachedimage) GetUsableZoneIds() ([]string, error) { q = q.Filter(sqlchemy.In(providers.Field("status"), api.CLOUD_PROVIDER_VALID_STATUS)) q = q.Filter(sqlchemy.In(providers.Field("health_status"), api.CLOUD_PROVIDER_VALID_HEALTH_STATUS)) q = q.Filter(sqlchemy.Equals(storagecacheimages.Field("cachedimage_id"), image.Id)) - q = q.Filter(sqlchemy.Equals(storagecacheimages.Field("status"), api.CACHED_IMAGE_STATUS_READY)) + q = q.Filter(sqlchemy.Equals(storagecacheimages.Field("status"), api.CACHED_IMAGE_STATUS_ACTIVE)) q = q.Filter(sqlchemy.Equals(q.Field("status"), api.ZONE_ENABLE)) result := []string{} @@ -702,7 +702,7 @@ func (manager *SCachedimageManager) ListItemFilter( subq = subq.Join(storageCaches, sqlchemy.Equals(storagecachedImages.Field("storagecache_id"), storageCaches.Field("id"))) subq = subq.Join(storages, sqlchemy.Equals(storageCaches.Field("id"), storages.Field("storagecache_id"))) subq = subq.Join(zones, sqlchemy.Equals(storages.Field("zone_id"), zones.Field("id"))) - subq = subq.Filter(sqlchemy.Equals(storagecachedImages.Field("status"), api.CACHED_IMAGE_STATUS_READY)) + subq = subq.Filter(sqlchemy.Equals(storagecachedImages.Field("status"), api.CACHED_IMAGE_STATUS_ACTIVE)) return subq }) if err != nil { @@ -717,7 +717,7 @@ func (manager *SCachedimageManager) ListItemFilter( subq := storagecachedImages.Query(storagecachedImages.Field("cachedimage_id")) subq = subq.Join(storageCaches, sqlchemy.Equals(storagecachedImages.Field("storagecache_id"), storageCaches.Field("id"))) subq = subq.Join(storages, sqlchemy.Equals(storageCaches.Field("id"), storages.Field("storagecache_id"))) - subq = subq.Filter(sqlchemy.Equals(storagecachedImages.Field("status"), api.CACHED_IMAGE_STATUS_READY)) + subq = subq.Filter(sqlchemy.Equals(storagecachedImages.Field("status"), api.CACHED_IMAGE_STATUS_ACTIVE)) return subq }) if err != nil { diff --git a/pkg/compute/models/storagecachedimages.go b/pkg/compute/models/storagecachedimages.go index 17278bb5d6..8d09cfd085 100644 --- a/pkg/compute/models/storagecachedimages.go +++ b/pkg/compute/models/storagecachedimages.go @@ -323,7 +323,7 @@ func (self *SStoragecachedimage) markDeleting(ctx context.Context, userCred mccl } if !isForce && !utils.IsInStringArray(self.Status, - []string{api.CACHED_IMAGE_STATUS_READY, api.CACHED_IMAGE_STATUS_DELETING, api.CACHED_IMAGE_STATUS_CACHE_FAILED}) { + []string{api.CACHED_IMAGE_STATUS_ACTIVE, api.CACHED_IMAGE_STATUS_DELETING, api.CACHED_IMAGE_STATUS_CACHE_FAILED}) { return httperrors.NewInvalidStatusError("Cannot uncache in status %s", self.Status) } _, err = db.Update(self, func() error { diff --git a/pkg/compute/tasks/storage_cache_image_task.go b/pkg/compute/tasks/storage_cache_image_task.go index 3c78bf5e5d..2f9427e010 100644 --- a/pkg/compute/tasks/storage_cache_image_task.go +++ b/pkg/compute/tasks/storage_cache_image_task.go @@ -56,7 +56,7 @@ func (self *StorageCacheImageTask) OnRelinquishLeastUsedCachedImageComplete(ctx storageCache := obj.(*models.SStoragecache) scimg := models.StoragecachedimageManager.Register(ctx, self.UserCred, storageCache.Id, imageId, "") - if scimg.Status != api.CACHED_IMAGE_STATUS_READY { + if scimg.Status != api.CACHED_IMAGE_STATUS_ACTIVE { scimg.SetStatus(self.UserCred, api.CACHED_IMAGE_STATUS_CACHING, "storage_cache_image_task") } @@ -115,7 +115,7 @@ func (self *StorageCacheImageTask) OnCacheSucc(ctx context.Context, cache *model scimg := models.StoragecachedimageManager.Register(ctx, self.UserCred, cache.Id, imageId, "") extImgId, _ := data.GetString("image_id") - scimg.SetStatus(self.UserCred, api.CACHED_IMAGE_STATUS_READY, "cached") + scimg.SetStatus(self.UserCred, api.CACHED_IMAGE_STATUS_ACTIVE, "cached") if len(extImgId) > 0 && scimg.ExternalId != extImgId { scimg.SetExternalId(extImgId) }