feat: bookmark and error response should be skipped in yurthub filter (#1868) (#1953)

github-actions[bot] · crazytaxii · web-flow · commit cb2055bc5ba0 · 2024-02-20T19:33:15.000+08:00
Signed-off-by: HF <crazytaxii666@gmail.com> (cherry picked from commit 286a43e) Co-authored-by: HF <crazytaxii666@gmail.com>
diff --git a/pkg/yurthub/filter/filter.go b/pkg/yurthub/filter/filter.go
@@ -238,9 +238,12 @@ func (frc *filterReadCloser) StreamResponseFilter(rc io.ReadCloser, ch chan *byt
 			return err
 		}
 
-		newObj := frc.objectFilter.Filter(obj, frc.stopCh)
-		if yurtutil.IsNil(newObj) {
-			continue
+		newObj := obj
+		// BOOKMARK and ERROR response are unnecessary to filter
+		if !(watchType == watch.Bookmark || watchType == watch.Error) {
+			if newObj = frc.objectFilter.Filter(obj, frc.stopCh); yurtutil.IsNil(newObj) {
+				continue
+			}
 		}
 
 		wEvent := watch.Event{

Original file line number	Diff line number	Diff line change
`@@ -238,9 +238,12 @@ func (frc filterReadCloser) StreamResponseFilter(rc io.ReadCloser, ch chan byt`
`238`	`238`	`return err`
`239`	`239`	`}`
`240`	`240`
`241`		`- newObj := frc.objectFilter.Filter(obj, frc.stopCh)`
`242`		`- if yurtutil.IsNil(newObj) {`
`243`		`- continue`
	`241`	`+ newObj := obj`
	`242`	`+ // BOOKMARK and ERROR response are unnecessary to filter`
	`243`	`+ if !(watchType == watch.Bookmark \|\| watchType == watch.Error) {`
	`244`	`+ if newObj = frc.objectFilter.Filter(obj, frc.stopCh); yurtutil.IsNil(newObj) {`
	`245`	`+ continue`
	`246`	`+ }`
`244`	`247`	`}`
`245`	`248`
`246`	`249`	`wEvent := watch.Event{`