[TSA] Reliable TSA: Addressing pizza box issues #19217

fountzou · 2024-06-05T19:24:38Z

Why I did it

Implement HLD https://github.com/skeesara-nokia/SONiC/blob/master/doc/voq/Reliable_TSA.md
Resolves pizza box issues from the original PR #18928 reverted by PR #19173

Work item tracking

Microsoft ADO (number only):

How I did it

A new attribute "tsa_enabled" has been added in CHASSIS_APP_DB the value of which changes whenever TSA/TSB is issued in the supervisor (default value is false). bgpcfgd subscribes to CHASSIS_APP_DB to receive updates on the newly added "tsa_enabled" attribute and in conjunction with the CONFIG_DB "tsa_enabled" attribute value, determine the BGP operational state is determined to be in TSA or TSB.

How to verify it

Which release branch to backport (provide reason below if selected)

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

- Why I did it Implement HLD https://github.com/skeesara-nokia/SONiC/blob/master/doc/voq/Reliable_TSA.md OB- How I did it A new attribute "tsa_enabled" has been added in CHASSIS_APP_DB the value of which changes whenever TSA/TSB is issued in the supervisor (default value is false). bgpcfgd subscribes to CHASSIS_APP_DB to receive updates on the newly added "tsa_enabled" attribute and in conjunction with the CONFIG_DB "tsa_enabled" attribute value, determine the BGP operational state is determined to be in TSA or TSB. Signed-off-by: fountzou <ioannis.fountzoulas@nokia.com>

fountzou · 2024-06-05T19:27:02Z

Addresses the pizza box issues introduced by the original PR #18928 reverted by PR #19173.

fountzou · 2024-06-05T21:28:41Z

@abdosi / @arlakshm Please help to review. Thanks!

Signed-off-by: fountzou <ioannis.fountzoulas@nokia.com>

fountzou · 2024-06-07T12:28:25Z

@abdosi @arlakshm Could you please restart the Azure pipeline and review? Thanks!

abdosi · 2024-06-07T21:45:27Z

src/sonic-bgpcfgd/bgpcfgd/main.py

@@ -74,6 +76,10 @@ def do_work():
        # Device Global Manager
        DeviceGlobalCfgMgr(common_objs, "CONFIG_DB", swsscommon.CFG_BGP_DEVICE_GLOBAL_TABLE_NAME),
    ]
+
+    if device_info.get_platform_info().get('switch_type') == "voq":


we need not limit to voq chassis but to any chassis.

Please replace the API to this one: https://github.com/sonic-net/sonic-buildimage/blob/master/src/sonic-py-common/sonic_py_common/device_info.py#L575

Thank you for your comment and for pointing out the correct API. Done

abdosi · 2024-06-07T21:46:26Z

src/sonic-bgpcfgd/bgpcfgd/managers_device_global.py

+            ch.connect(ch.CHASSIS_APP_DB, False)
+            chassis_tsa_status = ch.get(ch.CHASSIS_APP_DB, "BGP_DEVICE_GLOBAL|STATE", 'tsa_enabled')
+        except Exception:
+            pass


Please log the message on exception. Helpful for debugging.

Fixed. Thanks!

abdosi · 2024-06-07T21:51:43Z

files/build_templates/docker_image_ctl.j2

+        if [[ -z "$DEV" ]] && [[ -f /etc/sonic/chassisdb.conf ]]; then
+           tsa_cfg="$($SONIC_DB_CLI CONFIG_DB HGET "BGP_DEVICE_GLOBAL|STATE" "tsa_enabled")"
+           if [[ -n "$tsa_cfg" ]]; then
+              docker exec -i ${DOCKERNAME} $SONIC_DB_CLI CHASSIS_APP_DB HMSET "BGP_DEVICE_GLOBAL|STATE" tsa_enabled ${tsa_cfg}


Please capture return code of operation and log message in case of failure.

Addressed your suggestion. Thanks!

abdosi · 2024-06-07T21:51:48Z

files/image_config/config-setup/config-setup

+    #Enforce CHASSIS_APP_DB.tsa_enabled to be in sync with BGP_DEVICE_GLOBAL.STATE.tsa_enabled
+    if [[ -f /etc/sonic/chassisdb.conf ]]; then
+       tsa_cfg="$(sonic-db-cli CONFIG_DB HGET "BGP_DEVICE_GLOBAL|STATE" "tsa_enabled")"
+       sonic-db-cli CHASSIS_APP_DB HMSET "BGP_DEVICE_GLOBAL|STATE" tsa_enabled ${tsa_cfg}


Please capture return code of operation and log message in case of failure.

Fixed. Thanks for your comment

abdosi

Comments added.

Signed-off-by: fountzou <ioannis.fountzoulas@nokia.com>

abdosi

LGTM

abdosi · 2024-06-11T07:24:58Z

@lguohan : Can you help with merge of this.

mlok-nokia · 2024-06-13T19:53:57Z

@lguohan Hi Guohan, Please help to merge this PR. Thanks

mlok-nokia · 2024-06-13T20:30:12Z

@rlhui Hi Rita, Please help to merge this PR. Thanks

tjchadaga · 2024-07-05T23:06:19Z

dockers/docker-fpm-frr/base_image_files/TS

+switch_type=`sonic-db-cli CONFIG_DB hget 'DEVICE_METADATA|localhost' 'switch_type'`
+TSA_CHASSIS_STATE=false
+
+if [[ $switch_type == 'voq' ]]; then


could you please change this to include chassis-packet or change the check to look for type == "SpineRouter"?

@fountzou : Please address this comment.

Thank you for comment @tjchadaga @abdosi . Fixed -- kindly see #19527

tjchadaga · 2024-07-05T23:07:31Z

dockers/docker-fpm-frr/base_image_files/TSA

+    sonic-cfggen -a "$CONFIG_DB_TSA_STATE_UPDATE" -w
+    echo "Chassis Mode: Normal -> Maintenance"
+    logger -t TSA -p user.info "Chassis Mode: Normal -> Maintenance"
+  fi
  echo "Please execute \"rexec all -c 'sudo config save -y'\" to preserve System mode in Maintenance after reboot\


Should this be changed to just 'sudo config save' instead of rexec all now?

@fountzou : Please address this comment.

Thank you for comment @tjchadaga @abdosi . Fixed -- kindly see #19527

tjchadaga · 2024-07-05T23:08:19Z

dockers/docker-fpm-frr/base_image_files/TSB

+    sonic-cfggen -a "$CONFIG_DB_TSA_STATE_UPDATE" -w
+    echo "Chassis Mode: Maintenance -> Normal"
+    logger -t TSB -p user.info "Chassis Mode: Maintenance -> Normal"
+  fi
  echo "Please execute \"rexec all -c 'sudo config save -y'\" to preserve System mode in Normal state after reboot\


Same comment here

@fountzou : Please address this comment.

Thank you for comment @tjchadaga @abdosi . Fixed -- kindly see #19527

yejianquan · 2024-07-10T11:05:38Z

Hi @fountzou , please resolve the conflict to 202405 and raise a seperate PR

fountzou · 2024-07-10T14:40:33Z

Hi @yejianquan. Sure, working on that -- thank you

* [TSA] Reliable TSA: Addressing pizza box issues - Why I did it Implement HLD https://github.com/skeesara-nokia/SONiC/blob/master/doc/voq/Reliable_TSA.md OB- How I did it A new attribute "tsa_enabled" has been added in CHASSIS_APP_DB the value of which changes whenever TSA/TSB is issued in the supervisor (default value is false). bgpcfgd subscribes to CHASSIS_APP_DB to receive updates on the newly added "tsa_enabled" attribute and in conjunction with the CONFIG_DB "tsa_enabled" attribute value, determine the BGP operational state is determined to be in TSA or TSB. Signed-off-by: fountzou <ioannis.fountzoulas@nokia.com>

fountzou requested review from StormLiangMS and lguohan as code owners June 5, 2024 19:24

fountzou and others added 3 commits June 6, 2024 18:25

Merge branch 'master' into TSA

5128817

Resolving merge issues

386e7d5

Signed-off-by: fountzou <ioannis.fountzoulas@nokia.com>

Fix the UT error

d339520

Signed-off-by: fountzou <ioannis.fountzoulas@nokia.com>

judyjoseph requested a review from abdosi June 7, 2024 16:36

abdosi reviewed Jun 7, 2024

View reviewed changes

abdosi requested changes Jun 7, 2024

View reviewed changes

Addressing review comments

0975f25

Signed-off-by: fountzou <ioannis.fountzoulas@nokia.com>

fountzou requested a review from abdosi June 10, 2024 13:42

abdosi approved these changes Jun 11, 2024

View reviewed changes

sanjair-git mentioned this pull request Jun 13, 2024

[T2-Chassis] - New tests for Reliable-TSA feature sonic-net/sonic-mgmt#13290

Merged

8 tasks

rlhui added the Request for 202405 Branch label Jun 19, 2024

rlhui merged commit 99e0e1a into sonic-net:master Jun 19, 2024
20 checks passed

tjchadaga reviewed Jul 5, 2024

View reviewed changes

yejianquan added the Approved for 202405 Branch label Jul 10, 2024

mssonicbld added the Cherry Pick Conflict_202405 label Jul 10, 2024

fountzou mentioned this pull request Jul 10, 2024

Reliable TSA: Addressing review comments to use 'SpineRouter' in checks instead of 'voq' and fix few echo msgs. #19527

Merged

11 tasks

fountzou mentioned this pull request Jul 11, 2024

[202405][TSA] Reliable TSA: Conflict resolution for merging into 2024.05 branch #19539

Merged

11 tasks

bingwang-ms removed Cherry Pick Conflict_202405 Approved for 202405 Branch Request for 202405 Branch labels Aug 23, 2024

mssonicbld mentioned this pull request Nov 4, 2024

[action] [PR:13290] [T2-Chassis] - New tests for Reliable-TSA feature sonic-net/sonic-mgmt#15338

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[TSA] Reliable TSA: Addressing pizza box issues #19217

[TSA] Reliable TSA: Addressing pizza box issues #19217

fountzou commented Jun 5, 2024

fountzou commented Jun 5, 2024

fountzou commented Jun 5, 2024

fountzou commented Jun 7, 2024

abdosi Jun 7, 2024 •

edited

Loading

fountzou Jun 10, 2024

abdosi Jun 7, 2024

fountzou Jun 10, 2024

abdosi Jun 7, 2024

fountzou Jun 10, 2024

abdosi Jun 7, 2024

fountzou Jun 10, 2024

abdosi left a comment

abdosi left a comment

abdosi commented Jun 11, 2024

mlok-nokia commented Jun 13, 2024

mlok-nokia commented Jun 13, 2024

tjchadaga Jul 5, 2024

abdosi Jul 9, 2024

fountzou Jul 10, 2024

tjchadaga Jul 5, 2024

abdosi Jul 9, 2024

fountzou Jul 10, 2024

tjchadaga Jul 5, 2024

abdosi Jul 9, 2024

fountzou Jul 10, 2024

yejianquan commented Jul 10, 2024 •

edited

Loading

fountzou commented Jul 10, 2024

[TSA] Reliable TSA: Addressing pizza box issues #19217

[TSA] Reliable TSA: Addressing pizza box issues #19217

Conversation

fountzou commented Jun 5, 2024

Why I did it

Work item tracking

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

fountzou commented Jun 5, 2024

fountzou commented Jun 5, 2024

fountzou commented Jun 7, 2024

abdosi Jun 7, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

abdosi left a comment

Choose a reason for hiding this comment

abdosi left a comment

Choose a reason for hiding this comment

abdosi commented Jun 11, 2024

mlok-nokia commented Jun 13, 2024

mlok-nokia commented Jun 13, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yejianquan commented Jul 10, 2024 • edited Loading

fountzou commented Jul 10, 2024

abdosi Jun 7, 2024 •

edited

Loading

yejianquan commented Jul 10, 2024 •

edited

Loading