add support for MCLAG #453

shine4chen · 2019-02-01T09:22:47Z

Signed-off-by: shine.chen shine.chen@nephosinc.com

- What I did
add support for MCLAG

- How I did it
Add iccpd(mclag daemon) item on restart_service and stop service.
issue docker kill iccpd when fast-reboot

- How to verify it
Tested on nephos lab

- Previous command output (if the output of a command-line utility has changed)

- New command output (if the output of a command-line utility has changed)

-->

Signed-off-by: shine.chen <shine.chen@nephosinc.com>

jleveque · 2019-02-15T23:29:30Z

Retest this please

Signed-off-by: shine.chen <shine.chen@nephosinc.com>

adyeung

BRCM team has completed the review, we have no further request or comment to add, please proceed to the next steps.

Signed-off-by: shine.chen <shine.chen@mediatek.com>

scripts/fast-reboot

Signed-off-by: shine.chen <shine.chen@mediatek.com>

shine4chen · 2019-11-30T11:50:23Z

retest this please

shine4chen · 2019-12-02T15:41:44Z

retest this please

shine4chen · 2019-12-04T13:50:17Z

retest this please

scripts/fast-reboot

shine4chen · 2019-12-11T14:06:51Z

retest this please

config/main.py

Signed-off-by: shine.chen <shine.chen@mediatek.com>

jleveque · 2019-12-13T20:57:02Z

config/main.py

+    optional_services_dict = config_db.get_table('FEATURE')
+    if not optional_services_dict:
+        return None
+    return optional_services_dict.keys()


Maybe this function could return the entire dictionary, then the consumers below can determine whether or not to stop/start the service based on whether it is enabled or disabled in the DB, in conjunction with the result of running systemctl is-enabled. Theoretically, the two states should match, but I'm trying to consider the corner case just in case they are out-of-sync.

Thoughts?

If out of sync I prefer the result from systemctl is-enable. In general this out of sync should be caused by user behavior such as directly running systemctl enable xxx. This is the reason I choose systemctl is-enabled instead of config-db.
Anyway I am open for this. Giving priority to config-db is acceptable.

@jleveque any comment? If no could you approve this PR?

I am fine with this approach. I will approve the PR, but I would also like to get @lguohan's approval before merging.

shine4chen · 2019-12-14T14:04:16Z

retest this please

jleveque · 2019-12-19T15:56:21Z

Retest this please

shine4chen · 2019-12-20T14:06:55Z

retest this please

nazariig · 2020-02-26T09:24:25Z

config/main.py

+    config_db.connect()
+    optional_services_dict = config_db.get_table('FEATURE')
+    if not optional_services_dict:
+        return None


@shine4chen please fix a bug:

TASK [execute cli "config load_minigraph -y" to apply new minigraph] *********** Tuesday 25 February 2020 19:54:51 +0000 (0:00:00.067) 0:00:18.526 ****** fatal: [vlab-01]: FAILED! => {"changed": true, "cmd": "config load_minigraph -y", "delta": "0:00:55.103499", "end": "2020-02-25 19:55:46.147827", "msg": "non-zero return code", "rc": 1, "start": "2020-02-25 19:54:51.044328", "stderr": "Traceback (most recent call last):\n File \"/usr/bin/config\", line 12, in <module>\n sys.exit(config())\n File \"/usr/lib/python2.7/dist-packages/click/core.py\", line 722, in __call__\n return self.main(*args, **kwargs)\n File \"/usr/lib/python2.7/dist-packages/click/core.py\", line 697, in main\n rv = self.invoke(ctx)\n File \"/usr/lib/python2.7/dist-packages/click/core.py\", line 1066, in invoke\n return _process_result(sub_ctx.command.invoke(sub_ctx))\n File \"/usr/lib/python2.7/dist-packages/click/core.py\", line 895, in invoke\n return ctx.invoke(self.callback, **ctx.params)\n File \"/usr/lib/python2.7/dist-packages/click/core.py\", line 535, in invoke\n return callback(*args, **kwargs)\n File \"/usr/lib/python2.7/dist-packages/config/main.py\", line 684, in load_minigraph\n _stop_services()\n File \"/usr/lib/python2.7/dist-packages/config/main.py\", line 451, in _stop_services\n for service in _get_optional_services():\nTypeError: 'NoneType' object is not iterable", "stderr_lines": ["Traceback (most recent call last):", " File \"/usr/bin/config\", line 12, in <module>", " sys.exit(config())", " File \"/usr/lib/python2.7/dist-packages/click/core.py\", line 722, in __call__", " return self.main(*args, **kwargs)", " File \"/usr/lib/python2.7/dist-packages/click/core.py\", line 697, in main", " rv = self.invoke(ctx)", " File \"/usr/lib/python2.7/dist-packages/click/core.py\", line 1066, in invoke", " return _process_result(sub_ctx.command.invoke(sub_ctx))", " File \"/usr/lib/python2.7/dist-packages/click/core.py\", line 895, in invoke", " return ctx.invoke(self.callback, **ctx.params)", " File \"/usr/lib/python2.7/dist-packages/click/core.py\", line 535, in invoke", " return callback(*args, **kwargs)", " File \"/usr/lib/python2.7/dist-packages/config/main.py\", line 684, in load_minigraph", " _stop_services()", " File \"/usr/lib/python2.7/dist-packages/config/main.py\", line 451, in _stop_services", " for service in _get_optional_services():", "TypeError: 'NoneType' object is not iterable"], "stdout": "Stopping service swss ...\nStopping service lldp ...\nStopping service pmon ...\nStopping service bgp ...\nStopping service hostcfgd ...\nStopping service nat ...", "stdout_lines": ["Stopping service swss ...", "Stopping service lldp ...", "Stopping service pmon ...", "Stopping service bgp ...", "Stopping service hostcfgd ...", "Stopping service nat ..."]}

@qiluo-msft / @yxieca FYI.

It seems github website has some error that we can't open PRs now. I will fix it after github service recover.

the return value of _get_optional_services() must be iterable This bug is imported from PR #453 Co-authored-by: shine.chen <shine.chen@mediatek.com>

This reverts commit 8aea564.

* add support for MCLAG Signed-off-by: shine.chen <shine.chen@nephosinc.com> * add warm-reboot support for ICCPd Signed-off-by: shine.chen <shine.chen@nephosinc.com> * ensure iccpd is there before stop iccpd Signed-off-by: shine.chen <shine.chen@mediatek.com> * fix service function * remove unused comment * refactor code according to feature management mechanism Signed-off-by: shine.chen <shine.chen@mediatek.com>

the return value of _get_optional_services() must be iterable This bug is imported from PR sonic-net#453 Co-authored-by: shine.chen <shine.chen@mediatek.com>

This reverts commit 8aea564.

add support for MCLAG

946a02a

Signed-off-by: shine.chen <shine.chen@nephosinc.com>

jleveque added the Enhancement label Feb 1, 2019

add warm-reboot support for ICCPd

c7f65a0

Signed-off-by: shine.chen <shine.chen@nephosinc.com>

shine4chen mentioned this pull request Aug 30, 2019

MCLAG feature for SONIC sonic-net/sonic-buildimage#2514

Merged

adyeung approved these changes Sep 20, 2019

View reviewed changes

merge to master branch and resolve the conflict

2dcf086

Signed-off-by: shine.chen <shine.chen@mediatek.com>

lguohan reviewed Nov 12, 2019

View reviewed changes

scripts/fast-reboot Outdated Show resolved Hide resolved

ensure iccpd is there before stop iccpd

758d033

Signed-off-by: shine.chen <shine.chen@mediatek.com>

fix service function

3d6db7a

paulnice reviewed Dec 10, 2019

View reviewed changes

scripts/fast-reboot Outdated Show resolved Hide resolved

remove unused comment

c8dd172

jleveque reviewed Dec 11, 2019

View reviewed changes

config/main.py Outdated Show resolved Hide resolved

refactor code according to feature management mechanism

796786c

Signed-off-by: shine.chen <shine.chen@mediatek.com>

jleveque reviewed Dec 13, 2019

View reviewed changes

jleveque approved these changes Dec 19, 2019

View reviewed changes

rlhui merged commit 8aea564 into sonic-net:master Feb 24, 2020

nazariig reviewed Feb 26, 2020

View reviewed changes

nazariig mentioned this pull request Feb 26, 2020

[submodule]: Advance sonic-utilities sonic-net/sonic-buildimage#4176

Closed

shine4chen mentioned this pull request Feb 27, 2020

FIX the issue "config load_minigraph -y" command fails #822

Merged

lguohan pushed a commit that referenced this pull request Mar 22, 2020

return list for _get_optional_services() (#822)

f1c79d5

the return value of _get_optional_services() must be iterable This bug is imported from PR #453 Co-authored-by: shine.chen <shine.chen@mediatek.com>

lguohan added a commit that referenced this pull request Mar 22, 2020

Revert "add support for MCLAG (#453)"

5bb9956

This reverts commit 8aea564.

lguohan mentioned this pull request Mar 22, 2020

Revert "add support for MCLAG" #849

Merged

lguohan added a commit that referenced this pull request Mar 22, 2020

Revert "add support for MCLAG (#453)" (#849)

d0f8091

This reverts commit 8aea564.

shine4chen mentioned this pull request Mar 23, 2020

re-submit mclag support #851

Open

abdosi pushed a commit to abdosi/sonic-utilities that referenced this pull request Aug 4, 2020

Revert "add support for MCLAG (sonic-net#453)" (sonic-net#849)

3d8ff33

This reverts commit 8aea564.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add support for MCLAG #453

add support for MCLAG #453

shine4chen commented Feb 1, 2019

jleveque commented Feb 15, 2019

adyeung left a comment

shine4chen commented Nov 30, 2019

shine4chen commented Dec 2, 2019

shine4chen commented Dec 4, 2019

shine4chen commented Dec 11, 2019

jleveque Dec 13, 2019 •

edited

Loading

shine4chen Dec 14, 2019

shine4chen Dec 19, 2019

jleveque Dec 19, 2019

shine4chen Dec 20, 2019

shine4chen commented Dec 14, 2019

jleveque commented Dec 19, 2019

shine4chen commented Dec 20, 2019

nazariig Feb 26, 2020

shine4chen Feb 26, 2020

add support for MCLAG #453

add support for MCLAG #453

Conversation

shine4chen commented Feb 1, 2019

jleveque commented Feb 15, 2019

adyeung left a comment

Choose a reason for hiding this comment

shine4chen commented Nov 30, 2019

shine4chen commented Dec 2, 2019

shine4chen commented Dec 4, 2019

shine4chen commented Dec 11, 2019

jleveque Dec 13, 2019 • edited Loading

Choose a reason for hiding this comment

shine4chen Dec 14, 2019

Choose a reason for hiding this comment

shine4chen Dec 19, 2019

Choose a reason for hiding this comment

jleveque Dec 19, 2019

Choose a reason for hiding this comment

shine4chen Dec 20, 2019

Choose a reason for hiding this comment

shine4chen commented Dec 14, 2019

jleveque commented Dec 19, 2019

shine4chen commented Dec 20, 2019

nazariig Feb 26, 2020

Choose a reason for hiding this comment

shine4chen Feb 26, 2020

Choose a reason for hiding this comment

jleveque Dec 13, 2019 •

edited

Loading