diff --git a/debian/changelog b/debian/changelog index 0c8dc7af..9271c62a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,18 @@ vitastor (0.6.2-1) unstable; urgency=medium + * RDMA support * Bugfixes - -- Vitaliy Filippov Tue, 02 Feb 2021 23:01:24 +0300 + -- Vitaliy Filippov Sat, 01 May 2021 18:46:10 +0300 + +vitastor (0.6.0-1) unstable; urgency=medium + + * Snapshots and Copy-on-Write clones + * Image metadata in etcd (name, size) + * Image I/O and space statistics in etcd + * Write throttling for smoothing random write workloads in SSD+HDD configurations + + -- Vitaliy Filippov Sun, 11 Apr 2021 00:49:18 +0300 vitastor (0.5.1-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index ba944ea2..ba8dab4d 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: vitastor Section: admin Priority: optional Maintainer: Vitaliy Filippov -Build-Depends: debhelper, liburing-dev (>= 0.6), g++ (>= 8), libstdc++6 (>= 8), linux-libc-dev, libgoogle-perftools-dev, libjerasure-dev, libgf-complete-dev +Build-Depends: debhelper, liburing-dev (>= 0.6), g++ (>= 8), libstdc++6 (>= 8), linux-libc-dev, libgoogle-perftools-dev, libjerasure-dev, libgf-complete-dev, libibverbs-dev Standards-Version: 4.5.0 Homepage: https://vitastor.io/ Rules-Requires-Root: no diff --git a/debian/vitastor.Dockerfile b/debian/vitastor.Dockerfile index 5320eef1..bc24d360 100644 --- a/debian/vitastor.Dockerfile +++ b/debian/vitastor.Dockerfile @@ -22,7 +22,7 @@ RUN apt-get -y build-dep qemu RUN apt-get -y build-dep fio RUN apt-get --download-only source qemu RUN apt-get --download-only source fio -RUN apt-get -y install libjerasure-dev cmake +RUN apt-get update && apt-get -y install libjerasure-dev cmake libibverbs-dev ADD . /root/vitastor RUN set -e -x; \ diff --git a/rpm/vitastor-el7.Dockerfile b/rpm/vitastor-el7.Dockerfile index c4369239..c68cf29f 100644 --- a/rpm/vitastor-el7.Dockerfile +++ b/rpm/vitastor-el7.Dockerfile @@ -17,6 +17,7 @@ RUN rpm --nomd5 -i fio*.src.rpm RUN rm -f /etc/yum.repos.d/CentOS-Media.repo RUN cd ~/rpmbuild/SPECS && yum-builddep -y --enablerepo='*' --disablerepo=centos-sclo-rh --disablerepo=centos-sclo-rh-source --disablerepo=centos-sclo-sclo-testing qemu-kvm.spec RUN cd ~/rpmbuild/SPECS && yum-builddep -y --enablerepo='*' --disablerepo=centos-sclo-rh --disablerepo=centos-sclo-rh-source --disablerepo=centos-sclo-sclo-testing fio.spec +RUN yum -y install rdma-core-devel ADD https://vitastor.io/rpms/liburing-el7/liburing-0.7-2.el7.src.rpm /root diff --git a/rpm/vitastor-el7.spec b/rpm/vitastor-el7.spec index 4c4058b5..61779bbe 100644 --- a/rpm/vitastor-el7.spec +++ b/rpm/vitastor-el7.spec @@ -14,6 +14,7 @@ BuildRequires: rh-nodejs12 BuildRequires: rh-nodejs12-npm BuildRequires: jerasure-devel BuildRequires: gf-complete-devel +BuildRequires: libibverbs-devel BuildRequires: cmake Requires: fio = 3.7-1.el7 Requires: qemu-kvm = 2.0.0-1.el7.6 @@ -61,8 +62,8 @@ cp -r mon %buildroot/usr/lib/vitastor/mon %_libdir/libfio_vitastor.so %_libdir/libfio_vitastor_blk.so %_libdir/libfio_vitastor_sec.so -%_libdir/libvitastor_blk.so -%_libdir/libvitastor_client.so +%_libdir/libvitastor_blk.so* +%_libdir/libvitastor_client.so* /usr/lib/vitastor diff --git a/rpm/vitastor-el8.Dockerfile b/rpm/vitastor-el8.Dockerfile index eacc8f31..c4a0eb61 100644 --- a/rpm/vitastor-el8.Dockerfile +++ b/rpm/vitastor-el8.Dockerfile @@ -15,6 +15,7 @@ RUN rpm --nomd5 -i qemu*.src.rpm RUN rpm --nomd5 -i fio*.src.rpm RUN cd ~/rpmbuild/SPECS && dnf builddep -y --enablerepo=powertools --spec qemu-kvm.spec RUN cd ~/rpmbuild/SPECS && dnf builddep -y --enablerepo=powertools --spec fio.spec && dnf install -y cmake +RUN yum -y install libibverbs-devel ADD https://vitastor.io/rpms/liburing-el7/liburing-0.7-2.el7.src.rpm /root diff --git a/rpm/vitastor-el8.spec b/rpm/vitastor-el8.spec index cf89fdba..0a7bed91 100644 --- a/rpm/vitastor-el8.spec +++ b/rpm/vitastor-el8.spec @@ -13,6 +13,7 @@ BuildRequires: gcc-toolset-9-gcc-c++ BuildRequires: nodejs >= 10 BuildRequires: jerasure-devel BuildRequires: gf-complete-devel +BuildRequires: libibverbs-devel BuildRequires: cmake Requires: fio = 3.7-3.el8 Requires: qemu-kvm = 4.2.0-29.el8.6 @@ -58,8 +59,8 @@ cp -r mon %buildroot/usr/lib/vitastor %_libdir/libfio_vitastor.so %_libdir/libfio_vitastor_blk.so %_libdir/libfio_vitastor_sec.so -%_libdir/libvitastor_blk.so -%_libdir/libvitastor_client.so +%_libdir/libvitastor_blk.so* +%_libdir/libvitastor_client.so* /usr/lib/vitastor diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b0720a9c..067e32e8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -72,14 +72,15 @@ target_link_libraries(fio_vitastor_blk ) # libvitastor_common.a +set(MSGR_RDMA "") +if (IBVERBS_LIBRARIES) + set(MSGR_RDMA "msgr_rdma.cpp") +endif (IBVERBS_LIBRARIES) add_library(vitastor_common STATIC epoll_manager.cpp etcd_state_client.cpp messenger.cpp msgr_stop.cpp msgr_op.cpp msgr_send.cpp msgr_receive.cpp ringloop.cpp ../json11/json11.cpp - http_client.cpp osd_ops.cpp pg_states.cpp timerfd_manager.cpp base64.cpp + http_client.cpp osd_ops.cpp pg_states.cpp timerfd_manager.cpp base64.cpp ${MSGR_RDMA} ) -if (IBVERBS_LIBRARIES) - target_sources(vitastor_common PRIVATE msgr_rdma.cpp) -endif (IBVERBS_LIBRARIES) target_compile_options(vitastor_common PUBLIC -fPIC) # vitastor-osd