Remove unused OF tables and flows on Windows #3138

hongliangl · 2021-12-14T11:38:55Z

On Windows Node:

Since all traffic from uplink interface is output to bridge
local interface directly instead of being resubmitted to
UplinkTable, flows on UplinkTables are no longer needed.
Since SNAT is performed on Windows host, flows in
SNATTable which are used to perform SNAT are no longer needed.

Another update is to add function CleanOFTableCache to reset
ofTableCache and this function is only used in integration tests.

Signed-off-by: Hongliang Liu lhongliang@vmware.com

codecov-commenter · 2021-12-14T13:07:10Z

Codecov Report

Merging #3138 (b90d195) into main (1b08a61) will decrease coverage by 10.40%.
The diff coverage is n/a.

❗ Current head b90d195 differs from pull request most recent head b15dfbb. Consider uploading reports for the commit b15dfbb to get more accurate results

@@             Coverage Diff             @@
##             main    #3138       +/-   ##
===========================================
- Coverage   59.79%   49.39%   -10.41%     
===========================================
  Files         306      302        -4     
  Lines       26178    36319    +10141     
===========================================
+ Hits        15654    17940     +2286     
- Misses       8807    16676     +7869     
+ Partials     1717     1703       -14

Flag	Coverage Δ
e2e-tests	`49.39% <ø> (?)`
kind-e2e-tests	`?`
unit-tests	`?`

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
pkg/agent/agent.go	`50.00% <ø> (-1.35%)`	⬇️
pkg/agent/apiserver/apiserver.go	`66.30% <ø> (-3.27%)`	⬇️
pkg/agent/client.go	`76.74% <ø> (-0.68%)`	⬇️
pkg/agent/config/node_config.go	`88.88% <ø> (-11.12%)`	⬇️
pkg/agent/consistenthash/consistenthash.go	`55.00% <ø> (ø)`
pkg/agent/controller/networkpolicy/fqdn.go	`71.42% <ø> (-4.56%)`	⬇️
...ntroller/networkpolicy/networkpolicy_controller.go	`65.78% <ø> (-5.86%)`	⬇️
pkg/agent/controller/networkpolicy/reconciler.go	`64.39% <ø> (-12.60%)`	⬇️
...gent/controller/noderoute/node_route_controller.go	`51.42% <ø> (-5.41%)`	⬇️
...g/agent/controller/serviceexternalip/controller.go	`0.00% <ø> (ø)`
... and 318 more

pkg/agent/openflow/client.go

jianjuns

LGTM

XinShuYang · 2022-01-05T13:47:33Z

/test-windows-e2e

pkg/agent/openflow/client.go

pkg/agent/openflow/pipeline.go

hongliangl · 2022-01-12T03:30:50Z

/test-all-features-conformance
/test-conformance
/test-e2e
/test-flexible-ipam-e2e
/test-ipv6-conformance
/test-ipv6-e2e
/test-ipv6-networkpolicy
/test-ipv6-only-conformance
/test-ipv6-only-e2e
/test-ipv6-only-networkpolicy
/test-multicluster-e2e
/test-networkpolicy
/test-windows-conformance
/test-windows-e2e
/test-windows-networkpolicy
/test-windows-proxyall-e2e

hongliangl · 2022-01-12T03:31:41Z

/test-e2e to

hongliangl · 2022-01-19T01:16:27Z

/test-all-features-conformance
/test-conformance
/test-e2e
/test-flexible-ipam-e2e
/test-ipv6-conformance
/test-ipv6-e2e
/test-ipv6-networkpolicy
/test-ipv6-only-conformance
/test-ipv6-only-e2e
/test-ipv6-only-networkpolicy
/test-multicluster-e2e
/test-networkpolicy
/test-windows-conformance
/test-windows-e2e
/test-windows-networkpolicy
/test-windows-proxyall-e2e

hongliangl · 2022-01-19T09:03:26Z

/test-e2e

hongliangl · 2022-01-20T05:56:11Z

/test-windows-conformance
/test-windows-e2e
/test-windows-networkpolicy
/test-windows-proxyall-e2e

hongliangl · 2022-01-20T05:56:50Z

/test-integration

hongliangl · 2022-01-20T05:57:37Z

/test-e2e

hongliangl · 2022-01-20T06:44:14Z

/test-integration

hongliangl · 2022-01-23T15:28:01Z

/test-all-features-conformance
/test-conformance
/test-e2e
/test-flexible-ipam-e2e
/test-ipv6-conformance
/test-ipv6-e2e
/test-ipv6-networkpolicy
/test-ipv6-only-conformance
/test-ipv6-only-e2e
/test-ipv6-only-networkpolicy
/test-multicluster-e2e
/test-networkpolicy
/test-windows-conformance
/test-windows-e2e
/test-windows-networkpolicy
/test-windows-proxyall-e2e

hongliangl · 2022-01-25T12:33:16Z

/test-all-features-conformance

hongliangl · 2022-01-25T13:41:05Z

/test-all-features-conformance
/test-conformance
/test-e2e
/test-flexible-ipam-e2e
/test-ipv6-conformance
/test-ipv6-e2e
/test-ipv6-networkpolicy
/test-ipv6-only-conformance
/test-ipv6-only-e2e
/test-ipv6-only-networkpolicy
/test-multicluster-e2e
/test-networkpolicy
/test-windows-conformance
/test-windows-e2e
/test-windows-networkpolicy
/test-windows-proxyall-e2e

hongliangl · 2022-02-14T09:57:08Z

@jianjuns @tnqn @wenyingd Do you have any more comments about this PR? Thanks.

hongliangl · 2022-02-14T09:57:25Z

/test-all-features-conformance
/test-conformance
/test-e2e
/test-flexible-ipam-e2e
/test-ipv6-conformance
/test-ipv6-e2e
/test-ipv6-networkpolicy
/test-ipv6-only-conformance
/test-ipv6-only-e2e
/test-ipv6-only-networkpolicy
/test-multicluster-e2e
/test-networkpolicy
/test-windows-conformance
/test-windows-e2e
/test-windows-networkpolicy
/test-windows-proxyall-e2e

jianjuns

No further comment from me.

hongliangl · 2022-02-15T03:14:13Z

No further comment from me.

Thanks!

hongliangl · 2022-02-15T05:37:08Z

@tnqn @wenyingd Do you have any further comments? Thanks.

hongliangl · 2022-02-17T08:00:17Z

/test-windows-all

hongliangl · 2022-02-18T13:00:45Z

/test-ipv6-conformance
/test-ipv6-e2e
/test-ipv6-networkpolicy
/test-ipv6-only-conformance
/test-ipv6-only-e2e
/test-ipv6-only-networkpolicy
/test-flexible-ipam-e2e

pkg/agent/openflow/client.go

pkg/agent/openflow/pipeline.go

hongliangl · 2022-02-21T14:59:18Z

/test-all-features-conformance
/test-conformance
/test-e2e
/test-flexible-ipam-e2e
/test-ipv6-conformance
/test-ipv6-e2e
/test-ipv6-networkpolicy
/test-ipv6-only-conformance
/test-ipv6-only-e2e
/test-ipv6-only-networkpolicy
/test-multicluster-e2e
/test-networkpolicy
/test-windows-conformance
/test-windows-e2e
/test-windows-networkpolicy
/test-windows-proxyall-e2e

hongliangl · 2022-02-22T09:44:02Z

/test-windows-proxyall-e2e

hongliangl · 2022-02-23T08:31:33Z

@tnqn Do you have any further comments? Thanks.

tnqn · 2022-02-23T16:15:12Z

pkg/agent/openflow/pipeline_windows.go

-			Cookie(c.cookieAllocator.Request(category).Raw()).
-			Done())
+		for _, localSubnet := range localSubnets {
+			flows = append(flows, ClassifierTable.BuildFlow(priorityHigh).MatchProtocol(binding.ProtocolIP).


This is wrong. localSubnets includes one IPv4 subnet and one IPv6 subnet, setting protocol to binding.ProtocolIP. for both subnets will not work. I don't think windows or flexiable IPAM supports IPv6, why don't just add the IPv4 check back and keep the IPv6 TODO as is?

Thanks, updated.

On Windows Node: - Since all traffic from uplink interface is output to bridge local interface directly instead of being resubmitted to UplinkTable, flows on UplinkTables are no longer needed. - Since SNAT is performed on Windows host, flows in SNATTable which are used to perform SNAT are no longer needed. Another update is to add function CleanOFTableCache to reset ofTableCache and this function is only used in integration tests. Signed-off-by: Hongliang Liu <lhongliang@vmware.com>

hongliangl · 2022-02-24T00:46:54Z

/test-windows-all

hongliangl · 2022-02-24T01:39:17Z

/test-all
/test-windows-all

tnqn

LGTM

tnqn · 2022-02-24T07:00:52Z

/test-integration

On Windows Node: - Since all traffic from uplink interface is output to bridge local interface directly instead of being resubmitted to UplinkTable, flows on UplinkTables are no longer needed. - Since SNAT is performed on Windows host, flows in SNATTable which are used to perform SNAT are no longer needed. Another update is to add function CleanOFTableCache to reset ofTableCache and this function is only used in integration tests. Signed-off-by: Hongliang Liu <lhongliang@vmware.com>

hongliangl requested review from jianjuns, wenyingd, tnqn and antoninbas December 14, 2021 14:29

jianjuns reviewed Dec 14, 2021

View reviewed changes

pkg/agent/openflow/client.go Outdated Show resolved Hide resolved

pkg/agent/openflow/client.go Outdated Show resolved Hide resolved

hongliangl force-pushed the remove-unused-tables branch from b3c7409 to 41a279b Compare December 15, 2021 02:07

jianjuns reviewed Dec 15, 2021

View reviewed changes

hongliangl requested a review from jianjuns December 15, 2021 02:09

hongliangl changed the title ~~Remove unused OF tables and flow on Windows~~ Remove unused OF tables and flows on Windows Dec 15, 2021

hongliangl force-pushed the remove-unused-tables branch from 41a279b to 2841ea1 Compare December 15, 2021 02:19

hongliangl force-pushed the remove-unused-tables branch 2 times, most recently from 14e78a0 to 76bc57f Compare January 11, 2022 12:03

jianjuns reviewed Jan 11, 2022

View reviewed changes

hongliangl force-pushed the remove-unused-tables branch from 76bc57f to 385c474 Compare January 12, 2022 02:06

hongliangl requested a review from jianjuns January 12, 2022 02:07

jianjuns previously approved these changes Jan 12, 2022

View reviewed changes

hongliangl dismissed jianjuns’s stale review via f5cdc16 January 19, 2022 01:15

hongliangl force-pushed the remove-unused-tables branch from 385c474 to f5cdc16 Compare January 19, 2022 01:15

hongliangl force-pushed the remove-unused-tables branch from f5cdc16 to 71e77a1 Compare January 20, 2022 07:10

hongliangl requested review from wenyingd and jianjuns January 26, 2022 02:49

jianjuns previously approved these changes Feb 14, 2022

View reviewed changes

tnqn reviewed Feb 18, 2022

View reviewed changes

pkg/agent/openflow/client.go Show resolved Hide resolved

pkg/agent/openflow/client.go Show resolved Hide resolved

pkg/agent/openflow/client.go Outdated Show resolved Hide resolved

pkg/agent/openflow/pipeline.go Show resolved Hide resolved

hongliangl dismissed jianjuns’s stale review via 7026245 February 21, 2022 14:55

hongliangl force-pushed the remove-unused-tables branch from b15dfbb to 7026245 Compare February 21, 2022 14:55

hongliangl requested review from tnqn and jianjuns February 21, 2022 14:58

tnqn reviewed Feb 23, 2022

View reviewed changes

hongliangl force-pushed the remove-unused-tables branch from 7026245 to 44d2512 Compare February 24, 2022 00:45

hongliangl requested a review from tnqn February 24, 2022 00:46

tnqn approved these changes Feb 24, 2022

View reviewed changes

tnqn merged commit ceae206 into antrea-io:main Feb 24, 2022

hongliangl deleted the remove-unused-tables branch April 28, 2022 11:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove unused OF tables and flows on Windows #3138

Remove unused OF tables and flows on Windows #3138

hongliangl commented Dec 14, 2021 •

edited

codecov-commenter commented Dec 14, 2021 •

edited

jianjuns left a comment

XinShuYang commented Jan 5, 2022

hongliangl commented Jan 12, 2022

hongliangl commented Jan 12, 2022

hongliangl commented Jan 19, 2022

hongliangl commented Jan 19, 2022

hongliangl commented Jan 20, 2022

hongliangl commented Jan 20, 2022

hongliangl commented Jan 20, 2022

hongliangl commented Jan 20, 2022

hongliangl commented Jan 23, 2022

hongliangl commented Jan 25, 2022

hongliangl commented Jan 25, 2022

hongliangl commented Feb 14, 2022

hongliangl commented Feb 14, 2022

jianjuns left a comment

hongliangl commented Feb 15, 2022

hongliangl commented Feb 15, 2022

hongliangl commented Feb 17, 2022

hongliangl commented Feb 18, 2022

hongliangl commented Feb 21, 2022

hongliangl commented Feb 22, 2022

hongliangl commented Feb 23, 2022

tnqn Feb 23, 2022

hongliangl Feb 24, 2022

hongliangl commented Feb 24, 2022

hongliangl commented Feb 24, 2022

tnqn left a comment

tnqn commented Feb 24, 2022

Remove unused OF tables and flows on Windows #3138

Remove unused OF tables and flows on Windows #3138

Conversation

hongliangl commented Dec 14, 2021 • edited

codecov-commenter commented Dec 14, 2021 • edited

Codecov Report

jianjuns left a comment

Choose a reason for hiding this comment

XinShuYang commented Jan 5, 2022

hongliangl commented Jan 12, 2022

hongliangl commented Jan 12, 2022

hongliangl commented Jan 19, 2022

hongliangl commented Jan 19, 2022

hongliangl commented Jan 20, 2022

hongliangl commented Jan 20, 2022

hongliangl commented Jan 20, 2022

hongliangl commented Jan 20, 2022

hongliangl commented Jan 23, 2022

hongliangl commented Jan 25, 2022

hongliangl commented Jan 25, 2022

hongliangl commented Feb 14, 2022

hongliangl commented Feb 14, 2022

jianjuns left a comment

Choose a reason for hiding this comment

hongliangl commented Feb 15, 2022

hongliangl commented Feb 15, 2022

hongliangl commented Feb 17, 2022

hongliangl commented Feb 18, 2022

hongliangl commented Feb 21, 2022

hongliangl commented Feb 22, 2022

hongliangl commented Feb 23, 2022

tnqn Feb 23, 2022

Choose a reason for hiding this comment

hongliangl Feb 24, 2022

Choose a reason for hiding this comment

hongliangl commented Feb 24, 2022

hongliangl commented Feb 24, 2022

tnqn left a comment

Choose a reason for hiding this comment

tnqn commented Feb 24, 2022

hongliangl commented Dec 14, 2021 •

edited

codecov-commenter commented Dec 14, 2021 •

edited