Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add OVS groups to support bundle #6195

Merged
merged 3 commits into from
Apr 9, 2024
Merged

Add OVS groups to support bundle #6195

merged 3 commits into from
Apr 9, 2024

Conversation

shikharish
Copy link
Contributor

Fixes #6066

@shikharish
Add OVS groups to support bundle
051287a 
Fixes antrea-io#6066

Signed-off-by: Shikhar Soni <shikharish05@gmail.com>
tnqn
tnqn reviewed Apr 9, 2024
View reviewed changes
Copy link
Member

@tnqn tnqn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shikharish thanks for the PR. You need to add the method to mockAgentDumper to pass the unit tests.

@tnqn tnqn added this to the Antrea v2.0 release milestone Apr 9, 2024
@shikharish
Add groups dump to mockAgentDumper
c1b9965 
Signed-off-by: Shikhar Soni <shikharish05@gmail.com>
@shikharish shikharish requested a review from tnqn April 9, 2024 17:40
antoninbas
antoninbas reviewed Apr 9, 2024
View reviewed changes
pkg/agent/supportbundlecollection/support_bundle_controller_test.go Outdated
name: "SupportBundleCollection failed to dump groups",
supportBundleCollection: generateSupportbundleCollection("supportBundle13", "sftp://10.220.175.92:22/root/supportbundle"),
expectedCompleted: false,
agentDumper: &mockAgentDumper{dumpGoroutinePprofErr: fmt.Errorf("failed to dump groups")},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it should not be dumpGoroutinePprofErr

@shikharish
fix error type
b2a32fb 
Signed-off-by: Shikhar Soni <shikharish05@gmail.com>
antoninbas
antoninbas approved these changes Apr 9, 2024
View reviewed changes
Copy link
Contributor

@antoninbas antoninbas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you test the command manually on a Kind cluster with Antrea to validate that group dumps are indeed included in the supportbundle?
Could you share a sample file structure as a comment to your PR to show that it is working as expected?

@shikharish
Copy link
Contributor Author 

root@kind-worker2:/# antctl supportbundle
Created bundle under /tmp
Expire time: 2024-04-09 19:30:44 +0000 UTC

root@kind-worker2:/tmp# cat groups 
group_id=2,type=all,bucket=bucket_id:0,actions=resubmit(,15),bucket=bucket_id:1,actions=set_field:0x400000/0x600000->reg0,resubmit(,28)
group_id=3,type=all,bucket=bucket_id:0,actions=resubmit(,24),bucket=bucket_id:1,actions=set_field:0x400000/0x600000->reg0,resubmit(,28)
group_id=4,type=all,bucket=bucket_id:0,actions=resubmit(,26),bucket=bucket_id:1,actions=set_field:0x400000/0x600000->reg0,resubmit(,28)
group_id=5,type=select,bucket=bucket_id:0,weight:100,actions=set_field:0x4000000/0x4000000->reg4,set_field:0xaf40002->reg3,set_field:0x35/0xffff->reg4,resubmit(,11),bucket=bucket_id:1,weight:100,actions=set_field:0x4000000/0x4000000->reg4,set_field:0xaf40003->reg3,set_field:0x35/0xffff->reg4,resubmit(,11)
group_id=8,type=select,bucket=bucket_id:0,weight:100,actions=set_field:0xac120004->reg3,set_field:0x192b/0xffff->reg4,resubmit(,11)
group_id=6,type=select,bucket=bucket_id:0,weight:100,actions=set_field:0x4000000/0x4000000->reg4,set_field:0xaf40002->reg3,set_field:0x35/0xffff->reg4,resubmit(,11),bucket=bucket_id:1,weight:100,actions=set_field:0x4000000/0x4000000->reg4,set_field:0xaf40003->reg3,set_field:0x35/0xffff->reg4,resubmit(,11)
group_id=1,type=all,bucket=bucket_id:0,actions=resubmit(,13),bucket=bucket_id:1,actions=set_field:0x400000/0x600000->reg0,resubmit(,28)
group_id=7,type=select,bucket=bucket_id:0,weight:100,actions=set_field:0x4000000/0x4000000->reg4,set_field:0xaf40002->reg3,set_field:0x23c1/0xffff->reg4,resubmit(,11),bucket=bucket_id:1,weight:100,actions=set_field:0x4000000/0x4000000->reg4,set_field:0xaf40003->reg3,set_field:0x23c1/0xffff->reg4,resubmit(,11)
group_id=9,type=select,bucket=bucket_id:0,weight:100,actions=set_field:0xac120003->reg3,set_field:0x286d/0xffff->reg4,resubmit(,11)

@antoninbas
Copy link
Contributor

/test-all

@antoninbas antoninbas merged commit d893e06 into antrea-io:main Apr 9, 2024
53 of 56 checks passed
@shikharish shikharish deleted the include-ovs-groups branch April 10, 2024 01:48
@wenyingd wenyingd mentioned this pull request Apr 11, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@antoninbas antoninbas antoninbas approved these changes

@tnqn tnqn Awaiting requested review from tnqn

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Antrea v2.0 release
Development

Successfully merging this pull request may close these issues.

Support bundle should include OVS groups
3 participants
@shikharish @antoninbas @tnqn