-
Notifications
You must be signed in to change notification settings - Fork 537
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update port_rates & rif_rates lua scripts to convert poll_interval to…
… MS (#1855) **What I did** Update the rif_rates/lua script to multiply by 1000 instead of FlexCounter class. related also to this PR - sonic-net/sonic-sairedis#878 Fix issue - sonic-net/sonic-buildimage#8392 **Why I did it** times were not calculated properly. **How I verified it** check that the output of cli and redis is close enough:
- Loading branch information
1 parent
a71a5d3
commit d240291
Showing
2 changed files
with
98 additions
and
98 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,94 +1,94 @@ | ||
| -- KEYS - port IDs | ||
| -- ARGV[1] - counters db index | ||
| -- ARGV[2] - counters table name | ||
| -- ARGV[3] - poll time interval | ||
| -- return log | ||
|
|
||
| local logtable = {} | ||
|
|
||
| local function logit(msg) | ||
| logtable[#logtable+1] = tostring(msg) | ||
| end | ||
|
|
||
| local counters_db = ARGV[1] | ||
| local counters_table_name = ARGV[2] | ||
| local rates_table_name = "RATES" | ||
|
|
||
| -- Get configuration | ||
| redis.call('SELECT', counters_db) | ||
| local smooth_interval = redis.call('HGET', rates_table_name .. ':' .. 'PORT', 'PORT_SMOOTH_INTERVAL') | ||
| local alpha = redis.call('HGET', rates_table_name .. ':' .. 'PORT', 'PORT_ALPHA') | ||
| if not alpha then | ||
| logit("Alpha is not defined") | ||
| return logtable | ||
| end | ||
| local one_minus_alpha = 1.0 - alpha | ||
| local delta = tonumber(ARGV[3]) | ||
|
|
||
| logit(alpha) | ||
| logit(one_minus_alpha) | ||
| logit(delta) | ||
|
|
||
| local n = table.getn(KEYS) | ||
| for i = 1, n do | ||
| local state_table = rates_table_name .. ':' .. KEYS[i] .. ':' .. 'PORT' | ||
| local initialized = redis.call('HGET', state_table, 'INIT_DONE') | ||
| logit(initialized) | ||
|
|
||
| -- Get new COUNTERS values | ||
| local in_ucast_pkts = redis.call('HGET', counters_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_IN_UCAST_PKTS') | ||
| local in_non_ucast_pkts = redis.call('HGET', counters_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_IN_NON_UCAST_PKTS') | ||
| local out_ucast_pkts = redis.call('HGET', counters_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_OUT_UCAST_PKTS') | ||
| local out_non_ucast_pkts = redis.call('HGET', counters_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_OUT_NON_UCAST_PKTS') | ||
| local in_octets = redis.call('HGET', counters_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_IN_OCTETS') | ||
| local out_octets = redis.call('HGET', counters_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_OUT_OCTETS') | ||
|
|
||
| if initialized == 'DONE' or initialized == 'COUNTERS_LAST' then | ||
| -- Get old COUNTERS values | ||
| local in_ucast_pkts_last = redis.call('HGET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_IN_UCAST_PKTS_last') | ||
| local in_non_ucast_pkts_last = redis.call('HGET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_IN_NON_UCAST_PKTS_last') | ||
| local out_ucast_pkts_last = redis.call('HGET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_OUT_UCAST_PKTS_last') | ||
| local out_non_ucast_pkts_last = redis.call('HGET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_OUT_NON_UCAST_PKTS_last') | ||
| local in_octets_last = redis.call('HGET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_IN_OCTETS_last') | ||
| local out_octets_last = redis.call('HGET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_OUT_OCTETS_last') | ||
|
|
||
| -- Calculate new rates values | ||
| local rx_bps_new = (in_octets - in_octets_last)/delta | ||
| local tx_bps_new = (out_octets - out_octets_last)/delta | ||
| local rx_pps_new = ((in_ucast_pkts + in_non_ucast_pkts) - (in_ucast_pkts_last + in_non_ucast_pkts_last))/delta | ||
| local tx_pps_new = ((out_ucast_pkts + out_non_ucast_pkts) - (out_ucast_pkts_last + out_non_ucast_pkts_last))/delta | ||
|
|
||
| if initialized == "DONE" then | ||
| -- Get old rates values | ||
| local rx_bps_old = redis.call('HGET', rates_table_name .. ':' .. KEYS[i], 'RX_BPS') | ||
| local rx_pps_old = redis.call('HGET', rates_table_name .. ':' .. KEYS[i], 'RX_PPS') | ||
| local tx_bps_old = redis.call('HGET', rates_table_name .. ':' .. KEYS[i], 'TX_BPS') | ||
| local tx_pps_old = redis.call('HGET', rates_table_name .. ':' .. KEYS[i], 'TX_PPS') | ||
|
|
||
| -- Smooth the rates values and store them in DB | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'RX_BPS', alpha*rx_bps_new + one_minus_alpha*rx_bps_old) | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'RX_PPS', alpha*rx_pps_new + one_minus_alpha*rx_pps_old) | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'TX_BPS', alpha*tx_bps_new + one_minus_alpha*tx_bps_old) | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'TX_PPS', alpha*tx_pps_new + one_minus_alpha*tx_pps_old) | ||
| else | ||
| -- Store unsmoothed initial rates values in DB | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'RX_BPS', rx_bps_new) | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'RX_PPS', rx_pps_new) | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'TX_BPS', tx_bps_new) | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'TX_PPS', tx_pps_new) | ||
| redis.call('HSET', state_table, 'INIT_DONE', 'DONE') | ||
| end | ||
| else | ||
| redis.call('HSET', state_table, 'INIT_DONE', 'COUNTERS_LAST') | ||
| end | ||
|
|
||
| -- Set old COUNTERS values | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_IN_UCAST_PKTS_last', in_ucast_pkts) | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_IN_NON_UCAST_PKTS_last', in_non_ucast_pkts) | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_OUT_UCAST_PKTS_last', out_ucast_pkts) | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_OUT_NON_UCAST_PKTS_last', out_non_ucast_pkts) | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_IN_OCTETS_last', in_octets) | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_OUT_OCTETS_last', out_octets) | ||
| end | ||
|
|
||
| return logtable | ||
| -- KEYS - port IDs | ||
| -- ARGV[1] - counters db index | ||
| -- ARGV[2] - counters table name | ||
| -- ARGV[3] - poll time interval | ||
| -- return log | ||
|
|
||
| local logtable = {} | ||
|
|
||
| local function logit(msg) | ||
| logtable[#logtable+1] = tostring(msg) | ||
| end | ||
|
|
||
| local counters_db = ARGV[1] | ||
| local counters_table_name = ARGV[2] | ||
| local rates_table_name = "RATES" | ||
|
|
||
| -- Get configuration | ||
| redis.call('SELECT', counters_db) | ||
| local smooth_interval = redis.call('HGET', rates_table_name .. ':' .. 'PORT', 'PORT_SMOOTH_INTERVAL') | ||
| local alpha = redis.call('HGET', rates_table_name .. ':' .. 'PORT', 'PORT_ALPHA') | ||
| if not alpha then | ||
| logit("Alpha is not defined") | ||
| return logtable | ||
| end | ||
| local one_minus_alpha = 1.0 - alpha | ||
| local delta = tonumber(ARGV[3]) | ||
|
|
||
| logit(alpha) | ||
| logit(one_minus_alpha) | ||
| logit(delta) | ||
|
|
||
| local n = table.getn(KEYS) | ||
| for i = 1, n do | ||
| local state_table = rates_table_name .. ':' .. KEYS[i] .. ':' .. 'PORT' | ||
| local initialized = redis.call('HGET', state_table, 'INIT_DONE') | ||
| logit(initialized) | ||
|
|
||
| -- Get new COUNTERS values | ||
| local in_ucast_pkts = redis.call('HGET', counters_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_IN_UCAST_PKTS') | ||
| local in_non_ucast_pkts = redis.call('HGET', counters_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_IN_NON_UCAST_PKTS') | ||
| local out_ucast_pkts = redis.call('HGET', counters_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_OUT_UCAST_PKTS') | ||
| local out_non_ucast_pkts = redis.call('HGET', counters_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_OUT_NON_UCAST_PKTS') | ||
| local in_octets = redis.call('HGET', counters_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_IN_OCTETS') | ||
| local out_octets = redis.call('HGET', counters_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_OUT_OCTETS') | ||
|
|
||
| if initialized == 'DONE' or initialized == 'COUNTERS_LAST' then | ||
| -- Get old COUNTERS values | ||
| local in_ucast_pkts_last = redis.call('HGET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_IN_UCAST_PKTS_last') | ||
| local in_non_ucast_pkts_last = redis.call('HGET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_IN_NON_UCAST_PKTS_last') | ||
| local out_ucast_pkts_last = redis.call('HGET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_OUT_UCAST_PKTS_last') | ||
| local out_non_ucast_pkts_last = redis.call('HGET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_OUT_NON_UCAST_PKTS_last') | ||
| local in_octets_last = redis.call('HGET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_IN_OCTETS_last') | ||
| local out_octets_last = redis.call('HGET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_OUT_OCTETS_last') | ||
|
|
||
| -- Calculate new rates values | ||
| local rx_bps_new = (in_octets - in_octets_last) / delta * 1000 | ||
| local tx_bps_new = (out_octets - out_octets_last) / delta * 1000 | ||
| local rx_pps_new = ((in_ucast_pkts + in_non_ucast_pkts) - (in_ucast_pkts_last + in_non_ucast_pkts_last)) / delta * 1000 | ||
| local tx_pps_new = ((out_ucast_pkts + out_non_ucast_pkts) - (out_ucast_pkts_last + out_non_ucast_pkts_last)) / delta * 1000 | ||
|
|
||
| if initialized == "DONE" then | ||
| -- Get old rates values | ||
| local rx_bps_old = redis.call('HGET', rates_table_name .. ':' .. KEYS[i], 'RX_BPS') | ||
| local rx_pps_old = redis.call('HGET', rates_table_name .. ':' .. KEYS[i], 'RX_PPS') | ||
| local tx_bps_old = redis.call('HGET', rates_table_name .. ':' .. KEYS[i], 'TX_BPS') | ||
| local tx_pps_old = redis.call('HGET', rates_table_name .. ':' .. KEYS[i], 'TX_PPS') | ||
|
|
||
| -- Smooth the rates values and store them in DB | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'RX_BPS', alpha*rx_bps_new + one_minus_alpha*rx_bps_old) | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'RX_PPS', alpha*rx_pps_new + one_minus_alpha*rx_pps_old) | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'TX_BPS', alpha*tx_bps_new + one_minus_alpha*tx_bps_old) | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'TX_PPS', alpha*tx_pps_new + one_minus_alpha*tx_pps_old) | ||
| else | ||
| -- Store unsmoothed initial rates values in DB | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'RX_BPS', rx_bps_new) | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'RX_PPS', rx_pps_new) | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'TX_BPS', tx_bps_new) | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'TX_PPS', tx_pps_new) | ||
| redis.call('HSET', state_table, 'INIT_DONE', 'DONE') | ||
| end | ||
| else | ||
| redis.call('HSET', state_table, 'INIT_DONE', 'COUNTERS_LAST') | ||
| end | ||
|
|
||
| -- Set old COUNTERS values | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_IN_UCAST_PKTS_last', in_ucast_pkts) | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_IN_NON_UCAST_PKTS_last', in_non_ucast_pkts) | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_OUT_UCAST_PKTS_last', out_ucast_pkts) | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_OUT_NON_UCAST_PKTS_last', out_non_ucast_pkts) | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_IN_OCTETS_last', in_octets) | ||
| redis.call('HSET', rates_table_name .. ':' .. KEYS[i], 'SAI_PORT_STAT_IF_OUT_OCTETS_last', out_octets) | ||
| end | ||
|
|
||
| return logtable |
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