SONiC-to-SONiC update #464

andriymoroz-mlnx · 2017-03-31T12:20:15Z

Usage:

build as usual
install sonic-xxx.bin image via ONIE
install any following updates from SONiC (same as in ONIE: scp and execute)

lguohan · 2017-03-31T18:19:03Z

qiluo-msft · 2017-03-31T18:49:06Z

files/initramfs-tools/union-mount.j2

-mkdir -p ${rootmnt}/host/rw
-mount -n -o dirs=${rootmnt}/host/rw:${rootmnt}=ro -t aufs root-aufs ${rootmnt}
+mkdir -p ${rootmnt}/host/image-%%GIT_REVISION%%/rw
+mount -n -o dirs=${rootmnt}/host/image-%%GIT_REVISION%%/rw:${rootmnt}=ro -t aufs root-aufs ${rootmnt}


image-%%GIT_REVISION%% [](start = 33, length = 22)

image-%%GIT_REVISION%% [](start = 33, length = 22)

One suggestion: could you also explore the possibility to dynamically get the path? Ideally the image content should not have the knowledge of its own revision/version.

Some mechanism I can think of, but not limited to:

kernel argument, provided by bootloader ONIE/Aboot/etc.

parse /proc/cmdline

parse a file with image version on the disk

Then we can remove the %GIT_REVISION% from build_debian.sh #Closed

ok, I will rework all GIT_REVISION places after Marian pushes updated versioning

Thanks!

In reply to: 109391921 [](ancestors = 109391921)

qiluo-msft · 2017-03-31T18:54:19Z

files/image_config/platform/rc.local

@@ -15,25 +15,25 @@

 echo "install platform dependent packages at the first boot time"

-if [ -f /host/platform/firsttime ]; then
+if [ -f /host/image-%%GIT_REVISION%%/platform/firsttime ]; then


GIT_REVISION [](start = 22, length = 12)

GIT_REVISION [](start = 22, length = 12)

The same. Is it possible to get it programmatically? #Closed

qiluo-msft · 2017-03-31T20:17:37Z

installer/x86_64/install.sh

@@ -110,7 +118,7 @@ git_revision="%%GIT_REVISION%%"
 timestamp="$(date -u +%Y%m%d)"

 demo_volume_label="SONiC-${demo_type}"
-demo_volume_revision_label="SONiC-${demo_type}-${git_revision}"
+demo_volume_revision_label="SONiC-${demo_type}"


demo_volume_revision_label [](start = 0, length = 26)

I am quite confused. Why not keep it unchanged and use $demo_volume_label? #Closed

qiluo-msft · 2017-03-31T20:57:34Z

installer/x86_64/install.sh

+sonic_dir="$SONIC_IMAGE_DIR_PREFIX-$git_revision"
+
+echo "Installing SONiC to $demo_mnt/$sonic_dir"
+mkdir $demo_mnt/$sonic_dir || {


mkdir $demo_mnt/$sonic_dir [](start = 0, length = 26)

If the directory already exist, it is better to clean up and reinstall it. #Closed

qiluo-msft · 2017-03-31T21:05:28Z

installer/x86_64/install.sh

-demo_grub_entry="$demo_volume_revision_label"
+demo_grub_entry="$demo_volume_revision_label-${git_revision}"
+if [ "$environment" = "sonic" ]; then
+    running_sonic_revision=$(cat /etc/sonic/sonic_version.yml | grep build_version | cut -f2 -d" ")


running_sonic_revision [](start = 4, length = 22)

Instead of finding the running revision, we can easily find the default entry in grub.cfg. So it is runnable both in ONIE and in sonic, you don't need if-condition. #Closed

I'm checking for currently running version in order to keep it. It could happen currently running is not the default one #Closed

You're correct. Thanks!

In reply to: 109413786 [](ancestors = 109413786)

qiluo-msft · 2017-03-31T21:07:48Z

installer/x86_64/install.sh

-# Add menu entries for ONIE -- use the grub fragment provided by the
-# ONIE distribution.
-$onie_root_dir/grub.d/50_onie_grub >> $grub_cfg
+if [ "$environment" != "sonic" ]; then


We don't care ONIE/sonic for the grub_cfg code here. We can just check if there is already sonic entry in grub.cfg or not.

I wanted to keep ONIE menu entry at the bottom and it is much simple to append text to the grub.cfg than insert it to the middle.

I said nothing related to entry order.

In reply to: 109420255 [](ancestors = 109420255)

grub.cfg is recreated on any installation ONIE or SONiC.
Here this "if" is needed to add ONIE submenu only in case of ONIE install or old menuitem+ONIE submenu in case of SONiC install. Also "ONIE submenu" source is different in both cases

qiluo-msft · 2017-03-31T21:09:07Z

installer/x86_64/install.sh

 cp $grub_cfg $onie_initrd_tmp/$demo_mnt/grub/grub.cfg

+# Remove extra SONiC image if any
+if [ "$environment" = "sonic" ]; then


The same. Just check grub.cfg to determin if we need to remove extra images.

I doubt the code will be simpler. Maybe I'm wrong - I'm not a real shell-script jedi...
And besides if we decide to change menu item format - guessing directory name to remove will require some legacy code

Enumerating thru the directories is much simpler than thru the menuitems in grub.cfg
Also in this case we get the exact image directory name we need to remove.

qiluo-msft · 2017-03-31T21:09:38Z

slave.mk

@@ -331,7 +331,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : .platform
 	export installer_start_scrips="$(foreach docker, $($*_DOCKERS),$(addsuffix .sh, $($(docker)_CONTAINER_NAME)))"
 	export installer_services="$(foreach docker, $($*_DOCKERS),$(addsuffix .service, $($(docker)_CONTAINER_NAME)))"
 	export installer_extra_files="$(foreach docker, $($*_DOCKERS), $(foreach file, $($(docker)_BASE_IMAGE_FILES), $($(docker)_PATH)/base_image_files/$(file)))"
-
 	j2 -f env files/initramfs-tools/union-mount.j2 onie-image.conf > files/initramfs-tools/union-mount


Keep it as is? #Closed

qiluo-msft

As comments.

andriymoroz-mlnx · 2017-04-03T14:55:49Z

installer/x86_64/install.sh

@@ -55,7 +53,17 @@ ONIE_PLATFORM_EXTRA_CMDLINE_LINUX=""
 # Default var/log device size in MB
 VAR_LOG_SIZE=4096

-[ -r platforms/$onie_platform ] && source platforms/$onie_platform
+
+# simple detect whether script was run in SONiC


Before I added support for installation form SONiC there were two options ONIE and some Linux. I'm not aware about the installation from Linux (some other platforms?) so I tried to keep the old code under "if != sonic" and add new "under if = sonic".

You should reuse the code to detect ONIE/Sonic.

In reply to: 109438459 [](ancestors = 109438459)

qiluo-msft · 2017-04-03T20:08:35Z

installer/x86_64/install.sh

-[ -r platforms/$onie_platform ] && source platforms/$onie_platform
+if [ -d "/etc/sonic" ]; then
+    echo "Running in SONiC"
+    environment="sonic"


sonic [](start = 17, length = 5)

Prefer say the environment as 'linux' #Closed

onie is also linux, sonic is more precise, IMHO

lguohan · 2017-04-04T07:33:22Z

files/initramfs-tools/union-mount.j2

 ## Check if the root block device is still there
 [ -b ${ROOT} ] || mdev -s
 ## Mount the raw partition again
 mount ${ROOT} ${rootmnt}/host
 ## Mount the working directory of docker engine in the raw partition, bypass the aufs
 mkdir -p ${rootmnt}/var/lib/docker
-mount --bind ${rootmnt}/host/{{ DOCKERFS_DIR }} ${rootmnt}/var/lib/docker
+mount --bind ${rootmnt}/host/image-%%GIT_REVISION%%/{{ DOCKERFS_DIR }} ${rootmnt}/var/lib/docker
 ## Mount the boot directory in the raw partition, bypass the aufs


I think this change is going to break the arista aboot image.

if you search DOCKERFS_DIR, it is also used in files/initramfs-tools/arista-convertfs.j2 and files/Aboot/boot0.j2

I do not need this commit to support sonic-to-sonic on arista aboot platform, but it is better not to break the existing func.

lguohan · 2017-04-04T07:36:52Z

installer/x86_64/install.sh

+    echo "Running in SONiC"
+    environment="sonic"
+else
+    echo "Running NOT in SONiC"


Running NOT in SONiC [](start = 10, length = 20)

-> Install SONiC in ONIE

lguohan · 2017-04-04T07:37:08Z

installer/x86_64/install.sh

@@ -55,7 +53,14 @@ ONIE_PLATFORM_EXTRA_CMDLINE_LINUX=""
 # Default var/log device size in MB
 VAR_LOG_SIZE=4096

-[ -r platforms/$onie_platform ] && source platforms/$onie_platform
+if [ -d "/etc/sonic" ]; then
+    echo "Running in SONiC"


Running in SONiC [](start = 10, length = 16)

-> Installing SONiC in SONiC

lguohan · 2017-04-04T07:37:27Z

installer/x86_64/install.sh

-[ -r platforms/$onie_platform ] && source platforms/$onie_platform
+if [ -d "/etc/sonic" ]; then
+    echo "Running in SONiC"
+    environment="sonic"


environment -> install_env

lguohan · 2017-04-04T07:41:13Z

installer/x86_64/install.sh

+    demo_mnt="/host"
+fi
+
+sonic_dir="$SONIC_IMAGE_DIR_PREFIX-$git_revision"


sonic_dir [](start = 0, length = 9)

sonic_dir -> image_dir

lguohan · 2017-04-04T07:43:52Z

installer/x86_64/install.sh

+        mkfs.ext4 -q $demo_mnt/disk-img/var-log.ext4 -F
+    fi
+else
+    echo "Log file system already exists. Skipping..."
 fi


can we also check the var-log size since the new sonic image may increase or descreae the file size.

Can we compare the size, if they are not the same then try to create a new one with new size.

lguohan · 2017-04-04T07:58:05Z

installer/x86_64/install.sh

+    running_sonic_revision=$(cat /etc/sonic/sonic_version.yml | grep build_version | cut -f2 -d" ")
+    old_grub_menuentry=$(cat /host/grub/grub.cfg | sed "/$running_sonic_revision/,/}/!d")
+    demo_dev=$(echo $old_grub_menuentry | sed -e "s/.*root\=\(.*\)rw.*/\1/")
+    grub_menuentry=$(cat /host/grub/grub.cfg | sed "/menuentry ONIE/,/}/!d")


rename to onie_menuentry

lguohan · 2017-04-04T08:01:36Z

installer/x86_64/install.sh

+    demo_dev=$(echo $old_grub_menuentry | sed -e "s/.*root\=\(.*\)rw.*/\1/")
+    grub_menuentry=$(cat /host/grub/grub.cfg | sed "/menuentry ONIE/,/}/!d")
+fi
+
 cat <<EOF >> $grub_cfg


rename grub_cfg to new_sonic_menuentry

lguohan · 2017-04-04T08:01:53Z

installer/x86_64/install.sh

@@ -486,29 +519,53 @@ fi
 # Add a menu entry for the DEMO OS
 # Note: assume that apparmor is supported in the kernel
 demo_grub_entry="$demo_volume_revision_label"
+if [ "$environment" = "sonic" ]; then
+    running_sonic_revision=$(cat /etc/sonic/sonic_version.yml | grep build_version | cut -f2 -d" ")
+    old_grub_menuentry=$(cat /host/grub/grub.cfg | sed "/$running_sonic_revision/,/}/!d")


rename to old_sonic_menuentry

lguohan · 2017-04-04T08:03:07Z

installer/x86_64/install.sh

+            rm -rf $f
+        fi
+    done
+fi


I suggest to move this logic before we do the installation, it will save some space.

stcheng · 2017-04-04T08:11:51Z

installer/x86_64/install.sh

+    rm -rf $demo_mnt/$sonic_dir/*
+else
+    mkdir $demo_mnt/$sonic_dir || {
+        echo "Error: Unable to create sonic directory"


sonic -> SONiC

qiluo-msft · 2017-04-04T21:00:59Z

@andriymoroz-mlnx Could you resolve the conflicts? #Closed

andriymoroz-mlnx · 2017-04-05T07:15:39Z

resolved conflicts

andriymoroz-mlnx · 2017-04-12T14:38:51Z

Updated. Used version string instead of git hash
GRUB menu example:

                          GNU GRUB  version 2.02~beta3

 +----------------------------------------------------------------------------+
 |*SONiC-OS-S2S_VER.6-dirty                                                   |
 | SONiC-OS-S2S_VER.4-dirty                                                   |
 | ONIE                                                                       |
 |                                                                            |

Directories with sonic images:

root@arc-switch1025:/home/admin# ls -l /host/
total 36
drwxr-xr-x 2 root root  4096 Apr 12 11:43 disk-img
drwxr-xr-x 5 root root  4096 Apr 12 11:45 grub
drwxr-xr-x 6 root root  4096 Apr 12 13:38 image-S2S_VER.4-dirty
drwxr-xr-x 6 root root  4096 Apr 12 14:21 image-S2S_VER.6-dirty
drwx------ 2 root root 16384 Apr 12 11:43 lost+found
-rw-r--r-- 1 root root   329 Apr 12 11:45 machine.conf
root@arc-switch1025:/home/admin#

@lguohan, @qiluo-msft, @stcheng please review

andriymoroz-mlnx · 2017-04-19T11:44:32Z

rebased on latest master

lguohan · 2017-04-19T16:14:07Z

installer/x86_64/install.sh

 cat <<EOF >> $grub_cfg
 menuentry '$demo_grub_entry' {
        search --no-floppy --label --set=root $demo_volume_label
-        echo    'Loading $demo_volume_revision_label $demo_type kernel ...'
+        echo    'Loading $demo_volume_label $demo_type kernel ...'


why not keep the demo_volume_revision_label here? We need to know which version we are loading.

lguohan · 2017-04-19T16:14:24Z

installer/x86_64/install.sh

                apparmor=1 security=apparmor $ONIE_PLATFORM_EXTRA_CMDLINE_LINUX
-        echo    'Loading $demo_volume_revision_label $demo_type initial ramdisk ...'
-        initrd  /boot/initrd.img-3.16.0-4-amd64
+        echo    'Loading $demo_volume_label $demo_type initial ramdisk ...'


-> demon_volume_revision_label

lguohan · 2017-04-19T16:14:36Z

installer/x86_64/install.sh

 cp $grub_cfg $onie_initrd_tmp/$demo_mnt/grub/grub.cfg

 cd /

-echo "Installed SONiC base image $demo_volume_revision_label successfully"
+echo "Installed SONiC base image $demo_volume_label successfully"


-> demo_volume_revision_label

Staphylo · 2017-04-19T20:10:07Z

files/initramfs-tools/arista-convertfs.j2

@@ -191,7 +191,7 @@ cmd="mount -t ext4 $root_dev $root_mnt"
 run_cmd "$cmd" "$err_msg"

 err_msg="Error: extract docker directory"
-cmd="[ -f $tmp_mnt/{{ FILESYSTEM_DOCKERFS }} ] && rm -rf $root_mnt/{{ DOCKERFS_DIR }} && mkdir $root_mnt/{{ DOCKERFS_DIR }} && tar xzf $tmp_mnt/{{ FILESYSTEM_DOCKERFS }} -C $root_mnt/{{ DOCKERFS_DIR }} && rm -f $tmp_mnt/{{ FILESYSTEM_DOCKERFS }}"
+cmd="[ -f $tmp_mnt/image-%%IMAGE_VERSION%%/{{ FILESYSTEM_DOCKERFS }} ] && rm -rf $root_mnt/image-%%IMAGE_VERSION%%/{{ DOCKERFS_DIR }} && mkdir $root_mnt/image-%%IMAGE_VERSION%%/{{ DOCKERFS_DIR }} && tar xzf $tmp_mnt/image-%%IMAGE_VERSION%%/{{ FILESYSTEM_DOCKERFS }} -C $root_mnt/image-%%IMAGE_VERSION%%/{{ DOCKERFS_DIR }} && rm -f $tmp_mnt/image-%%IMAGE_VERSION%%/{{ FILESYSTEM_DOCKERFS }}"


Same comment about having a temporary variable apply here.

Staphylo · 2017-04-19T20:11:37Z

files/Aboot/boot0.j2

@@ -42,14 +42,14 @@ parse_environment_config() {

 extract_image() {
    ## Remove all the other unnecssary files except swi file, boot-config
-    for f in $(ls -A $target_path); do
+    for f in $(ls -A $target_path/image-%%IMAGE_VERSION%%); do


Instead of adding image-%%IMAGE_VERSION%% everywhere it could be cleaner to just define a variable and use it instead of target_path where needs be.
image_path="$target_path/image-%%IMAGE_VERSION%%"

lguohan · 2017-04-19T22:00:25Z

files/Aboot/boot0.j2

        fi
    done

    ## Unzip the image
-    unzip -oq "$swipath" -x boot0 -d "$target_path"
+    unzip -oq "$swipath" -x boot0 -d "$target_path/image-%%IMAGE_VERSION%%"


need to create this path. I tested, and here are the errors.

ls: /mnt/flash/image-andriymoroz-mlnx-master.0-cf97eae: No such file or directory + unzip -oq /mnt/flash/sonic-aboot-broadcom.swi -x boot0 -d /mnt/flash/image-andriymoroz-mlnx-master.0-cf97eae unzip: chdir(/mnt/flash/image-andriymoroz-mlnx-master.0-cf97eae): No such file or directory

lguohan · 2017-04-20T02:28:49Z

files/initramfs-tools/union-mount.j2

@@ -6,17 +6,18 @@ case $1 in
 esac

 ## Mount the aufs file system: rw layer over squashfs
-mkdir -p ${rootmnt}/host/rw
-mount -n -o dirs=${rootmnt}/host/rw:${rootmnt}=ro -t aufs root-aufs ${rootmnt}
+image_dir=$(cat /proc/cmdline | sed -e 's/BOOT_IMAGE=\/\(.*\)\/boot\(.*\)/\1/')


Aboot0 does not pass BOOT_IMAGE in the cmdline, need to add that.

support multi-image installation on aboot

sonic-swss: [vnet]: Extend Bitmap VNET test with "remove" flows (sonic-net#900) [vxlanorch] Ambiguous return code for removeNextHopTunnel (sonic-net#880) Address review comment: remove data member m_entriesCreated, which is introduced for dependancy resolution purpose. (sonic-net#839) Set LAG mtu value based on kernel netlink msg (sonic-net#922) [orchagent]: Remove try/catch for correct coredump file (sonic-net#790) [aclorch] unittest by gtest (sonic-net#924) [orchagent]: Added support of PFC WD for BFN platform (sonic-net#823) [vnetorch]: Fix tunnel route removal flow for bitmap VNET (sonic-net#912) pkill -9 zebra for frr warm restart VS test fix (sonic-net#927) swss-orchagent: add new orch for vnet routes/tunnel routes tables in CONFIG_DB (sonic-net#907) [debian]: Do not build test when building with real SAI (sonic-net#932) sonic-swss-common: Add schema for dot1p to tc mapping config table (sonic-net#274) Fix MIRROR_SESSION table macro name (sonic-net#264) [schema] Add VNET Route tables in config_db (sonic-net#279) [debian] increment debian compatibility to 10 to enable parallel package build (sonic-net#280) White-list clear_stats op from orchagent to syncd (sonic-net#281) Correct comment (sonic-net#282) sonic-sairedis: [debian]: Change build order in target binary (sonic-net#452) [debian] increment debian compatibility to 10 to enable parallel package build (sonic-net#461) Full sleep wait flex counter polling thread when POLL_COUNTER_STATUS is disable (sonic-net#462) add support for SAI_ATTR_VALUE_TYPE_ACL_CAPABILITY (sonic-net#460) Check if port VID exists in db on flex counter query (sonic-net#464) Full sleep wait change for PFC watchdog (sonic-net#465) Add synchronous clear_stats operation path (sonic-net#463) Modify sai_create_port to breakout a port for virtual switch (sonic-net#454) Fix typo (sonic-net#467) Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>

sonic-swss: [vnet]: Extend Bitmap VNET test with "remove" flows (#900) [vxlanorch] Ambiguous return code for removeNextHopTunnel (#880) Address review comment: remove data member m_entriesCreated, which is introduced for dependancy resolution purpose. (#839) Set LAG mtu value based on kernel netlink msg (#922) [orchagent]: Remove try/catch for correct coredump file (#790) [aclorch] unittest by gtest (#924) [orchagent]: Added support of PFC WD for BFN platform (#823) [vnetorch]: Fix tunnel route removal flow for bitmap VNET (#912) pkill -9 zebra for frr warm restart VS test fix (#927) swss-orchagent: add new orch for vnet routes/tunnel routes tables in CONFIG_DB (#907) [debian]: Do not build test when building with real SAI (#932) sonic-swss-common: Add schema for dot1p to tc mapping config table (#274) Fix MIRROR_SESSION table macro name (#264) [schema] Add VNET Route tables in config_db (#279) [debian] increment debian compatibility to 10 to enable parallel package build (#280) White-list clear_stats op from orchagent to syncd (#281) Correct comment (#282) sonic-sairedis: [debian]: Change build order in target binary (#452) [debian] increment debian compatibility to 10 to enable parallel package build (#461) Full sleep wait flex counter polling thread when POLL_COUNTER_STATUS is disable (#462) add support for SAI_ATTR_VALUE_TYPE_ACL_CAPABILITY (#460) Check if port VID exists in db on flex counter query (#464) Full sleep wait change for PFC watchdog (#465) Add synchronous clear_stats operation path (#463) Modify sai_create_port to breakout a port for virtual switch (#454) Fix typo (#467) Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>

* Access DB directly to get the PSU status information * Add test case for psu CLI Signed-off-by: Kevin Wang <kevinw@mellanox.com>

* Update src/sonic-sairedis from branch 'broadcom_sonic' to 9de2a0cd3371723c925341091c3ee9bc6df88527 - Merge 201904 branch to broadcom_sonic branch on Mon Jul 1 13:57:56 PDT 2019 Change-Id: Ibc8bd38f6819bda73ba52fff6358b794f7366d46 - Fix typo (sonic-net#467) * Rename to fix typo Signed-off-by: Wenda Ni <wenni@microsoft.com> * Correct shared_ptr creation parameters Signed-off-by: Wenda Ni <wenni@microsoft.com> - Modify sai_create_port to breakout a port for virtual switch (sonic-net#454) For breakout a port, it needs to support create port and remove port. When create a port, it needs to init some attributes. Signed-off-by: chiourung_huang <chiourung_huang@edge-core.com> - Add synchronous clear_stats operation path (sonic-net#463) * Send clear_stats op from orchagent to syncd via Redis pipeline Signed-off-by: Wenda Ni <wenni@microsoft.com> * Handle clear_stats op in syncd Signed-off-by: Wenda Ni <wenni@microsoft.com> * Receive clear_stats op status response from sycnd in orchagent context Signed-off-by: Wenda Ni <wenni@microsoft.com> * Shift clear_stats to get synchronous response from ASIC Signed-off-by: Wenda Ni <wenni@microsoft.com> * Fix compilation error Signed-off-by: Wenda Ni <wenni@microsoft.com> * Fix log message output Signed-off-by: Wenda Ni <wenni@microsoft.com> * Remove debugging symbols Signed-off-by: Wenda Ni <wenni@microsoft.com> * Remove debugging symbols Signed-off-by: Wenda Ni <wenni@microsoft.com> * Change the validation order of KeyOpFieldsValuesTuple responded from syncd Signed-off-by: Wenda Ni <wenni@microsoft.com> * Expand status log utility to include op type as argument Signed-off-by: Wenda Ni <wenni@microsoft.com> * Address comments: check if object id is present in local db Signed-off-by: Wenda Ni <wenni@microsoft.com> * Leverage newly merged infrastructure to check if object id is present in the local db Signed-off-by: Wenda Ni <wenni@microsoft.com> * Fix compile error Signed-off-by: Wenda Ni <wenni@microsoft.com> - Full sleep wait change for PFC watchdog (sonic-net#465) * Sleep wait change for pfc watchdog, which still has plugins in place so isEmpty() always returns true. When issuing 'pfcwd stop' cli to stop PFC watchdog, it only clears the counter id list for physical ports under the hood, leaving lua script plugins still installed and ieEmpty() returns false. So even when PFC watchdog is stopped, the flex counter thread would wake up every 200 ms. Jun 4 17:58:51.273413 str-a7050-acs-1 ERR syncd#syncd: :- flexCounterThread: End of flex counter thread FC PFC_WD, took 33 ms Jun 4 17:58:51.471288 str-a7050-acs-1 ERR syncd#syncd: :- flexCounterThread: End of flex counter thread FC PFC_WD, took 30 ms Jun 4 17:58:51.672930 str-a7050-acs-1 ERR syncd#syncd: :- flexCounterThread: End of flex counter thread FC PFC_WD, took 31 ms Jun 4 17:58:51.882972 str-a7050-acs-1 ERR syncd#syncd: :- flexCounterThread: End of flex counter thread FC PFC_WD, took 40 ms Jun 4 17:58:52.074862 str-a7050-acs-1 ERR syncd#syncd: :- flexCounterThread: End of flex counter thread FC PFC_WD, took 31 ms This PR is to address the above observation: Fine granularize the isEmpty() to two functions---isIdsEmpty() and isPluginsEmpty(), and use the emptiness check of the counter id list, isIdsEmpty(), as the criteria for full sleep wait. This approach is generally valid because current flex counter use cases would have the presence of non-empty counter id list to be meaningful, followed by an optional execution of the Lua script plugins if they are installed. Signed-off-by: Wenda Ni <wenni@microsoft.com> - Check if port VID exists in db on flex counter query (sonic-net#464) - add support for SAI_ATTR_VALUE_TYPE_ACL_CAPABILITY (sonic-net#460) Signed-off-by: Stepan Blyschak <stepanb@mellanox.com> - Full sleep wait flex counter polling thread when POLL_COUNTER_STATUS is disable (sonic-net#462) Signed-off-by: Wenda Ni <wenni@microsoft.com> - [debian] increment debian compatibility to 10 to enable parallel package build (sonic-net#461) * fix parallel build Signed-off-by: Stepan Blyschak <stepanb@mellanox.com> * [debian] increment debian compatibility to 10 to enable parallel package build From debhelper man pages: "If neither option is specified, debhelper currently defaults to --parallel in compat 10 (or later) and --no-parallel otherwise." Signed-off-by: Stepan Blyschak <stepanb@mellanox.com> * make tests run serial Signed-off-by: Stepan Blyschak <stepanb@mellanox.com> - [debian]: Change build order in target binary (sonic-net#452) Make binary-syncd the last target, so the non-rpc requisites will be available after the first build It will allow doing incremental builds later on for the main binary type - Add buffer pool stat to flex counter architecture (sonic-net#451) - Watermark: test SAI clear api if the stats mode is READ_AND_CLEAR (sonic-net#427) * Test SAI clear api if the stats mode is READ_AND_CLEAR Signed-off-by: Wenda <wenni@microsoft.com> * Address compile error

- fix getting hash from redis db (#465) - [dbconnector] Initialize redisContext (#464)

…tilites submodules sonic-swss -[SFlowMgr] Sflow Crash on 200G ports handled (sonic-net#1683) -Stablize the test case (sonic-net#1679) -Remove PGs from an administratively down port. (sonic-net#1677) sonic-swss-common - fix getting hash from redis db (sonic-net#465) - [dbconnector] Initialize redisContext (sonic-net#464) sonic-utilities - route_check: Fix hanging & logging level (sonic-net#1520) - Add self timeout and crash if exceeded. (sonic-net#1502) - [reboot] User-friendly reboot cause message for kernel panic (sonic-net#1486) - [acl-loader]: do not add default deny rule for egress acl (sonic-net#1531) Signed-off-by: Danny Allen <daall@microsoft.com>

…tilites submodules (#7209) sonic-swss -[SFlowMgr] Sflow Crash on 200G ports handled (#1683) -Stablize the test case (#1679) -Remove PGs from an administratively down port. (#1677) sonic-swss-common - fix getting hash from redis db (#465) - [dbconnector] Initialize redisContext (#464) sonic-utilities - route_check: Fix hanging & logging level (#1520) - Add self timeout and crash if exceeded. (#1502) - [reboot] User-friendly reboot cause message for kernel panic (#1486) - [acl-loader]: do not add default deny rule for egress acl (#1531) Signed-off-by: Danny Allen <daall@microsoft.com>

- fix getting hash from redis db (sonic-net#465) - [dbconnector] Initialize redisContext (sonic-net#464)

…D automatically (#18652) #### Why I did it src/sonic-platform-daemons ``` * 4ed4fa8 - (HEAD -> 202311, origin/202311) [202311] Fix intermittent build failure for test_SfpStateUpdateTask_task_run_stop (#461) (#464) (8 hours ago) [mihirpat1] ``` #### How I did it #### How to verify it #### Description for the changelog

qiluo-msft reviewed Mar 31, 2017

View reviewed changes

qiluo-msft requested changes Mar 31, 2017

View reviewed changes

andriymoroz-mlnx commented Apr 3, 2017

View reviewed changes

qiluo-msft reviewed Apr 3, 2017

View reviewed changes

lguohan reviewed Apr 4, 2017

View reviewed changes

stcheng reviewed Apr 4, 2017

View reviewed changes

jleveque added the Enhancement ➕ label Apr 4, 2017

jleveque mentioned this pull request Apr 4, 2017

[oneimage] Add ":latest" to docker run script #477

Merged

andriymoroz-mlnx force-pushed the master branch from de87f18 to 25f0f78 Compare April 5, 2017 07:12

andriymoroz-mlnx force-pushed the master branch from 25f0f78 to 5117cd0 Compare April 12, 2017 14:31

andriymoroz-mlnx added 2 commits April 19, 2017 14:40

Some code refinements

6aaf7b4

Updated onie/not onie check (comment-293994504)

cf97eae

andriymoroz-mlnx force-pushed the master branch from 440fdd6 to cf97eae Compare April 19, 2017 11:44

lguohan reviewed Apr 19, 2017

View reviewed changes

Staphylo reviewed Apr 19, 2017

View reviewed changes

lguohan reviewed Apr 19, 2017

View reviewed changes

lguohan reviewed Apr 20, 2017

View reviewed changes

lguohan and others added 2 commits April 20, 2017 20:38

support multi-image installation on aboot

faaf106

Merge pull request #1 from lguohan/andriymoroz-mlnx-master

6e10e66

support multi-image installation on aboot

lguohan merged commit b549adc into sonic-net:master Apr 22, 2017

stcheng mentioned this pull request Jun 12, 2019

[swss]: Update swss submodules change #2995

Merged

dmytroxshevchuk pushed a commit to dmytroxshevchuk/sonic-buildimage that referenced this pull request Aug 31, 2020

Check if port VID exists in db on flex counter query (sonic-net#464)

86e6caf

mykolaxgerasymenko mentioned this pull request Mar 22, 2021

[swss-common] Update submodule #7121

Merged

4 tasks

lguohan pushed a commit that referenced this pull request Mar 29, 2021

[submodule]: update swss-common (#7121)

eb12244

- fix getting hash from redis db (#465) - [dbconnector] Initialize redisContext (#464)

daall mentioned this pull request Apr 1, 2021

[202012][submodule] Update sonic-swss, sonic-swss-common, and sonic-utilites submodules #7209

Merged

4 tasks

raphaelt-nvidia pushed a commit to raphaelt-nvidia/sonic-buildimage that referenced this pull request May 23, 2021

[submodule]: update swss-common (sonic-net#7121)

a5ee2b1

- fix getting hash from redis db (sonic-net#465) - [dbconnector] Initialize redisContext (sonic-net#464)

carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021

[submodule]: update swss-common (sonic-net#7121)

68cd276

- fix getting hash from redis db (sonic-net#465) - [dbconnector] Initialize redisContext (sonic-net#464)

SONiC-to-SONiC update #464

SONiC-to-SONiC update #464

Conversation

andriymoroz-mlnx commented Mar 31, 2017

lguohan commented Mar 31, 2017

qiluo-msft Mar 31, 2017 • edited

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

qiluo-msft Mar 31, 2017 • edited

Choose a reason for hiding this comment

qiluo-msft Mar 31, 2017 • edited

Choose a reason for hiding this comment

qiluo-msft Mar 31, 2017 • edited

Choose a reason for hiding this comment

qiluo-msft Mar 31, 2017 • edited

Choose a reason for hiding this comment

andriymoroz-mlnx Apr 3, 2017 • edited by qiluo-msft

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

qiluo-msft Mar 31, 2017 • edited

Choose a reason for hiding this comment

qiluo-msft left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

qiluo-msft Apr 3, 2017 • edited

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

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

qiluo-msft commented Apr 4, 2017 • edited

andriymoroz-mlnx commented Apr 5, 2017

andriymoroz-mlnx commented Apr 12, 2017 • edited

andriymoroz-mlnx commented Apr 19, 2017

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

qiluo-msft Mar 31, 2017 •

edited

qiluo-msft Mar 31, 2017 •

edited

qiluo-msft Mar 31, 2017 •

edited

qiluo-msft Mar 31, 2017 •

edited

qiluo-msft Mar 31, 2017 •

edited

andriymoroz-mlnx Apr 3, 2017 •

edited by qiluo-msft

qiluo-msft Mar 31, 2017 •

edited

qiluo-msft Apr 3, 2017 •

edited

qiluo-msft commented Apr 4, 2017 •

edited

andriymoroz-mlnx commented Apr 12, 2017 •

edited