Adding mount size #48

lkunjumon · 2021-04-07T11:17:56Z

No description provided.

lkunjumon · 2021-04-07T11:22:04Z

Below command will give the avialbale size of block

root@localhost:/home/admin# df /tmp/tmp.C4jZJkN3bo | tail -1 | tr -s ' ' | cut -d' ' -f4
7901600

root@localhost:/home/admin# df
Filesystem 1K-blocks Used Available Use% Mounted on
udev 1533572 0 1533572 0% /dev
tmpfs 310496 58112 252384 19% /run
root-overlay 12147768 3606048 7901600 32% /
/dev/sda2 12147768 3606048 7901600 32% /host

antony-rheneus · 2021-04-07T11:37:14Z

installer/sharch_body.sh

@@ -31,7 +31,8 @@ export cur_wd
 archive_path=$(realpath "$0")
 tmp_dir=$(mktemp -d)
 if [ "$(id -u)" = "0" ] ; then
-    mount -t tmpfs tmpfs-installer $tmp_dir || exit 1
+    mount_size=$(df $tmp_dir | tail -1 | tr -s ' ' | cut -d' ' -f4)


What is this logic for? Are you trying to take available space from tmpfs??

@antony-rheneus
yes
mktemp -d
/tmp/tmp.yWbDbATGf2
root@localhost:/home/admin# df /tmp/tmp.yWbDbATGf2
Filesystem 1K-blocks Used Available Use% Mounted on
root-overlay 12147768 3606788 7900860 32% /
root@localhost:/home/admin#

@antony-rheneus Updated mount size depends on image size.

[dataset] Add dataset "system uptime" into non-db client. (Marvell-OpenNOS#52) Adding new data set to query Sonic OS version. (Marvell-OpenNOS#50) [gnmi_server] Disregard EOF status for STREAM subs (Marvell-OpenNOS#48) Signed-off-by: Yong Zhao <[email protected]>

antony-rheneus · 2021-04-27T09:42:25Z

installer/sharch_body.sh

 # Untar and launch install script in a tmpfs
 cur_wd=$(pwd)
 export cur_wd
 archive_path=$(realpath "$0")
 tmp_dir=$(mktemp -d)
 if [ "$(id -u)" = "0" ] ; then
    mount -t tmpfs tmpfs-installer $tmp_dir || exit 1
+    mount_size=$(df $tmp_dir | tail -1 | tr -s ' ' | cut -d' ' -f4)
+    if [ "$mount_size" -lt "$((image_size*3))" ]; then
+        mount_size=$((image_size*3))


mount size should be aligned in power of 2.
try to ceil the image_size*3 to next aligned multiple of page size.

antony-rheneus · 2021-04-28T05:59:27Z

installer/sharch_body.sh

+    mount_size=$(df $tmp_dir | tail -1 | tr -s ' ' | cut -d' ' -f4)
+    if [ "$mount_size" -lt "$((image_size*3))" ]; then
+        #align mount_size to next power of two
+        mount_size=$(echo $((image_size*3)) | awk '{ print 2^int(((log($1)/log(2))+ 1)) }')


Dont complicate with math logic.
Use dictionry/array, to select numbers 8,16,32,64,128

Can u change logic to
image_size=du target/sonic-marvell-armhf.bin | awk '{print $1}'
mount_size=$((((image_size*3)/1000/1000)+1))
mount -o remount,size="${mount_size}G" -t tmpfs tmpfs-installer $tmp_dir || exit 1

antony-rheneus · 2021-04-28T06:00:52Z

installer/sharch_body.sh

@@ -25,13 +25,20 @@ fi

 echo " OK."

+image_size=$(du "$0" | awk '{print $1}')


Can you check du returns aligned size like 8,16,32,... this would ease in getting mount size

@antony-rheneus du return without aligned .

antony-rheneus · 2021-04-28T06:53:21Z

installer/sharch_body.sh

+    if [ "$mount_size" -lt "$((image_size*3))" ]; then
+        #align mount_size to next power of two
+        mount_size=$(echo $((image_size*3)) | awk '{ print 2^int(((log($1)/log(2))+ 1)) }')
+        mount -o remount,size="${mount_size}K" -t tmpfs tmpfs-installer $tmp_dir || exit 1


Instead K, use G, so that calculation wud be easier

@antony-rheneus changing mount_size to Gb is enough right? after mounting size is aligned .below is the mout_size in K when 4G is mounted

tmpfs-installer 4194304 0 4194304 0% /tmp/tmp.vHn5rFZYE1

antony-rheneus · 2021-04-28T09:58:57Z

installer/sharch_body.sh

 # Untar and launch install script in a tmpfs
 cur_wd=$(pwd)
 export cur_wd
 archive_path=$(realpath "$0")
 tmp_dir=$(mktemp -d)
 if [ "$(id -u)" = "0" ] ; then
    mount -t tmpfs tmpfs-installer $tmp_dir || exit 1
+    mount_size=$(df $tmp_dir | tail -1 | tr -s ' ' | cut -d' ' -f4)
+    if [ "$mount_size" -lt "$((image_size*3))" ]; then


Does mount size is in 'KB' and as well as image_size in 'KB'?

lkunjumon · 2021-05-17T11:24:02Z

@antony-rheneus updated the command to get actual size of compressed image.

lkunjumon · 2021-05-19T04:17:31Z

@radha-danda @antony-rheneus updated image_size check, can we add this check "$mount_size" -eq "$((image_size))" .

antony-rheneus · 2021-05-18T13:34:16Z

installer/sharch_body.sh

 # Untar and launch install script in a tmpfs
 cur_wd=$(pwd)
 export cur_wd
 archive_path=$(realpath "$0")
 tmp_dir=$(mktemp -d)
 if [ "$(id -u)" = "0" ] ; then
    mount -t tmpfs tmpfs-installer $tmp_dir || exit 1
+    mount_size=$(df $tmp_dir | tail -1 | tr -s ' ' | cut -d' ' -f4)
+    if [ "$mount_size" -lt "$((image_size))" ] || [ "$mount_size" -eq "$((image_size))" ]; then


use -le

Also
do extra padding like plus 100K free

lkunjumon · 2021-05-19T09:27:03Z

@antony-rheneus Added padding to image size.

antony-rheneus · 2021-05-19T09:45:29Z

installer/sharch_body.sh

 # Untar and launch install script in a tmpfs
 cur_wd=$(pwd)
 export cur_wd
 archive_path=$(realpath "$0")
 tmp_dir=$(mktemp -d)
 if [ "$(id -u)" = "0" ] ; then
    mount -t tmpfs tmpfs-installer $tmp_dir || exit 1
+    mount_size=$(df $tmp_dir | tail -1 | tr -s ' ' | cut -d' ' -f4)
+    if [ "$mount_size" -le "$((image_size + $padding))" ]; then


declare padding before this line.
also add comment as extra space for tmp

lkunjumon · 2021-05-19T11:32:07Z

@antony-rheneus Updated the comments.

lkunjumon · 2021-05-19T11:33:15Z

@antony-rheneus can use tmp_dir insted of tmp?

antony-rheneus · 2021-05-19T11:40:31Z

installer/sharch_body.sh

 # Untar and launch install script in a tmpfs
 cur_wd=$(pwd)
 export cur_wd
 archive_path=$(realpath "$0")
 tmp_dir=$(mktemp -d)
 if [ "$(id -u)" = "0" ] ; then
    mount -t tmpfs tmpfs-installer $tmp_dir || exit 1
+    mount_size=$(df $tmp_dir | tail -1 | tr -s ' ' | cut -d' ' -f4)
+    # Extra space for tmp
+    padding=102400


write the size value, also in the comment in KBs or MBs

not adding, only checking extra space after extraction

@antony-rheneus pls review the comments

@antony-rheneus Please review updated commit.

antony-rheneus · 2021-05-19T12:58:42Z

installer/sharch_body.sh

+    # Adding extra 100K free space for tmp_dir
+    padding=102400
+    if [ "$mount_size" -le "$((image_size + padding))" ]; then
+        mount_size=$((((image_size + padding)/1024/1024)+1))


Here, you dont need to add at all, as already we add up 1G extra

lkunjumon · 2021-05-20T08:48:52Z

@radha-danda pls review

antony-rheneus · 2021-06-15T09:55:05Z

installer/sharch_body.sh

@@ -24,6 +24,10 @@ if [ "$sha1" != "$payload_sha1" ] ; then
 fi

 echo " OK."
+#Image size in KB
+bytes=$((($(sed -e '1,/^exit_marker$/d' "$0"  | tar --to-stdout -xf - | wc -c) + 1023 ) / 1024))


see QiLuo's change... no need to converto to KB

@antony-rheneus

Below is his comments,
Here it is dividing one time only with 1024, and mouting size in MB
bytes = $(sed -e '1,/^exit_marker$/d' "$0" | tar --to-stdout -xf - | wc -c)
image_size=$((bytes + 1023) / 1024)
mount_size=$((image_size + 31) / 32) * 32
mount -o remount,size="${mount_size}M"

antony-rheneus · 2021-06-16T06:18:52Z

installer/sharch_body.sh

@@ -24,6 +24,10 @@ if [ "$sha1" != "$payload_sha1" ] ; then
 fi

 echo " OK."
+#Image size in KB
+bytes=$((($(sed -e '1,/^exit_marker$/d' "$0"  | tar --to-stdout -xf - | wc -c) + 1023 ) / 1024))


change variable name bytes to "image_size_in_kb"

antony-rheneus · 2021-06-16T06:19:34Z

installer/sharch_body.sh

@@ -32,6 +36,13 @@ archive_path=$(realpath "$0")
 tmp_dir=$(mktemp -d)
 if [ "$(id -u)" = "0" ] ; then
    mount -t tmpfs tmpfs-installer $tmp_dir || exit 1
+    mount_size=$(df $tmp_dir | tail -1 | tr -s ' ' | cut -d' ' -f4)


mount_size is in KB

antony-rheneus · 2021-06-16T06:20:25Z

installer/sharch_body.sh

+    mount_size=$(df $tmp_dir | tail -1 | tr -s ' ' | cut -d' ' -f4)
+    #checking extra 100KB space in tmp_dir, after image extraction
+    padding=102400
+    if [ "$mount_size" -le "$((image_size + padding))" ]; then


comparing KB and MB

…action.

Adding mount size

4743499

antony-rheneus reviewed Apr 7, 2021

View reviewed changes

Updating mount size

707747d

antony-rheneus reviewed Apr 27, 2021

View reviewed changes

Align mount_size to next power of 2

8438c34

antony-rheneus reviewed Apr 28, 2021

View reviewed changes

Updating mount_size in Gb

d4f43e9

antony-rheneus reviewed Apr 28, 2021

View reviewed changes

updating mount size

d9de9b3

antony-rheneus approved these changes Apr 28, 2021

View reviewed changes

update command to get actual size of compressed image.

98312e7

antony-rheneus approved these changes May 17, 2021

View reviewed changes

updating image size check

06c2388

antony-rheneus reviewed May 19, 2021

View reviewed changes

Add paddig to image size

da11766

antony-rheneus reviewed May 19, 2021

View reviewed changes

lkunjumon added 2 commits May 19, 2021 15:58

Added comments for padding

538f077

Updated padding

884b169

antony-rheneus reviewed May 19, 2021

View reviewed changes

Updating coment for padding

3eca178

antony-rheneus reviewed May 19, 2021

View reviewed changes

lkunjumon added 2 commits May 19, 2021 20:52

update command

1d62e3f

update command

d36f8aa

antony-rheneus approved these changes May 20, 2021

View reviewed changes

Updating mount size

4f36d57

antony-rheneus reviewed Jun 15, 2021

View reviewed changes

antony-rheneus reviewed Jun 16, 2021

View reviewed changes

update mountsize in MB and added 32MB extra free space for image extr…

02227f0

…action.

antony-rheneus approved these changes Jun 16, 2021

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding mount size #48

Adding mount size #48

lkunjumon commented Apr 7, 2021

lkunjumon commented Apr 7, 2021

antony-rheneus Apr 7, 2021

lkunjumon Apr 7, 2021 •

edited

Loading

lkunjumon Apr 27, 2021

antony-rheneus Apr 27, 2021

antony-rheneus Apr 28, 2021

antony-rheneus Apr 28, 2021

lkunjumon Apr 28, 2021

antony-rheneus Apr 28, 2021

lkunjumon Apr 28, 2021

antony-rheneus Apr 28, 2021

lkunjumon Apr 28, 2021 •

edited

Loading

antony-rheneus Apr 28, 2021

lkunjumon commented May 17, 2021

lkunjumon commented May 19, 2021

antony-rheneus May 18, 2021

lkunjumon commented May 19, 2021

antony-rheneus May 19, 2021

lkunjumon commented May 19, 2021

lkunjumon commented May 19, 2021

antony-rheneus May 19, 2021

antony-rheneus May 19, 2021

lkunjumon May 20, 2021

lkunjumon Jun 15, 2021

antony-rheneus May 19, 2021

lkunjumon commented May 20, 2021

antony-rheneus Jun 15, 2021

lkunjumon Jun 15, 2021 •

edited

Loading

antony-rheneus Jun 16, 2021

antony-rheneus Jun 16, 2021

antony-rheneus Jun 16, 2021

		@@ -25,13 +25,20 @@ fi

		echo " OK."

		image_size=$(du "$0" \| awk '{print $1}')

Adding mount size #48

Are you sure you want to change the base?

Adding mount size #48

Conversation

lkunjumon commented Apr 7, 2021

lkunjumon commented Apr 7, 2021

Choose a reason for hiding this comment

lkunjumon Apr 7, 2021 • 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

Choose a reason for hiding this comment

lkunjumon Apr 28, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lkunjumon commented May 17, 2021

lkunjumon commented May 19, 2021

Choose a reason for hiding this comment

lkunjumon commented May 19, 2021

Choose a reason for hiding this comment

lkunjumon commented May 19, 2021

lkunjumon commented May 19, 2021

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

lkunjumon commented May 20, 2021

Choose a reason for hiding this comment

lkunjumon Jun 15, 2021 • 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

lkunjumon Apr 7, 2021 •

edited

Loading

lkunjumon Apr 28, 2021 •

edited

Loading

lkunjumon Jun 15, 2021 •

edited

Loading