Shiz01
/
vitastor
forked from vitalif/vitastor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename cli/ to cmd/, fix cmake install

Vitaliy Filippov 2024-05-15 23:04:50 +03:00
parent c79b38bd26
commit a12d328793
35 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/CMakeLists.txt
View File

@ -73,7 +73,7 @@ add_dependencies(test build_tests)
include_directories(
../
${CMAKE_SOURCE_DIR}/src/blockstore
${CMAKE_SOURCE_DIR}/src/cli
${CMAKE_SOURCE_DIR}/src/cmd
${CMAKE_SOURCE_DIR}/src/client
${CMAKE_SOURCE_DIR}/src/disk_tool
${CMAKE_SOURCE_DIR}/src/kv
@ -87,7 +87,7 @@ include_directories(
)
add_subdirectory(blockstore)
add_subdirectory(cli)
add_subdirectory(cmd)
add_subdirectory(client)
add_subdirectory(disk_tool)
add_subdirectory(kv)
@ -106,7 +106,7 @@ install(
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/vitastor.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/client/vitastor.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
if (${WITH_FIO})
install(TARGETS fio_vitastor fio_vitastor_blk fio_vitastor_sec LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif (${WITH_FIO})

2
src/client/CMakeLists.txt
View File

@ -21,7 +21,7 @@ add_library(vitastor_client SHARED
cluster_client_wb.cpp
vitastor_c.cpp
)
set_target_properties(vitastor_client PROPERTIES PUBLIC_HEADER "vitastor_c.h")
set_target_properties(vitastor_client PROPERTIES PUBLIC_HEADER "client/vitastor_c.h")
target_link_libraries(vitastor_client
vitastor_common
vitastor_cli

0
src/cli/CMakeLists.txt → src/cmd/CMakeLists.txt
View File

0
src/cli/cli.cpp → src/cmd/cli.cpp
View File

0
src/cli/cli.h → src/cmd/cli.h
View File

0
src/cli/cli_alloc_osd.cpp → src/cmd/cli_alloc_osd.cpp
View File

0
src/cli/cli_common.cpp → src/cmd/cli_common.cpp
View File

0
src/cli/cli_create.cpp → src/cmd/cli_create.cpp
View File

0
src/cli/cli_describe.cpp → src/cmd/cli_describe.cpp
View File

0
src/cli/cli_fix.cpp → src/cmd/cli_fix.cpp
View File

0
src/cli/cli_fix.h → src/cmd/cli_fix.h
View File

0
src/cli/cli_flatten.cpp → src/cmd/cli_flatten.cpp
View File

0
src/cli/cli_ls.cpp → src/cmd/cli_ls.cpp
View File

0
src/cli/cli_merge.cpp → src/cmd/cli_merge.cpp
View File

0
src/cli/cli_modify.cpp → src/cmd/cli_modify.cpp
View File

0
src/cli/cli_pool_cfg.cpp → src/cmd/cli_pool_cfg.cpp
View File

0
src/cli/cli_pool_cfg.h → src/cmd/cli_pool_cfg.h
View File

0
src/cli/cli_pool_create.cpp → src/cmd/cli_pool_create.cpp
View File

0
src/cli/cli_pool_ls.cpp → src/cmd/cli_pool_ls.cpp
View File

0
src/cli/cli_pool_modify.cpp → src/cmd/cli_pool_modify.cpp
View File

0
src/cli/cli_pool_rm.cpp → src/cmd/cli_pool_rm.cpp
View File

0
src/cli/cli_rm.cpp → src/cmd/cli_rm.cpp
View File

0
src/cli/cli_rm_data.cpp → src/cmd/cli_rm_data.cpp
View File

0
src/cli/cli_rm_osd.cpp → src/cmd/cli_rm_osd.cpp
View File

0
src/cli/cli_status.cpp → src/cmd/cli_status.cpp
View File

2
src/kv/CMakeLists.txt
View File

@ -6,7 +6,7 @@ project(vitastor)
add_library(vitastor_kv SHARED
kv_db.cpp
)
set_target_properties(vitastor_kv PROPERTIES PUBLIC_HEADER "vitastor_kv.h")
set_target_properties(vitastor_kv PROPERTIES PUBLIC_HEADER "kv/vitastor_kv.h")
target_link_libraries(vitastor_kv
vitastor_client
)

2
tests/test_add_osd.sh
View File

@ -30,7 +30,7 @@ wait_finish_rebalance 60
sleep 1
kill -9 $OSD4_PID
sleep 1
build/src/cli/vitastor-cli --etcd_address $ETCD_URL rm-osd --force 4
build/src/cmd/vitastor-cli --etcd_address $ETCD_URL rm-osd --force 4
sleep 2

2
tests/test_create_nomaxid.sh
View File

@ -6,7 +6,7 @@
$ETCDCTL put /vitastor/config/inode/1/120 '{"name":"testimg","size":'$((1024*1024*1024))'}'
build/src/cli/vitastor-cli create --etcd_address $ETCD_URL -s 1G testimg2
build/src/cmd/vitastor-cli create --etcd_address $ETCD_URL -s 1G testimg2
t=$($ETCDCTL get --print-value-only /vitastor/config/inode/1/121 | jq -r .name)
if [[ "$t" != "testimg2" ]]; then

8
tests/test_failure_domain.sh
View File

@ -13,13 +13,13 @@ $ETCDCTL put /vitastor/osd/stats/5 '{"host":"host3","size":1073741824,"time":"'$
$ETCDCTL put /vitastor/osd/stats/6 '{"host":"host3","size":1073741824,"time":"'$TIME'"}'
$ETCDCTL put /vitastor/osd/stats/7 '{"host":"host4","size":1073741824,"time":"'$TIME'"}'
$ETCDCTL put /vitastor/osd/stats/8 '{"host":"host4","size":1073741824,"time":"'$TIME'"}'
build/src/cli/vitastor-cli --etcd_address $ETCD_URL create-pool testpool --ec 3+2 -n 32 --failure_domain rack --force
build/src/cmd/vitastor-cli --etcd_address $ETCD_URL create-pool testpool --ec 3+2 -n 32 --failure_domain rack --force
$ETCDCTL get --print-value-only /vitastor/config/pools | jq -s -e '. == [{"1": {"failure_domain": "rack", "name": "testpool", "parity_chunks": 2, "pg_count": 32, "pg_minsize": 4, "pg_size": 5, "scheme": "ec"}}]'
build/src/cli/vitastor-cli --etcd_address $ETCD_URL modify-pool testpool --ec 3+3 --failure_domain host
build/src/cmd/vitastor-cli --etcd_address $ETCD_URL modify-pool testpool --ec 3+3 --failure_domain host
$ETCDCTL get --print-value-only /vitastor/config/pools | jq -s -e '. == [{"1": {"failure_domain": "host", "name": "testpool", "parity_chunks": 3, "pg_count": 32, "pg_minsize": 4, "pg_size": 6, "scheme": "ec"}}]'
build/src/cli/vitastor-cli --etcd_address $ETCD_URL rm-pool testpool
build/src/cmd/vitastor-cli --etcd_address $ETCD_URL rm-pool testpool
$ETCDCTL get --print-value-only /vitastor/config/pools | jq -s -e '. == [{}]'
build/src/cli/vitastor-cli --etcd_address $ETCD_URL create-pool testpool -s 2 -n 4 --failure_domain rack --force
build/src/cmd/vitastor-cli --etcd_address $ETCD_URL create-pool testpool -s 2 -n 4 --failure_domain rack --force
$ETCDCTL get --print-value-only /vitastor/config/pools | jq -s -e '. == [{"1":{"name":"testpool","scheme":"replicated","pg_size":2,"pg_minsize":1,"pg_count":4,"failure_domain":"rack"}}]'
node mon/mon-main.js --etcd_address $ETCD_URL --etcd_prefix "/vitastor" >>./testdata/mon.log 2>&1 &

4
tests/test_nfs.sh
View File

@ -3,8 +3,8 @@
PG_COUNT=16
. `dirname $0`/run_3osds.sh
build/src/cli/vitastor-cli --etcd_address $ETCD_URL create -s 10G fsmeta
build/src/cli/vitastor-cli --etcd_address $ETCD_URL modify-pool --used-for-fs fsmeta testpool
build/src/cmd/vitastor-cli --etcd_address $ETCD_URL create -s 10G fsmeta
build/src/cmd/vitastor-cli --etcd_address $ETCD_URL modify-pool --used-for-fs fsmeta testpool
build/src/nfs/vitastor-nfs start --fs fsmeta --etcd_address $ETCD_URL --portmap 0 --port 2050 --foreground 1 --trace 1 >>./testdata/nfs.log 2>&1 &
NFS_PID=$!

2
tests/test_rm.sh
View File

@ -9,6 +9,6 @@ LD_PRELOAD="build/src/client/libfio_vitastor.so" \
$ETCDCTL get --prefix '/vitastor/pg/state'
build/src/cli/vitastor-cli rm-data --etcd_address $ETCD_URL --pool 1 --inode 1
build/src/cmd/vitastor-cli rm-data --etcd_address $ETCD_URL --pool 1 --inode 1
format_green OK

8
tests/test_scrub.sh
View File

@ -48,17 +48,17 @@ wait_condition 300 "$ETCDCTL get --prefix /vitastor/pg/history/ --print-value-on
if [[ ($SCHEME = replicated && $PG_SIZE < 3) || ($SCHEME != replicated && $((PG_SIZE-PG_DATA_SIZE)) < 2) ]]; then
# Check that objects are marked as inconsistent if 2 replicas or EC/XOR 2+1
build/src/cli/vitastor-cli describe --etcd_address $ETCD_URL --json | jq -e '[ .[] | select(.inconsistent) ] | length == '$((IMG_SIZE * 8 * PG_SIZE / (SCHEME = replicated ? 1 : PG_DATA_SIZE)))
build/src/cmd/vitastor-cli describe --etcd_address $ETCD_URL --json | jq -e '[ .[] | select(.inconsistent) ] | length == '$((IMG_SIZE * 8 * PG_SIZE / (SCHEME = replicated ? 1 : PG_DATA_SIZE)))
# Fix objects using vitastor-cli fix
build/src/cli/vitastor-cli describe --etcd_address $ETCD_URL --json | \
build/src/cmd/vitastor-cli describe --etcd_address $ETCD_URL --json | \
jq -s '[ .[0][] | select(.inconsistent and .osd_num == '$ZERO_OSD') ]' | \
build/src/cli/vitastor-cli fix --etcd_address $ETCD_URL --bad_osds $ZERO_OSD
build/src/cmd/vitastor-cli fix --etcd_address $ETCD_URL --bad_osds $ZERO_OSD
elif [[ ($SCHEME = replicated && $PG_SIZE > 2) || ($SCHEME != replicated && $((PG_SIZE-PG_DATA_SIZE)) > 1) ]]; then
# Check that everything heals
wait_finish_rebalance 300
build/src/cli/vitastor-cli describe --etcd_address $ETCD_URL --json | jq -e '. | length == 0'
build/src/cmd/vitastor-cli describe --etcd_address $ETCD_URL --json | jq -e '. | length == 0'
fi
# Read everything back

2
tests/test_snapshot.sh
View File

@ -54,7 +54,7 @@ cmp ./testdata/merged.bin ./testdata/check.bin
$ETCDCTL put /vitastor/config/inode/1/3 '{"parent_id":2,"name":"testimg","size":'$((32*1024*1024))'}'
build/src/cli/vitastor-cli rm --etcd_address $ETCD_URL testimg@0
build/src/cmd/vitastor-cli rm --etcd_address $ETCD_URL testimg@0
qemu-img convert -S 4096 -p \
-f raw "vitastor:etcd_host=127.0.0.1\:$ETCD_PORT/v3:image=testimg" \

6
tests/test_snapshot_chain.sh
View File

@ -5,7 +5,7 @@ check_qemu
# Test multiple snapshots
build/src/cli/vitastor-cli --etcd_address $ETCD_URL create -s 32M testchain
build/src/cmd/vitastor-cli --etcd_address $ETCD_URL create -s 32M testchain
LD_PRELOAD="build/src/client/libfio_vitastor.so" \
fio -thread -name=test -ioengine=build/src/client/libfio_vitastor.so -bs=4M -direct=1 -iodepth=1 -fsync=1 -rw=write \
@ -13,7 +13,7 @@ LD_PRELOAD="build/src/client/libfio_vitastor.so" \
for i in {1..10}; do
# Create a snapshot
build/src/cli/vitastor-cli --etcd_address $ETCD_URL snap-create testchain@$i
build/src/cmd/vitastor-cli --etcd_address $ETCD_URL snap-create testchain@$i
# Check that the new snapshot is see-through
qemu-img convert -p \
-f raw "vitastor:etcd_host=127.0.0.1\:$ETCD_PORT/v3:image=testchain" \
@ -31,7 +31,7 @@ for i in {1..10}; do
cmp ./testdata/layer1.bin ./testdata/mirror.bin
done
build/src/cli/vitastor-cli --etcd_address $ETCD_URL rm testchain@1 testchain@9
build/src/cmd/vitastor-cli --etcd_address $ETCD_URL rm testchain@1 testchain@9
# Check the final image
qemu-img convert -p \

6
tests/test_snapshot_down.sh
View File

@ -5,14 +5,14 @@ check_qemu
# Test merge to child (without "inverse rename" optimisation)
build/src/cli/vitastor-cli --etcd_address $ETCD_URL create -s 128M testchain
build/src/cmd/vitastor-cli --etcd_address $ETCD_URL create -s 128M testchain
LD_PRELOAD="build/src/client/libfio_vitastor.so" \
fio -thread -name=test -ioengine=build/src/client/libfio_vitastor.so -bs=4M -direct=1 -iodepth=1 -fsync=1 -rw=write \
-etcd=$ETCD_URL -image=testchain -mirror_file=./testdata/mirror.bin
# Create a snapshot
build/src/cli/vitastor-cli --etcd_address $ETCD_URL snap-create testchain@0
build/src/cmd/vitastor-cli --etcd_address $ETCD_URL snap-create testchain@0
# Write something to it
LD_PRELOAD="build/src/client/libfio_vitastor.so" \
@ -26,7 +26,7 @@ qemu-img convert -p \
cmp ./testdata/layer1.bin ./testdata/mirror.bin
# Merge
build/src/cli/vitastor-cli --etcd_address $ETCD_URL rm testchain@0
build/src/cmd/vitastor-cli --etcd_address $ETCD_URL rm testchain@0
# Check the final image
qemu-img convert -p \