Commit 5b79ce8d authored by vincentgoat's avatar vincentgoat
Browse files

fix lots of duplicate logs "Failed to get obj" in objectsync.go

Signed-off-by: default avatarvincentgoat <49225405+vincentgoat@users.noreply.github.com>
parent 5c150068
Showing with 16 additions and 5 deletions
+16 -5
......@@ -8,8 +8,10 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
"k8s.io/klog/v2"
beehiveContext "github.com/kubeedge/beehive/pkg/core/context"
......@@ -31,16 +33,25 @@ func (sctl *SyncController) manageObject(sync *v1alpha1.ObjectSync) {
}
resource := util.UnsafeKindToResource(sync.Spec.ObjectKind)
gvr := gv.WithResource(resource)
nodeName := getNodeName(sync.Name)
resourceType := strings.ToLower(sync.Spec.ObjectKind)
//ret, err := informers.GetInformersManager().GetDynamicSharedInformerFactory().ForResource(gvr).Lister().ByNamespace(sync.Namespace).Get(sync.Spec.ObjectName)
ret, err := sctl.kubeclient.Resource(gvr).Namespace(sync.Namespace).Get(context.TODO(), sync.Spec.ObjectName, metav1.GetOptions{})
if err != nil || ret == nil {
if apierrors.IsNotFound(err) {
// trigger the delete event
klog.V(4).Infof("%s: %s has been deleted in K8s, send the delete event to edge in sync loop", resourceType, sync.Spec.ObjectName)
newObject := &unstructured.Unstructured{}
newObject.SetNamespace(sync.Namespace)
newObject.SetName(sync.Spec.ObjectName)
newObject.SetUID(types.UID(getObjectUID(sync.Name)))
msg := buildEdgeControllerMessage(nodeName, sync.Namespace, resourceType, sync.Spec.ObjectName, model.DeleteOperation, newObject)
beehiveContext.Send(commonconst.DefaultContextSendModuleName, *msg)
return
} else if err != nil || ret == nil {
klog.Errorf("failed to get obj(gvr:%v,namespace:%v,name:%v), %v", gvr, sync.Namespace, sync.Spec.ObjectName, err)
return
}
nodeName := getNodeName(sync.Name)
object, err = meta.Accessor(ret)
if err != nil {
return
......@@ -54,7 +65,7 @@ func (sctl *SyncController) manageObject(sync *v1alpha1.ObjectSync) {
}, sync.Spec.ObjectName)
}
sendEvents(err, nodeName, sync, strings.ToLower(sync.Spec.ObjectKind), object.GetResourceVersion(), object)
sendEvents(err, nodeName, sync, resourceType, object.GetResourceVersion(), object)
}
func sendEvents(err error, nodeName string, sync *v1alpha1.ObjectSync, resourceType string,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment