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

feat(region): Add list and delelte apis for snapshot policy cache

Browse Source 
Now, you can take the initiative to push snapshotpolicy to cloud and
view the caches of a snasphotpolicy or delete them.
Add status for snapshotpolicy cache: ready, deleting and delete_failed.
This commit is contained in:
郑雨
2019-10-31 11:57:43 +08:00
parent 77d722ee45
commit 136e0c534c
4 changed files with 112 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/compute/snapshot_const.go
+4
View File
@@ -48,4 +48,8 @@ const (
INSTANCE_SNAPSHOT_FAILED = "instance_snapshot_create_failed"
INSTANCE_SNAPSHOT_START_DELETE = "instance_snapshot_start_delete"
INSTANCE_SNAPSHOT_DELETE_FAILED = "instance_snapshot_delete_failed"
SNAPSHOT_POLICY_CACHE_STATUS_READY = "ready"
SNAPSHOT_POLICY_CACHE_STATUS_DELETING = "deleting"
SNAPSHOT_POLICY_CACHE_STATUS_DELETE_FAILED = "delete_failed"
)
pkg/compute/models/snapshotpolicycache.go
+43 -54
View File
@@ -23,37 +23,36 @@ import (
"yunion.io/x/jsonutils"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/util/stringutils"
"yunion.io/x/sqlchemy"
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/appsrv"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/cloudcommon/db/lockman"
"yunion.io/x/onecloud/pkg/cloudcommon/db/taskman"
"yunion.io/x/onecloud/pkg/cloudprovider"
"yunion.io/x/onecloud/pkg/httperrors"
"yunion.io/x/onecloud/pkg/mcclient"
)
type SSnapshotPolicyCacheManager struct {
db.SResourceBaseManager
db.SStatusStandaloneResourceBaseManager
}
type SSnapshotPolicyCache struct {
db.SResourceBase
db.SStatusStandaloneResourceBase
db.SExternalizedResourceBase
SCloudregionResourceBase
SManagedResourceBase
Id string `width:"128" charset:"ascii" primary:"true" list:"user"`
SnapshotpolicyId string `width:"128" charset:"ascii" create:"required"`
CloudregionId string `width:"128" charset:"ascii" create:"required"`
ExternalId string `width:"256" charset:"utf8" index:"true" list:"admin" create:"admin_optional"`
}
var SnapshotPolicyCacheManager *SSnapshotPolicyCacheManager
func init() {
SnapshotPolicyCacheManager = &SSnapshotPolicyCacheManager{
db.NewResourceBaseManager(
db.NewStatusStandaloneResourceBaseManager(
SSnapshotPolicyCache{},
"snapshotpolicycache_tbl",
"snapshotpolicycache",
@@ -63,44 +62,30 @@ func init() {
SnapshotPolicyCacheManager.SetVirtualObject(SnapshotPolicyCacheManager)
}
func (spc *SSnapshotPolicyCache) BeforeInsert() {
if len(spc.Id) == 0 {
spc.Id = stringutils.UUID4()
func NewSSnapshotPolicyCache(snapshotpolicyId, cloudregionId, externalId string) SSnapshotPolicyCache {
return SSnapshotPolicyCache{
SnapshotpolicyId: snapshotpolicyId,
SCloudregionResourceBase: SCloudregionResourceBase{cloudregionId},
SExternalizedResourceBase: db.SExternalizedResourceBase{externalId},
}
}
func (spcm *SSnapshotPolicyCacheManager) FilterById(q *sqlchemy.SQuery, idStr string) *sqlchemy.SQuery {
return q.Equals("id", idStr)
}
func (spcm *SSnapshotPolicyCacheManager) GetIStandaloneModelManager() db.IStandaloneModelManager {
return spcm.GetVirtualObject().(db.IStandaloneModelManager)
}
func (spc *SSnapshotPolicyCache) GetIStandaloneModel() db.IStandaloneModel {
return spc.GetVirtualObject().(db.IStandaloneModel)
}
func (spc *SSnapshotPolicyCache) ClearSchedDescCache() error {
return nil
}
func (spcm *SSnapshotPolicyCacheManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQuery, userCred mcclient.TokenCredential,
query jsonutils.JSONObject) (*sqlchemy.SQuery, error) {
q, err := spcm.SResourceBaseManager.ListItemFilter(ctx, q, userCred, query)
if err != nil {
return nil, err
}
if defsecgroup, _ := query.GetString("snapshotpolicy"); len(defsecgroup) > 0 {
secgroup, err := SecurityGroupManager.FetchByIdOrName(userCred, defsecgroup)
if snapshotpolicyIden, _ := query.GetString("snapshotpolicyIden"); len(snapshotpolicyIden) > 0 {
snapshotpolicy, err := SnapshotPolicyManager.FetchByIdOrName(userCred, snapshotpolicyIden)
if err != nil {
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError2(SecurityGroupManager.Keyword(), defsecgroup)
if errors.Cause(err) == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError2(SnapshotPolicyManager.Keyword(), snapshotpolicyIden)
} else {
return nil, httperrors.NewGeneralError(err)
return nil, err
}
}
q = q.Equals("snapshotpolicy_id", secgroup.GetId())
q = q.Equals("snapshotpolicy_id", snapshotpolicy.GetId())
}
return q, nil
}
@@ -125,20 +110,14 @@ func (spc *SSnapshotPolicyCache) GetSnapshotPolicy() (*SSnapshotPolicy, error) {
return model.(*SSnapshotPolicy), nil
}
func (spc *SSnapshotPolicyCache) SetExternalId(userCred mcclient.TokenCredential, externalId string) error {
diff, err := db.Update(spc, func() error {
spc.ExternalId = externalId
return nil
})
if err != nil {
return err
func (spc *SSnapshotPolicyCache) GetCustomizeColumns(ctx context.Context, userCred mcclient.TokenCredential,
query jsonutils.JSONObject) *jsonutils.JSONDict {
extra := spc.SStandaloneResourceBase.GetCustomizeColumns(ctx, userCred, query)
regionInfo := spc.SCloudregionResourceBase.GetCustomizeColumns(ctx, userCred, query)
if regionInfo != nil {
extra.Update(regionInfo)
}
db.OpsLog.LogEvent(spc, db.ACT_UPDATE, diff, userCred)
return nil
}
func (spc SSnapshotPolicyCache) GetExternalId() string {
return spc.ExternalId
return extra
}
// =============================================== detach and delete ===================================================
@@ -147,21 +126,34 @@ func (spc *SSnapshotPolicyCache) RealDetele(ctx context.Context, userCred mcclie
return db.DeleteModel(ctx, userCred, spc)
}
func (spc *SSnapshotPolicyCache) Delete(ctx context.Context, userCred mcclient.TokenCredential) error {
return nil
}
func (spc *SSnapshotPolicyCache) CustomizeDelete(ctx context.Context, userCred mcclient.TokenCredential,
query jsonutils.JSONObject, data jsonutils.JSONObject) error {
spc.SetStatus(userCred, api.SNAPSHOT_POLICY_CACHE_STATUS_DELETING, "")
task, err := taskman.TaskManager.NewTask(ctx, "SnapshotPolicyCacheDeleteTask", spc, userCred, nil, "", "", nil)
if err != nil {
return err
}
task.ScheduleRun(nil)
return nil
}
// ================================================= new and regist ====================================================
func (spcm *SSnapshotPolicyCacheManager) NewCache(ctx context.Context, userCred mcclient.TokenCredential,
snapshotPolicyId, regionId, providerId string) (*SSnapshotPolicyCache, error) {
snapshotPolicyCache := SSnapshotPolicyCache{
SnapshotpolicyId: snapshotPolicyId,
CloudregionId: regionId,
}
snapshotPolicyCache := NewSSnapshotPolicyCache(snapshotPolicyId, regionId, "")
snapshotPolicyCache.ManagerId = providerId
err := snapshotPolicyCache.CreateCloudSnapshotPolicy()
if err != nil {
return nil, err
}
snapshotPolicyCache.Status = api.SNAPSHOT_POLICY_CACHE_STATUS_READY
// should have lock
if err := spcm.TableSpec().Insert(&snapshotPolicyCache); err != nil {
@@ -173,13 +165,10 @@ func (spcm *SSnapshotPolicyCacheManager) NewCache(ctx context.Context, userCred
func (spcm *SSnapshotPolicyCacheManager) NewCacheWithExternalId(ctx context.Context, userCred mcclient.TokenCredential,
snapshotPolicyId, externalId, regionId, providerId string) (*SSnapshotPolicyCache, error) {
snapshotPolicyCache := SSnapshotPolicyCache{
SnapshotpolicyId: snapshotPolicyId,
CloudregionId: regionId,
ExternalId: externalId,
}
snapshotPolicyCache := NewSSnapshotPolicyCache(snapshotPolicyId, regionId, externalId)
snapshotPolicyCache.ManagerId = providerId
snapshotPolicyCache.Status = api.SNAPSHOT_POLICY_CACHE_STATUS_READY
// should have lock
if err := spcm.TableSpec().Insert(&snapshotPolicyCache); err != nil {
return nil, errors.Wrapf(err, "insert snapshotpolicycache failed")
pkg/compute/service/handlers.go
+1
View File
@@ -97,6 +97,7 @@ func InitHandlers(app *appsrv.Application) {
models.InstanceSnapshotManager,
models.SnapshotManager,
models.SnapshotPolicyManager,
models.SnapshotPolicyCacheManager,
models.BaremetalagentManager,
models.LoadbalancerManager,
models.LoadbalancerListenerManager,
pkg/compute/tasks/snapshot_policy_cache_delete_task.go
+64
View File
@@ -0,0 +1,64 @@
// Copyright 2019 Yunion
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package tasks
import (
"context"
"yunion.io/x/jsonutils"
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/cloudcommon/db/taskman"
"yunion.io/x/onecloud/pkg/compute/models"
)
type SnapshotPolicyCacheDeleteTask struct {
taskman.STask
}
func init() {
taskman.RegisterTask(SnapshotPolicyCacheDeleteTask{})
}
func (self *SnapshotPolicyCacheDeleteTask) taskFailed(ctx context.Context, cache *models.SSnapshotPolicyCache,
err error) {
cache.SetStatus(self.UserCred, api.SNAPSHOT_POLICY_CACHE_STATUS_DELETE_FAILED, err.Error())
self.SetStageFailed(ctx, err.Error())
}
func (self *SnapshotPolicyCacheDeleteTask) taskComplete(ctx context.Context, cache *models.SSnapshotPolicyCache) {
cache.RealDetele(ctx, self.UserCred)
self.SetStageComplete(ctx, nil)
}
func (self *SnapshotPolicyCacheDeleteTask) OnInit(ctx context.Context, obj db.IStandaloneModel,
data jsonutils.JSONObject) {
cache := obj.(*models.SSnapshotPolicyCache)
if len(cache.ExternalId) == 0 {
self.taskComplete(ctx, cache)
return
}
err := cache.DeleteCloudSnapshotPolicy()
if err != nil {
self.taskFailed(ctx, cache, err)
return
}
self.taskComplete(ctx, cache)
}