diff --git a/src/disk_tool/disk_tool_prepare.cpp b/src/disk_tool/disk_tool_prepare.cpp index ea20f7a7..0e8d46a7 100644 --- a/src/disk_tool/disk_tool_prepare.cpp +++ b/src/disk_tool/disk_tool_prepare.cpp @@ -347,13 +347,16 @@ std::vector disk_tool_t::collect_devices(const std::vector< { std::vector devinfo; std::set seen; - for (auto & dev: devices) + for (auto & orig_dev: devices) { + // Resolve symlinks like /dev/disk/by-id/*, /sys/block/ only has real device names + std::string dev = realpath_str(orig_dev); if (seen.find(dev) != seen.end()) { - fprintf(stderr, "%s is specified multiple times, ignoring\n", dev.c_str()); + fprintf(stderr, "%s is specified multiple times, ignoring\n", orig_dev.c_str()); continue; } + seen.insert(dev); // Check if the device is a whole disk if (dev.substr(0, 5) != "/dev/") { diff --git a/tests/test_resize_auto.sh b/tests/test_resize_auto.sh index 53589557..e8f4c7d6 100755 --- a/tests/test_resize_auto.sh +++ b/tests/test_resize_auto.sh @@ -15,6 +15,13 @@ trap "kill -9 $(jobs -p) || true; sudo losetup -d $LOOP1 $LOOP2"' || true' EXIT # also test prepare --hybrid :) # non-vitastor random type UUID to prevent udev activation mount | grep '/dev type devtmpfs' || sudo mount udev /dev/ -t devtmpfs +# prepare should resolve symlinks (like /dev/disk/by-id/*), take each disk only once +# and complain about a path which doesn't resolve +ln -s $LOOP1 ./testdata/bin/test_osd1_link1 +ln -s $LOOP1 ./testdata/bin/test_osd1_link2 +sudo -E build/src/disk_tool/vitastor-disk-test prepare --dry-run --json ./testdata/bin/test_osd1_link1 ./testdata/bin/test_osd1_link2 \ + ./testdata/bin/test_osd1_nolink 2>./testdata/prepare_err.txt | jq -e '[ .devices[].device_path ] == [ "'$LOOP1'" ]' +grep 'test_osd1_nolink does not start with /dev/, ignoring' ./testdata/prepare_err.txt sudo -E build/src/disk_tool/vitastor-disk-test prepare $OFFSET_ARGS --no_init 1 --meta_reserve 1x,1M \ --block_size 131072 --osd_num 987654 --part_type_uuid 0df42ae0-3695-4395-a957-7d5ff3645c56 \ --hybrid --fast-devices $LOOP2 $LOOP1