ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts/setup: Enable extglob, nullglob in parser's global scope

Browse Source 
This done due changes in latest Bash releases (>=5.2) which is
currently shipped with fedora36.

Fixes issue #2740.

Signed-off-by: Michal Berger <michal.berger@intel.com>
Change-Id: Id6e6f00eb4ae8b7f2b110848fd55e710368fcf94
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15081
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: wanghailiang <hailiangx.e.wang@intel.com>
Reviewed-by: Krzysztof Karas <krzysztof.karas@intel.com>
Reviewed-by: Kamil Godzwon <kamilx.godzwon@intel.com>
This commit is contained in:
Michal Berger 2022-10-20 13:36:04 +02:00 committed by Tomasz Zawadzki
parent fd487dbd8b
commit 8c19851209
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/setup.sh
View File

@ -1,6 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e set -e
shopt -s nullglob extglob
os=$(uname -s) os=$(uname -s)
@ -409,7 +410,6 @@ function configure_linux_pci() {
} }
function cleanup_linux() { function cleanup_linux() {
shopt -s extglob nullglob
dirs_to_clean="" dirs_to_clean=""
dirs_to_clean="$(echo {/var/run,/tmp}/dpdk/spdk{,_pid}+([0-9])) " dirs_to_clean="$(echo {/var/run,/tmp}/dpdk/spdk{,_pid}+([0-9])) "
if [[ -d $XDG_RUNTIME_DIR && $XDG_RUNTIME_DIR != *" "* ]]; then if [[ -d $XDG_RUNTIME_DIR && $XDG_RUNTIME_DIR != *" "* ]]; then
@ -421,7 +421,6 @@ function cleanup_linux() {
files_to_clean+="$(echo $dir/*) " files_to_clean+="$(echo $dir/*) "
done done
file_locks+=(/var/tmp/spdk_pci_lock*) file_locks+=(/var/tmp/spdk_pci_lock*)
shopt -u extglob nullglob
files_to_clean+="$(ls -1 /dev/shm/* \ files_to_clean+="$(ls -1 /dev/shm/* \
| grep -E '(spdk_tgt|iscsi|vhost|nvmf|rocksdb|bdevio|bdevperf|vhost_fuzz|nvme_fuzz|accel_perf|bdev_svc)_trace|spdk_iscsi_conns' || true) " | grep -E '(spdk_tgt|iscsi|vhost|nvmf|rocksdb|bdevio|bdevperf|vhost_fuzz|nvme_fuzz|accel_perf|bdev_svc)_trace|spdk_iscsi_conns' || true) "
@ -432,11 +431,9 @@ function cleanup_linux() {
return 0 return 0
fi fi
shopt -s extglob
for fd_dir in $(echo /proc/+([0-9])); do for fd_dir in $(echo /proc/+([0-9])); do
opened_files+="$(readlink -e assert_not_empty $fd_dir/fd/* || true)" opened_files+="$(readlink -e assert_not_empty $fd_dir/fd/* || true)"
done done
shopt -u extglob
if [[ -z "$opened_files" ]]; then if [[ -z "$opened_files" ]]; then
echo "Can't get list of opened files!" echo "Can't get list of opened files!"
@ -624,7 +621,6 @@ function status_linux() {
printf "%-6s %10s %8s / %6s\n" "node" "hugesize" "free" "total" >&2 printf "%-6s %10s %8s / %6s\n" "node" "hugesize" "free" "total" >&2
numa_nodes=0 numa_nodes=0
shopt -s nullglob
for path in /sys/devices/system/node/node*/hugepages/hugepages-*/; do for path in /sys/devices/system/node/node*/hugepages/hugepages-*/; do
numa_nodes=$((numa_nodes + 1)) numa_nodes=$((numa_nodes + 1))
free_pages=$(cat $path/free_hugepages) free_pages=$(cat $path/free_hugepages)
@ -637,7 +633,6 @@ function status_linux() {
printf "%-6s %10s %8s / %6s\n" $node $huge_size $free_pages $all_pages printf "%-6s %10s %8s / %6s\n" $node $huge_size $free_pages $all_pages
done done
shopt -u nullglob
# fall back to system-wide hugepages # fall back to system-wide hugepages
if [ "$numa_nodes" = "0" ]; then if [ "$numa_nodes" = "0" ]; then