#16466 fixing based on review comments:

To add the rdbtools into base docker.
Move saidump.sh from host to syncd docker container.

build_debian.sh

@@ -734,10 +734,6 @@ SONIC_VERSION_CACHE=${SONIC_VERSION_CACHE}  \
 	DBGOPT="${DBGOPT}" \
 	scripts/collect_host_image_version_files.sh $CONFIGURED_ARCH $IMAGE_DISTRO $TARGET_PATH $FILESYSTEM_ROOT
 
-## Copy saidump.sh
-sudo cp ./files/scripts/saidump.sh $FILESYSTEM_ROOT/usr/local/bin/saidump.sh
-sudo chmod +x $FILESYSTEM_ROOT/usr/local/bin/saidump.sh
-
 # Remove GCC
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y remove gcc
 

platform/broadcom/docker-syncd-brcm-dnx/Dockerfile.j2

@@ -30,6 +30,10 @@ COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
 COPY ["critical_processes", "/etc/supervisor/"]
 
+# Copy saidump.sh
+COPY ["saidump.sh", "/usr/bin/"]
+RUN chmod +x /usr/bin/saidump.sh
+
 ## Clean up
 RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
 RUN rm -rf /debs

platform/broadcom/docker-syncd-brcm-dnx/saidump.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+set -e
+
+function debug()
+{
+  /usr/bin/logger "$1"
+}
+
+save_saidump_by_rdb() {
+  local filepath="/var/run/redis/sonic-db/database_config.json"
+
+  #Get hostname, port, redis directory
+  local redis_config=$(python3 -c "
+import json
+with open('$filepath') as json_file:
+  data = json.load(json_file)
+  print(data['INSTANCES']['redis']['hostname'], data['INSTANCES']['redis']['port'], data['INSTANCES']['redis']['unix_socket_path'])")
+
+  #split
+  redis_config=(${redis_config// / })
+  local hostname=${redis_config[0]}
+  local port=${redis_config[1]}
+  local redis_dir=`dirname ${redis_config[2]}`
+  debug "saidump.sh: hostname:$hostname, port:$port, redis_dir:$redis_dir"
+
+  debug "saidump.sh: [1] Config Redis consistency directory."
+  redis-cli -h $hostname -p $port CONFIG SET dir $redis_dir > /dev/null
+
+  debug "saidump.sh: [2] SAVE."
+  redis-cli -h $hostname -p $port SAVE > /dev/null
+
+  debug "saidump.sh: [3] Run the rdb command to convert the dump.rdb into a JSON file."
+  rdb --command json  $redis_dir/dump.rdb | tee $redis_dir/dump.json > /dev/null
+
+  debug "saidump.sh: [4] Run saidump -r to update the JSON file's format, and then get the result in the standard output."
+  saidump -r $redis_dir/dump.json -m 100
+
+  debug "saidump.sh: [5] Clear the temporary files."
+  rm -f $redis_dir/dump.rdb
+  rm -f $redis_dir/dump.json
+}
+
+save_saidump_by_rdb