[SFLOW] Fixed SFLOW DROPMON patch to align with 2.0.45 version#15948
Merged
liat-grozovik merged 2 commits intosonic-net:masterfrom Aug 28, 2023
rajkumar38:master
Merged
[SFLOW] Fixed SFLOW DROPMON patch to align with 2.0.45 version#15948liat-grozovik merged 2 commits intosonic-net:masterfrom rajkumar38:master
liat-grozovik merged 2 commits intosonic-net:masterfrom
rajkumar38:master
Conversation
Signed-off-by: rajkumar38 <rpennadamram@marvell.com>
Contributor
Author
|
@dgsudharsan , Pls review. |
10 tasks
dgsudharsan
requested changes
Jul 28, 2023
| + // drop-monitor support | ||
| + myLog(LOG_INFO, "drop-monitor support for SONiC"); | ||
| + sp->dropmon.dropmon = YES; | ||
| + sp->dropmon.group = 1; |
Collaborator
There was a problem hiding this comment.
Why sp->dropmon.group=1 removed?
Contributor
Author
There was a problem hiding this comment.
struct variable "group" is removed in version 2.0.45. This was resulting in compilation failure. Hence removed it.
| @@ -1,49 +1,32 @@ | |||
| From 4bdd892662c08a396066ba6a1c55eac3f8aa0a5f Mon Sep 17 00:00:00 2001 | |||
Collaborator
There was a problem hiding this comment.
Can you please retain the original contributor details in the patch?
dgsudharsan
approved these changes
Aug 16, 2023
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
liat-grozovik
approved these changes
Aug 22, 2023
Collaborator
|
@saiarcot895 would you like to review as well? |
saiarcot895
reviewed
Aug 22, 2023
| FEATURES_OS10= OS10 DBUS SYSTEMD | ||
| FEATURES_OPX= OPX DBUS SYSTEMD | ||
| -FEATURES_SONIC= SONIC PSAMPLE DOCKER | ||
| +FEATURES_SONIC= SONIC PSAMPLE DOCKER DROPMON |
Contributor
There was a problem hiding this comment.
Why is DROPMON removed here? Is it no longer needed?
Collaborator
There was a problem hiding this comment.
@saiarcot895 This patch is removed, because its already part of 2.0.45 version
https://github.com/sflow/host-sflow/blob/0de668dd9e7a19ceef2dfc22ec46485fe829498b/src/Linux/Makefile#L49
saiarcot895
approved these changes
Aug 22, 2023
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
mssonicbld
pushed a commit
to mssonicbld/sonic-buildimage
that referenced
this pull request
Sep 3, 2023
…-net#15948) - Why I did it Fixed build failure when flag ENABLE_SFLOW_DROPMON=y set - How I did it Fixed sflow dropmon patch to align with hsflowd version 2.0.45 Signed-off-by: rajkumar38 <rpennadamram@marvell.com>
Collaborator
|
Cherry-pick PR to 202305: #16403 |
11 tasks
mssonicbld
pushed a commit
that referenced
this pull request
Sep 3, 2023
- Why I did it Fixed build failure when flag ENABLE_SFLOW_DROPMON=y set - How I did it Fixed sflow dropmon patch to align with hsflowd version 2.0.45 Signed-off-by: rajkumar38 <rpennadamram@marvell.com>
mssonicbld
added
Included in 202305 Branch
and removed
Created PR to 202305 Branch
labels
sonic-otn
pushed a commit
to sonic-otn/sonic-buildimage
that referenced
this pull request
Sep 20, 2023
…-net#15948) - Why I did it Fixed build failure when flag ENABLE_SFLOW_DROPMON=y set - How I did it Fixed sflow dropmon patch to align with hsflowd version 2.0.45 Signed-off-by: rajkumar38 <rpennadamram@marvell.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why I did it
Fixed build failure when flag ENABLE_SFLOW_DROPMON=y set
Work item tracking
How I did it
Fixed sflow dropmon patch to align with hsflowd version 2.0.45
How to verify it
Which release branch to backport (provide reason below if selected)
Tested branch (Please provide the tested image version)
Description for the changelog
Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)