Skip to content

Commit 2847c66

Browse files
committed
Preserve results when NLM_F_DUMP_INTR is set
Similar to #1018, but for ConntrackDeleteFilters() Relates to kubernetes/kubernetes#129562
1 parent 68cf136 commit 2847c66

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

conntrack_linux.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,15 @@ func (h *Handle) ConntrackDeleteFilter(table ConntrackTableType, family InetFami
159159
// ConntrackDeleteFilters deletes entries on the specified table matching any of the specified filters using the netlink handle passed
160160
// conntrack -D [table] parameters Delete conntrack or expectation
161161
func (h *Handle) ConntrackDeleteFilters(table ConntrackTableType, family InetFamily, filters ...CustomConntrackFilter) (uint, error) {
162+
var errMsgs []string
162163
res, err := h.dumpConntrackTable(table, family)
163-
if err != nil {
164+
if err != nil && !errors.Is(err, ErrDumpInterrupted) {
164165
return 0, err
165166
}
166167

168+
errMsgs = append(errMsgs, err.Error())
169+
167170
var matched uint
168-
var errMsgs []string
169171
for _, dataRaw := range res {
170172
flow := parseRawData(dataRaw)
171173
for _, filter := range filters {

0 commit comments

Comments
 (0)