1fff0107f2
tpd and pds Depending upon system load, the read pmc call can timeout. When it happens the corresponding data set is reset, allowing the HA algorithm to switch over the current source. Although the read timeout is undesirable, the error message is misleading because the failure is mitigated. Downgrade the error message to notice to disable it in the default log level. Test Plan: PASS: Deploy T-BC with single PTP4L instance - Load system (stress -c 64 -m 5 -t 60) check user.log, phc2sys not showing the error message phc2sys: notice [1200995.017] phc-inst2 pmc agent index 0, timeout reading pmc tpd PASS: Deploy T-BC with single PTP4L instance - Adjust the log to debug level system ptp-instance-parameter-add phc-inst2 logging_level=7 - Load system (stress -c 64 -m 5 -t 60) check user.log, phc2sys eventually shows the error message phc2sys: notice [1215208.628] phc-inst2 pmc agent index 0, timeout reading pmc tpd PASS: Build linuxptp package Closes-Bug: 2132273 Change-Id: I3e05de4006c0e35b725178d9e56eaf8c72d52747 Signed-off-by: Andre Mauricio Zelak <andre.zelak@windriver.com>
49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
From: Andre Mauricio Zelak <andre.zelak@windriver.com>
|
|
Date: Thu, 4 Jan 2024 13:27:09 -0300
|
|
Subject: [PATCH 55/67] Ignore interface in conf file when HA is disabled
|
|
|
|
Fixed the behavior when HA is disabled, one interface has been configured and
|
|
'-a' autoconfiguration option is enabled. The behavior before HA feature was
|
|
to ignore the givven interface. To keep retrocompatibility with earlier
|
|
configurations, interfaces in the configuration file are ignored
|
|
if HA is disabled.
|
|
|
|
Test Plan: non HA
|
|
PASS: Verify behavior when HA is disabled and interface has been configured
|
|
PASS: Verify behavior when HA is ommited and interface has been configured
|
|
PASS: Verify behavior when HA is disabled and no interface has been configured
|
|
|
|
Test Plan: HA
|
|
PASS: Verify phc2sys exit with error when HA is enabled and one interface
|
|
has been configured.
|
|
|
|
Closes-bug: 2048085
|
|
|
|
Signed-off-by: Andre Mauricio Zelak <andre.zelak@windriver.com>
|
|
---
|
|
phc2sys.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/phc2sys.c b/phc2sys.c
|
|
index 4120568..1f6b6c2 100644
|
|
--- a/phc2sys.c
|
|
+++ b/phc2sys.c
|
|
@@ -2236,7 +2236,8 @@ int main(int argc, char *argv[])
|
|
return c;
|
|
}
|
|
|
|
- if (src_cnt == 0) {
|
|
+ ha_enabled = config_get_int(cfg, NULL, "ha_enabled");
|
|
+ if (ha_enabled && src_cnt == 0) {
|
|
/* get the source interface list from configuration file */
|
|
src_cnt = config_get_interfaces(cfg, src_names, MAX_SRC_CLOCKS);
|
|
if (src_cnt == (unsigned int)-1) {
|
|
@@ -2297,7 +2298,6 @@ int main(int argc, char *argv[])
|
|
goto end;
|
|
}
|
|
|
|
- ha_enabled = config_get_int(cfg, NULL, "ha_enabled");
|
|
if (!ha_enabled && src_cnt > 1) {
|
|
fprintf(stderr, "too many source clocks\n");
|
|
fprintf(stderr, "Use 'ha_enabled 1' to accept more than one source clock\n");
|