From a12d328793a9ef23b4e8511bb18d97aec351d8fa Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Wed, 15 May 2024 23:04:50 +0300 Subject: [PATCH] Rename cli/ to cmd/, fix cmake install --- src/CMakeLists.txt | 6 +++--- src/client/CMakeLists.txt | 2 +- src/{cli => cmd}/CMakeLists.txt | 0 src/{cli => cmd}/cli.cpp | 0 src/{cli => cmd}/cli.h | 0 src/{cli => cmd}/cli_alloc_osd.cpp | 0 src/{cli => cmd}/cli_common.cpp | 0 src/{cli => cmd}/cli_create.cpp | 0 src/{cli => cmd}/cli_describe.cpp | 0 src/{cli => cmd}/cli_fix.cpp | 0 src/{cli => cmd}/cli_fix.h | 0 src/{cli => cmd}/cli_flatten.cpp | 0 src/{cli => cmd}/cli_ls.cpp | 0 src/{cli => cmd}/cli_merge.cpp | 0 src/{cli => cmd}/cli_modify.cpp | 0 src/{cli => cmd}/cli_pool_cfg.cpp | 0 src/{cli => cmd}/cli_pool_cfg.h | 0 src/{cli => cmd}/cli_pool_create.cpp | 0 src/{cli => cmd}/cli_pool_ls.cpp | 0 src/{cli => cmd}/cli_pool_modify.cpp | 0 src/{cli => cmd}/cli_pool_rm.cpp | 0 src/{cli => cmd}/cli_rm.cpp | 0 src/{cli => cmd}/cli_rm_data.cpp | 0 src/{cli => cmd}/cli_rm_osd.cpp | 0 src/{cli => cmd}/cli_status.cpp | 0 src/kv/CMakeLists.txt | 2 +- tests/test_add_osd.sh | 2 +- tests/test_create_nomaxid.sh | 2 +- tests/test_failure_domain.sh | 8 ++++---- tests/test_nfs.sh | 4 ++-- tests/test_rm.sh | 2 +- tests/test_scrub.sh | 8 ++++---- tests/test_snapshot.sh | 2 +- tests/test_snapshot_chain.sh | 6 +++--- tests/test_snapshot_down.sh | 6 +++--- 35 files changed, 25 insertions(+), 25 deletions(-) rename src/{cli => cmd}/CMakeLists.txt (100%) rename src/{cli => cmd}/cli.cpp (100%) rename src/{cli => cmd}/cli.h (100%) rename src/{cli => cmd}/cli_alloc_osd.cpp (100%) rename src/{cli => cmd}/cli_common.cpp (100%) rename src/{cli => cmd}/cli_create.cpp (100%) rename src/{cli => cmd}/cli_describe.cpp (100%) rename src/{cli => cmd}/cli_fix.cpp (100%) rename src/{cli => cmd}/cli_fix.h (100%) rename src/{cli => cmd}/cli_flatten.cpp (100%) rename src/{cli => cmd}/cli_ls.cpp (100%) rename src/{cli => cmd}/cli_merge.cpp (100%) rename src/{cli => cmd}/cli_modify.cpp (100%) rename src/{cli => cmd}/cli_pool_cfg.cpp (100%) rename src/{cli => cmd}/cli_pool_cfg.h (100%) rename src/{cli => cmd}/cli_pool_create.cpp (100%) rename src/{cli => cmd}/cli_pool_ls.cpp (100%) rename src/{cli => cmd}/cli_pool_modify.cpp (100%) rename src/{cli => cmd}/cli_pool_rm.cpp (100%) rename src/{cli => cmd}/cli_rm.cpp (100%) rename src/{cli => cmd}/cli_rm_data.cpp (100%) rename src/{cli => cmd}/cli_rm_osd.cpp (100%) rename src/{cli => cmd}/cli_status.cpp (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b93016f15..caaf232d9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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}) diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index 6433aebc3..701f48bc8 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -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 diff --git a/src/cli/CMakeLists.txt b/src/cmd/CMakeLists.txt similarity index 100% rename from src/cli/CMakeLists.txt rename to src/cmd/CMakeLists.txt diff --git a/src/cli/cli.cpp b/src/cmd/cli.cpp similarity index 100% rename from src/cli/cli.cpp rename to src/cmd/cli.cpp diff --git a/src/cli/cli.h b/src/cmd/cli.h similarity index 100% rename from src/cli/cli.h rename to src/cmd/cli.h diff --git a/src/cli/cli_alloc_osd.cpp b/src/cmd/cli_alloc_osd.cpp similarity index 100% rename from src/cli/cli_alloc_osd.cpp rename to src/cmd/cli_alloc_osd.cpp diff --git a/src/cli/cli_common.cpp b/src/cmd/cli_common.cpp similarity index 100% rename from src/cli/cli_common.cpp rename to src/cmd/cli_common.cpp diff --git a/src/cli/cli_create.cpp b/src/cmd/cli_create.cpp similarity index 100% rename from src/cli/cli_create.cpp rename to src/cmd/cli_create.cpp diff --git a/src/cli/cli_describe.cpp b/src/cmd/cli_describe.cpp similarity index 100% rename from src/cli/cli_describe.cpp rename to src/cmd/cli_describe.cpp diff --git a/src/cli/cli_fix.cpp b/src/cmd/cli_fix.cpp similarity index 100% rename from src/cli/cli_fix.cpp rename to src/cmd/cli_fix.cpp diff --git a/src/cli/cli_fix.h b/src/cmd/cli_fix.h similarity index 100% rename from src/cli/cli_fix.h rename to src/cmd/cli_fix.h diff --git a/src/cli/cli_flatten.cpp b/src/cmd/cli_flatten.cpp similarity index 100% rename from src/cli/cli_flatten.cpp rename to src/cmd/cli_flatten.cpp diff --git a/src/cli/cli_ls.cpp b/src/cmd/cli_ls.cpp similarity index 100% rename from src/cli/cli_ls.cpp rename to src/cmd/cli_ls.cpp diff --git a/src/cli/cli_merge.cpp b/src/cmd/cli_merge.cpp similarity index 100% rename from src/cli/cli_merge.cpp rename to src/cmd/cli_merge.cpp diff --git a/src/cli/cli_modify.cpp b/src/cmd/cli_modify.cpp similarity index 100% rename from src/cli/cli_modify.cpp rename to src/cmd/cli_modify.cpp diff --git a/src/cli/cli_pool_cfg.cpp b/src/cmd/cli_pool_cfg.cpp similarity index 100% rename from src/cli/cli_pool_cfg.cpp rename to src/cmd/cli_pool_cfg.cpp diff --git a/src/cli/cli_pool_cfg.h b/src/cmd/cli_pool_cfg.h similarity index 100% rename from src/cli/cli_pool_cfg.h rename to src/cmd/cli_pool_cfg.h diff --git a/src/cli/cli_pool_create.cpp b/src/cmd/cli_pool_create.cpp similarity index 100% rename from src/cli/cli_pool_create.cpp rename to src/cmd/cli_pool_create.cpp diff --git a/src/cli/cli_pool_ls.cpp b/src/cmd/cli_pool_ls.cpp similarity index 100% rename from src/cli/cli_pool_ls.cpp rename to src/cmd/cli_pool_ls.cpp diff --git a/src/cli/cli_pool_modify.cpp b/src/cmd/cli_pool_modify.cpp similarity index 100% rename from src/cli/cli_pool_modify.cpp rename to src/cmd/cli_pool_modify.cpp diff --git a/src/cli/cli_pool_rm.cpp b/src/cmd/cli_pool_rm.cpp similarity index 100% rename from src/cli/cli_pool_rm.cpp rename to src/cmd/cli_pool_rm.cpp diff --git a/src/cli/cli_rm.cpp b/src/cmd/cli_rm.cpp similarity index 100% rename from src/cli/cli_rm.cpp rename to src/cmd/cli_rm.cpp diff --git a/src/cli/cli_rm_data.cpp b/src/cmd/cli_rm_data.cpp similarity index 100% rename from src/cli/cli_rm_data.cpp rename to src/cmd/cli_rm_data.cpp diff --git a/src/cli/cli_rm_osd.cpp b/src/cmd/cli_rm_osd.cpp similarity index 100% rename from src/cli/cli_rm_osd.cpp rename to src/cmd/cli_rm_osd.cpp diff --git a/src/cli/cli_status.cpp b/src/cmd/cli_status.cpp similarity index 100% rename from src/cli/cli_status.cpp rename to src/cmd/cli_status.cpp diff --git a/src/kv/CMakeLists.txt b/src/kv/CMakeLists.txt index 4fece5984..a5a43178a 100644 --- a/src/kv/CMakeLists.txt +++ b/src/kv/CMakeLists.txt @@ -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 ) diff --git a/tests/test_add_osd.sh b/tests/test_add_osd.sh index 74fb22e65..0d166cfba 100755 --- a/tests/test_add_osd.sh +++ b/tests/test_add_osd.sh @@ -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 diff --git a/tests/test_create_nomaxid.sh b/tests/test_create_nomaxid.sh index 1514d4e83..03a85f073 100755 --- a/tests/test_create_nomaxid.sh +++ b/tests/test_create_nomaxid.sh @@ -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 diff --git a/tests/test_failure_domain.sh b/tests/test_failure_domain.sh index 566bcd464..cc5d22899 100755 --- a/tests/test_failure_domain.sh +++ b/tests/test_failure_domain.sh @@ -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 & diff --git a/tests/test_nfs.sh b/tests/test_nfs.sh index 1ac09685b..c5f87ef48 100755 --- a/tests/test_nfs.sh +++ b/tests/test_nfs.sh @@ -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=$! diff --git a/tests/test_rm.sh b/tests/test_rm.sh index 12addbeb2..e8facef94 100755 --- a/tests/test_rm.sh +++ b/tests/test_rm.sh @@ -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 diff --git a/tests/test_scrub.sh b/tests/test_scrub.sh index 55ff02d92..3d6949b94 100755 --- a/tests/test_scrub.sh +++ b/tests/test_scrub.sh @@ -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 diff --git a/tests/test_snapshot.sh b/tests/test_snapshot.sh index 6090188d9..957a02186 100755 --- a/tests/test_snapshot.sh +++ b/tests/test_snapshot.sh @@ -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" \ diff --git a/tests/test_snapshot_chain.sh b/tests/test_snapshot_chain.sh index 00e4ad071..5bc067099 100755 --- a/tests/test_snapshot_chain.sh +++ b/tests/test_snapshot_chain.sh @@ -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 \ diff --git a/tests/test_snapshot_down.sh b/tests/test_snapshot_down.sh index 303ef1b44..5145b27a2 100755 --- a/tests/test_snapshot_down.sh +++ b/tests/test_snapshot_down.sh @@ -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 \