starlingx/ptp-notification-armada-app
Code Issues Proposed changes

Merge "Handle incomplete pmc results"

Browse Source
This commit is contained in:
Zuul 2024-09-20 19:29:53 +00:00 committed by Gerrit Code Review
commit 4a9f089600
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
notificationservice-base-v2/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/ptp_monitor.py
View File

@ -139,8 +139,12 @@ class PtpMonitor:
if pmc and ptp4l and phc2sys and ptp4lconf: if pmc and ptp4l and phc2sys and ptp4lconf:
self.pmc_query_results, total_ptp_keywords, port_count = \ self.pmc_query_results, total_ptp_keywords, port_count = \
self.ptpsync() self.ptpsync()
try:
sync_state = utils.check_results(self.pmc_query_results, sync_state = utils.check_results(self.pmc_query_results,
total_ptp_keywords, port_count) total_ptp_keywords, port_count)
except RuntimeError as err:
LOG.warning(err)
sync_state = previous_sync_state
else: else:
LOG.warning("Missing critical resource: " LOG.warning("Missing critical resource: "
"PMC %s PTP4L %s PHC2SYS %s PTP4LCONF %s" "PMC %s PTP4L %s PHC2SYS %s PTP4LCONF %s"

6
notificationservice-base-v2/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/ptpsync.py
View File

@ -74,9 +74,9 @@ def check_results(result, total_ptp_keywords, port_count):
# check for a healthy result # check for a healthy result
if len(result) != total_ptp_keywords: if len(result) != total_ptp_keywords:
sync_state = constants.FREERUN_PHC_STATE LOG.info("Results %s" % result)
LOG.warning('results are not complete, returning FREERUN') LOG.info("Results len %s, total_ptp_keywords %s" % (len(result), total_ptp_keywords))
return sync_state raise RuntimeError("PMC results are incomplete, retrying")
# determine the current sync state # determine the current sync state
if (result[constants.GM_PRESENT].lower() != constants.GM_IS_PRESENT if (result[constants.GM_PRESENT].lower() != constants.GM_IS_PRESENT
and result[constants.GRANDMASTER_IDENTITY] != result[constants.CLOCK_IDENTITY]): and result[constants.GRANDMASTER_IDENTITY] != result[constants.CLOCK_IDENTITY]):

10
notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/ptpsync.py
View File

@ -124,9 +124,9 @@ def check_results(result, total_ptp_keywords, port_count):
# check for a healthy result # check for a healthy result
if len(result) != total_ptp_keywords: if len(result) != total_ptp_keywords:
sync_state = constants.FREERUN_PHC_STATE LOG.info("Results %s" % result)
LOG.warning('results are not complete, returning FREERUN') LOG.info("Results len %s, total_ptp_keywords %s" % (len(result), total_ptp_keywords))
return sync_state raise RuntimeError("PMC results are incomplete, retrying")
# determine the current sync state # determine the current sync state
if (result[constants.GM_PRESENT].lower() != constants.GM_IS_PRESENT if (result[constants.GM_PRESENT].lower() != constants.GM_IS_PRESENT
and result[constants.GRANDMASTER_IDENTITY] != result[constants.CLOCK_IDENTITY]): and result[constants.GRANDMASTER_IDENTITY] != result[constants.CLOCK_IDENTITY]):
@ -225,7 +225,11 @@ def ptp_status(holdover_time, freq, sync_state, event_time):
# run pmc command if preconditions met # run pmc command if preconditions met
if pmc and ptp4l and phc2sys and ptp4lconf: if pmc and ptp4l and phc2sys and ptp4lconf:
result, total_ptp_keywords, port_count = ptpsync() result, total_ptp_keywords, port_count = ptpsync()
try:
sync_state = check_results(result, total_ptp_keywords, port_count) sync_state = check_results(result, total_ptp_keywords, port_count)
except RuntimeError as err:
LOG.warning(err)
sync_state = previous_sync_state
else: else:
LOG.warning("Critical resources not available: pmc %s ptp4l %s phc2sys %s ptp4lconf %s" % LOG.warning("Critical resources not available: pmc %s ptp4l %s phc2sys %s ptp4lconf %s" %
(pmc, ptp4l, phc2sys, ptp4lconf)) (pmc, ptp4l, phc2sys, ptp4lconf))