modify syncd init script for supporting yml #1411

geans-pin · 2024-08-08T00:37:56Z

No description provided.

…onic-net#1402) Fixes sonic-net/sonic-buildimage#19411 During fast reboot temp view is not used and any failure will not result in SAI failure dump taken. Hence moving the handling of SAI failure dump above the ignore of non temp view.

linux-foundation-easycla · 2024-08-08T00:38:00Z

The committers listed above are authorized under a signed CLA.

✅ login: geans-pin / name: 賓少鈺 (2b7aa8d, 1095d04, d8ef6fc, 4657857, ac3dec7, 64baffd, e6a2ee9, 5211222, ca167de, c493160, a045078, 063c81f, d43752f, b7f8d5c, 24caeac, 8e16fdc, 773059f)
✅ login: dgsudharsan / name: Sudharsan Dhamal Gopalarathnam (9785762)
✅ login: yaqiangz / name: Yaqiang Zhu (1f18948)
✅ login: geanspin (8e34b95, 0a5fcb7, c8d7fec, 9975c2b)
✅ login: Ndancejic / name: Nikola Dancejic (b764db3)
✅ login: arlakshm / name: Arvindsrinivasan Lakshmi Narasimhan (2099350)
✅ login: liushilongbuaa / name: Liu Shilong (17e893c)
✅ login: bingwang-ms (4060b79)
✅ login: rajkumar38 / name: Rajkumar-Marvell (f65180c)
✅ login: yejianquan / name: Jianquan Ye (4f1ad92)
✅ login: kcudnik / name: Kamil Cudnik (a00e89d)

syncd/scripts/syncd_init_common.sh

ZhaohuiS · 2024-09-13T08:10:21Z

syncd/scripts/syncd_init_common.sh

+    if [ ! -z "$PLT_CONFIG_YML" ] && [ -f $PLATFORM_DIR/common_config_support ]; then
+       cp -f $HWSKU_DIR/*.config.yml /tmp
+       cp -f /etc/sai.d/sai.profile /tmp
+       CONFIG_YML=$(find /tmp -name '*.yml')


@geans-pin what about this config.bcm file? It doesn't have .yml suffix, but it is yaml format, how to deal with it? https://github.com/sonic-net/sonic-buildimage/blob/b73d613bf581076192dd0150cb35d6d2de6645b1/device/arista/x86_64-arista_7060dx5_64s/Arista-7060DX5-64S/th4-a7060dx5-64s.config.bcm#L4

We use the file name .yml suffix to identify the file format. Can you change the sai.profile and *.config.bcm to *.yml as following BRCM SDK rule ?

syncd/scripts/syncd_init_common.sh

SAI 1.11.0 added support for bulk neighbor entries. Adding support for neighbor bulk operations to syncd. * added neighbor entry capability to bulk operations in syncd * added unit tests for neighbor bulk operations * added code coverage for neighbor bulk operations Signed-off-by: Nikola Dancejic <[email protected]>

kcudnik · 2024-10-02T12:37:42Z

what is motivation here? please provide extended descrption for this pr

geans-pin · 2024-10-08T16:20:48Z

what is motivation here? please provide extended descrption for this pr

I had added the comment to remind this in HLD. Please check the PR of HLD

kcudnik · 2024-10-09T13:18:40Z

still not description in PR and seems like build is failing

Update the SAI submodule for 202405 to pickup the fix for sonic-net/sonic-buildimage#19972 Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <[email protected]>

…onic-net#1412) (sonic-net#1433) On Mellanox platforms, the /tmp/sai.profile file inside syncd might end up with invalid formatting after running the script modified by this PR, such as missing new lines after concatenation or redundant new lines. This PR aims to fix that. Co-authored-by: Tomer Shalvi <[email protected]>

geans-pin · 2024-10-23T02:57:58Z

still not description in PR and seems like build is failing
Can you check the latest commit in this PR ? on line 182 and 183

            #Overwrite section in common config should
            #be located after normal section

Also, in the HLD PR. Please check the following description.

#Note, the Overwrite Section should be located after normal section in the common config file, otherwise the logic will overwrite all properties

kcudnik · 2024-10-23T09:22:16Z

still not description in PR and seems like build is failing
Can you check the latest commit in this PR ? on line 182 and 183
            #Overwrite section in common config should
            #be located after normal section
Also, in the HLD PR. Please check the following description.

#Note, the Overwrite Section should be located after normal section in the common config file, otherwise the logic will overwrite all properties

here: #1411 (comment) no description

geans-pin · 2024-10-27T03:59:46Z

still not description in PR and seems like build is failing
Can you check the latest commit in this PR ? on line 182 and 183
            #Overwrite section in common config should
            #be located after normal section
Also, in the HLD PR. Please check the following description.
#Note, the Overwrite Section should be located after normal section in the common config file, otherwise the logic will overwrite all properties
here: #1411 (comment) no description

With the new fix, we don't have this limitation. So, we don't need the comment now.

Geans

…1445) The counters for syncd (switch chip) were attempted to be added to gbsyncd (gearbox phys), and vice versa. This issue is introduced by sonic-net#1362 When setting the redis attribute SAI_REDIS_SWITCH_ATTR_FLEX_COUNTER_GROUP and SAI_REDIS_SWITCH_ATTR_FLEX_COUNTER, the operation is applied to every contexts (both syncd and gbsyncd). However, the counters to initialize could only exist in one context. The fix is to check that the target switch id exists in a specific context, for the set operation of any redis type attribute; if not, skip the set on that context. Before the fix, we see the error below in syslog ERR gbsyncd#syncd: :- processFlexCounterEvent: port VID oid:0x1000000000002, was not found (probably port was removed/splitted) and will remove from counters now After the fix, log like below is printed on info level: INFO swss#orchagent: :- containsSwitch: context phys failed to find switch oid:0x21000000000000 This change is needed by the SONiC release 202405 and later. Co-authored-by: byu343 <[email protected]>

Rename file to avoid clone issue in case insensitive file system. This caused auto-cherry-pick don't work.

syncd/scripts/syncd_init_common.sh

syncd/scripts/brcm_common_config_ut.sh

geans-pin · 2024-11-14T23:14:46Z

/azpw run

mssonicbld · 2024-11-14T23:14:49Z

/AzurePipelines run

azure-pipelines · 2024-11-14T23:15:00Z

Azure Pipelines successfully started running 1 pipeline(s).

Fix checker issue : remove white space

Remove white space

remove white space

geans-pin · 2024-11-15T10:53:11Z

@ZhaohuiS

Can you help the checker failed ? In this PR, we don't change this src/singaler.cpp actually.

Geans

Assertion failed: pfd.revents & POLLIN (src/signaler.cpp:265)
/bin/bash: line 6: 22075 Aborted (core dumped) ${dir}$tst
FAIL: tests

…onic-net#1461) Backported PR sonic-net#1420 from master to 202405. Signed-off-by: Rajkumar P R <[email protected]>

To fix RPC build issue

…sting by replacing redis-rdb-tool with rdb-cli (sonic-net#1391) (sonic-net#1471) Why I did it Fix issue: sonic-net#1387 The latest redis-rdb-tools-0.1.15 doesn't support Redis 7.0. Redis 7.0 was released in 2020 and adopted by SONiC's latest version. So, this issue turned out. https://github.com/sripathikrishnan/redis-rdb-tools I.e., the rdb-tools is far behind the Redis 7.0. The librdb can perfectly fix this issue. Please see quote from https://github.com/redis/librdb. Motivation behind this project There is a genuine need by the Redis community for a versatile RDB file parser that can export data, perform data analysis, or merely extract raw data from RDB and RESTORE it against a live Redis server. However, available parsers have shortcomings in some aspects such as lack of long-term support, lagging far behind the latest Redis release, and usually not being optimized for memory, performance, or high-traffic streaming for production environments. Additionally, most of them are not written in C, which limits the reuse of Redis components and the potential to contribute back to Redis repo. To address these issues, it is worthwhile to develop a new parser with a modern architecture, that maybe can also challenge the current integrated RDB parser of Redis and even replace it in the future. So, the below PRS are to replace rdbtools with librdb's tool rdb-cli. sonic-net/sonic-buildimage#19268 Co-authored-by: JunhongMao <[email protected]>

ZhaohuiS · 2024-11-25T10:39:27Z

syncd/scripts/syncd_init_common.sh

+    done < $from_file
+    echo "# End of $message" >> $to_file
+    echo "Merged $from_file to $to_file"
+}


On 7260 hwsku, syncd is not running with this change:

2024 Nov 25 10:04:26.043570 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd Merged /usr/share/sonic/device/x86_64-broadcom_common/x86_64-broadcom_b97/broadcom-sonic-th2.config.bcm to /tmp/config.bcm 2024 Nov 25 10:04:26.043962 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd Merging /etc/sai.d/config.bcm with /usr/share/sonic/device/x86_64-broadcom_common/x86_64-broadcom_b97/broadcom-sonic-th2.config.bcm, merge files stored in /tmp/config.bcm 2024 Nov 25 10:04:26.359627 str2-7260cx3-acs-9 INFO lldp#supervisord 2024-11-25 10:04:26,358 INFO success: rsyslogd entered RUNNING state, process has stayed up for > than 1 seconds (startsecs) 2024 Nov 25 10:04:26.411278 str2-7260cx3-acs-9 DEBUG syncd#syncd: :> syncd_main: enter 2024 Nov 25 10:04:26.415024 str2-7260cx3-acs-9 NOTICE syncd#syncd: :- initialize: initializeing metadata log function 2024 Nov 25 10:04:26.415082 str2-7260cx3-acs-9 WARNING syncd#syncd: :- parseCommandLine: param -s is depreacated, use -z 2024 Nov 25 10:04:26.415106 str2-7260cx3-acs-9 WARNING syncd#syncd: :- parseCommandLine: unknown option B 2024 Nov 25 10:04:26.415128 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd /usr/bin/syncd: invalid option -- 'B'#015 2024 Nov 25 10:04:26.415150 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd Usage: syncd [-d] [-p profile] [-t type] [-u] [-S] [-U] [-C] [-s] [-z mode] [-l] [-g idx] [-x contextConfig] [-b breakConfig] [-h]#015 2024 Nov 25 10:04:26.415174 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd -d --diag#015 2024 Nov 25 10:04:26.415195 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd Enable diagnostic shell#015 2024 Nov 25 10:04:26.415218 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd -p --profile profile#015 2024 Nov 25 10:04:26.415240 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd Provide profile map file 2024 Nov 25 10:04:26.415261 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd #015 2024 Nov 25 10:04:26.415283 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd -t --startType type 2024 Nov 25 10:04:26.415348 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd #015 2024 Nov 25 10:04:26.415373 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd Specify start type (cold|warm|fast|fastfast|express) 2024 Nov 25 10:04:26.415395 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd #015 2024 Nov 25 10:04:26.415414 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd -u --useTempView 2024 Nov 25 10:04:26.415452 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd #015 2024 Nov 25 10:04:26.415475 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd Use temporary view between init and apply 2024 Nov 25 10:04:26.415532 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd #015 2024 Nov 25 10:04:26.415556 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd -S --disableExitSleep 2024 Nov 25 10:04:26.415578 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd #015 2024 Nov 25 10:04:26.415621 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd Disable sleep when syncd crashes 2024 Nov 25 10:04:26.415658 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd #015 2024 Nov 25 10:04:26.419067 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd -U --enableUnittests 2024 Nov 25 10:04:26.419125 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd #015 2024 Nov 25 10:04:26.419148 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd Metadata enable unittests 2024 Nov 25 10:04:26.419169 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd #015 2024 Nov 25 10:04:26.419190 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd -C --enableConsistencyCheck#015 2024 Nov 25 10:04:26.419211 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd Enable consisteny check DB vs ASIC after comparison logic#015 2024 Nov 25 10:04:26.419231 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd -s --syncMode#015 2024 Nov 25 10:04:26.419250 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd Enable synchronous mode (depreacated, use -z)#015 2024 Nov 25 10:04:26.419274 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd -z --redisCommunicationMode#015 2024 Nov 25 10:04:26.419297 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd Redis communication mode (redis_async|redis_sync|zmq_sync), default: redis_async#015 2024 Nov 25 10:04:26.419319 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd -l --enableBulk#015 2024 Nov 25 10:04:26.419341 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd Enable SAI Bulk support#015 2024 Nov 25 10:04:26.419366 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd -g --globalContext#015 2024 Nov 25 10:04:26.419389 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd Global context index to load from context config file#015 2024 Nov 25 10:04:26.419410 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd -x --contextConfig#015 2024 Nov 25 10:04:26.419431 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd Context configuration file#015 2024 Nov 25 10:04:26.419452 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd -b --breakConfig#015 2024 Nov 25 10:04:26.419474 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd Comparison logic 'break before make' configuration file#015 2024 Nov 25 10:04:26.419495 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd -w --watchdogWarnTimeSpan#015 2024 Nov 25 10:04:26.419518 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd Watchdog time span (in microseconds) to watch for execution#015 2024 Nov 25 10:04:26.419540 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd -h --help#015 2024 Nov 25 10:04:26.419561 str2-7260cx3-acs-9 INFO syncd#supervisord: syncd Print out this message#015 2024 Nov 25 10:04:26.440339 str2-7260cx3-acs-9 NOTICE syncd#dsserve: child /usr/bin/syncd exited status: 256

Zhaohui,

I found the following PR which I merged from master caused the issue.
c4aea50

In my previous local PR for running UT, I didn't hit this issue. Recently, I merged my PR and rebase with master.
The change from the following PR was merged to the syncd_init_common.sh and caused the issue.

Can you check the following PR ? Not sure how this merged to community master ?
I try to remove the change of the PR change from Stephen Sun, the issue is resolved.

Can you please confirm this again ?

Geans

3 weeks ago

Do not poll counters in bulk mode during initialization for objects t…
47
48
49
50
51
SUPPORTING_BULK_COUNTER_GROUPS=$(echo $SYNCD_VARS | jq -r '.supporting_bulk_counter_groups')
if [ "$SUPPORTING_BULK_COUNTER_GROUPS" != "" ]; then
CMD_ARGS+=" -B $SUPPORTING_BULK_COUNTER_GROUPS"
fi

Zhaohui,

I found the following PR which I merged from master caused the issue. c4aea50

In my previous local PR for running UT, I didn't hit this issue. Recently, I merged my PR and rebase with master. The change from the following PR was merged to the syncd_init_common.sh and caused the issue.

Can you check the following PR ? Not sure how this merged to community master ? I try to remove the change of the PR change from Stephen Sun, the issue is resolved.

Can you please confirm this again ?

Geans

3 weeks ago

Do not poll counters in bulk mode during initialization for objects t… 47 48 49 50 51 SUPPORTING_BULK_COUNTER_GROUPS=$(echo $SYNCD_VARS | jq -r '.supporting_bulk_counter_groups') if [ "$SUPPORTING_BULK_COUNTER_GROUPS" != "" ]; then CMD_ARGS+=" -B $SUPPORTING_BULK_COUNTER_GROUPS" fi

@geans-pin could you please help fix the conflicts? And then I will test it again with your latest submit

I don't see any conflicts. The issue is caused by the previous merged commits. Can you check with the PR owner of the previous commit by Stephen Sun? I have no idea why he add the new option -B? I don't see any UT on this PR from Stephen Sun.

BTW, I can see the same issue when syncd running with this script syncd_init_common.sh without my PR change

Geans

@geans-pin To make things easier, #1437 was merged before your PR, we have to rebase the code.
I will test the changes in your PR without -B option, I mean based on 202405 image, not master image.

Praveen-Brcm · 2024-11-27T16:39:51Z

@ ZhaohuiS , Please help look into @geans-pin analysis shared here before and help resolve the conflicts.?
Thanks,

geans-pin · 2024-11-28T01:38:46Z

Zhaohui,

FYI, This is community checker test issue which is not conflict and not related with my PR code change. Please help to resolve it.

Assertion failed: pfd.revents & POLLIN (src/signaler.cpp:265)
/bin/bash: line 6: 22075 Aborted (core dumped) ${dir}$tst
FAIL: tests

ZhaohuiS · 2024-11-28T02:30:11Z

Zhaohui,

FYI, This is community checker test issue which is not conflict and not related with my PR code change. Please help to resolve it.

Assertion failed: pfd.revents & POLLIN (src/signaler.cpp:265) /bin/bash: line 6: 22075 Aborted (core dumped) ${dir}$tst FAIL: tests

It said your branch is out ot date, if you don't resolve it, you are not able to merge your PR into master branch. Please fix this.

geans-pin · 2024-11-28T04:13:44Z

Let me rebase update the branch and see if this issue can be resolved

…rovement

Rebase with upstream master

geans-pin · 2024-11-28T05:27:08Z

Let me rebase update the branch and see if this issue can be resolved

I rebase with upstream master and see the following compile error. Any idea ?
We don't change this sai_serialize.h in the PR.

sai_serialize.h:76:20: error: 'sai_prefix_compression_entry_t' does not name a type

Geans

make[5]: 'saimetadata.c' is up to date.
make[5]: Leaving directory '/__w/1/s/SAI/meta'
/bin/bash ../libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I.. -DNDEBUG -Wdate-time -D_FORTIFY_SOURCE=2 -g -I../SAI/inc -I../SAI/experimental -I../SAI/meta -I../lib -ansi -fPIC -pipe -std=c++14 -Wall -Wcast-align -Wcast-qual -Wconversion -Wdisabled-optimization -Werror -Wextra -Wfloat-equal -Wformat=2 -Wformat-nonliteral -Wformat-security -Wformat-y2k -Wimport -Winit-self -Wno-inline -Winvalid-pch -Wmissing-field-initializers -Wmissing-format-attribute -Wmissing-include-dirs -Wmissing-noreturn -Wno-aggregate-return -Wno-padded -Wno-switch-enum -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wshadow -Wstack-protector -Wstrict-aliasing=3 -Wswitch -Wswitch-default -Wunreachable-code -Wunused -Wvariadic-macros -Wwrite-strings -Wno-switch-default -Wconversion -Wno-psabi -Wcast-align=strict -O0 -g -fprofile-arcs -ftest-coverage -g -O2 -ffile-prefix-map=/__w/1/s=. -fstack-protector-strong -Wformat -Werror=format-security -c -o libsaimeta_la-Globals.lo test -f 'Globals.cpp' || echo './'Globals.cpp
libtool: compile: g++ -DHAVE_CONFIG_H -I. -I.. -DNDEBUG -Wdate-time -D_FORTIFY_SOURCE=2 -g -I../SAI/inc -I../SAI/experimental -I../SAI/meta -I../lib -ansi -fPIC -pipe -std=c++14 -Wall -Wcast-align -Wcast-qual -Wconversion -Wdisabled-optimization -Werror -Wextra -Wfloat-equal -Wformat=2 -Wformat-nonliteral -Wformat-security -Wformat-y2k -Wimport -Winit-self -Wno-inline -Winvalid-pch -Wmissing-field-initializers -Wmissing-format-attribute -Wmissing-include-dirs -Wmissing-noreturn -Wno-aggregate-return -Wno-padded -Wno-switch-enum -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wshadow -Wstack-protector -Wstrict-aliasing=3 -Wswitch -Wswitch-default -Wunreachable-code -Wunused -Wvariadic-macros -Wwrite-strings -Wno-switch-default -Wconversion -Wno-psabi -Wcast-align=strict -O0 -g -fprofile-arcs -ftest-coverage -g -O2 -ffile-prefix-map=/__w/1/s=. -fstack-protector-strong -Wformat -Werror=format-security -c Globals.cpp -fPIC -DPIC -o .libs/libsaimeta_la-Globals.o
In file included from AttrKeyMap.cpp:3:
sai_serialize.h:76:20: error: 'sai_prefix_compression_entry_t' does not name a type
76 | In const sai_prefix_compression_entry_t &prefix_compression_entry);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
sai_serialize.h:451:15: error: 'sai_prefix_compression_entry_t' has not been declared
451 | Out sai_prefix_compression_entry_t& prefix_compression_entry);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
make[4]: *** [Makefile:727: libsaimeta_la-AttrKeyMap.lo] Error 1
make[4]: *** Waiting for unfinished jobs....
In file included from Globals.cpp:3:
sai_serialize.h:76:20: error: 'sai_prefix_compression_entry_t' does not name a type
76 | In const sai_prefix_compression_entry_t &prefix_compression_entry);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
sai_serialize.h:451:15: error: 'sai_prefix_compression_entry_t' has not been declared
451 | Out sai_prefix_compression_entry_t& prefix_compression_entry);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
make[4]: *** [Makefile:734: libsaimeta_la-Globals.lo] Error 1
make[3]: *** [Makefile:515: all] Error 2
make[4]: Leaving directory '/__w/1/s/meta'
make[3]: Leaving directory '/__w/1/s/meta'
make[2]: Leaving directory '/__w/1/s'
make[1]: Leaving directory '/__w/1/s'
make[2]: *** [Makefile:460: all-recursive] Error 1
make[1]: *** [Makefile:392: all] Error 2

…rovement

ZhaohuiS · 2024-11-28T06:15:55Z

Let me rebase update the branch and see if this issue can be resolved

I rebase with upstream master and see the following compile error. Any idea ? We don't change this sai_serialize.h in the PR.

sai_serialize.h:76:20: error: 'sai_prefix_compression_entry_t' does not name a type

Geans

make[5]: 'saimetadata.c' is up to date. make[5]: Leaving directory '/__w/1/s/SAI/meta' /bin/bash ../libtool --tag=CXX --

Not sure if you complete the rebase, what we need in this PR is for the syncd/scripts/syncd_init_common.sh and syncd/scripts/brcm_common_config_ut.sh. But I noticed there are other updates for other files. Can you confirm?

geans-pin · 2024-11-28T06:21:27Z

Yes, only two scripts required in this PR.
The other files comes along when I do rebase with master. Have no idea about these files ?
BTW, I found the same build compile issue with rebasing 202405

I am thinking to clone a new branch from master and try again~ Let me know your thoughts

Geans

geans-pin · 2024-11-28T06:32:32Z

I bring my changes to a whole new PR and try.. Let's see if any difference
#1474

geans-pin · 2024-11-28T07:37:31Z

FYI, in the new fresh PR, I don't see the strange compile error which looks better but see this Azure Pipelines ran longer error.

Geans

##[error]The job running on agent Azure Pipelines 13 ran longer than the maximum time of 60 minutes. For more information, see https://go.microsoft.com/fwlink/?linkid=2077134
Agent: Azure Pipelines 13
Started: Today at 下午2:30
Duration: 1h 0m 7s

Job preparation parameters
9 queue time variables used
1 artifact produced

kcudnik · 2024-11-28T11:35:09Z

if you rebased with master, then SAI changes to latest 1.15.1 which contains preffix compression entry, and your test_sai_*cpp files are no longer required, are you sure your changes is meant for master branch ? and not some older one ?

geans-pin · 2024-11-28T11:49:54Z

if you rebased with master, then SAI changes to latest 1.15.1 which contains preffix compression entry, and your test_sai_*cpp files are no longer required, are you sure your changes is meant for master branch ? and not some older one ?

Yes, the PR is meant for master branch. It' just a script file changes. Not sure why lots of strange compile error coming in when rebase with master using the Github Desktop. Anyway, I have cloned a new PR from master with the same changes.
Please check PR1474 in which I didn't see the strange compile error which looks better but see this Azure Pipelines ran longer error.

geans-pin · 2024-11-28T15:06:47Z

Zhaohui,

With /azpw run, all checker pass on PR1474.
#1474

Please check the PR1474, I will close this old PR1411.
Geans

geans-pin mentioned this pull request Aug 23, 2024

Silicon config support for Broadcom yml file and property overwrite sonic-net/SONiC#1744

Merged

ZhaohuiS reviewed Sep 13, 2024

View reviewed changes

syncd/scripts/syncd_init_common.sh Outdated Show resolved Hide resolved

ZhaohuiS reviewed Sep 13, 2024

View reviewed changes

syncd/scripts/syncd_init_common.sh Show resolved Hide resolved

ZhaohuiS reviewed Sep 13, 2024

View reviewed changes

syncd/scripts/syncd_init_common.sh Outdated Show resolved Hide resolved

arlakshm and others added 2 commits October 15, 2024 11:34

[202405] update the SAI submodule in sonic-airedis

2099350

Update the SAI submodule for 202405 to pickup the fix for sonic-net/sonic-buildimage#19972 Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <[email protected]>

yaqiangz and others added 6 commits October 28, 2024 10:05

modify syncd init script for supporting yml

ac3dec7

Fix for review comment

ca167de

Fix review comment for overwrite section

64baffd

Fix review comment for section naming

c8d7fec

ADD UT script

0a5fcb7

geans-pin force-pushed the common_config_improvement branch from 61e80b3 to 0a5fcb7 Compare October 29, 2024 23:18

Rename file name to fit case insensitive file system. (sonic-net#1446)

17e893c

Rename file to avoid clone issue in case insensitive file system. This caused auto-cherry-pick don't work.

ZhaohuiS reviewed Nov 1, 2024

View reviewed changes

syncd/scripts/syncd_init_common.sh Outdated Show resolved Hide resolved

ZhaohuiS reviewed Nov 1, 2024

View reviewed changes

syncd/scripts/syncd_init_common.sh Show resolved Hide resolved

ZhaohuiS reviewed Nov 1, 2024

View reviewed changes

syncd/scripts/brcm_common_config_ut.sh Outdated Show resolved Hide resolved

geanspin and others added 3 commits November 2, 2024 07:39

Fix config bcm located in different location

8e34b95

Minor fix

d8ef6fc

Minor fix

4657857

Fix review comment

9975c2b

geans-pin added 5 commits November 15, 2024 09:30

Update syncd_init_common.sh

1095d04

Fix checker issue : remove white space

Update syncd_init_common.sh

c493160

Remove white space

Update brcm_common_config_ut.sh

063c81f

remove white space

Update brcm_common_config_ut.sh

d43752f

remove white space

Merge branch 'master' into common_config_improvement

a045078

rajkumar38 and others added 3 commits November 18, 2024 08:38

[PATCH] [Marvell] Add Flag to identify SONiC related Init Handling (s…

f65180c

…onic-net#1461) Backported PR sonic-net#1420 from master to 202405. Signed-off-by: Rajkumar P R <[email protected]>

[submodule] Update SAI to v1.14.1 (sonic-net#1464)

a00e89d

To fix RPC build issue

ZhaohuiS reviewed Nov 25, 2024

View reviewed changes

geans-pin added 2 commits November 28, 2024 13:11

Merge remote-tracking branch 'upstream/master' into common_config_imp…

24caeac

…rovement

Update SAI

8e16fdc

Rebase with upstream master

Merge remote-tracking branch 'upstream/202405' into common_config_imp…

773059f

…rovement

geans-pin closed this Nov 28, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

modify syncd init script for supporting yml #1411

modify syncd init script for supporting yml #1411

geans-pin commented Aug 8, 2024

linux-foundation-easycla bot commented Aug 8, 2024 •

edited

Loading

ZhaohuiS Sep 13, 2024

geans-pin Sep 19, 2024

kcudnik commented Oct 2, 2024

geans-pin commented Oct 8, 2024

kcudnik commented Oct 9, 2024

geans-pin commented Oct 23, 2024 •

edited

Loading

kcudnik commented Oct 23, 2024

geans-pin commented Oct 27, 2024

geans-pin commented Nov 14, 2024

mssonicbld commented Nov 14, 2024

azure-pipelines bot commented Nov 14, 2024

geans-pin commented Nov 15, 2024

ZhaohuiS Nov 25, 2024

geans-pin Nov 25, 2024

ZhaohuiS Nov 28, 2024

geans-pin Nov 28, 2024 •

edited

Loading

ZhaohuiS Nov 28, 2024

Praveen-Brcm commented Nov 27, 2024

geans-pin commented Nov 28, 2024

ZhaohuiS commented Nov 28, 2024

geans-pin commented Nov 28, 2024

geans-pin commented Nov 28, 2024

ZhaohuiS commented Nov 28, 2024

geans-pin commented Nov 28, 2024

geans-pin commented Nov 28, 2024

geans-pin commented Nov 28, 2024

kcudnik commented Nov 28, 2024

geans-pin commented Nov 28, 2024

geans-pin commented Nov 28, 2024

modify syncd init script for supporting yml #1411

modify syncd init script for supporting yml #1411

Conversation

geans-pin commented Aug 8, 2024

linux-foundation-easycla bot commented Aug 8, 2024 • edited Loading

ZhaohuiS Sep 13, 2024

Choose a reason for hiding this comment

geans-pin Sep 19, 2024

Choose a reason for hiding this comment

kcudnik commented Oct 2, 2024

geans-pin commented Oct 8, 2024

kcudnik commented Oct 9, 2024

geans-pin commented Oct 23, 2024 • edited Loading

kcudnik commented Oct 23, 2024

geans-pin commented Oct 27, 2024

geans-pin commented Nov 14, 2024

mssonicbld commented Nov 14, 2024

azure-pipelines bot commented Nov 14, 2024

geans-pin commented Nov 15, 2024

ZhaohuiS Nov 25, 2024

Choose a reason for hiding this comment

geans-pin Nov 25, 2024

Choose a reason for hiding this comment

ZhaohuiS Nov 28, 2024

Choose a reason for hiding this comment

geans-pin Nov 28, 2024 • edited Loading

Choose a reason for hiding this comment

ZhaohuiS Nov 28, 2024

Choose a reason for hiding this comment

Praveen-Brcm commented Nov 27, 2024

geans-pin commented Nov 28, 2024

ZhaohuiS commented Nov 28, 2024

geans-pin commented Nov 28, 2024

geans-pin commented Nov 28, 2024

ZhaohuiS commented Nov 28, 2024

geans-pin commented Nov 28, 2024

geans-pin commented Nov 28, 2024

geans-pin commented Nov 28, 2024

kcudnik commented Nov 28, 2024

geans-pin commented Nov 28, 2024

geans-pin commented Nov 28, 2024

linux-foundation-easycla bot commented Aug 8, 2024 •

edited

Loading

geans-pin commented Oct 23, 2024 •

edited

Loading

geans-pin Nov 28, 2024 •

edited

Loading