Merge branch 'v24.05.x' into lvolstore-ha-snapshot

Author: hamdy-simplyblock

docker/Dockerfile_spdk

@@ -10,14 +10,16 @@ COPY ./ /root/spdk/
 
 RUN dnf install -y git diffutils procps-ng pip kmod hostname wget pkg-config cmake nano systemd-udev
 
+RUN yum install -y dosfstools ntfsprogs e2fsprogs ntfs-* gdb parted fio xfsprogs libasan libubsan
+
+RUN pip install requests
+
 RUN cd spdk && git submodule update --init --depth 1
 
 RUN cd spdk && scripts/pkgdep.sh --rdma --pmem --idxd
 
 RUN mkdir /tmp/pmem
 
-RUN #pip3 install grpcio-tools==1.51.3 protobuf==4.22.1
-
 RUN sed -i "s/^#define SPDK_BDEV_QOS_MIN_IOS_PER_SEC.*/#define SPDK_BDEV_QOS_MIN_IOS_PER_SEC\t200/" /root/spdk/lib/bdev/bdev.c
 
 RUN sed -i "s/^#define SPDK_BDEV_QOS_TIMESLICE_IN_USEC.*/#define SPDK_BDEV_QOS_TIMESLICE_IN_USEC\t5000/" /root/spdk/lib/bdev/bdev.c

docker/Dockerfile_spdk_arm

@@ -13,14 +13,16 @@ RUN yum install -y /root/spdk/docker/accel-config-libs-4.1.8.git4405db70-2.el9.a
     /root/spdk/docker/accel-config-4.1.8.git4405db70-2.el9.aarch64.rpm \
     /root/spdk/docker/accel-config-devel-4.1.8.git4405db70-2.el9.aarch64.rpm
 
+RUN yum install -y dosfstools ntfsprogs e2fsprogs ntfs-* gdb parted fio xfsprogs libasan libubsan
+
+RUN pip install requests
+
 RUN cd spdk && git submodule update --init --depth 1
 
 RUN cd spdk && scripts/pkgdep.sh --rdma --pmem --idxd
 
 RUN mkdir /tmp/pmem
 
-RUN #pip3 install grpcio-tools==1.51.3 protobuf==4.22.1
-
 RUN sed -i "s/^#define SPDK_BDEV_QOS_MIN_IOS_PER_SEC.*/#define SPDK_BDEV_QOS_MIN_IOS_PER_SEC\t200/" /root/spdk/lib/bdev/bdev.c
 
 RUN sed -i "s/^#define SPDK_BDEV_QOS_TIMESLICE_IN_USEC.*/#define SPDK_BDEV_QOS_TIMESLICE_IN_USEC\t5000/" /root/spdk/lib/bdev/bdev.c

scripts/run_spdk_tgt.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+set -x
+
+modprobe nvme-tcp
+modprobe nbd
+export spdk=/root/spdk
+export cpu_mask=$1
+export HUGEMEM=$2
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$spdk/build/lib:$spdk/dpdk/build/lib"
+SPDK_SOCK=$3
+if [ -z "$SPDK_SOCK" ] ; then
+  SPDK_SOCK=/var/tmp/spdk.sock
+fi
+export SPDK_SOCK
+$spdk/scripts/setup.sh
+$spdk/build/bin/spdk_tgt -m "$cpu_mask" -r "$SPDK_SOCK"