[sonic_installer] don't print errors when installing an image not sup… #1719

stepanblyschak · 2021-07-20T10:51:49Z

…porting app ext

Signed-off-by: Stepan Blyschak stepanb@nvidia.com

FIXES: sonic-net/sonic-buildimage#8149

What I did

Don't print errors if installing app.ext incompatible image.

How I did it

Check for docker.sh existance and take an assumption that if it exists then it is app.ext compatible.

How to verify it

From master image install 202012 image and verify no errors in logs.

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)

Installing image SONiC-OS-202012.129-90c0dcf9e_Internal and setting it as default...
Command: bash ./sonic-mellanox.bin
Verifying image checksum ... OK.
Preparing image archive ... OK.
Installing SONiC in SONiC
ONIE Installer: platform: x86_64-mellanox-r0
onie_platform: x86_64-mlnx_msn3700-r0
Installing SONiC to /host/image-202012.129-90c0dcf9e_Internal
Archive:  fs.zip
   creating: /host/image-202012.129-90c0dcf9e_Internal/boot/
  inflating: /host/image-202012.129-90c0dcf9e_Internal/boot/config-4.19.0-12-2-amd64  
  inflating: /host/image-202012.129-90c0dcf9e_Internal/boot/initrd.img-4.19.0-12-2-amd64  
  inflating: /host/image-202012.129-90c0dcf9e_Internal/boot/System.map-4.19.0-12-2-amd64  
  inflating: /host/image-202012.129-90c0dcf9e_Internal/boot/vmlinuz-4.19.0-12-2-amd64  
   creating: /host/image-202012.129-90c0dcf9e_Internal/platform/
 extracting: /host/image-202012.129-90c0dcf9e_Internal/platform/firsttime  
   creating: /host/image-202012.129-90c0dcf9e_Internal/platform/x86_64-grub/
  inflating: /host/image-202012.129-90c0dcf9e_Internal/platform/x86_64-grub/grub-pc-bin_2.02+dfsg1-20+deb10u4_amd64.deb  
 extracting: /host/image-202012.129-90c0dcf9e_Internal/fs.squashfs  
Switch CPU vendor is: GenuineIntel
Switch CPU cstates are: disabled
Installed SONiC base image SONiC-OS successfully

Command: grub-set-default --boot-directory=/host 0

Command: config-setup backup
Taking backup of current configuration

Command: mkdir -p /tmp/image-202012.129-90c0dcf9e_Internal-fs
Command: mount -t squashfs /host/image-202012.129-90c0dcf9e_Internal/fs.squashfs /tmp/image-202012.129-90c0dcf9e_Internal-fs
Command: sonic-cfggen -d -y /tmp/image-202012.129-90c0dcf9e_Internal-fs/etc/sonic/sonic_version.yml -t /tmp/image-202012.129-90c0dcf9e_Internal-fs/usr/share/sonic/templates/sonic-environment.j2
Command: umount -r -f /tmp/image-202012.129-90c0dcf9e_Internal-fs
Command: rm -rf /tmp/image-202012.129-90c0dcf9e_Internal-fs
Command: mkdir -p /tmp/image-202012.129-90c0dcf9e_Internal-fs
Command: mount -t squashfs /host/image-202012.129-90c0dcf9e_Internal/fs.squashfs /tmp/image-202012.129-90c0dcf9e_Internal-fs
Command: mkdir -p /host/image-202012.129-90c0dcf9e_Internal/rw
Command: mkdir -p /host/image-202012.129-90c0dcf9e_Internal/work
Command: mkdir -p /tmp/image-202012.129-90c0dcf9e_Internal-fs
Command: mount overlay -t overlay -o rw,relatime,lowerdir=/tmp/image-202012.129-90c0dcf9e_Internal-fs,upperdir=/host/image-202012.129-90c0dcf9e_Internal/rw,workdir=/host/image-202012.129-90c0dcf9e_Internal/work /tmp/image-202012.129-90c0dcf9e_Internal-fs
Command: mkdir -p /tmp/image-202012.129-90c0dcf9e_Internal-fs/var/lib/docker
Command: mount --bind /host/image-202012.129-90c0dcf9e_Internal/docker /tmp/image-202012.129-90c0dcf9e_Internal-fs/var/lib/docker
Command: chroot /tmp/image-202012.129-90c0dcf9e_Internal-fs mount proc /proc -t proc
Command: chroot /tmp/image-202012.129-90c0dcf9e_Internal-fs mount sysfs /sys -t sysfs
Warning: SONiC Application Extension is not supported in this image
Command: umount -f -R /tmp/image-202012.129-90c0dcf9e_Internal-fs
Command: umount -r -f /tmp/image-202012.129-90c0dcf9e_Internal-fs
Command: rm -rf /tmp/image-202012.129-90c0dcf9e_Internal-fs
Command: sync;sync;sync

Command: sleep 3

Done

…porting app ext Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

stepanblyschak · 2021-07-20T16:24:34Z

/azpw run

stepanblyschak · 2021-07-22T05:09:59Z

/azpw run

qiluo-msft · 2021-07-27T07:39:22Z

sonic_installer/main.py

            run_command_or_raise(["chroot", new_image_mount, SONIC_PACKAGE_MANAGER, "migrate",
                                os.path.join("/", tmp_dir, packages_file),
                                "--dockerd-socket", os.path.join("/", tmp_dir, DOCKERD_SOCK),
                                "-y"])
        finally:
-            run_command_or_raise(["chroot", new_image_mount, DOCKER_CTL_SCRIPT, "stop"], raise_exception=False)
+            if docker_started:


docker_started

Why you need this check? If the DOCKER_CTL_SCRIPT could not be stop more than once, it's a bug. #Closed

@qiluo-msft This check prevents doing "stop" in case we haven't done "start" at line 351

I know your intention. My point here is that a service script in general should allow stop a stopped service and return 0. So I think this is a bug inside /usr/lib/docker/docker.sh

It is not like it cannot stop it if it is stopped already. Here we added a check - if DOCKER_CTL_SCRIPT exists or not. If it exists then we continue the flow and start docker, if not we return from the function but a cleanup is still required. In case DOCKER_CTL_SCRIPT is missing this line will fail and print error. So a check is added "if docker_started", if it was started DOCKER_CTL_SCRIPT exists and we can execute this line, if not - not even needed to execute stop.

It is not like it cannot stop it if it is stopped already.

I checked files/docker/docker, and it is using start-stop-daemon --stop --pidfile "$DOCKER_SSD_PIDFILE" --retry 10 in the stop branch. I think the option --oknodo will treat noop as success.

@qiluo-msft It is not what I fix in this PR. The intention is to not call DOCKER_CTL_SCRIPT stop in case DOCKER_CTL_SCRIPT is missing.

Thanks for the clarification!

…porting app ext (#1719) FIXES: sonic-net/sonic-buildimage#8149 #### What I did Don't print errors if installing app.ext incompatible image. #### How I did it Check for docker.sh existance and take an assumption that if it exists then it is app.ext compatible. #### How to verify it From master image install 202012 image and verify no errors in logs.

[sonic_installer] don't print errors when installing an image not sup…

73ba576

…porting app ext Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

stepanblyschak closed this Jul 22, 2021

stepanblyschak reopened this Jul 22, 2021

qiluo-msft self-requested a review July 26, 2021 15:12

liat-grozovik added the Request for 202106 Branch label Jul 26, 2021

qiluo-msft reviewed Jul 27, 2021

View reviewed changes

qiluo-msft approved these changes Aug 3, 2021

View reviewed changes

qiluo-msft merged commit 0d53b7a into sonic-net:master Aug 3, 2021

judyjoseph added the Included in 202106 Branch label Aug 7, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[sonic_installer] don't print errors when installing an image not sup… #1719

[sonic_installer] don't print errors when installing an image not sup… #1719

stepanblyschak commented Jul 20, 2021 •

edited

Loading

stepanblyschak commented Jul 20, 2021

stepanblyschak commented Jul 22, 2021

qiluo-msft Jul 27, 2021 •

edited

Loading

stepanblyschak Aug 2, 2021

qiluo-msft Aug 2, 2021

stepanblyschak Aug 2, 2021

qiluo-msft Aug 3, 2021

stepanblyschak Aug 3, 2021

qiluo-msft Aug 3, 2021

[sonic_installer] don't print errors when installing an image not sup… #1719

[sonic_installer] don't print errors when installing an image not sup… #1719

Conversation

stepanblyschak commented Jul 20, 2021 • edited Loading

What I did

How I did it

How to verify it

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)

stepanblyschak commented Jul 20, 2021

stepanblyschak commented Jul 22, 2021

qiluo-msft Jul 27, 2021 • edited Loading

Choose a reason for hiding this comment

stepanblyschak Aug 2, 2021

Choose a reason for hiding this comment

qiluo-msft Aug 2, 2021

Choose a reason for hiding this comment

stepanblyschak Aug 2, 2021

Choose a reason for hiding this comment

qiluo-msft Aug 3, 2021

Choose a reason for hiding this comment

stepanblyschak Aug 3, 2021

Choose a reason for hiding this comment

qiluo-msft Aug 3, 2021

Choose a reason for hiding this comment

stepanblyschak commented Jul 20, 2021 •

edited

Loading

qiluo-msft Jul 27, 2021 •

edited

Loading