Skip to content

Commit 3f58ca1

Browse files
wendanilguohan
wendani
authored and
lguohan
committed
[qos]: Resolve ecn runtime config save conflict with default config (#2109)
* Avoid ecn default config conflict with saving runtime ecn on/off on queues Signed-off-by: Wenda <[email protected]> * S6000 qos & buffer config change: 1) DSCP 46 to 5 2) ecn config 3) ecn on by default 4) DWRR equal weight 5) ingress lossless alpha 1/8 Signed-off-by: Wenda <[email protected]>
1 parent ad4e9c3 commit 3f58ca1

File tree

5 files changed

+45
-27
lines changed

5 files changed

+45
-27
lines changed

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,11 @@
127127
}
128128
},
129129
"QUEUE": {
130-
"Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|3-4" : {
130+
"Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|3" : {
131+
"scheduler" : "[SCHEDULER|scheduler.0]",
132+
"wred_profile" : "[WRED_PROFILE|AZURE_LOSSLESS]"
133+
},
134+
"Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|4" : {
131135
"scheduler" : "[SCHEDULER|scheduler.0]",
132136
"wred_profile" : "[WRED_PROFILE|AZURE_LOSSLESS]"
133137
},

‎device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/qos.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,11 @@
127127
}
128128
},
129129
"QUEUE": {
130-
"Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|3-4" : {
130+
"Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|3" : {
131+
"scheduler" : "[SCHEDULER|scheduler.0]",
132+
"wred_profile" : "[WRED_PROFILE|AZURE_LOSSLESS]"
133+
},
134+
"Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|4" : {
131135
"scheduler" : "[SCHEDULER|scheduler.0]",
132136
"wred_profile" : "[WRED_PROFILE|AZURE_LOSSLESS]"
133137
},

‎device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers.json.j2

+7-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"xon":"18432",
9191
"xoff":"40560",
9292
"size":"41808",
93-
"dynamic_th":"-4",
93+
"dynamic_th":"-3",
9494
"xon_offset":"2496"
9595
},
9696
"ingress_lossy_profile": {
@@ -115,6 +115,9 @@
115115
},
116116
"{{ port_names }}|0-1": {
117117
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
118+
},
119+
"{{ port_names }}|5": {
120+
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
118121
}
119122
},
120123
"BUFFER_QUEUE": {
@@ -123,6 +126,9 @@
123126
},
124127
"{{ port_names }}|0-1": {
125128
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
129+
},
130+
"{{ port_names }}|5": {
131+
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
126132
}
127133
}
128134
}

‎device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/qos.json

+23-23
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,26 @@
44
"0": "0",
55
"1": "1",
66
"3": "3",
7-
"4": "4"
7+
"4": "4",
8+
"5": "5"
89
}
910
},
1011
"MAP_PFC_PRIORITY_TO_QUEUE": {
1112
"AZURE": {
1213
"0": "0",
1314
"1": "1",
1415
"3": "3",
15-
"4": "4"
16+
"4": "4",
17+
"5": "5"
1618
}
1719
},
1820
"TC_TO_QUEUE_MAP": {
1921
"AZURE": {
2022
"0": "0",
2123
"1": "1",
2224
"3": "3",
23-
"4": "4"
25+
"4": "4",
26+
"5": "5"
2427
}
2528
},
2629
"DSCP_TO_TC_MAP": {
@@ -71,7 +74,7 @@
7174
"43":"0",
7275
"44":"0",
7376
"45":"0",
74-
"46":"0",
77+
"46":"5",
7578
"47":"0",
7679
"48":"0",
7780
"49":"0",
@@ -93,14 +96,6 @@
9396
},
9497
"SCHEDULER": {
9598
"scheduler.0" : {
96-
"type":"DWRR",
97-
"weight": "25"
98-
},
99-
"scheduler.1" : {
100-
"type":"DWRR",
101-
"weight": "30"
102-
},
103-
"scheduler.2" : {
10499
"type":"DWRR",
105100
"weight": "20"
106101
}
@@ -120,29 +115,34 @@
120115
"wred_yellow_enable":"true",
121116
"wred_red_enable":"true",
122117
"ecn":"ecn_all",
123-
"red_max_threshold":"312000",
124-
"red_min_threshold":"104000",
125-
"yellow_max_threshold":"312000",
126-
"yellow_min_threshold":"104000",
127-
"green_max_threshold":"312000",
128-
"green_min_threshold":"104000"
118+
"red_max_threshold":"2097152",
119+
"red_min_threshold":"1048576",
120+
"yellow_max_threshold":"2097152",
121+
"yellow_min_threshold":"1048576",
122+
"green_max_threshold":"2097152",
123+
"green_min_threshold":"1048576",
124+
"green_drop_probability":"5",
125+
"yellow_drop_probability":"5",
126+
"red_drop_probability":"5"
129127
}
130128
},
131129
"QUEUE": {
132-
"Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|3-4" : {
133-
"scheduler" : "[SCHEDULER|scheduler.0]"
134-
},
135130
"Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|3" : {
131+
"scheduler" : "[SCHEDULER|scheduler.0]",
136132
"wred_profile" : "[WRED_PROFILE|AZURE_LOSSLESS]"
137133
},
138134
"Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|4" : {
135+
"scheduler" : "[SCHEDULER|scheduler.0]",
139136
"wred_profile" : "[WRED_PROFILE|AZURE_LOSSLESS]"
140137
},
141138
"Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|0" : {
142-
"scheduler" : "[SCHEDULER|scheduler.1]"
139+
"scheduler" : "[SCHEDULER|scheduler.0]"
143140
},
144141
"Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|1" : {
145-
"scheduler" : "[SCHEDULER|scheduler.2]"
142+
"scheduler" : "[SCHEDULER|scheduler.0]"
143+
},
144+
"Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|5" : {
145+
"scheduler" : "[SCHEDULER|scheduler.0]"
146146
}
147147
}
148148
}

‎device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,11 @@
136136
}
137137
},
138138
"QUEUE": {
139-
"Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58,Ethernet59,Ethernet60,Ethernet61,Ethernet62,Ethernet63|3-4" : {
139+
"Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58,Ethernet59,Ethernet60,Ethernet61,Ethernet62,Ethernet63|3" : {
140+
"scheduler" : "[SCHEDULER|scheduler.0]",
141+
"wred_profile" : "[WRED_PROFILE|AZURE_LOSSLESS]"
142+
},
143+
"Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58,Ethernet59,Ethernet60,Ethernet61,Ethernet62,Ethernet63|4" : {
140144
"scheduler" : "[SCHEDULER|scheduler.0]",
141145
"wred_profile" : "[WRED_PROFILE|AZURE_LOSSLESS]"
142146
},

0 commit comments

Comments
 (0)