-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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.
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
[Flex Counters] Reset flex counters delay flag on config DB when enable_counters script is called #8500
Merged
qiluo-msft
merged 6 commits into
sonic-net:master
from
shlomibitton:shlomi_new_fast_reboot_indication_master
Sep 2, 2021
Merged
[Flex Counters] Reset flex counters delay flag on config DB when enable_counters script is called #8500
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
4e355d9
Reset flex counters delay flag on DB when enable_counters script is c…
db2f4ea
comments
shlomibitton dc3679e
update yang model for flex counters
eb536a6
Change 'flex_delay_status' type to boolean instead of enumeration
shlomibitton 8cddca4
Update sonic-flex_counter.yang
shlomibitton d06f8f2
Update sonic-flex_counter.yang
shlomibitton File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,6 +23,13 @@ module sonic-flex_counter { | |
} | ||
} | ||
|
||
typedef flex_delay_status { | ||
type enumeration { | ||
enum true; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why is There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. no special reason for it, changed to boolean |
||
enum false; | ||
} | ||
} | ||
|
||
description "FLEX_COUNTER_TABLE part of config_db.json"; | ||
|
||
/* below are in alphabetical order */ | ||
|
@@ -32,83 +39,119 @@ module sonic-flex_counter { | |
leaf FLEX_COUNTER_STATUS { | ||
type flex_status; | ||
} | ||
leaf FLEX_COUNTER_DELAY_STATUS { | ||
type flex_delay_status; | ||
} | ||
} | ||
|
||
container DEBUG_COUNTER { | ||
/* DEBUG_COUNTER_FLEX_COUNTER_GROUP */ | ||
leaf FLEX_COUNTER_STATUS { | ||
type flex_status; | ||
} | ||
leaf FLEX_COUNTER_DELAY_STATUS { | ||
type flex_delay_status; | ||
} | ||
} | ||
|
||
container PFCWD { | ||
/* PFC_WD_FLEX_COUNTER_GROUP */ | ||
leaf FLEX_COUNTER_STATUS { | ||
type flex_status; | ||
} | ||
leaf FLEX_COUNTER_DELAY_STATUS { | ||
type flex_delay_status; | ||
} | ||
} | ||
|
||
container PG_DROP { | ||
/* PG_DROP_STAT_COUNTER_FLEX_COUNTER_GROUP */ | ||
leaf FLEX_COUNTER_STATUS { | ||
type flex_status; | ||
} | ||
leaf FLEX_COUNTER_DELAY_STATUS { | ||
type flex_delay_status; | ||
} | ||
} | ||
|
||
container PG_WATERMARK { | ||
/* PG_WATERMARK_STAT_COUNTER_FLEX_COUNTER_GROUP */ | ||
leaf FLEX_COUNTER_STATUS { | ||
type flex_status; | ||
} | ||
leaf FLEX_COUNTER_DELAY_STATUS { | ||
type flex_delay_status; | ||
} | ||
} | ||
|
||
container PORT { | ||
/* PORT_STAT_COUNTER_FLEX_COUNTER_GROUP */ | ||
leaf FLEX_COUNTER_STATUS { | ||
type flex_status; | ||
} | ||
leaf FLEX_COUNTER_DELAY_STATUS { | ||
type flex_delay_status; | ||
} | ||
} | ||
|
||
container PORT_RATES { | ||
/* PORT_BUFFER_DROP_COUNTER_FLEX_COUNTER_GROUP */ | ||
leaf FLEX_COUNTER_STATUS { | ||
type flex_status; | ||
} | ||
leaf FLEX_COUNTER_DELAY_STATUS { | ||
type flex_delay_status; | ||
} | ||
} | ||
|
||
container PORT_BUFFER_DROP { | ||
/* PORT_BUFFER_DROP_COUNTER_FLEX_COUNTER_GROUP */ | ||
leaf FLEX_COUNTER_STATUS { | ||
type flex_status; | ||
} | ||
leaf FLEX_COUNTER_DELAY_STATUS { | ||
type flex_delay_status; | ||
} | ||
} | ||
|
||
container QUEUE { | ||
/* QUEUE_STAT_COUNTER_FLEX_COUNTER_GROUP */ | ||
leaf FLEX_COUNTER_STATUS { | ||
type flex_status; | ||
} | ||
leaf FLEX_COUNTER_DELAY_STATUS { | ||
type flex_delay_status; | ||
} | ||
} | ||
|
||
container QUEUE_WATERMARK { | ||
/* QUEUE_WATERMARK_STAT_COUNTER_FLEX_COUNTER_GROUP */ | ||
leaf FLEX_COUNTER_STATUS { | ||
type flex_status; | ||
} | ||
leaf FLEX_COUNTER_DELAY_STATUS { | ||
type flex_delay_status; | ||
} | ||
} | ||
|
||
container RIF { | ||
/* RIF_STAT_COUNTER_FLEX_COUNTER_GROUP */ | ||
leaf FLEX_COUNTER_STATUS { | ||
type flex_status; | ||
} | ||
leaf FLEX_COUNTER_DELAY_STATUS { | ||
type flex_delay_status; | ||
} | ||
} | ||
|
||
container RIF_RATES { | ||
/* RIF_RATE_COUNTER_FLEX_COUNTER_GROUP */ | ||
leaf FLEX_COUNTER_STATUS { | ||
type flex_status; | ||
} | ||
leaf FLEX_COUNTER_DELAY_STATUS { | ||
type flex_delay_status; | ||
} | ||
} | ||
|
||
} | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't the disabling of delay status happen regardless of
entry_info
exists or not?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is no reason too, if the entry not exist on the DB so we push it without the delay indicator and orchagent will start the flow normally.
Please check:
https://github.com/Azure/sonic-swss/blob/0febef7d167bc7ef77bf1c8b03ee91b88cb3e213/orchagent/flexcounterorch.cpp#L89