resource synch process for delete event

Signed-off-by: huiwq1990 <[email protected]>
clusterpedia-io · Nov 15, 2023 · eef9a52 · eef9a52
1 parent 41975c5
commit eef9a52
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/pkg/storage/internalstorage/resource_storage.go b/pkg/storage/internalstorage/resource_storage.go
@@ -278,6 +278,10 @@ func (s *ResourceStorage) Watch(_ context.Context, _ *internal.ListOptions) (wat
 	return nil, apierrors.NewMethodNotSupported(s.storageGroupResource, "watch")
 }
 
+func (s *ResourceStorage) GetStorageName() string {
+	return StorageName
+}
+
 func applyListOptionsToResourceQuery(db *gorm.DB, query *gorm.DB, opts *internal.ListOptions) (int64, *int64, *gorm.DB, error) {
 	applyFn := func(query *gorm.DB, opts *internal.ListOptions) (*gorm.DB, error) {
 		query, err := applyOwnerToResourceQuery(db, query, opts)

diff --git a/pkg/storage/memorystorage/memory_resource_storage.go b/pkg/storage/memorystorage/memory_resource_storage.go
@@ -228,6 +228,10 @@ func (s *ResourceStorage) Watch(ctx context.Context, options *internal.ListOptio
 	return watcher, nil
 }
 
+func (s *ResourceStorage) GetStorageName() string {
+	return StorageName
+}
+
 type errWatcher struct {
 	result chan watch.Event
 }

diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go
@@ -29,6 +29,7 @@ type StorageFactory interface {
 
 type ResourceStorage interface {
 	GetStorageConfig() *ResourceStorageConfig
+	GetStorageName() string
 
 	Get(ctx context.Context, cluster, namespace, name string, obj runtime.Object) error
 	List(ctx context.Context, listObj runtime.Object, opts *internal.ListOptions) error

diff --git a/pkg/synchromanager/clustersynchro/resource_synchro.go b/pkg/synchromanager/clustersynchro/resource_synchro.go
@@ -21,6 +21,7 @@ import (
 	clusterv1alpha2 "github.com/clusterpedia-io/api/cluster/v1alpha2"
 	kubestatemetrics "github.com/clusterpedia-io/clusterpedia/pkg/kube_state_metrics"
 	"github.com/clusterpedia-io/clusterpedia/pkg/storage"
+	"github.com/clusterpedia-io/clusterpedia/pkg/storage/memorystorage"
 	"github.com/clusterpedia-io/clusterpedia/pkg/synchromanager/clustersynchro/informer"
 	"github.com/clusterpedia-io/clusterpedia/pkg/synchromanager/clustersynchro/queue"
 	"github.com/clusterpedia-io/clusterpedia/pkg/synchromanager/features"
@@ -67,6 +68,8 @@ type ResourceSynchro struct {
 
 	// for debug
 	runningStage string
+
+	transDeleteObject bool
 }
 
 func newResourceSynchro(cluster string, syncResource schema.GroupVersionResource, kind string, lw cache.ListerWatcher, rvs map[string]interface{},
@@ -95,6 +98,8 @@ func newResourceSynchro(cluster string, syncResource schema.GroupVersionResource
 
 		closer: make(chan struct{}),
 		closed: make(chan struct{}),
+
+		transDeleteObject: storage.GetStorageName() != memorystorage.StorageName,
 	}
 	close(synchro.runnableForStorage)
 	synchro.ctx, synchro.cancel = context.WithCancel(context.Background())
@@ -317,6 +322,12 @@ func (synchro *ResourceSynchro) OnDelete(obj interface{}) {
 		return
 	}
 
+	if !synchro.transDeleteObject {
+		synchro.pruneObject(obj.(*unstructured.Unstructured))
+		_ = synchro.queue.Delete(obj)
+		return
+	}
+
 	key, err := cache.DeletionHandlingMetaNamespaceKeyFunc(obj)
 	if err != nil {
 		return