Merge #1639

1639: fix(block/list): update deps to get safeMountIter fix r=tiagolobocastro a=tiagolobocastro Dep update fixes deadlock on the new safe mount which basically looped forever trying to read mounts. This would cause list_block_devices gRPC call to hang. Co-authored-by: Tiago Castro <[email protected]>
openebs · Apr 18, 2024 · 58b7ecc · 58b7ecc
2 parents fcfb6ad + a06f37c
commit 58b7ecc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/scripts/release.sh b/scripts/release.sh
@@ -37,20 +37,18 @@ pre_fetch_cargo_deps() {
 
   local outLink="--no-out-link"
   local cargoVendorMsg=""
-  local cargoVendorDir=""
   if [ -n "$CARGO_VENDOR_DIR" ]; then
-    if [ "$(realpath -s "$CARGO_VENDOR_DIR")" = "$(realpath -s "$SCRIPTDIR/..")" ]; then
+    if [ "$(realpath -ms "$CARGO_VENDOR_DIR")" = "$(realpath -ms "$SCRIPTDIR/..")" ]; then
       cargoVendorDir="$CARGO_VENDOR_DIR/$GIT_BRANCH"
     else
       cargoVendorDir="$CARGO_VENDOR_DIR/$project/$GIT_BRANCH"
     fi
-
+    cargoVendorMsg="into $(realpath -ms "$cargoVendorDir") "
     outLink="--out-link "$cargoVendorDir""
   fi
 
   for (( attempt=1; attempt<=maxAttempt; attempt++ )); do
      if $NIX_BUILD $outLink -A "$nixAttrPath"; then
-       [ -n "$cargoVendorDir" ] && cargoVendorMsg="into $(realpath -s "$cargoVendorDir") "
        echo "Cargo vendored dependencies pre-fetched "$cargoVendorMsg"after $attempt attempt(s)"
        return 0
      fi

diff --git a/utils/dependencies b/utils/dependencies