matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[auto-ts] add memory check (#10433)"

Browse Source 
This reverts commit a2cd0f5d4c.
This commit is contained in:
Ying Xie 2022-10-04 21:53:05 +00:00
parent 1a08069d40
commit 76f7d7fa53
5 changed files with 10 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
files/build_templates/init_cfg.json.j2
View File

@ -84,8 +84,6 @@
"rate_limit_interval" : "180", "rate_limit_interval" : "180",
"max_techsupport_limit" : "10.0", "max_techsupport_limit" : "10.0",
"max_core_limit" : "5.0", "max_core_limit" : "5.0",
"available_mem_threshold": "10.0",
"min_available_mem": "200",
"since" : "2 days ago" "since" : "2 days ago"
} }
}, },
@ -95,8 +93,7 @@
{%- if enable_auto_tech_support == "y" %} {%- if enable_auto_tech_support == "y" %}
"state" : "enabled", {% else %} "state" : "enabled", {% else %}
"state" : "disabled", {% endif %} "state" : "disabled", {% endif %}
"rate_limit_interval" : "600", "rate_limit_interval" : "600"
"available_mem_threshold": "10.0"
}{%if not loop.last %},{% endif -%} }{%if not loop.last %},{% endif -%}
{% endfor %} {% endfor %}
}, },

3
files/image_config/monit/conf.d/sonic-host
View File

@ -46,6 +46,3 @@ check program vnetRouteCheck with path "/usr/local/bin/vnet_route_check.py"
every 5 cycles every 5 cycles
if status != 0 for 3 cycle then alert repeat every 1 cycles if status != 0 for 3 cycle then alert repeat every 1 cycles
# memory_check tool that verifies that memory usage does not cross the threshold or invokes techsupport.
check program memory_check with path "/usr/local/bin/memory_threshold_check.py"
if status == 2 for 10 times within 20 cycles then exec "/usr/local/bin/memory_threshold_check_handler.py"

18
src/sonic-yang-models/tests/yang_model_tests/tests/auto_techsupport.json
View File

@ -8,7 +8,7 @@
}, },
"AUTO_TECHSUPPORT_INVALID_RATE_LIMIT_FORMAT": { "AUTO_TECHSUPPORT_INVALID_RATE_LIMIT_FORMAT": {
"desc" : "Configure cooloff with a value of invalid format", "desc" : "Configure cooloff with a value of invalid format",
"eStrKey": "InvalidValue" "eStrKey": "InvalidValue"
}, },
"AUTO_TECHSUPPORT_OUT_OF_RANGE_DECIMAL": { "AUTO_TECHSUPPORT_OUT_OF_RANGE_DECIMAL": {
"desc" : "Configure a value for core-uage outside the range [0, 100)", "desc" : "Configure a value for core-uage outside the range [0, 100)",
@ -19,23 +19,9 @@
}, },
"AUTO_TECHSUPPORT_INVALID_FRACTION_DIGITS": { "AUTO_TECHSUPPORT_INVALID_FRACTION_DIGITS": {
"desc" : "Configure a value for max_techsupport_size inside the range [0, 100) but with 3 fractional digits", "desc" : "Configure a value for max_techsupport_size inside the range [0, 100) but with 3 fractional digits",
"eStrKey": "InvalidValue" "eStrKey": "InvalidValue"
}, },
"AUTO_TECHSUPPORT_RATE_LIMIT_INTERVAL_TEST": { "AUTO_TECHSUPPORT_RATE_LIMIT_INTERVAL_TEST": {
"desc" : "Configure and test the valid configuration" "desc" : "Configure and test the valid configuration"
},
"AUTO_TECHSUPPORT_AVAILABLE_MEM_THRESHOLD": {
"desc" : "Configure and test the valid configuration"
},
"AUTO_TECHSUPPORT_INVALID_AVAILABLE_MEM_THRESHOLD": {
"desc" : "Configure a value for available_mem_threshold inside the range [0, 100) but with 3 fractional digits",
"eStrKey": "InvalidValue"
},
"AUTO_TECHSUPPORT_GLOBAL_MEM_THRESHOLD_VALID": {
"desc" : "Configure and test the valid configuration"
},
"AUTO_TECHSUPPORT_GLOBAL_MEM_THRESHOLD_INVALID_THRESHOLD": {
"desc" : "Configure a value for available_mem_threshold inside the range [0, 100) but with 3 fractional digits",
"eStrKey": "InvalidValue"
} }
} }

69
src/sonic-yang-models/tests/yang_model_tests/tests_config/auto_techsupport.json
View File

@ -8,7 +8,7 @@
"max_techsupport_limit" : "10.0", "max_techsupport_limit" : "10.0",
"max_core_limit" : "5.0", "max_core_limit" : "5.0",
"since" : "2 days ago" "since" : "2 days ago"
} }
} }
} }
}, },
@ -20,8 +20,8 @@
"rate_limit_interval" : "180", "rate_limit_interval" : "180",
"max_techsupport_limit" : "10.0", "max_techsupport_limit" : "10.0",
"max_core_limit" : "5.0", "max_core_limit" : "5.0",
"since" : "2 days ago" "since" : "2 days ago"
} }
} }
} }
}, },
@ -30,7 +30,7 @@
"sonic-auto_techsupport:AUTO_TECHSUPPORT": { "sonic-auto_techsupport:AUTO_TECHSUPPORT": {
"sonic-auto_techsupport:GLOBAL": { "sonic-auto_techsupport:GLOBAL": {
"rate_limit_interval" : "whatever" "rate_limit_interval" : "whatever"
} }
} }
} }
}, },
@ -40,7 +40,7 @@
"sonic-auto_techsupport:GLOBAL": { "sonic-auto_techsupport:GLOBAL": {
"max_core_limit" : "100.00", "max_core_limit" : "100.00",
"rate_limit_interval" : "180" "rate_limit_interval" : "180"
} }
} }
} }
}, },
@ -50,7 +50,7 @@
"sonic-auto_techsupport:GLOBAL": { "sonic-auto_techsupport:GLOBAL": {
"max_techsupport_limit" : "11.23", "max_techsupport_limit" : "11.23",
"max_core_limit" : "99.99" "max_core_limit" : "99.99"
} }
} }
} }
}, },
@ -60,7 +60,7 @@
"sonic-auto_techsupport:GLOBAL": { "sonic-auto_techsupport:GLOBAL": {
"max_techsupport_limit" : "11.111", "max_techsupport_limit" : "11.111",
"max_core_limit" : "99.99" "max_core_limit" : "99.99"
} }
} }
} }
}, },
@ -81,60 +81,5 @@
] ]
} }
} }
},
"AUTO_TECHSUPPORT_GLOBAL_MEM_THRESHOLD_VALID": {
"sonic-auto_techsupport:sonic-auto_techsupport": {
"sonic-auto_techsupport:AUTO_TECHSUPPORT": {
"sonic-auto_techsupport:GLOBAL": {
"available_mem_threshold": "10.0",
"min_available_mem": "900"
}
}
}
},
"AUTO_TECHSUPPORT_GLOBAL_MEM_THRESHOLD_INVALID_THRESHOLD": {
"sonic-auto_techsupport:sonic-auto_techsupport": {
"sonic-auto_techsupport:AUTO_TECHSUPPORT": {
"sonic-auto_techsupport:GLOBAL": {
"available_mem_threshold": "11.111"
}
}
}
},
"AUTO_TECHSUPPORT_AVAILABLE_MEM_THRESHOLD": {
"sonic-auto_techsupport:sonic-auto_techsupport": {
"sonic-auto_techsupport:AUTO_TECHSUPPORT_FEATURE": {
"AUTO_TECHSUPPORT_FEATURE_LIST": [
{
"feature_name" : "bgp",
"state" : "enabled",
"available_mem_threshold": "10.0"
},
{
"feature_name" : "swss",
"state" : "disabled",
"available_mem_threshold": "10.0"
}
]
}
}
},
"AUTO_TECHSUPPORT_INVALID_AVAILABLE_MEM_THRESHOLD": {
"sonic-auto_techsupport:sonic-auto_techsupport": {
"sonic-auto_techsupport:AUTO_TECHSUPPORT_FEATURE": {
"AUTO_TECHSUPPORT_FEATURE_LIST": [
{
"feature_name" : "bgp",
"state" : "enabled",
"available_mem_threshold": "11.111"
},
{
"feature_name" : "swss",
"state" : "disabled",
"available_mem_threshold": "10.0"
}
]
}
}
} }
} }

18
src/sonic-yang-models/yang-models/sonic-auto_techsupport.yang
View File

@ -59,18 +59,6 @@ module sonic-auto_techsupport {
description "Max Limit in percentage for the cummulative size of core dumps. No cleanup is performed if the value isn't congiured or is 0.0"; description "Max Limit in percentage for the cummulative size of core dumps. No cleanup is performed if the value isn't congiured or is 0.0";
type decimal-repr; type decimal-repr;
} }
leaf available_mem_threshold {
description "Memory threshold; 0 to disable techsupport invocation on memory usage threshold crossing";
type decimal-repr;
default 10.0;
}
leaf min_available_mem {
description "Minimum Free memory (in MB) that should be available for the techsupport execution to start";
type uint32;
default 200;
}
leaf since { leaf since {
/* /*
@ -108,12 +96,6 @@ module sonic-auto_techsupport {
type stypes:admin_mode; type stypes:admin_mode;
} }
leaf available_mem_threshold {
description "Memory threshold; 0 to disable techsupport invocation on memory usage threshold crossing";
type decimal-repr;
default 10.0;
}
leaf rate_limit_interval { leaf rate_limit_interval {
description "Rate limit interval for the corresponding feature. Configure 0 to explicitly disable"; description "Rate limit interval for the corresponding feature. Configure 0 to explicitly disable";
type uint16; type uint16;