HTTP "hello, world!"

Seems slightly overcomplicated...

.gitea/workflows/buildenv.Dockerfile

@@ -23,7 +23,7 @@ RUN apt-get update
 RUN apt-get -y install etcd qemu-system-x86 qemu-block-extra qemu-utils fio libasan8 \
     libgoogle-perftools-dev devscripts libjerasure-dev cmake libibverbs-dev libisal-dev
 RUN apt-get -y build-dep fio qemu=`dpkg -s qemu-system-x86|grep ^Version:|awk '{print $2}'`
-RUN apt-get update && apt-get -y install jq lp-solve sudo nfs-common fdisk parted libc-ares-dev udev iproute2
+RUN apt-get update && apt-get -y install jq lp-solve sudo nfs-common fdisk parted libc-ares-dev udev
 RUN apt-get --download-only source fio qemu=`dpkg -s qemu-system-x86|grep ^Version:|awk '{print $2}'`
 
 RUN set -ex; \

.gitea/workflows/test.yml

@@ -162,24 +162,6 @@ jobs:
           echo ""
         done
 
-  test_change_pg_minsize:
-    runs-on: ubuntu-latest
-    needs: build
-    container: ${{env.TEST_IMAGE}}:${{github.sha}}
-    steps:
-    - name: Run test
-      id: test
-      timeout-minutes: 3
-      run: /root/vitastor/tests/test_change_pg_minsize.sh
-    - name: Print logs
-      if: always() && steps.test.outcome == 'failure'
-      run: |
-        for i in /root/vitastor/testdata/*.log /root/vitastor/testdata/*.txt; do
-          echo "-------- $i --------"
-          cat $i
-          echo ""
-        done
-
   test_change_pg_size:
     runs-on: ubuntu-latest
     needs: build
@@ -306,24 +288,6 @@ jobs:
           echo ""
         done
 
-  test_img_online_resize:
-    runs-on: ubuntu-latest
-    needs: build
-    container: ${{env.TEST_IMAGE}}:${{github.sha}}
-    steps:
-    - name: Run test
-      id: test
-      timeout-minutes: 3
-      run: /root/vitastor/tests/test_img_online_resize.sh
-    - name: Print logs
-      if: always() && steps.test.outcome == 'failure'
-      run: |
-        for i in /root/vitastor/testdata/*.log /root/vitastor/testdata/*.txt; do
-          echo "-------- $i --------"
-          cat $i
-          echo ""
-        done
-
   test_interrupted_rebalance:
     runs-on: ubuntu-latest
     needs: build
@@ -396,78 +360,6 @@ jobs:
           echo ""
         done
 
-  test_dump_load:
-    runs-on: ubuntu-latest
-    needs: build
-    container: ${{env.TEST_IMAGE}}:${{github.sha}}
-    steps:
-    - name: Run test
-      id: test
-      timeout-minutes: 3
-      run: /root/vitastor/tests/test_dump_load.sh
-    - name: Print logs
-      if: always() && steps.test.outcome == 'failure'
-      run: |
-        for i in /root/vitastor/testdata/*.log /root/vitastor/testdata/*.txt; do
-          echo "-------- $i --------"
-          cat $i
-          echo ""
-        done
-
-  test_dump_load_32k:
-    runs-on: ubuntu-latest
-    needs: build
-    container: ${{env.TEST_IMAGE}}:${{github.sha}}
-    steps:
-    - name: Run test
-      id: test
-      timeout-minutes: 3
-      run: TEST_NAME=32k OSD_ARGS="--data_csum_type crc32c --csum_block_size 32k" OFFSET_ARGS="$OSD_ARGS" /root/vitastor/tests/test_dump_load.sh
-    - name: Print logs
-      if: always() && steps.test.outcome == 'failure'
-      run: |
-        for i in /root/vitastor/testdata/*.log /root/vitastor/testdata/*.txt; do
-          echo "-------- $i --------"
-          cat $i
-          echo ""
-        done
-
-  test_old_dump_load:
-    runs-on: ubuntu-latest
-    needs: build
-    container: ${{env.TEST_IMAGE}}:${{github.sha}}
-    steps:
-    - name: Run test
-      id: test
-      timeout-minutes: 3
-      run: OLD=1 /root/vitastor/tests/test_dump_load.sh
-    - name: Print logs
-      if: always() && steps.test.outcome == 'failure'
-      run: |
-        for i in /root/vitastor/testdata/*.log /root/vitastor/testdata/*.txt; do
-          echo "-------- $i --------"
-          cat $i
-          echo ""
-        done
-
-  test_dump_load_old_32k:
-    runs-on: ubuntu-latest
-    needs: build
-    container: ${{env.TEST_IMAGE}}:${{github.sha}}
-    steps:
-    - name: Run test
-      id: test
-      timeout-minutes: 3
-      run: TEST_NAME=old_32k OLD=1 OSD_ARGS="--data_csum_type crc32c --csum_block_size 32k" OFFSET_ARGS="$OSD_ARGS" /root/vitastor/tests/test_dump_load.sh
-    - name: Print logs
-      if: always() && steps.test.outcome == 'failure'
-      run: |
-        for i in /root/vitastor/testdata/*.log /root/vitastor/testdata/*.txt; do
-          echo "-------- $i --------"
-          cat $i
-          echo ""
-        done
-
   test_old_interrupted_rebalance:
     runs-on: ubuntu-latest
     needs: build
@@ -828,24 +720,6 @@ jobs:
           echo ""
         done
 
-  test_snapshot_chain_enc_gcm:
-    runs-on: ubuntu-latest
-    needs: build
-    container: ${{env.TEST_IMAGE}}:${{github.sha}}
-    steps:
-    - name: Run test
-      id: test
-      timeout-minutes: 3
-      run: TEST_NAME=enc_gcm ENCRYPTED=1 VITASTOR_CFG=',"proto_checksums":"gcm"' /root/vitastor/tests/test_snapshot_chain.sh
-    - name: Print logs
-      if: always() && steps.test.outcome == 'failure'
-      run: |
-        for i in /root/vitastor/testdata/*.log /root/vitastor/testdata/*.txt; do
-          echo "-------- $i --------"
-          cat $i
-          echo ""
-        done
-
   test_old_snapshot_chain:
     runs-on: ubuntu-latest
     needs: build
@@ -1404,24 +1278,6 @@ jobs:
           echo ""
         done
 
-  test_heal_ec_rdma:
-    runs-on: ubuntu-latest
-    needs: build
-    container: ${{env.TEST_IMAGE}}:${{github.sha}}
-    steps:
-    - name: Run test
-      id: test
-      timeout-minutes: 10
-      run: TEST_NAME=ec_rdma RDMA=1 SCHEME=ec /root/vitastor/tests/test_heal.sh
-    - name: Print logs
-      if: always() && steps.test.outcome == 'failure'
-      run: |
-        for i in /root/vitastor/testdata/*.log /root/vitastor/testdata/*.txt; do
-          echo "-------- $i --------"
-          cat $i
-          echo ""
-        done
-
   test_checksum:
     runs-on: ubuntu-latest
     needs: build
@@ -1692,24 +1548,6 @@ jobs:
           echo ""
         done
 
-  test_resize_last:
-    runs-on: ubuntu-latest
-    needs: build
-    container: ${{env.TEST_IMAGE}}:${{github.sha}}
-    steps:
-    - name: Run test
-      id: test
-      timeout-minutes: 3
-      run: /root/vitastor/tests/test_resize_last.sh
-    - name: Print logs
-      if: always() && steps.test.outcome == 'failure'
-      run: |
-        for i in /root/vitastor/testdata/*.log /root/vitastor/testdata/*.txt; do
-          echo "-------- $i --------"
-          cat $i
-          echo ""
-        done
-
   test_resize_auto:
     runs-on: ubuntu-latest
     needs: build
@@ -1746,24 +1584,6 @@ jobs:
           echo ""
         done
 
-  test_old_resize_last:
-    runs-on: ubuntu-latest
-    needs: build
-    container: ${{env.TEST_IMAGE}}:${{github.sha}}
-    steps:
-    - name: Run test
-      id: test
-      timeout-minutes: 3
-      run: OLD=1 /root/vitastor/tests/test_resize_last.sh
-    - name: Print logs
-      if: always() && steps.test.outcome == 'failure'
-      run: |
-        for i in /root/vitastor/testdata/*.log /root/vitastor/testdata/*.txt; do
-          echo "-------- $i --------"
-          cat $i
-          echo ""
-        done
-
   test_old_resize_auto:
     runs-on: ubuntu-latest
     needs: build
@@ -2322,24 +2142,6 @@ jobs:
           echo ""
         done
 
-  test_nfs_long_readdir:
-    runs-on: ubuntu-latest
-    needs: build
-    container: ${{env.TEST_IMAGE}}:${{github.sha}}
-    steps:
-    - name: Run test
-      id: test
-      timeout-minutes: 3
-      run: /root/vitastor/tests/test_nfs_long_readdir.sh
-    - name: Print logs
-      if: always() && steps.test.outcome == 'failure'
-      run: |
-        for i in /root/vitastor/testdata/*.log /root/vitastor/testdata/*.txt; do
-          echo "-------- $i --------"
-          cat $i
-          echo ""
-        done
-
   test_write_encrypted:
     runs-on: ubuntu-latest
     needs: build

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8...3.30)
 
 project(vitastor)
 
-set(VITASTOR_VERSION "3.1.0")
+set(VITASTOR_VERSION "3.0.9")
 
 include(CTest)
 

README-ru.md

@@ -73,7 +73,6 @@ Vitastor поддерживает QEMU-драйвер, протоколы UBLK,
   - [NBD](docs/usage/nbd.ru.md) - старый интерфейс для монтирования ядром
   - [QEMU, qemu-img и VDUSE](docs/usage/qemu.ru.md)
   - [NFS](docs/usage/nfs.ru.md) кластерная файловая система и псевдо-ФС прокси
-  - [Безопасность](docs/usage/security.ru.md)
   - [Администрирование](docs/usage/admin.ru.md)
 - Производительность
   - [Понимание сути производительности](docs/performance/understanding.ru.md)

README.md

@@ -73,7 +73,6 @@ Read more details in the documentation. You can start from here: [Quick Start](d
   - [NBD](docs/usage/nbd.en.md) - old interface for kernel mounts
   - [QEMU, qemu-img and VDUSE](docs/usage/qemu.en.md)
   - [NFS](docs/usage/nfs.en.md) clustered file system and pseudo-FS proxy
-  - [Security](docs/usage/security.en.md)
   - [Administration](docs/usage/admin.en.md)
 - Performance
   - [Understanding storage performance](docs/performance/understanding.en.md)

csi/Makefile

@@ -1,4 +1,4 @@
-VITASTOR_VERSION ?= v3.1.0
+VITASTOR_VERSION ?= v3.0.9
 
 all: build push
 

csi/deploy/004-csi-nodeplugin.yaml

@@ -49,7 +49,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          image: vitalif/vitastor-csi:v3.1.0
+          image: vitalif/vitastor-csi:v3.0.9
           args:
             - "--node=$(NODE_ID)"
             - "--endpoint=$(CSI_ENDPOINT)"

csi/deploy/007-csi-provisioner.yaml

@@ -121,7 +121,7 @@ spec:
             privileged: true
             capabilities:
               add: ["SYS_ADMIN"]
-          image: vitalif/vitastor-csi:v3.1.0
+          image: vitalif/vitastor-csi:v3.0.9
           args:
             - "--node=$(NODE_ID)"
             - "--endpoint=$(CSI_ENDPOINT)"

csi/src/config.go

@@ -5,7 +5,7 @@ package vitastor
 
 const (
     vitastorCSIDriverName    = "csi.vitastor.io"
-    vitastorCSIDriverVersion = "3.1.0"
+    vitastorCSIDriverVersion = "3.0.9"
 )
 
 // Config struct fills the parameters of request or user input

csi/src/controllerserver.go

@@ -27,6 +27,7 @@ const (
     MB int64 = 1024 * KB
     GB int64 = 1024 * MB
     TB int64 = 1024 * GB
+    ETCD_TIMEOUT time.Duration = 15*time.Second
 )
 
 type InodeIndex struct
@@ -686,7 +687,7 @@ func (cs *ControllerServer) ControllerExpandVolume(ctx context.Context, req *csi
 
     return &csi.ControllerExpandVolumeResponse{
         CapacityBytes: int64(inodeCfg[0].Size),
-        NodeExpansionRequired: true,
+        NodeExpansionRequired: false,
     }, nil
 }
 

csi/src/nodeserver.go

@@ -754,7 +754,7 @@ func (ns *NodeServer) mountNFS(ctxVars map[string]string) (string, error)
     // Mount NFS
     _, _, err = system(
         "mount", "-t", "nfs", "127.0.0.1:/", state.Path,
-        "-o", fmt.Sprintf("port=%d,mountport=%d,nfsvers=3,soft,sync,nolock,tcp", port, port),
+        "-o", fmt.Sprintf("port=%d,mountport=%d,nfsvers=3,soft,nolock,tcp", port, port),
     )
     if (err != nil)
     {
@@ -1030,131 +1030,10 @@ func (ns *NodeServer) NodeGetVolumeStats(ctx context.Context, req *csi.NodeGetVo
     return nil, status.Error(codes.Unimplemented, "")
 }
 
-// NodeExpandVolume expands the block device and, for filesystem volumes, the filesystem on the node
+// NodeExpandVolume expanding the file system on the node
 func (ns *NodeServer) NodeExpandVolume(ctx context.Context, req *csi.NodeExpandVolumeRequest) (*csi.NodeExpandVolumeResponse, error)
 {
-    klog.Infof("received node expand volume request %+v", protosanitizer.StripSecrets(req))
-    if (req == nil)
-    {
-        return nil, status.Error(codes.InvalidArgument, "request cannot be empty")
-    }
-    if (req.VolumeId == "")
-    {
-        return nil, status.Error(codes.InvalidArgument, "VolumeId is required")
-    }
-
-    ctxVars := make(map[string]string)
-    err := json.Unmarshal([]byte(req.VolumeId), &ctxVars)
-    if (err != nil)
-    {
-        return nil, status.Error(codes.Internal, "volume ID not in JSON format")
-    }
-    volName := ctxVars["name"]
-
-    if (ctxVars["vitastorfs"] != "")
-    {
-        // VitastorFS CSI volumes are NFS-backed and currently don't have per-volume quotas to resize here.
-        return &csi.NodeExpandVolumeResponse{CapacityBytes: req.GetCapacityRange().GetRequiredBytes()}, nil
-    }
-
-    ns.lockVolume(ctxVars["configPath"]+":block:"+volName)
-    defer ns.unlockVolume(ctxVars["configPath"]+":block:"+volName)
-
-    targetPath := req.GetStagingTargetPath()
-    if (targetPath == "")
-    {
-        targetPath = req.GetVolumePath()
-    }
-    if (targetPath == "")
-    {
-        return nil, status.Error(codes.InvalidArgument, "VolumePath or StagingTargetPath is required")
-    }
-
-    devicePath, err := GetDeviceNameFromMount(targetPath)
-    if (err != nil)
-    {
-        if (os.IsNotExist(err))
-        {
-            return nil, status.Error(codes.NotFound, "Target path not found")
-        }
-        return nil, err
-    }
-    if (devicePath == "")
-    {
-        return nil, status.Errorf(codes.NotFound, "%s is not a mountpoint", targetPath)
-    }
-    if (devicePath[0] != '/')
-    {
-        return nil, status.Errorf(codes.Internal, "failed to resolve device for %s: %s", targetPath, devicePath)
-    }
-    if (len(devicePath) < 5 || devicePath[0:5] != "/dev/")
-    {
-        // NodeExpandVolume may be called with the published target path. For block volumes it is
-        // usually a bind mount of the staging target, so resolve one more mount layer if needed.
-        var realDevicePath string
-        realDevicePath, err = GetDeviceNameFromMount(devicePath)
-        if (err == nil && realDevicePath != "")
-        {
-            devicePath = realDevicePath
-        }
-    }
-
-    // All newest Vitastor driver versions (nbd, ublk and vduse) support online resize.
-    // So all we need to do is just wait a bit until the device is resized by the driver.
-    requiredBytes := req.GetCapacityRange().GetRequiredBytes()
-    if (requiredBytes > 0)
-    {
-        timeout := 30
-        var actualSize uint64
-        var err error
-        for i := 0; i < timeout && actualSize < requiredBytes; i++
-        {
-            actualSize, err = GetBlockDeviceSize(devicePath)
-            if (err != nil)
-            {
-                return nil, err
-            }
-            time.Sleep(1 * time.Second)
-        }
-        if (actualSize < requiredBytes)
-        {
-            return nil, status.Error(codes.NotFound, "Failed to wait for online resize of %s to %v bytes: actual size is still %v after %v seconds",
-                devicePath, requiredBytes, actualSize, timeout)
-        }
-    }
-
-    isBlock := req.GetVolumeCapability().GetBlock() != nil
-    if (isBlock)
-    {
-        return &csi.NodeExpandVolumeResponse{CapacityBytes: requiredBytes}, nil
-    }
-
-    diskMounter := &mount.SafeFormatAndMount{Interface: ns.mounter, Exec: utilexec.New()}
-    fsType := req.GetVolumeCapability().GetMount().GetFsType()
-    if (fsType == "")
-    {
-        fsType, err = diskMounter.GetDiskFormat(devicePath)
-        if (err != nil)
-        {
-            return nil, err
-        }
-    }
-
-    switch (fsType)
-    {
-        case "ext4":
-            _, err = systemCombined("resize2fs", devicePath)
-        case "xfs":
-            _, err = systemCombined("xfs_growfs", targetPath)
-        default:
-            return nil, status.Errorf(codes.InvalidArgument, "unsupported filesystem for resize: %s", fsType)
-    }
-    if (err != nil)
-    {
-        return nil, err
-    }
-
-    return &csi.NodeExpandVolumeResponse{CapacityBytes: requiredBytes}, nil
+    return nil, status.Error(codes.Unimplemented, "")
 }
 
 // NodeGetCapabilities returns the supported capabilities of the node server
@@ -1169,13 +1048,6 @@ func (ns *NodeServer) NodeGetCapabilities(ctx context.Context, req *csi.NodeGetC
                     },
                 },
             },
-            &csi.NodeServiceCapability{
-                Type: &csi.NodeServiceCapability_Rpc{
-                    Rpc: &csi.NodeServiceCapability_RPC{
-                        Type: csi.NodeServiceCapability_RPC_EXPAND_VOLUME,
-                    },
-                },
-            },
         },
     }, nil
 }

csi/src/utils.go

@@ -20,7 +20,6 @@ import (
 
     "google.golang.org/grpc/codes"
     "google.golang.org/grpc/status"
-    "golang.org/x/sys/unix"
 )
 
 type MountMethod int
@@ -520,22 +519,3 @@ func GetDeviceNameFromMount(mountPath string) (string, error)
 
     return device, nil
 }
-
-func GetBlockDeviceSize(devicePath string) (uint64, error)
-{
-    file, err := os.Open(devicePath)
-    if (err != nil)
-    {
-        return 0, err
-    }
-    defer file.Close()
-
-    // BLKGETSIZE64 returns the size in bytes as a uint64/int64
-    size, err := unix.IoctlGetInt(int(file.Fd()), unix.BLKGETSIZE64)
-    if (err != nil)
-    {
-        return 0, fmt.Errorf("ioctl BLKGETSIZE64 failed: %w", err)
-    }
-
-    return uint64(size), nil
-}

debian/changelog

@@ -1,4 +1,4 @@
-vitastor (3.1.0-1) unstable; urgency=medium
+vitastor (3.0.9-1) unstable; urgency=medium
 
   * Bugfixes
 

debian/rules

@@ -11,7 +11,6 @@ override_dh_install:
 	cp -v node-binding/package.json node-binding/index.js node-binding/addon.cc node-binding/addon.h node-binding/client.cc node-binding/client.h debian/tmp/usr/lib/x86_64-linux-gnu/nodejs/vitastor
 	cp -v node-binding/build/Release/addon.node debian/tmp/usr/lib/x86_64-linux-gnu/nodejs/vitastor/build/Release
 	dh_install
-	cd debian/vitastor-mon/usr/lib/vitastor/mon && npm install --production
 
 override_dh_installdeb:
 	cat debian/fio_version >> debian/vitastor-fio.substvars

debian/vitastor-build.sh

@@ -37,6 +37,12 @@ rm -rf a b
 
 echo "dep:fio=$FIO" > debian/fio_version
 
+cd /root/vitastor/packages/vitastor-$REL/vitastor-$VER
+mkdir mon/node_modules
+cd mon/node_modules
+curl -s https://git.yourcmc.ru/vitalif/antietcd/archive/master.tar.gz | tar -zx
+curl -s https://git.yourcmc.ru/vitalif/tinyraft/archive/master.tar.gz | tar -zx
+
 cd /root/vitastor/packages/vitastor-$REL
 if [[ ( "$REL" = "trixie" || "$REL" = "resolute" ) && -e ../vitastor-bookworm/vitastor_$VER.orig.tar.xz ]]; then
     # Fucking shit, archives differ between bookworm (xz 5.4.1) and trixie (xz 5.8.1)

debian/vitastor-buildenv.Dockerfile

@@ -14,18 +14,18 @@ WORKDIR /root
 RUN set -e -x; \
     if [ "$REL" = "buster" ]; then \
         perl -i -pe 's/deb.debian.org/archive.debian.org/' /etc/apt/sources.list; \
+        apt-get update; \
+        apt-get -y install wget; \
+        wget https://vitastor.io/debian/pubkey.gpg -O /etc/apt/trusted.gpg.d/vitastor.gpg; \
+        echo "deb https://vitastor.io/debian $REL main" >> /etc/apt/sources.list; \
     fi; \
-    apt-get update; \
-    apt-get -y install wget; \
-    wget https://vitastor.io/debian/pubkey.gpg -O /etc/apt/trusted.gpg.d/vitastor.gpg; \
-    echo "deb https://vitastor.io/debian $REL main" >> /etc/apt/sources.list; \
     grep '^deb ' /etc/apt/sources.list | perl -pe 's/^deb/deb-src/' >> /etc/apt/sources.list; \
     perl -i -pe 's/Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/*.sources || true; \
     echo 'APT::Install-Recommends false;' >> /etc/apt/apt.conf; \
     echo 'APT::Install-Suggests false;' >> /etc/apt/apt.conf
 
 RUN apt-get update && \
-    apt-get -y install fio libgoogle-perftools-dev devscripts libjerasure-dev cmake libc-ares-dev libisal-crypto-dev \
-        libibverbs-dev librdmacm-dev libisal-dev libnl-3-dev libnl-genl-3-dev libssl-dev curl nodejs npm node-nan node-bindings && \
+    apt-get -y install fio libgoogle-perftools-dev devscripts libjerasure-dev cmake libc-ares-dev \
+        libibverbs-dev librdmacm-dev libisal-dev libnl-3-dev libnl-genl-3-dev curl nodejs npm node-nan node-bindings && \
     apt-get -y build-dep fio && \
     apt-get --download-only source fio

debian/vitastor-client.install

@@ -4,8 +4,6 @@ usr/bin/vitastor-rm
 usr/bin/vitastor-nbd
 usr/bin/vitastor-ublk
 usr/bin/vitastor-nfs
-usr/sbin/mount.vitastorfs
-usr/sbin/mount.vitastorblk
 usr/bin/vitastor-kv
 usr/bin/vitastor-kv-stress
 usr/lib/*/libvitastor*.so*

docker/Makefile

@@ -1,4 +1,4 @@
-VITASTOR_VERSION ?= v3.1.0
+VITASTOR_VERSION ?= v3.0.9
 
 all: build push
 

docker/etc/systemd/system/vitastor-etcd.service

@@ -12,7 +12,12 @@ EnvironmentFile=/etc/vitastor/etcd.conf
 SyslogIdentifier=etcd
 ExecStart=bash -c 'docker run --rm -i -v /var/lib/vitastor/etcd:/data \
     --log-driver none --network host $CONTAINER_OPTIONS --name vitastor-etcd \
-    $ETCD_IMAGE /usr/local/bin/etcd --data-dir /data
+    $ETCD_IMAGE /usr/local/bin/etcd --name "$ETCD_NAME" --data-dir /data \
+    --snapshot-count 10000 --advertise-client-urls http://$ETCD_IP:2379 --listen-client-urls http://$ETCD_IP:2379 \
+    --initial-advertise-peer-urls http://$ETCD_IP:2380 --listen-peer-urls http://$ETCD_IP:2380 \
+    --initial-cluster-token vitastor-etcd-1 --initial-cluster "$ETCD_INITIAL_CLUSTER" \
+    --initial-cluster-state new --max-txn-ops=100000 --max-request-bytes=104857600 \
+    --auto-compaction-retention=10 --auto-compaction-mode=revision'
 ExecStop=docker stop vitastor-etcd
 Restart=always
 StartLimitInterval=0

docker/etc/vitastor/docker.conf

@@ -4,7 +4,7 @@
 #
 
 # Desired Vitastor version
-VITASTOR_VERSION=v3.1.0
+VITASTOR_VERSION=v3.0.9
 
 # Additional arguments for all containers
 # For example, you may want to specify a custom logging driver here

docker/etc/vitastor/etcd.conf

@@ -1 +1,4 @@
 ETCD_IMAGE=quay.io/coreos/etcd:v3.5.18
+ETCD_NAME=""
+ETCD_IP=""
+ETCD_INITIAL_CLUSTER=""

docs/config/monitor.en.md

@@ -50,9 +50,6 @@ or antietcd_data_dir options). All other antietcd parameters
 cluster, cluster_key, persist_filter, stale_read can also be set in
 Vitastor configuration with `antietcd_` prefix.
 
-See also: [antietcd_cert](security.en.md#antietcd_cert),
-[antietcd_key](security.en.md#antietcd_key) and [etcd_proxy](security.en.md#etcd_proxyurls).
-
 You can dump/load data to or from antietcd using Antietcd `anticli` tool:
 
 ```

docs/config/monitor.ru.md

@@ -50,9 +50,6 @@ antietcd_data_file или antietcd_data_dir). Все остальные пара
 node_id, cluster, cluster_key, persist_filter, stale_read также можно задавать
 в конфигурации Vitastor с префиксом `antietcd_`.
 
-Смотрите также настройки [antietcd_cert](security.ru.md#antietcd_cert),
-[antietcd_key](security.ru.md#antietcd_key) и [etcd_proxy](security.ru.md#etcd_proxyurls).
-
 Вы можете выгружать/загружать данные в или из antietcd с помощью его инструмента
 `anticli`:
 

docs/config/security.en.md

@@ -10,37 +10,13 @@ These parameters affect your Vitastor installation security and apply to OSDs, m
 
 Most of them can be set in /etc/vitastor/vitastor.conf and in etcd, but don't support online modification.
 
-All certificate and private key parameters mentioned may contain a path to a PEM file or just
-a PEM string with certificate or a private key. In the latter case, the string must begin with
-"-----BEGIN CERTIFICATE-----" or "-----BEGIN PRIVATE KEY-----".
-
-- [use_perms](#use_perms)
-- [cert](#cert)
-- [pkey](#pkey)
-- [etcd_ca](#etcd_ca)
-- [client_ca](#client_ca)
-- [admin_ca](#admin_ca)
-- [osd_ca](#osd_ca)
-- [mon_ca](#mon_ca)
-- [antietcd_cert](#antietcd_cert)
-- [antietcd_key](#antietcd_key)
-- [etcd_proxy.urls](#etcd_proxyurls)
-- [etcd_proxy.cert](#etcd_proxycert)
-- [etcd_proxy.key](#etcd_proxykey)
-- [etcd_proxy.ca](#etcd_proxyca)
-- [osd_cert](#osd_cert)
-- [osd_pkey](#osd_pkey)
-- [api_cert](#api_cert)
-- [api_pkey](#api_pkey)
 - [etcd_client_cert](#etcd_client_cert)
 - [etcd_client_key](#etcd_client_key)
+- [etcd_ca](#etcd_ca)
 - [osd_etcd_client_cert](#osd_etcd_client_cert)
 - [osd_etcd_client_key](#osd_etcd_client_key)
 - [mon_etcd_client_cert](#mon_etcd_client_cert)
 - [mon_etcd_client_key](#mon_etcd_client_key)
-- [proto_checksums](#proto_checksums)
-- [force_proto_checksums](#force_proto_checksums)
-- [max_cipher_pool_size](#max_cipher_pool_size)
 - [vault_url](#vault_url)
 - [vault_secret_api_path](#vault_secret_api_path)
 - [vault_client_cert](#vault_client_cert)
@@ -49,201 +25,54 @@ a PEM string with certificate or a private key. In the latter case, the string m
 - [vault_timeout_ms](#vault_timeout_ms)
 - [vault_error_timeout_sec](#vault_error_timeout_sec)
 - [vault_refresh_leeway_sec](#vault_refresh_leeway_sec)
-
-## use_perms
-
-- Type: boolean
-- Default: false
-
-Enable client permissions in a Vitastor cluster, including Antietcd built into the Monitor.
-Requires configured encryption. Also note that separate Antietcd requires separate configuration
-to use permissions (see [security documentation](../usage/security.en.md) for details).
-
-## cert
-
-- Type: string
-
-Client certificate of the current Vitastor user. Required for Vitastor protocol encryption.
-Must be signed with [client_ca](#client_ca). Also used as the client certificate for etcd/Antietcd
-connections by default.
-
-## pkey
-
-- Type: string
-
-Private key of the current Vitastor user.
-
-## etcd_ca
-
-- Type: string
-
-Trusted TLS CA to verify etcd server certificate. Or just the etcd server's
-certificate itself - it's fine to use it for etcd_ca.
-
-## client_ca
-
-- Type: string
-
-Trusted TLS CA to verify Vitastor client certificates.
-Mandatory for Vitastor protocol encryption.
-
-## admin_ca
-
-- Type: string
-
-Trusted TLS CA to verify Vitastor administrator certificates.
-
-## osd_ca
-
-- Type: string
-
-Trusted TLS CA to verify Vitastor OSD certificates. Also mandatory for Vitastor protocol
-encryption. Must be different from client_ca. May be equal to osd_cert - different OSDs
-don't require separate certificates at the moment because their permissions don't differ.
-
-## mon_ca
-
-- Type: string
-
-Trusted TLS CA to verify Vitastor Monitor certificates. Used only for separate Antietcd,
-not required when a monitor built-in Antietcd is used. May be equal to mon_client_etcd_cert.
-
-## antietcd_cert
-
-- Type: string
-
-Server TLS certificate for Antietcd built into the Monitor.
-
-## antietcd_key
-
-- Type: string
-
-Private key for antietcd_cert.
-
-## etcd_proxy.urls
-
-- Type: string or array of strings
-
-etcd URLs for Antietcd etcd proxy mode.
-See [Mon as Etcd proxy](../usage/security.en.md#mon-as-etcd-proxy) for details.
-
-## etcd_proxy.cert
-
-- Type: string
-
-Client certificate for Antietcd connections to etcd in proxy mode.
-
-## etcd_proxy.key
-
-- Type: string
-
-Private key for etcd_proxy.cert.
-
-## etcd_proxy.ca
-
-- Type: string
-
-Trusted TLS CA to verify etcd server certificate when connecting to it from Antietcd.
-
-## osd_cert
-
-- Type: string
-
-Vitastor OSD server certificate. Required for Vitastor protocol encryption. May be equal
-to [osd_ca](#osd_ca) - all OSDs share the same permission set for now. Also used as the client
-certificate for connections from OSD to etcd/Antietcd by default.
-
-## osd_pkey
-
-- Type: string
-
-Private key for osd_cert.
-
-## api_cert
-
-- Type: string
-
-Server TLS certificate for [vitastor-cli serve](../usage/cli.en.md#serve) API server.
-
-## api_pkey
-
-- Type: string
-
-Private key for api_cert.
+- [max_aes_xts_pool_size](#max_aes_xts_pool_size)
 
 ## etcd_client_cert
 
 - Type: string
 
-Client TLS certificate to use for connections from Vitastor clients to etcd/Antietcd if you don't want
-to use the common client certificate [cert](#cert).
+Client TLS certificate to use for Vitastor client (not OSD and not monitor)
+etcd https connections. May be path to a file or just a PEM string with certificate.
+In the latter case, string must begin with "-----BEGIN CERTIFICATE-----".
 
 ## etcd_client_key
 
 - Type: string
 
-Private key for etcd_client_cert.
+Private key for etcd_client_cert (also a file or a PEM string).
+
+## etcd_ca
+
+- Type: string
+
+Trusted TLS CA to verify etcd server certificate. May be path to a file,
+directory or just a PEM string with certificate.
 
 ## osd_etcd_client_cert
 
 - Type: string
 
-Client TLS certificate to use for connections from Vitastor OSDs to etcd/Antietcd if you don't want
-to use the common OSD certificate [osd_cert](#osd_cert).
+Same as [etcd_client_cert](#etcd_client_cert), but only for OSDs.
+OSDs, clients and monitors should have different permissions, so they should
+use different certificates.
 
 ## osd_etcd_client_key
 
 - Type: string
 
-Private key for osd_etcd_client_cert.
+Same as [etcd_client_key](#etcd_client_key), but only for OSDs.
 
 ## mon_etcd_client_cert
 
 - Type: string
 
-Client TLS certificate to use for connections from Vitastor Monitors to etcd/Antietcd - required
-if you don't use the built-in Antietcd. In case you use it Monitor has direct access to Antietcd data
-and doesn't require any connection.
+Same as [etcd_client_cert](#etcd_client_cert), but only for Vitastor monitors.
 
 ## mon_etcd_client_key
 
 - Type: string
 
-Private key for mon_etcd_client_cert.
-
-## proto_checksums
-
-- Type: string
-- Default: payload
-
-One of "full", "payload", "gcm", "none":
-- "full" means calculate and verify transport level checksums from the full message data
-  including the header - recommended for unencrypted setups.
-- "payload" enables checksums only for the actual read/write data, but skips them for message
-  headers - recommended for encrypted setups because headers are already protected by AES-GCM.
-- "gcm" disables checksums and enables AES-GCM encryption of the whole messages including headers
-  and data - AES-GCM already includes MAC which is actually a stronger checksum. This option is
-  slower and is only recommended for untrusted networks.
-- "none" disables transport level checksums at all.
-
-## force_proto_checksums
-
-- Type: string
-
-To allow older clients to connect to a Vitastor cluster with enabled checksums, Vitastor OSDs
-allow clients to downgrade their proto_checksums by default. force_proto_checksums sets the
-minimum security level allowed for connecting clients. When encryption is disabled, default
-force_proto_checksums is none and clients without checksums are allowed. With enabled
-encryption, force_proto_checksums becomes "payload" by default to block unauthenticated data
-on the transport level.
-
-## max_cipher_pool_size
-
-- Type: integer
-- Default: 256
-
-Maximum number of OpenSSL cipher contexts cached in OSD memory, counted separately
-for each cipher and for encryption/decryption. Probably doesn't require modification.
+Same as [etcd_client_key](#etcd_client_key), but only for Vitastor monitors.
 
 ## vault_url
 
@@ -274,14 +103,14 @@ Vault v1 secret API mount path to use.
 
 - Type: string
 
-Client TLS certificate to use for Vault connections if you don't want to use the common Vitastor
-client certificate [cert](#cert) which is also used for Vault connections by default.
+Client TLS certificate to use for Vault connections. Just like [etcd_client_cert](#etcd_client_cert),
+may be path to a file or just a certificate in PEM string.
 
 ## vault_client_key
 
 - Type: string
 
-Private key for the vault_client_cert certificate.
+Private key for vault_client_cert (also a file or a PEM string).
 
 ## vault_ca
 
@@ -311,3 +140,11 @@ Time (in seconds) to wait before retrying after receiving an error from Vault.
 
 Extra time (in seconds) before real Vault token lease_timeout to refresh it, just
 in case of system clock drift.
+
+## max_aes_xts_pool_size
+
+- Type: integer
+- Default: 256
+
+Maximum number of OpenSSL encryption contexts cached in OSD memory. Probably
+doesn't require modification.

docs/config/security.ru.md

@@ -12,37 +12,13 @@ OSD, мониторами и клиентами.
 Большая их часть может задаваться в /etc/vitastor/vitastor.conf и в etcd, но не
 поддерживает онлайн-изменение.
 
-Все параметры сертификатов и закрытых ключей могут быть путём к файлу или просто
-строкой с сертификатом в формате PEM. В последнем случае строка должна начинаться с
-"-----BEGIN CERTIFICATE-----" или "-----BEGIN PRIVATE KEY-----".
-
-- [use_perms](#use_perms)
-- [cert](#cert)
-- [pkey](#pkey)
-- [etcd_ca](#etcd_ca)
-- [client_ca](#client_ca)
-- [admin_ca](#admin_ca)
-- [osd_ca](#osd_ca)
-- [mon_ca](#mon_ca)
-- [antietcd_cert](#antietcd_cert)
-- [antietcd_key](#antietcd_key)
-- [etcd_proxy.urls](#etcd_proxyurls)
-- [etcd_proxy.cert](#etcd_proxycert)
-- [etcd_proxy.key](#etcd_proxykey)
-- [etcd_proxy.ca](#etcd_proxyca)
-- [osd_cert](#osd_cert)
-- [osd_pkey](#osd_pkey)
-- [api_cert](#api_cert)
-- [api_pkey](#api_pkey)
 - [etcd_client_cert](#etcd_client_cert)
 - [etcd_client_key](#etcd_client_key)
+- [etcd_ca](#etcd_ca)
 - [osd_etcd_client_cert](#osd_etcd_client_cert)
 - [osd_etcd_client_key](#osd_etcd_client_key)
 - [mon_etcd_client_cert](#mon_etcd_client_cert)
 - [mon_etcd_client_key](#mon_etcd_client_key)
-- [proto_checksums](#proto_checksums)
-- [force_proto_checksums](#force_proto_checksums)
-- [max_cipher_pool_size](#max_cipher_pool_size)
 - [vault_url](#vault_url)
 - [vault_secret_api_path](#vault_secret_api_path)
 - [vault_client_cert](#vault_client_cert)
@@ -51,205 +27,56 @@ OSD, мониторами и клиентами.
 - [vault_timeout_ms](#vault_timeout_ms)
 - [vault_error_timeout_sec](#vault_error_timeout_sec)
 - [vault_refresh_leeway_sec](#vault_refresh_leeway_sec)
+- [max_aes_xts_pool_size](#max_aes_xts_pool_size)
 
-## use_perms
-
-- Тип: булево (да/нет)
-- Значение по умолчанию: false
-
-Включает клиентские привилегии в кластере Vitastor, в том числе во встроенном в мониторе Antietcd.
-Требует настроенного шифрования протокола. Также обратите внимание, что отдельно установленный Antietcd
-требует отдельной настройки привилегий (подробности смотрите в [документации безопасности](../usage/security.ru.md)).
-
-## cert
+## etcd_client_cert
 
 - Тип: строка
 
-Клиентский сертификат текущего пользователя Vitastor. Требуется для шифрования протокола Vitastor.
-Должен быть подписан [client_ca](#client_ca). Также по умолчанию используется как клиентский
-сертификат для подключения к etcd/Antietcd и Vault.
+Клиентский TLS сертификат для https-подключений к etcd для клиентов Vitastor
+(не OSD и не мониторов). Может быть путём к файлу или просто строкой с
+сертификатом в формате PEM. В последнем случае строка должна начинаться с
+"-----BEGIN CERTIFICATE-----".
 
-## pkey
+## etcd_client_key
 
 - Тип: строка
 
-Закрытый ключ текущего пользователя Vitastor.
+Закрытый ключ для сертификата etcd_client_cert (также путь к файлу или PEM строка).
 
 ## etcd_ca
 
 - Тип: строка
 
 Доверенный корневой TLS-сертификат для проверки сертификата сервера etcd.
-Либо же просто сам сертификат сервера etcd - его можно использовать как etcd_ca.
-
-## client_ca
-
-- Тип: строка
-
-Доверенный TLS-сертификат для проверки сертификатов клиентов Vitastor.
-Требуется для шифрования протокола Vitastor.
-
-## admin_ca
-
-- Тип: строка
-
-Доверенный TLS-сертификат для проверки сертификатов администраторов Vitastor.
-
-## osd_ca
-
-- Тип: строка
-
-Доверенный TLS-сертификат для проверки сертификатов OSD Vitastor. Также обязателен
-для шифрования протокола Vitastor. Должен отличаться от client_ca. Может быть равен
-osd_cert - разные OSD не требуют разных сертификатов, потому что на данный момент
-привилегии разных OSD никак не отличаются.
-
-## mon_ca
-
-- Тип: строка
-
-Доверенный TLS-сертификат для проверки сертификатов мониторов Vitastor. Используется
-только отдельно установленным Antietcd, не требуется при использовании встроенного в монитор
-Antietcd. Может быть равен mon_client_etcd_cert.
-
-## antietcd_cert
-
-- Тип: строка
-
-Серверный TLS-сертификат для Antietcd, встроенного в монитор.
-
-## antietcd_key
-
-- Тип: строка
-
-Закрытый ключ для сертификата antietcd_cert.
-
-## etcd_proxy.urls
-
-- Тип: строка или массив строк
-
-Адреса etcd для режима Antietcd etcd-прокси.
-Смотрите подробности в разделе [Mon в роли Etcd proxy](../usage/security.ru.md#mon-в-роли-etcd-proxy).
-
-## etcd_proxy.cert
-
-- Тип: строка
-
-Клиентский сертификат для подключений от Antietcd к etcd в режиме прокси.
-
-## etcd_proxy.key
-
-- Тип: строка
-
-Закрытый ключ для сертификата etcd_proxy.cert.
-
-## etcd_proxy.ca
-
-- Тип: строка
-
-Доверенный TLS-сертификат для проверки сертификата сервера etcd при подключениях от Antietcd.
-
-## osd_cert
-
-- Тип: строка
-
-Сертификат сервера Vitastor OSD. Требуется для шифрования протокола Vitastor. Может быть равен
-[osd_ca](#osd_ca) - все OSD на данный момент имеют одинаковые привилегии. Также по умолчанию
-используется как клиентский сертификат для подключения от OSD к etcd/Antietcd.
-
-## osd_pkey
-
-- Тип: строка
-
-Закрытый ключ для сертификата osd_cert.
-
-## api_cert
-
-- Тип: строка
-
-Серверный TLS-сертификат для API-сервера [vitastor-cli serve](../usage/cli.ru.md#serve).
-
-## api_pkey
-
-- Тип: строка
-
-Закрытый ключ для сертификата api_cert.
-
-## etcd_client_cert
-
-- Тип: строка
-
-Клиентский TLS сертификат для подключений от клиентов Vitastor к etcd/Antietcd, если вы не хотите
-использовать общий клиентский сертификат [cert](#cert).
-
-## etcd_client_key
-
-- Тип: строка
-
-Закрытый ключ для сертификата etcd_client_cert.
+Может быть путём к файлу, директории или просто строкой с сертификатом в
+формате PEM.
 
 ## osd_etcd_client_cert
 
 - Тип: строка
 
-Клиентский TLS сертификат для подключений от Vitastor OSD к etcd/Antietcd, если вы не хотите
-использовать общий сертификат OSD [osd_cert](#osd_cert).
+Аналогично [etcd_client_cert](#etcd_client_cert), но только для OSD.
+OSD, клиенты и мониторы должны иметь разные привилегии, поэтому они должны
+использовать разные сертификаты.
 
 ## osd_etcd_client_key
 
 - Тип: строка
 
-Закрытый ключ для сертификата osd_etcd_client_cert.
+Аналогично [etcd_client_key](#etcd_client_key), но только для OSD.
 
 ## mon_etcd_client_cert
 
 - Тип: строка
 
-Клиентский TLS сертификат для подключений от мониторов Vitastor к etcd/Antietcd - требуется, если
-вы не используете встроенный в монитор Antietcd. Если вы используете его, то монитор и так имеет
-прямой доступ к данным Antietcd и не требует никаких соединений.
+Аналогично [etcd_client_cert](#etcd_client_cert), но только для мониторов Vitastor.
 
 ## mon_etcd_client_key
 
 - Тип: строка
 
-Закрытый ключ для сертификата mon_etcd_client_cert.
-
-## proto_checksums
-
-- Тип: строка
-- Значение по умолчанию: payload
-
-Одно из значений "full", "payload", "gcm" и "none":
-- "full" означает расчёт и проверку контрольных сумм на транспортном уровне от полных сообщений,
-  включая их заголовки и данные - рекомендуется для кластеров без шифрования.
-- "payload" включает контрольные суммы только для данных сообщений, но пропускает заголовки -
-  такая настройка рекомендуется для кластеров с включённым шифрованием, потому что в них заголовки
-  и так защищены шифрованием AES-GCM.
-- "gcm" отключает контрольные суммы и включает шифрование полных сообщений включая заголовки и
-  данные - AES-GCM уже включает в себя MAC, который по сути является криптостойкой контрольной
-  суммой. Такая настройка медленнее и рекомендуется только для недоверенных сетей.
-- "none" полностью отключает контрольные суммы на транспортном уровне.
-
-## force_proto_checksums
-
-- Тип: строка
-
-Чтобы старые клиенты Vitastor могли подключаться к кластеру с включёнными контрольными
-суммами, Vitastor OSD по умолчанию разрешают клиентам отключать контрольные суммы
-данных (proto_checksums). Настройка force_proto_checksums задаёт минимальный уровень
-безопасности, разрешённый для подключающихся клиентов. Когда шифрование отключено,
-force_proto_checksums по умолчанию равно none и подключения клиентов без контрольных
-сумм разрешаются. При включённом шифровании значение по умолчанию force_proto_checksums
-становится "payload", чтобы блокировать подключения с неаутентифицированными данными.
-
-## max_cipher_pool_size
-
-- Тип: целое число
-- Значение по умолчанию: 256
-
-Максимальное количество кэшируемых в памяти OSD контекстов шифра OpenSSL, учитываемое
-отдельно для каждого шифра и для шифрования и расшифровки. Вряд ли требует изменения.
+Аналогично [etcd_client_key](#etcd_client_key), но только для мониторов Vitastor.
 
 ## vault_url
 
@@ -279,14 +106,14 @@ force_proto_checksums по умолчанию равно none и подключ
 
 - Тип: строка
 
-Клиентский TLS сертификат для подключений к Vault на тот случай, если вы не хотите использовать
-общий сертификат клиента Vitastor [cert](#cert), используемый для подключений к Vault по умолчанию.
+Клиентский TLS сертификат для подключений к Vault. Как и [etcd_client_cert](#etcd_client_cert),
+может быть путём к файлу или просто PEM-строкой с сертификатом.
 
 ## vault_client_key
 
 - Тип: строка
 
-Закрытый ключ для сертификата vault_client_cert.
+Закрытый ключ для сертификата vault_client_cert (также путь к файлу или PEM строка).
 
 ## vault_ca
 
@@ -317,3 +144,11 @@ force_proto_checksums по умолчанию равно none и подключ
 
 Зазор времени (в секундах), чтобы обновлять токены Vault чуть раньше их реального
 lease_timeout, на случай "ухода" системных часов.
+
+## max_aes_xts_pool_size
+
+- Тип: целое число
+- Значение по умолчанию: 256
+
+Максимальное количество кэшируемых в памяти OSD контекстов шифрования OpenSSL.
+Вряд ли требует изменения.

docs/config/src/included.en.md

@@ -66,8 +66,6 @@
 
 {{../../usage/nfs.en.md}}
 
-{{../../usage/security.en.md}}
-
 {{../../usage/admin.en.md}}
 
 ## Performance

docs/config/src/included.ru.md

@@ -66,8 +66,6 @@
 
 {{../../usage/nfs.ru.md}}
 
-{{../../usage/security.ru.md}}
-
 {{../../usage/admin.ru.md}}
 
 ## Производительность

docs/config/src/make.js

@@ -64,7 +64,7 @@ for (const file of params_files)
         let out = '\n';
         for (const c of cfg)
         {
-            out += `\n- [${c.name}](#${c.name.replace(/\./g, '')})`;
+            out += `\n- [${c.name}](#${c.name})`;
         }
         for (const c of cfg)
         {

docs/config/src/monitor.yml

@@ -21,9 +21,6 @@
     cluster, cluster_key, persist_filter, stale_read can also be set in
     Vitastor configuration with `antietcd_` prefix.
 
-    See also: [antietcd_cert](security.en.md#antietcd_cert),
-    [antietcd_key](security.en.md#antietcd_key) and [etcd_proxy](security.en.md#etcd_proxyurls).
-
     You can dump/load data to or from antietcd using Antietcd `anticli` tool:
 
     ```
@@ -50,9 +47,6 @@
     node_id, cluster, cluster_key, persist_filter, stale_read также можно задавать
     в конфигурации Vitastor с префиксом `antietcd_`.
 
-    Смотрите также настройки [antietcd_cert](security.ru.md#antietcd_cert),
-    [antietcd_key](security.ru.md#antietcd_key) и [etcd_proxy](security.ru.md#etcd_proxyurls).
-
     Вы можете выгружать/загружать данные в или из antietcd с помощью его инструмента
     `anticli`:
 

docs/config/src/security.en.md

@@ -3,7 +3,3 @@
 These parameters affect your Vitastor installation security and apply to OSDs, monitors and clients.
 
 Most of them can be set in /etc/vitastor/vitastor.conf and in etcd, but don't support online modification.
-
-All certificate and private key parameters mentioned may contain a path to a PEM file or just
-a PEM string with certificate or a private key. In the latter case, the string must begin with
-"-----BEGIN CERTIFICATE-----" or "-----BEGIN PRIVATE KEY-----".

docs/config/src/security.ru.md

@@ -5,7 +5,3 @@ OSD, мониторами и клиентами.
 
 Большая их часть может задаваться в /etc/vitastor/vitastor.conf и в etcd, но не
 поддерживает онлайн-изменение.
-
-Все параметры сертификатов и закрытых ключей могут быть путём к файлу или просто
-строкой с сертификатом в формате PEM. В последнем случае строка должна начинаться с
-"-----BEGIN CERTIFICATE-----" или "-----BEGIN PRIVATE KEY-----".

docs/config/src/security.yml

@@ -1,209 +1,49 @@
-- name: use_perms
-  type: bool
-  default: false
-  info: |
-    Enable client permissions in a Vitastor cluster, including Antietcd built into the Monitor.
-    Requires configured encryption. Also note that separate Antietcd requires separate configuration
-    to use permissions (see [security documentation](../usage/security.en.md) for details).
-  info_ru: |
-    Включает клиентские привилегии в кластере Vitastor, в том числе во встроенном в мониторе Antietcd.
-    Требует настроенного шифрования протокола. Также обратите внимание, что отдельно установленный Antietcd
-    требует отдельной настройки привилегий (подробности смотрите в [документации безопасности](../usage/security.ru.md)).
-- name: cert
-  type: string
-  info: |
-    Client certificate of the current Vitastor user. Required for Vitastor protocol encryption.
-    Must be signed with [client_ca](#client_ca). Also used as the client certificate for etcd/Antietcd
-    connections by default.
-  info_ru: |
-    Клиентский сертификат текущего пользователя Vitastor. Требуется для шифрования протокола Vitastor.
-    Должен быть подписан [client_ca](#client_ca). Также по умолчанию используется как клиентский
-    сертификат для подключения к etcd/Antietcd и Vault.
-- name: pkey
-  type: string
-  info: Private key of the current Vitastor user.
-  info_ru: Закрытый ключ текущего пользователя Vitastor.
-- name: etcd_ca
-  type: string
-  info: |
-    Trusted TLS CA to verify etcd server certificate. Or just the etcd server's
-    certificate itself - it's fine to use it for etcd_ca.
-  info_ru: |
-    Доверенный корневой TLS-сертификат для проверки сертификата сервера etcd.
-    Либо же просто сам сертификат сервера etcd - его можно использовать как etcd_ca.
-- name: client_ca
-  type: string
-  info: |
-    Trusted TLS CA to verify Vitastor client certificates.
-    Mandatory for Vitastor protocol encryption.
-  info_ru: |
-    Доверенный TLS-сертификат для проверки сертификатов клиентов Vitastor.
-    Требуется для шифрования протокола Vitastor.
-- name: admin_ca
-  type: string
-  info: |
-    Trusted TLS CA to verify Vitastor administrator certificates.
-  info_ru: |
-    Доверенный TLS-сертификат для проверки сертификатов администраторов Vitastor.
-- name: osd_ca
-  type: string
-  info: |
-    Trusted TLS CA to verify Vitastor OSD certificates. Also mandatory for Vitastor protocol
-    encryption. Must be different from client_ca. May be equal to osd_cert - different OSDs
-    don't require separate certificates at the moment because their permissions don't differ.
-  info_ru: |
-    Доверенный TLS-сертификат для проверки сертификатов OSD Vitastor. Также обязателен
-    для шифрования протокола Vitastor. Должен отличаться от client_ca. Может быть равен
-    osd_cert - разные OSD не требуют разных сертификатов, потому что на данный момент
-    привилегии разных OSD никак не отличаются.
-- name: mon_ca
-  type: string
-  info: |
-    Trusted TLS CA to verify Vitastor Monitor certificates. Used only for separate Antietcd,
-    not required when a monitor built-in Antietcd is used. May be equal to mon_client_etcd_cert.
-  info_ru: |
-    Доверенный TLS-сертификат для проверки сертификатов мониторов Vitastor. Используется
-    только отдельно установленным Antietcd, не требуется при использовании встроенного в монитор
-    Antietcd. Может быть равен mon_client_etcd_cert.
-- name: antietcd_cert
-  type: string
-  info: Server TLS certificate for Antietcd built into the Monitor.
-  info_ru: Серверный TLS-сертификат для Antietcd, встроенного в монитор.
-- name: antietcd_key
-  type: string
-  info: Private key for antietcd_cert.
-  info_ru: Закрытый ключ для сертификата antietcd_cert.
-- name: etcd_proxy.urls
-  type: string or array of strings
-  type_ru: строка или массив строк
-  info: |
-    etcd URLs for Antietcd etcd proxy mode.
-    See [Mon as Etcd proxy](../usage/security.en.md#mon-as-etcd-proxy) for details.
-  info_ru: |
-    Адреса etcd для режима Antietcd etcd-прокси.
-    Смотрите подробности в разделе [Mon в роли Etcd proxy](../usage/security.ru.md#mon-в-роли-etcd-proxy).
-- name: etcd_proxy.cert
-  type: string
-  info: Client certificate for Antietcd connections to etcd in proxy mode.
-  info_ru: Клиентский сертификат для подключений от Antietcd к etcd в режиме прокси.
-- name: etcd_proxy.key
-  type: string
-  info: Private key for etcd_proxy.cert.
-  info_ru: Закрытый ключ для сертификата etcd_proxy.cert.
-- name: etcd_proxy.ca
-  type: string
-  info: Trusted TLS CA to verify etcd server certificate when connecting to it from Antietcd.
-  info_ru: Доверенный TLS-сертификат для проверки сертификата сервера etcd при подключениях от Antietcd.
-- name: osd_cert
-  type: string
-  info: |
-    Vitastor OSD server certificate. Required for Vitastor protocol encryption. May be equal
-    to [osd_ca](#osd_ca) - all OSDs share the same permission set for now. Also used as the client
-    certificate for connections from OSD to etcd/Antietcd by default.
-  info_ru: |
-    Сертификат сервера Vitastor OSD. Требуется для шифрования протокола Vitastor. Может быть равен
-    [osd_ca](#osd_ca) - все OSD на данный момент имеют одинаковые привилегии. Также по умолчанию
-    используется как клиентский сертификат для подключения от OSD к etcd/Antietcd.
-- name: osd_pkey
-  type: string
-  info: Private key for osd_cert.
-  info_ru: Закрытый ключ для сертификата osd_cert.
-- name: api_cert
-  type: string
-  info: Server TLS certificate for [vitastor-cli serve](../usage/cli.en.md#serve) API server.
-  info_ru: Серверный TLS-сертификат для API-сервера [vitastor-cli serve](../usage/cli.ru.md#serve).
-- name: api_pkey
-  type: string
-  info: Private key for api_cert.
-  info_ru: Закрытый ключ для сертификата api_cert.
 - name: etcd_client_cert
   type: string
   info: |
-    Client TLS certificate to use for connections from Vitastor clients to etcd/Antietcd if you don't want
-    to use the common client certificate [cert](#cert).
+    Client TLS certificate to use for Vitastor client (not OSD and not monitor)
+    etcd https connections. May be path to a file or just a PEM string with certificate.
+    In the latter case, string must begin with "-----BEGIN CERTIFICATE-----".
   info_ru: |
-    Клиентский TLS сертификат для подключений от клиентов Vitastor к etcd/Antietcd, если вы не хотите
-    использовать общий клиентский сертификат [cert](#cert).
+    Клиентский TLS сертификат для https-подключений к etcd для клиентов Vitastor
+    (не OSD и не мониторов). Может быть путём к файлу или просто строкой с
+    сертификатом в формате PEM. В последнем случае строка должна начинаться с
+    "-----BEGIN CERTIFICATE-----".
 - name: etcd_client_key
   type: string
-  info: Private key for etcd_client_cert.
-  info_ru: Закрытый ключ для сертификата etcd_client_cert.
+  info: Private key for etcd_client_cert (also a file or a PEM string).
+  info_ru: Закрытый ключ для сертификата etcd_client_cert (также путь к файлу или PEM строка).
+- name: etcd_ca
+  type: string
+  info: |
+    Trusted TLS CA to verify etcd server certificate. May be path to a file,
+    directory or just a PEM string with certificate.
+  info_ru: |
+    Доверенный корневой TLS-сертификат для проверки сертификата сервера etcd.
+    Может быть путём к файлу, директории или просто строкой с сертификатом в
+    формате PEM.
 - name: osd_etcd_client_cert
   type: string
   info: |
-    Client TLS certificate to use for connections from Vitastor OSDs to etcd/Antietcd if you don't want
-    to use the common OSD certificate [osd_cert](#osd_cert).
+    Same as [etcd_client_cert](#etcd_client_cert), but only for OSDs.
+    OSDs, clients and monitors should have different permissions, so they should
+    use different certificates.
   info_ru: |
-    Клиентский TLS сертификат для подключений от Vitastor OSD к etcd/Antietcd, если вы не хотите
-    использовать общий сертификат OSD [osd_cert](#osd_cert).
+    Аналогично [etcd_client_cert](#etcd_client_cert), но только для OSD.
+    OSD, клиенты и мониторы должны иметь разные привилегии, поэтому они должны
+    использовать разные сертификаты.
 - name: osd_etcd_client_key
   type: string
-  info: Private key for osd_etcd_client_cert.
-  info_ru: Закрытый ключ для сертификата osd_etcd_client_cert.
+  info: Same as [etcd_client_key](#etcd_client_key), but only for OSDs.
+  info_ru: Аналогично [etcd_client_key](#etcd_client_key), но только для OSD.
 - name: mon_etcd_client_cert
   type: string
-  info: |
-    Client TLS certificate to use for connections from Vitastor Monitors to etcd/Antietcd - required
-    if you don't use the built-in Antietcd. In case you use it Monitor has direct access to Antietcd data
-    and doesn't require any connection.
-  info_ru: |
-    Клиентский TLS сертификат для подключений от мониторов Vitastor к etcd/Antietcd - требуется, если
-    вы не используете встроенный в монитор Antietcd. Если вы используете его, то монитор и так имеет
-    прямой доступ к данным Antietcd и не требует никаких соединений.
+  info: Same as [etcd_client_cert](#etcd_client_cert), but only for Vitastor monitors.
+  info_ru: Аналогично [etcd_client_cert](#etcd_client_cert), но только для мониторов Vitastor.
 - name: mon_etcd_client_key
   type: string
-  info: Private key for mon_etcd_client_cert.
-  info_ru: Закрытый ключ для сертификата mon_etcd_client_cert.
-- name: proto_checksums
-  type: string
-  default: payload
-  info: |
-    One of "full", "payload", "gcm", "none":
-    - "full" means calculate and verify transport level checksums from the full message data
-      including the header - recommended for unencrypted setups.
-    - "payload" enables checksums only for the actual read/write data, but skips them for message
-      headers - recommended for encrypted setups because headers are already protected by AES-GCM.
-    - "gcm" disables checksums and enables AES-GCM encryption of the whole messages including headers
-      and data - AES-GCM already includes MAC which is actually a stronger checksum. This option is
-      slower and is only recommended for untrusted networks.
-    - "none" disables transport level checksums at all.
-  info_ru: |
-    Одно из значений "full", "payload", "gcm" и "none":
-    - "full" означает расчёт и проверку контрольных сумм на транспортном уровне от полных сообщений,
-      включая их заголовки и данные - рекомендуется для кластеров без шифрования.
-    - "payload" включает контрольные суммы только для данных сообщений, но пропускает заголовки -
-      такая настройка рекомендуется для кластеров с включённым шифрованием, потому что в них заголовки
-      и так защищены шифрованием AES-GCM.
-    - "gcm" отключает контрольные суммы и включает шифрование полных сообщений включая заголовки и
-      данные - AES-GCM уже включает в себя MAC, который по сути является криптостойкой контрольной
-      суммой. Такая настройка медленнее и рекомендуется только для недоверенных сетей.
-    - "none" полностью отключает контрольные суммы на транспортном уровне.
-- name: force_proto_checksums
-  type: string
-  info: |
-    To allow older clients to connect to a Vitastor cluster with enabled checksums, Vitastor OSDs
-    allow clients to downgrade their proto_checksums by default. force_proto_checksums sets the
-    minimum security level allowed for connecting clients. When encryption is disabled, default
-    force_proto_checksums is none and clients without checksums are allowed. With enabled
-    encryption, force_proto_checksums becomes "payload" by default to block unauthenticated data
-    on the transport level.
-  info_ru: |
-    Чтобы старые клиенты Vitastor могли подключаться к кластеру с включёнными контрольными
-    суммами, Vitastor OSD по умолчанию разрешают клиентам отключать контрольные суммы
-    данных (proto_checksums). Настройка force_proto_checksums задаёт минимальный уровень
-    безопасности, разрешённый для подключающихся клиентов. Когда шифрование отключено,
-    force_proto_checksums по умолчанию равно none и подключения клиентов без контрольных
-    сумм разрешаются. При включённом шифровании значение по умолчанию force_proto_checksums
-    становится "payload", чтобы блокировать подключения с неаутентифицированными данными.
-- name: max_cipher_pool_size
-  type: int
-  default: 256
-  info: |
-    Maximum number of OpenSSL cipher contexts cached in OSD memory, counted separately
-    for each cipher and for encryption/decryption. Probably doesn't require modification.
-  info_ru: |
-    Максимальное количество кэшируемых в памяти OSD контекстов шифра OpenSSL, учитываемое
-    отдельно для каждого шифра и для шифрования и расшифровки. Вряд ли требует изменения.
+  info: Same as [etcd_client_key](#etcd_client_key), but only for Vitastor monitors.
+  info_ru: Аналогично [etcd_client_key](#etcd_client_key), но только для мониторов Vitastor.
 - name: vault_url
   type: string
   info: |
@@ -241,15 +81,15 @@
 - name: vault_client_cert
   type: string
   info: |
-    Client TLS certificate to use for Vault connections if you don't want to use the common Vitastor
-    client certificate [cert](#cert) which is also used for Vault connections by default.
+    Client TLS certificate to use for Vault connections. Just like [etcd_client_cert](#etcd_client_cert),
+    may be path to a file or just a certificate in PEM string.
   info_ru: |
-    Клиентский TLS сертификат для подключений к Vault на тот случай, если вы не хотите использовать
-    общий сертификат клиента Vitastor [cert](#cert), используемый для подключений к Vault по умолчанию.
+    Клиентский TLS сертификат для подключений к Vault. Как и [etcd_client_cert](#etcd_client_cert),
+    может быть путём к файлу или просто PEM-строкой с сертификатом.
 - name: vault_client_key
   type: string
-  info: Private key for the vault_client_cert certificate.
-  info_ru: Закрытый ключ для сертификата vault_client_cert.
+  info: Private key for vault_client_cert (also a file or a PEM string).
+  info_ru: Закрытый ключ для сертификата vault_client_cert (также путь к файлу или PEM строка).
 - name: vault_ca
   type: string
   info: |
@@ -280,3 +120,12 @@
   info_ru: |
     Зазор времени (в секундах), чтобы обновлять токены Vault чуть раньше их реального
     lease_timeout, на случай "ухода" системных часов.
+- name: max_aes_xts_pool_size
+  type: int
+  default: 256
+  info: |
+    Maximum number of OpenSSL encryption contexts cached in OSD memory. Probably
+    doesn't require modification.
+  info_ru: |
+    Максимальное количество кэшируемых в памяти OSD контекстов шифрования OpenSSL.
+    Вряд ли требует изменения.

docs/installation/docker.en.md

@@ -26,9 +26,9 @@ at Vitastor Kubernetes operator: https://github.com/Antilles7227/vitastor-operat
 The instruction is very simple.
 
 1. Download a Docker image of the desired version: \
-   `docker pull vitalif/vitastor:v3.1.0`
+   `docker pull vitalif/vitastor:v3.0.9`
 2. Install scripts to the host system: \
-   `docker run --rm -it -v /etc:/host-etc -v /usr/bin:/host-bin vitalif/vitastor:v3.1.0 install.sh`
+   `docker run --rm -it -v /etc:/host-etc -v /usr/bin:/host-bin vitalif/vitastor:v3.0.9 install.sh`
 3. Reload udev rules: \
    `udevadm control --reload-rules`
 4. Enable the vitastor-host service: \

docs/installation/docker.ru.md

@@ -25,9 +25,9 @@ Vitastor можно установить в Docker/Podman. При этом etcd,
 Инструкция по установке максимально простая.
 
 1. Скачайте Docker-образ желаемой версии: \
-   `docker pull vitalif/vitastor:v3.1.0`
+   `docker pull vitalif/vitastor:v3.0.9`
 2. Установите скрипты в хост-систему командой: \
-   `docker run --rm -it -v /etc:/host-etc -v /usr/bin:/host-bin vitalif/vitastor:v3.1.0 install.sh`
+   `docker run --rm -it -v /etc:/host-etc -v /usr/bin:/host-bin vitalif/vitastor:v3.0.9 install.sh`
 3. Перезагрузите правила udev: \
    `udevadm control --reload-rules`
 4. Включите сервис vitastor-host: \

docs/installation/packages.en.md

@@ -14,9 +14,12 @@
   - Debian 13 (Trixie/Sid): `deb https://vitastor.io/debian trixie main`
   - Debian 12 (Bookworm): `deb https://vitastor.io/debian bookworm main`
   - Debian 11 (Bullseye): `deb https://vitastor.io/debian bullseye main`
-  - Ubuntu 26.04 (Resolute): `deb https://vitastor.io/debian resolute main`
-  - Ubuntu 24.04 (Noble): `deb https://vitastor.io/debian noble main`
+  - Debian 10 (Buster): `deb https://vitastor.io/debian buster main`
   - Ubuntu 22.04 (Jammy): `deb https://vitastor.io/debian jammy main`
+  - Ubuntu 24.04 (Noble): `deb https://vitastor.io/debian noble main`
+  - Ubuntu 26.04 (Resolute): `deb https://vitastor.io/debian resolute main`
+  - Add `-oldstable` to bookworm/bullseye/buster in this line to install the last
+    stable version from 0.9.x branch instead of 1.x
 - To always prefer vitastor-patched QEMU and Libvirt versions, add the following to `/etc/apt/preferences`:
   ```
   Package: *
@@ -28,14 +31,17 @@
 ## CentOS
 
 - Add Vitastor package repository:
+  - CentOS 7: `yum install https://vitastor.io/rpms/centos/7/vitastor-release.rpm`
   - CentOS 8: `dnf install https://vitastor.io/rpms/centos/8/vitastor-release.rpm`
   - AlmaLinux 9 and other RHEL 9 clones (Rocky, Oracle...): `dnf install https://vitastor.io/rpms/centos/9/vitastor-release.rpm`
   - AlmaLinux 10 and other RHEL 10 clones: `dnf install https://vitastor.io/rpms/centos/10/vitastor-release.rpm`
 - Enable EPEL: `yum/dnf install epel-release`
 - Enable additional CentOS repositories:
+  - CentOS 7: `yum install centos-release-scl`
   - CentOS 8: `dnf install centos-release-advanced-virtualization`
   - RHEL 9/10 clones: not required
 - Enable elrepo-kernel:
+  - CentOS 7: `yum install https://www.elrepo.org/elrepo-release-7.el7.elrepo.noarch.rpm`
   - CentOS 8: `dnf install https://www.elrepo.org/elrepo-release-8.el8.elrepo.noarch.rpm`
   - RHEL 9 clones: `dnf install https://www.elrepo.org/elrepo-release-9.el9.elrepo.noarch.rpm`
   - RHEL 10 clones: not required

docs/installation/packages.ru.md

@@ -14,9 +14,12 @@
   - Debian 13 (Trixie/Sid): `deb https://vitastor.io/debian trixie main`
   - Debian 12 (Bookworm): `deb https://vitastor.io/debian bookworm main`
   - Debian 11 (Bullseye): `deb https://vitastor.io/debian bullseye main`
-  - Ubuntu 26.04 (Resolute): `deb https://vitastor.io/debian resolute main`
-  - Ubuntu 24.04 (Noble): `deb https://vitastor.io/debian noble main`
+  - Debian 10 (Buster): `deb https://vitastor.io/debian buster main`
   - Ubuntu 22.04 (Jammy): `deb https://vitastor.io/debian jammy main`
+  - Ubuntu 24.04 (Noble): `deb https://vitastor.io/debian noble main`
+  - Ubuntu 26.04 (Resolute): `deb https://vitastor.io/debian resolute main`
+  - Добавьте `-oldstable` к слову bookworm/bullseye/buster в этой строке, чтобы
+    установить последнюю стабильную версию из ветки 0.9.x вместо 1.x
 - Чтобы всегда предпочитались версии пакетов QEMU и Libvirt с патчами Vitastor, добавьте в `/etc/apt/preferences`:
   ```
   Package: *
@@ -28,14 +31,17 @@
 ## CentOS
 
 - Добавьте в систему репозиторий Vitastor:
+  - CentOS 7: `yum install https://vitastor.io/rpms/centos/7/vitastor-release.rpm`
   - CentOS 8: `dnf install https://vitastor.io/rpms/centos/8/vitastor-release.rpm`
   - AlmaLinux 9 и другие клоны RHEL 9 (Rocky, Oracle...): `dnf install https://vitastor.io/rpms/centos/9/vitastor-release.rpm`
   - AlmaLinux 10 и другие клоны RHEL 10: `dnf install https://vitastor.io/rpms/centos/10/vitastor-release.rpm`
 - Включите EPEL: `yum/dnf install epel-release`
 - Включите дополнительные репозитории CentOS:
+  - CentOS 7: `yum install centos-release-scl`
   - CentOS 8: `dnf install centos-release-advanced-virtualization`
   - Клоны RHEL 9/10: не нужно
 - Включите elrepo-kernel:
+  - CentOS 7: `yum install https://www.elrepo.org/elrepo-release-7.el7.elrepo.noarch.rpm`
   - CentOS 8: `dnf install https://www.elrepo.org/elrepo-release-8.el8.elrepo.noarch.rpm`
   - Клоны RHEL 9: `dnf install https://www.elrepo.org/elrepo-release-9.el9.elrepo.noarch.rpm`
   - Клоны RHEL 10: не нужно

docs/installation/proxmox.en.md

@@ -6,10 +6,10 @@
 
 # Proxmox VE
 
-To enable Vitastor support in Proxmox Virtual Environment (7.x-9.x are supported):
+To enable Vitastor support in Proxmox Virtual Environment (6.4-9.x are supported):
 
 - Add the corresponding Vitastor Debian repository into sources.list on Proxmox hosts:
-  trixie for 9.0+, bookworm for 8.1+, pve8.0 for 8.0, bullseye for 7.4, pve7.3 for 7.3, pve7.2 for 7.2, pve7.1 for 7.1
+  trixie for 9.0+, bookworm for 8.1+, pve8.0 for 8.0, bullseye for 7.4, pve7.3 for 7.3, pve7.2 for 7.2, pve7.1 for 7.1, buster for 6.4
 - Install vitastor-client, pve-qemu-kvm, pve-storage-vitastor (* or see note) packages from Vitastor repository
 - Define storage in `/etc/pve/storage.cfg` (see below)
 - Block network access from VMs to Vitastor network (to OSDs and etcd),

docs/installation/proxmox.ru.md

@@ -6,10 +6,10 @@
 
 # Proxmox VE
 
-Чтобы подключить Vitastor к Proxmox Virtual Environment (поддерживаются версии 7.x-9.x):
+Чтобы подключить Vitastor к Proxmox Virtual Environment (поддерживаются версии 6.4-9.x):
 
 - Добавьте соответствующий Debian-репозиторий Vitastor в sources.list на хостах Proxmox:
-  trixie для 9.0+, bookworm для 8.1+, pve8.0 для 8.0, bullseye для 7.4, pve7.3 для 7.3, pve7.2 для 7.2, pve7.1 для 7.1
+  trixie для 9.0+, bookworm для 8.1+, pve8.0 для 8.0, bullseye для 7.4, pve7.3 для 7.3, pve7.2 для 7.2, pve7.1 для 7.1, buster для 6.4
 - Установите пакеты vitastor-client, pve-qemu-kvm, pve-storage-vitastor (* или см. сноску) из репозитория Vitastor
 - Определите тип хранилища в `/etc/pve/storage.cfg` (см. ниже)
 - Обязательно заблокируйте доступ от виртуальных машин к сети Vitastor (OSD и etcd), т.к. Vitastor (пока) не поддерживает аутентификацию

docs/installation/source.en.md

@@ -17,6 +17,7 @@
 - CMake
 - jerasure, c-ares headers and libraries
 - ISA-L, libibverbs, librdmacm, libnl3 headers and libraries (optional)
+- tcmalloc (google-perftools-dev)
 
 ## Basic instructions
 

docs/installation/source.ru.md

@@ -17,6 +17,7 @@
 - CMake
 - Заголовки и библиотеки jerasure, c-ares
 - Опционально - заголовки и библиотеки ISA-L, libibverbs, librdmacm, libnl3
+- tcmalloc (google-perftools-dev)
 
 ## Базовая инструкция
 

docs/intro/features.en.md

@@ -41,8 +41,8 @@
 - [Built-in Prometheus metric exporter](../config/monitor.en.md#enable_prometheus)
 - [NFS RDMA support](../usage/nfs.en.md#rdma) (probably also usable for GPUDirect)
 - [S3](../installation/s3.en.md)
-- [Full transport encryption and access control](../usage/security.en.md)
-- [AES-256-XTS end-to-end image encryption](../usage/security.en.md#end-to-end-image-data-encryption-aes-xts) with [Vault support](../usage/security.en.md#vaultopenbao-setup) for key storage
+- [TLS support for etcd connections](../config/security.en.md)
+- [AES-256-XTS image encryption](../usage/cli.en.md#create) and [Vault support](../config/security.en.md#vault_url) for key storage
 
 ## Plugins and tools
 

docs/intro/features.ru.md

@@ -43,8 +43,8 @@
 - [Встроенный Prometheus-экспортер метрик](../config/monitor.ru.md#enable_prometheus)
 - [Поддержка NFS RDMA](../usage/nfs.ru.md#rdma) (вероятно, также подходящая для GPUDirect)
 - [S3](../installation/s3.ru.md)
-- [Полное транспортное шифрование и контроль доступа](../usage/security.ru.md)
-- [AES-256-XTS сквозное шифрование данных](../usage/security.ru.md#сквозное-шифрование-данных-образов-aes-xts) с [поддержкой Vault](../usage/security.ru.md#настройка-vaultopenbao) для хранения ключей
+- [Поддержка TLS-соединений с etcd](../config/security.ru.md)
+- [AES-256-XTS шифрование данных](../usage/cli.ru.md#create) и [поддержка Vault](../config/security.ru.md#vault_url) для хранения ключей
 
 ## Драйверы и инструменты
 

docs/intro/quickstart.en.md

@@ -41,16 +41,12 @@
 ## Configure monitors
 
 On the monitor hosts:
-- Create minimal configuration in `/etc/vitastor/vitastor.conf`:
+- Put identical etcd_address into `/etc/vitastor/vitastor.conf`. Example:
   ```
   {
-    "etcd_address": ["http://10.200.1.10:2379","http://10.200.1.11:2379","http://10.200.1.12:2379"],
-    "osd_network": "10.200.1.0/24",
-    "use_perms": false
+    "etcd_address": ["10.200.1.10:2379","10.200.1.11:2379","10.200.1.12:2379"]
   }
   ```
-- Note that you can enable encryption by using `https://` and `use_perms` option.
-  [Details](security.en.md#quick-setup) about encryption setup with make-etcd.
 - Create systemd units for etcd by running: `/usr/lib/vitastor/mon/make-etcd`
   Or, if you installed Vitastor in Docker, run `systemctl start vitastor-host; docker exec vitastor make-etcd`.
 - Start etcd and monitors: `systemctl enable --now vitastor-etcd vitastor-mon`

docs/intro/quickstart.ru.md

@@ -41,23 +41,25 @@
 ## Настройте мониторы
 
 На хостах, выделенных под мониторы:
-- Создайте минимальную конфигурацию в `/etc/vitastor/vitastor.conf`:
+- Пропишите одинаковые etcd_address в `/etc/vitastor/vitastor.conf`. Например:
   ```
   {
-    "etcd_address": ["http://10.200.1.10:2379","http://10.200.1.11:2379","http://10.200.1.12:2379"],
-    "osd_network": "10.200.1.0/24",
-    "use_perms": false
+    "etcd_address": ["10.200.1.10:2379","10.200.1.11:2379","10.200.1.12:2379"]
   }
   ```
-- Обратите внимание, что с помощью схемы `https://` и опции `use_perms` можно включить шифрование.
-  [Подробно](security.ru.md#быстрая-настройка) о настройке шифрования через make-etcd.
 - Инициализируйте сервисы etcd, запустив `/usr/lib/vitastor/mon/make-etcd`.\
   Либо, если вы установили Vitastor в Docker, запустите `systemctl start vitastor-host; docker exec vitastor make-etcd`.
 - Запустите etcd и мониторы: `systemctl enable --now vitastor-etcd vitastor-mon`
 
 ## Настройте OSD
 
-- Создайте/скопируйте с узлов с мониторами файл конфигурации `/etc/vitastor/vitastor.conf`.
+- Пропишите etcd_address и [osd_network](../config/network.ru.md#osd_network) в `/etc/vitastor/vitastor.conf`. Например:
+  ```
+  {
+    "etcd_address": ["10.200.1.10:2379","10.200.1.11:2379","10.200.1.12:2379"],
+    "osd_network": "10.200.1.0/24"
+  }
+  ```
 - Инициализуйте OSD:
   - Только SSD или только HDD: `vitastor-disk prepare /dev/sdXXX [/dev/sdYYY ...]`.
     Если вы используете десктопные SSD без конденсаторов, добавьте опцию `--disable_data_fsync off`,

docs/usage/cli.en.md

@@ -33,11 +33,6 @@ It supports the following commands:
 - [modify-pool](#modify-pool)
 - [ls-pools](#ls-pools)
 - [rm-pool](#rm-pool)
-- [ls-user](#ls-user)
-- [modify-user](#modify-user)
-- [rm-user](#rm-user)
-- [serve](#serve)
-- [cpubench](#cpubench)
 
 Global options:
 
@@ -112,7 +107,6 @@ Options:
 --sort FIELD    Sort by specified field (name, size, used_size, <read|write|delete>_<iops|bps|lat|queue>)
 -r|--reverse    Sort in descending order
 -n|--count N    Only list first N items
---ids ID1,ID2   Only list images with specified full IDs
 --tree          Show image snapshot/clone tree
 ```
 
@@ -142,10 +136,6 @@ Create an image. Options:
 * `--enc-key random` - Generate a new random AES-256-XTS encryption key for the new image.
 * `--enc-key HEX` - Set a specified AES-256-XTS key (64 bytes in hex) for the new image.
 * `--enc-key vault:ID` - Use an encryption key from an external Vault secret with specified ID.
-* `--owner USERNAME` - Set image owner. The default owner is the current user taken from the
-  CN of the TLS certificate used to connect to the cluster.
-* `--owner-group NAME` - Set image owner group. Users in this group get full access to the image.
-* `--reader-group NAME` - Set image reader group. Users in this group get read-only access to the image.
 
 ```
 vitastor-cli create --snapshot <snapshot> [OPTIONS] <image>
@@ -175,9 +165,6 @@ You should resize file system in the image, if present, before shrinking it.
 * `-f|--force` - Proceed with shrinking or setting readwrite flag even if the image has children.
 * `--down-ok` - Proceed with shrinking even if some data will be left on unavailable OSDs.
 * `--enc-key HEX` - Change image encryption key (allowed only with `--force`).
-* `--owner USERNAME` - Change image owner.
-* `--owner-group NAME` - Change image owner group name.
-* `--reader-group NAME` - Change image reader group name.
 
 ## dd
 
@@ -433,7 +420,6 @@ Optional parameters:
 | `--used_for_app s3:<name>`     | Mark pool as used for S3 location with name `<name>`                       |
 | `--pg_stripe_size <number>`    | Increase object grouping stripe                                            |
 | `--max_osd_combinations 10000` | Maximum number of random combinations for LP solver input                  |
-| `--creator_group <group>`      | User group allowed to create images in this pool                           |
 | `--wait`                       | Wait for the new pool to come online                                       |
 | `-f` or `--force`              | Do not check that cluster has enough OSDs to create the pool               |
 
@@ -453,9 +439,8 @@ Modify an existing pool. Modifiable parameters:
 
 ```
 [-s|--pg_size <number>] [--pg_minsize <number>] [-n|--pg_count <count>]
-[--failure_domain <level>] [--root_node <node>] [--osd_tags <tags>] [--used_for_app <type>:<name>]
+[--failure_domain <level>] [--root_node <node>] [--osd_tags <tags>] [--no_inode_stats 0|1]
 [--max_osd_combinations <number>] [--primary_affinity_tags <tags>] [--scrub_interval <time>]
-[--level_placement <rules>] [--raw_placement <rules>] [--creator_group <group>]
 ```
 
 Non-modifiable parameters (changing them WILL lead to data loss):
@@ -483,7 +468,7 @@ Remove a pool. Refuses to remove pools with images without `--force`.
 
 ## ls-pools
 
-`vitastor-cli ls-pools|pool-ls|ls-pool|pools [-l] [--detail] [--sort FIELD] [-r] [-n N] [<glob> ...]`
+`vitastor-cli ls-pools|pool-ls|ls-pool|pools [-l] [--detail] [--sort FIELD] [-r] [-n N] [--stats] [<glob> ...]`
 
 List pools (only matching <glob> patterns if passed).
 
@@ -494,77 +479,3 @@ List pools (only matching <glob> patterns if passed).
 | `--sort FIELD`       | Sort by specified field (see fields in --json output) |
 | `-r` or `--reverse`  | Sort in descending order                              |
 | `-n` or `--count N`  | Only list first N items                               |
-
-## ls-user
-
-`vitastor-cli ls-users|user-ls|ls-user|list-users [<name> ...]`
-
-List users. If names are passed, only list users with those names. User names must
-match CN (Common Name) of TLS client certificates used to connect to the cluster.
-
-See [Users and access rights](security.en.md#users-and-access-rights) for details on
-the Vitastor authorization model.
-
-## modify-user
-
-`vitastor-cli modify-user --groups <group1,group2,...> <username>`
-
-Create or update a user with the given name (matching TLS certificate CN).
-
-Options:
-
-* `--groups GROUPS` - Set user's groups (comma-separated). Groups are used together with
-  `--owner-group` / `--reader-group` fields of images and `--creator_group` of the pool to
-  authorize operations. Pass an empty string to clear the groups.
-
-## rm-user
-
-`vitastor-cli rm-user|remove-user|delete-user <username>`
-
-Remove a user.
-
-## serve
-
-`vitastor-cli serve`
-
-Start an HTTP server that handles vitastor-cli commands over a REST API in JSON format.
-
-Options:
-
-| <!-- -->              | <!-- -->                                                                      |
-|-----------------------|-------------------------------------------------------------------------------|
-| `--bind_address ADDR` | Server IP address(es), separated by space. Default is `127.0.0.1`.            |
-| `--port 8080`         | Server port. Default is `8080`.                                               |
-| `--api_cert FILE`     | Server TLS certificate.                                                       |
-| `--api_pkey FILE`     | Private key for `--api_cert`.                                                 |
-| `--cert FILE`         | Administrator or client certificate used by the server to access the cluster. |
-| `--pkey FILE`         | Private key for `--cert`.                                                     |
-
-When `api_cert`/`api_pkey` are set the server operates in HTTPS mode. If `client_ca`
-is also set (in configuration or on the command line), connecting clients are authenticated by their
-TLS certificates. When [use_perms](../config/security.en.md#use_perms) is enabled, HTTPS with client
-authentication is mandatory and per-user permissions are enforced. For regular clients the server only
-allows operations on images that the user owns or has group access to; all other operations require
-administrator privileges.
-
-The vitastor-cli process itself must be authenticated as an admin user (its own client
-[cert](../config/security.en.md#cert) must be signed with [admin_ca](../config/security.en.md#admin_ca))
-to be able to serve all requests.
-
-`vitastor-cli serve` exposes a full OpenAPI specification at `/openapi` endpoint.
-Start the server and check it out for the information about available API methods.
-
-See also [Security in Vitastor](security.en.md) for the full picture of how authentication
-and authorization work.
-
-## cpubench
-
-`vitastor-cli cpubench [--json]`
-
-Run CPU crypto performance tests: AES-256-GCM, AES-256-XTS and xxhash3. This benchmark
-does not connect to the cluster — it only measures encryption/hashing speed locally.
-
-Specify `--json` to get the output as machine-readable JSON.
-
-See [Encryption performance](security.en.md#encryption-performance) for example results
-on modern and older CPUs.

docs/usage/cli.ru.md

@@ -34,11 +34,6 @@ vitastor-cli - интерфейс командной строки для адм
 - [modify-pool](#modify-pool)
 - [ls-pools](#ls-pools)
 - [rm-pool](#rm-pool)
-- [ls-user](#ls-user)
-- [modify-user](#modify-user)
-- [rm-user](#rm-user)
-- [serve](#serve)
-- [cpubench](#cpubench)
 
 Глобальные опции:
 
@@ -114,7 +109,6 @@ kaveri    2/1     32   0 B      10 G    0 B        100%    0%
 --sort FIELD    Сортировать по заданному полю (name, size, used_size, <read|write|delete>_<iops|bps|lat|queue>)
 -r|--reverse    Сортировать в обратном порядке
 -n|--count N    Показывать только первые N записей
---ids ID1,ID2   Показывать только образы с заданными полными ID
 --tree          Вывести снапшоты и клоны в виде дерева
 ```
 
@@ -144,12 +138,6 @@ bench-kaveri         kaveri    10 G  10 G    0 B/s  0     0      0 us  0 B/s  0
 * `--enc-key random` - Сгенерировать случайный ключ шифрования AES-256-XTS для нового образа.
 * `--enc-key HEX` - Установить заданный ключ AES-256-XTS (64 байта в hex) для нового образа.
 * `--enc-key vault:ID` - Использовать ключ из внешнего секрета с заданным ID из Vault.
-* `--owner USERNAME` - Задать владельца образа. По умолчанию владельцем становится текущий
-  пользователь, определяемый по CN TLS-сертификата, используемого для подключения к кластеру.
-* `--owner-group NAME` - Задать группу владельцев образа. Пользователи из этой группы получают
-  полный доступ к образу.
-* `--reader-group NAME` - Задать группу читателей образа. Пользователи из этой группы получают
-  доступ к образу только на чтение.
 
 ```
 vitastor-cli create --snapshot <snapshot> [ОПЦИИ] <image>
@@ -182,9 +170,6 @@ vitastor-cli snap-create [ОПЦИИ] <image>@<snapshot>
 * `-f|--force` - Разрешить уменьшение или перевод в чтение-запись образа, у которого есть клоны.
 * `--down-ok` - Разрешить уменьшение, даже если часть данных останется неудалённой на недоступных OSD.
 * `--enc-key HEX` - Изменить ключ шифрования образа (разрешено только с `--force`).
-* `--owner USERNAME` - Изменить владельца образа.
-* `--owner-group NAME` - Изменить имя группы владельцев образа.
-* `--reader-group NAME` - Изменить имя группы читателей образа.
 
 ## dd
 
@@ -450,7 +435,6 @@ OSD  PARENT            UP    SIZE  USED%    TAGS          WEIGHT  BLOCK  BITMAP
 | `--scrub_interval <time>`      | Включить скрабы с заданным интервалом времени (число + единица s/m/h/d/M/y) |
 | `--pg_stripe_size <number>`    | Увеличить блок группировки объектов по PG                                  |
 | `--max_osd_combinations 10000` | Максимальное число случайных комбинаций OSD для ЛП-солвера                 |
-| `--creator_group <group>`      | Группа пользователей, которым разрешено создавать образы в данном пуле     |
 | `--wait`                       | Подождать, пока новый пул будет активирован                                |
 | `-f` или `--force`             | Не проверять, что в кластере достаточно доменов отказа для создания пула   |
 
@@ -470,9 +454,8 @@ OSD  PARENT            UP    SIZE  USED%    TAGS          WEIGHT  BLOCK  BITMAP
 
 ```
 [-s|--pg_size <number>] [--pg_minsize <number>] [-n|--pg_count <count>]
-[--failure_domain <level>] [--root_node <node>] [--osd_tags <tags>] [--used_for_app <type>:<name>]
+[--failure_domain <level>] [--root_node <node>] [--osd_tags <tags>]
 [--max_osd_combinations <number>] [--primary_affinity_tags <tags>] [--scrub_interval <time>]
-[--level_placement <rules>] [--raw_placement <rules>] [--creator_group <group>]
 ```
 
 Неизменяемые параметры (их изменение ПРИВЕДЁТ к потере данных):
@@ -500,7 +483,7 @@ OSD  PARENT            UP    SIZE  USED%    TAGS          WEIGHT  BLOCK  BITMAP
 
 ## ls-pools
 
-`vitastor-cli ls-pools|pool-ls|ls-pool|pools [-l] [--detail] [--sort FIELD] [-r] [-n N] [<glob> ...]`
+`vitastor-cli ls-pools|pool-ls|ls-pool|pools [-l] [--detail] [--sort FIELD] [-r] [-n N] [--stats] [<glob> ...]`
 
 Показать список пулов. Если передан(ы) шаблон(ы) `<glob>`, то только с именами,
 соответствующими одному из шаблонов (стандартные ФС-шаблоны с * и ?).
@@ -512,79 +495,3 @@ OSD  PARENT            UP    SIZE  USED%    TAGS          WEIGHT  BLOCK  BITMAP
 | `--sort FIELD`        | Сортировать по заданному полю (поля см. в выводе с --json) |
 | `-r` или `--reverse`  | Сортировать в обратном порядке                             |
 | `-n` или `--count N`  | Выводить только первые N записей                           |
-
-## ls-user
-
-`vitastor-cli ls-users|user-ls|ls-user|list-users [<name> ...]`
-
-Показать список пользователей. Если переданы имена, показать только пользователей с указанными
-именами. Имена пользователей должны совпадать с CN (Common Name) TLS-сертификатов
-клиентов, используемых для подключения к кластеру.
-
-Подробнее о модели авторизации в Vitastor см. в разделе
-[Пользователи и права доступа](security.ru.md#пользователи-и-права-доступа).
-
-## modify-user
-
-`vitastor-cli modify-user --groups <group1,group2,...> <username>`
-
-Создать или изменить пользователя с указанным именем (совпадающим с CN TLS-сертификата).
-
-Опции:
-
-* `--groups GROUPS` - Задать группы пользователя (через запятую). Группы используются
-  вместе с полями `owner-group` / `reader-group` образов и полем `--creator_group` пулов
-  для авторизации операций. Пустая строка очищает список групп.
-
-## rm-user
-
-`vitastor-cli rm-user|remove-user|delete-user <username>`
-
-Удалить пользователя.
-
-## serve
-
-`vitastor-cli serve`
-
-Запустить HTTP-сервер, обрабатывающий команды vitastor-cli через REST API в формате JSON.
-
-Опции:
-
-| <!-- -->              | <!-- -->                                                                         |
-|-----------------------|----------------------------------------------------------------------------------|
-| `--bind_address ADDR` | IP-адрес(а) сервера через пробел. По умолчанию `127.0.0.1`.                      |
-| `--port 8080`         | Порт сервера. По умолчанию `8080`.                                               |
-| `--api_cert FILE`     | TLS-сертификат сервера.                                                          |
-| `--api_pkey FILE`     | Закрытый ключ для сертификата `--api_cert`.                                      |
-| `--cert FILE`         | Сертификат администратора/клиента, используемый сервером для доступа к кластеру. |
-| `--pkey FILE`         | Закрытый ключ для сертификата `--cert`.                                          |
-
-Если заданы `api_cert`/`api_pkey`, сервер работает в режиме HTTPS. Если дополнительно
-задан `client_ca` (в файле конфигурации или в командной строке), подключающиеся клиенты аутентифицируются
-по своим TLS-сертификатам. Если включена опция [use_perms](../config/security.ru.md#use_perms), HTTPS с
-аутентификацией клиентов обязателен, и права доступа проверяются для каждого пользователя. Обычным клиентам
-сервер разрешает только операции с образами, которыми они владеют или к которым имеют доступ через группы;
-остальные операции разрешены только администраторам.
-
-Сам процесс vitastor-cli при этом должен использовать сертификат администратора ([cert](../config/security.en.md#cert),
-подписанный [admin_ca](../config/security.en.md#admin_ca)), чтобы иметь возможность обслуживать
-все виды запросов.
-
-`vitastor-cli serve` выставляет полную OpenAPI-спецификацию по адресу `/openapi`.
-Запустите сервер и посмотрите её для подробной информации о доступных методах API.
-
-Смотрите также подробную информацию о том, как устроены аутентификация и авторизация:
-[Безопасность в Vitastor](security.ru.md).
-
-## cpubench
-
-`vitastor-cli cpubench [--json]`
-
-Запустить тесты производительности CPU для криптографических операций: AES-256-GCM,
-AES-256-XTS и xxhash3. Эта команда не обращается к кластеру — она только замеряет
-скорость шифрования/хеширования локально.
-
-Укажите опцию `--json`, чтобы получить вывод в машиночитаемом JSON-формате.
-
-Примеры вывода на современных и старых процессорах см. в разделе
-[Производительность шифрования](security.ru.md#производительность-шифрования).

docs/usage/nfs.en.md

@@ -8,27 +8,15 @@
 
 Vitastor has two file system implementations. Both can be used via `vitastor-nfs`.
 
+Commands:
+- [mount](#mount)
+- [start](#start)
+- [upgrade](#upgrade)
+- [defrag](#defrag)
+
 ⚠️ Important: follow the instructions from [Linux NFS write size](#linux-nfs-write-size)
 for optimal Vitastor NFS performance if you use EC and HDD and mount your NFS from Linux.
 
-- [Pseudo-FS](#pseudo-fs)
-- [VitastorFS](#vitastorfs)
-  - [Supported POSIX features](#supported-posix-features)
-  - [Limitations](#limitations)
-- [Linux NFS](#linux-nfs)
-  - [Sync vs async safety](#sync-vs-async-safety)
-  - [Linux NFS readahead](#linux-nfs-readahead)
-  - [Linux NFS write size](#linux-nfs-write-size)
-  - [Horizontal scaling](#horizontal-scaling)
-- [RDMA](#rdma)
-- [Commands](#commands)
-  - [mount](#mount)
-  - [start](#start)
-  - [upgrade](#upgrade)
-  - [defrag](#defrag)
-- [Mounting from /etc/fstab](#mounting-from-etc-fstab)
-- [Common options](#common-options)
-
 ## Pseudo-FS
 
 Simplified pseudo-FS proxy is used for file-based image access emulation. It's not
@@ -54,7 +42,7 @@ vitastor-nfs start --block --etcd_address 192.168.5.10:2379 --portmap 0 --port 2
 To mount the FS exported by this server, run:
 
 ```
-mount server:/ /mnt/ -o port=2050,mountport=2050,nfsvers=3,soft,sync,nolock,tcp
+mount server:/ /mnt/ -o port=2050,mountport=2050,nfsvers=3,soft,nolock,tcp
 ```
 
 ## VitastorFS
@@ -117,57 +105,7 @@ Other notable missing features which should be addressed in the future:
   in the DB. The FS is implemented is such way that this garbage doesn't affect its
   function, but having a tool to clean it up still seems a right thing to do.
 
-## Linux NFS
-
-Linux NFS client has some specific features of behaviour important for Vitastor:
-
-### Sync vs async safety
-
-Linux NFS has 2 options which affect the mount mode: **soft/hard** and **sync/async**.
-
-**⚠️ Warning: soft,async mode is dangerous and may lead to data loss!**
-
-How these options work:
-
-- In the **hard** mode all requests to the server are retried infinitely. If the NFS server becomes
-  unavailable, it becomes impossible to unmount the FS until you reboot the client host.
-- In the **soft** each request is only tried 2 times (default **retrans** option value for TCP connections).
-  In this case, unmounting a dead FS is possible.
-- In the **sync** mode all modification requests are sent to the server immediately. This is slower,
-  but allows the client to see all errors if they happen.
-- In the **async** mode, modification requests are accumulated and sent to the server in the background
-  mode in parallel. It is faster, but it can hide write errors from the client. Instead of receiving an
-  error from a write operation, the client will only get an error when he closes the file (unsuccessful
-  close() call). Another problem is that there's no convenient way to set write parallelism for NFS, so
-  the client can overload the server.
-
-That's exactly why **soft,async** is dangerous. When a large file is copied, the server is easily overwhelmed
-with write requests and starts to respond slowly. Write requests time out, soft mode retries them only 1 time
-and discards them, which results in parts of the file being lost.
-
-So to recap: always use either **soft,sync** mode, or **hard,async**. By default, `vitastor-nfs mount` uses
-**soft,sync** if mode options are not specified.
-
-### Linux NFS readahead
-
-By default, Linux uses rather small readahead value of 128 KB for NFS mounts.
-
-For simple reading/copuing of files it's way too low because it stops VitastorFS from
-using parallel reads.
-
-However, you can increase readahead. You have 3 options:
-
-1. Use the built-in `vitastor-nfs mount --readahead <SIZE>` option (for example, `--readahead 2M`).
-2. Edit `[nfsrahead]` section in `/etc/nfs.conf` - add `nfs=2048` in it (global setting for all NFS 3.0 mounts).
-3. Manually with the following command: \
-   `echo 2048 > /sys/class/bdi/$(findmnt -no MAJ:MIN /mnt/nfs 2>/dev/null | tr -d ' ')/read_ahead_kb`
-
-Here, `2048` is the desired readahead in KB, and `/mnt/nfs` is your FS mountpoint.
-
-You can easily see 2x-3x linear read improvement after you increase the parameter, so we
-really urge you to try increasing it!
-
-### Linux NFS write size
+## Linux NFS write size
 
 Linux NFS client (nfs/nfsv3/nfsv4 kernel modules) has a hard-coded maximum I/O size,
 currently set to 1 MB - see `rsize` and `wsize` in [man 5 nfs](https://linux.die.net/man/5/nfs).
@@ -223,7 +161,7 @@ modprobe nfsv3
 After these (not much complicated 🙂) manipulations NFS begins to be mounted
 with new wsize and rsize by default and it fixes Vitastor-NFS linear write performance.
 
-### Horizontal scaling
+## Horizontal scaling
 
 Linux NFS 3.0 client doesn't support built-in scaling or failover, i.e. you can't
 specify multiple server addresses when mounting the FS.
@@ -262,7 +200,6 @@ Use regular `umount <MOUNTPOINT>` to unmount the FS.
 The server will be automatically stopped when the FS is unmounted.
 
 - `-o|--options <OPT>` - Pass additional NFS mount options (ex.: -o async).
-- `--readahead <SIZE>` - Set Linux FS readahead to `<SIZE>`. Default is 128 KB, larger values increase sequential read speed (for example, try `--readahead 2M`).
 
 ### start
 
@@ -312,31 +249,6 @@ Options:
 | `--include-empty`          | Include old and empty volumes; make sure to restart NFS servers before using it |
 | `--no-rm`                  | Move, but do not delete data                                            |
 
-## Mounting from /etc/fstab
-
-Vitastor packages include mount helpers for `/etc/fstab`: **/usr/sbin/mount.vitastorfs** and **/usr/sbin/mount.vitastorblk**.
-
-Both are simple symbolic links to `vitastor-nfs` and allow to handle `mount` calls correctly.
-
-Example `/etc/fstab` entries:
-
-```
-myfs /S vitastorfs pool=fspool,readahead=2M,--etcd_address=10.0.2.15:2379,soft,sync 0 0
-none /mnt/vitastor-block vitastorblk pool=ecpool 0 0
-```
-
-When you run `mount /S`, the helper is called internally and starts VitastorFS.
-Helper call syntax is:
-
-```
-mount.vitastorfs <FSNAME> <MOUNTPOINT> -o <OPTS>
-```
-
-`<OPTS>` is comma-separated and includes all mount options from fstab. You can include
-both Vitastor and NFS mount options in it. An option is treated as an NFS option if it
-does not start with `--`, `pool=`, `readahead=` or if it doesn't contain `=` or `_`.
-Other options are treated as Vitastor options.
-
 ## Common options
 
 | <!-- -->           | <!-- -->                                                 |
@@ -350,4 +262,3 @@ Other options are treated as Vitastor options.
 | `--logfile <FILE>` | log to the specified file                                |
 | `--enforce 1`      | enforce permissions at the server side (no by default)   |
 | `--foreground 1`   | stay in foreground, do not daemonize                     |
-| `--trace`          | trace all NFS requests                                   |

docs/usage/nfs.ru.md

@@ -8,27 +8,15 @@
 
 В Vitastor есть две реализации файловой системы. Обе используются через `vitastor-nfs`.
 
+Команды:
+- [mount](#mount)
+- [start](#start)
+- [upgrade](#upgrade)
+- [defrag](#defrag)
+
 ⚠️ Важно: для оптимальной производительности Vitastor NFS в Linux при использовании
 HDD и EC (erasure кодов) выполните инструкции из раздела [Размер записи Linux NFS](#размер-записи-linux-nfs).
 
-- [Псевдо-ФС](#псевдо-фс)
-- [VitastorFS](#vitastorfs)
-  - [Поддерживаемые функции POSIX](#поддерживаемые-функции-posix)
-  - [Ограничения](#ограничения)
-- [NFS в Linux](#nfs-в-linux)
-  - [Безопасность режимов sync и async](#безопасность-режимов-sync-и-async)
-  - [Упреждающее чтение Linux NFS](#упреждающее-чтение-linux-nfs)
-  - [Размер записи Linux NFS](#размер-записи-linux-nfs)
-  - [Горизонтальное масштабирование](#горизонтальное-масштабирование)
-- [RDMA](#rdma)
-- [Команды](#команды)
-  - [mount](#mount)
-  - [start](#start)
-  - [upgrade](#upgrade)
-  - [defrag](#defrag)
-- [Монтирование из /etc/fstab](#монтирование-из-etc-fstab)
-- [Общие опции](#общие-опции)
-
 ## Псевдо-ФС
 
 Упрощённая реализация псевдо-ФС используется для эмуляции файлового доступа к блочным
@@ -54,7 +42,7 @@ vitastor-nfs start --block --etcd_address 192.168.5.10:2379 --portmap 0 --port 2
 Примонтировать ФС, запущенную с такими опциями, можно следующей командой:
 
 ```
-mount server:/ /mnt/ -o port=2050,mountport=2050,nfsvers=3,soft,sync,nolock,tcp
+mount server:/ /mnt/ -o port=2050,mountport=2050,nfsvers=3,soft,nolock,tcp
 ```
 
 ## VitastorFS
@@ -121,58 +109,7 @@ JSON-формате :-). Для инспекции содержимого БД
   записи. ФС устроена так, что на работу они не влияют, но для порядка и их стоит
   уметь подчищать.
 
-## NFS в Linux
-
-NFS в Linux имеет некоторые важные для Vitastor особенности поведения:
-
-### Безопасность режимов sync и async
-
-В Linux NFS есть 2 опции, влияющие на режим монтирования: **soft/hard** и **sync/async**.
-
-**⚠️ Внимание: сочетание soft,async опасно и может приводить к потере данных!**
-
-Логика работы опций:
-
-- В режиме **hard** все запросы к серверу повторяются бесконечно. Если NFS-сервер становится недоступен,
-  отмонтировать ФС становится невозможно до перезагрузки клиентской машины.
-- В режиме **soft** каждый запрос повторяется только 2 раза (значение опции **retrans** по умолчанию для
-  TCP соединений). В этом случае отмонтировать умершую ФС можно.
-- В режиме **sync** все запросы изменения отправляются на сервер сразу. Это медленнее, но зато любую
-  ошибку записи клиент видит сразу.
-- В режиме **async** запросы изменения накапливаются и отправляются на сервер в фоновом режиме, параллельно.
-  Это быстрее, но ошибки записи могут быть незаметны для клиента и вместо ошибки записи клиент может
-  получить ошибку в момент закрытия файла (вызова close()). Помимо этого, в NFS нет нормального способа
-  регулировать параллелизм записи, поэтому клиент может легко перегружать сервер большим количеством команд.
-
-Именно поэтому режим **soft,async** опасен. При копировании любого большого файла сервер перегружается и
-начинает медленно отвечать. Команды записи заканчиваются таймаутом, soft режим делает 1 повторную попытку,
-после чего забывает команды совсем. Часть блоков файла оказывается просто потерянной.
-
-Резюме: всегда используйте либо режим **soft,sync**, либо **hard,async**. Если опции `vitastor-nfs mount`
-не указаны, режим по умолчанию - **soft,sync**.
-
-### Упреждающее чтение Linux NFS
-
-По умолчанию Linux использует довольно небольшой размер упреждающего чтения для
-файловых систем NFS - 128 КБ.
-
-Для простого чтения/копирования файлов его не достаточно, потому что оно мешает VitastorFS
-нормально утилизировать параллелизм чтения.
-
-Однако, вы можете увеличить эту настройку целыми 3 способами:
-
-1. Встроенной опцией `vitastor-nfs mount --readahead <SIZE>` (например, `--readahead 2M`).
-2. Добавив в секцию `[nfsrahead]` файла конфигурации `/etc/nfs.conf` строку `nfs=2048` (глобальная
-   настройка для всех NFS 3.0 точек монтирования).
-3. Вручную следующей командой: \
-   `echo 2048 > /sys/class/bdi/$(findmnt -no MAJ:MIN /mnt/nfs 2>/dev/null | tr -d ' ')/read_ahead_kb`
-
-Здесь `2048` - размер readahead, а `/mnt/nfs` - путь к вашей ФС.
-
-После увеличения параметра скорость линейного чтения легко может увеличиться в 2-3 раза, так что
-советуем обязательно попробовать!
-
-### Размер записи Linux NFS
+## Размер записи Linux NFS
 
 Клиент Linux NFS (модули ядра nfs/nfsv3/nfsv4) имеет фиксированный в коде максимальный
 размер запроса ввода-вывода, равный 1 МБ - см. `rsize` и `wsize` в [man 5 nfs](https://linux.die.net/man/5/nfs).
@@ -232,7 +169,7 @@ modprobe nfsv3
 монтироваться с новыми wsize и rsize, и производительность линейной записи в Vitastor-NFS
 исправляется.
 
-### Горизонтальное масштабирование
+## Горизонтальное масштабирование
 
 Клиент Linux NFS 3.0 не поддерживает встроенное масштабирование или отказоустойчивость.
 То есть, вы не можете задать несколько адресов серверов при монтировании ФС.
@@ -272,9 +209,6 @@ VitastorFS из GPUDirect.
 Сервер автоматически останавливается при отмонтировании ФС.
 
 - `-o|--options <OPT>` - Передать дополнительные опции монтирования NFS (пример: -o async).
-- `--readahead <SIZE>` - Устанавливает размер упреждающей записи ФС Linux в `<SIZE>`.
-  Значение по умолчанию 128 KB, бОльшие значения значительно улучшают скорость линейного чтения.
-  Попробуйте, например, `--readahead 2M`.
 
 ### start
 
@@ -327,32 +261,6 @@ VitastorFS из GPUDirect.
 | `--include-empty`          | Дефрагментировать старые и пустые тома; обязательно перезапустите NFS-сервера после использования этой опции |
 | `--no-rm`                  | Перемещать, но не удалять данные                                        |
 
-## Монтирование из /etc/fstab
-
-Пакеты Vitastor включают хелперы для монтирования из `/etc/fstab`: **/usr/sbin/mount.vitastorfs** и **/usr/sbin/mount.vitastorblk**.
-
-Оба являются простыми символическими ссылками на `vitastor-nfs` и дают возможность
-корректно обрабатывать вызовы монтирования утилитой `mount`.
-
-Примеры записей `/etc/fstab`:
-
-```
-myfs /S vitastorfs pool=fspool,readahead=2M,--etcd_address=10.0.2.15:2379,soft,sync 0 0
-none /mnt/vitastor-block vitastorblk pool=ecpool 0 0
-```
-
-Когда вы запускаете `mount /S`, внутри вызывается хелпер и запускает VitastorFS.
-Синтаксис вызова самого хелпера:
-
-```
-mount.vitastorfs <FSNAME> <MOUNTPOINT> -o <OPTS>
-```
-
-`<OPTS>` - это набор опций, разделённых запятой, и в нём передаются все опции
-монтирования из fstab. В него можно включать и опции Vitastor, и опции NFS. Опция
-считается опцией NFS, если она не начинается с `--`, `pool=` и `readahead=`, а также
-если она не содержит `=` или `_`. Все прочие опции считаются опциями Vitastor.
-
 ## Общие опции
 
 | <!-- -->           | <!-- -->                                                |
@@ -366,4 +274,3 @@ mount.vitastorfs <FSNAME> <MOUNTPOINT> -o <OPTS>
 | `--logfile <FILE>` | записывать логи в заданный файл                         |
 | `--enforce 1`      | проверять права доступа на стороне сервера (по умолчанию нет) |
 | `--foreground 1`   | не уходить в фон после запуска                          |
-| `--trace`          | логгировать все запросы NFS                             |

docs/usage/security.en.md

@@ -1,665 +0,0 @@
-[Documentation](../../README.md#documentation) → Usage → Security in Vitastor
-
------
-
-[Читать на русском](security.ru.md)
-
-# Security in Vitastor
-
-- [Overview](#overview)
-- [Quick setup](#quick-setup)
-- Principles of operation
-  - [etcd transport encryption (TLS)](#etcd-transport-encryption-tls)
-  - [OSD transport encryption (AES-GCM)](#osd-transport-encryption-aes-gcm)
-  - [End-to-end image data encryption (AES-XTS)](#end-to-end-image-data-encryption-aes-xts)
-  - [Certificate-based authentication](#certificate-based-authentication)
-  - [Users and access rights](#users-and-access-rights)
-  - [etcd privileges](#etcd-privileges)
-- Manual setup
-  - [Configuring OSD transport encryption](#configuring-osd-transport-encryption)
-  - etcd/Antietcd setup options
-    - [Mon with embedded Antietcd](#mon-with-embedded-antietcd)
-    - [Mon as an Etcd proxy](#mon-as-an-etcd-proxy)
-    - [Mon with a separate Antietcd Proxy](#mon-with-a-separate-antietcd-proxy)
-    - [Standalone Antietcd without etcd](#standalone-antietcd-without-etcd)
-  - [Vault/OpenBao setup](#vaultopenbao-setup)
-    - [Vault setup example](#vault-setup-example)
-- Lists of allowed operations
-  - [etcd data access rights](#etcd-data-access-rights)
-  - [OSD data access rights](#osd-data-access-rights)
-  - [API access rights](#api-access-rights)
-- [Encryption performance](#encryption-performance)
-
-## Overview
-
-Starting from version 3.1.0, Vitastor provides full data protection:
-control plane protection (etcd), data plane protection (OSDs), and end-to-end data encryption.
-
-- Control plane protection:
-  - etcd transport encryption (TLS)
-  - Authentication via client TLS (X.509) certificates
-  - Access control of clients to etcd data
-- Data plane protection:
-  - Full AES-GCM encryption of OSD transport (similar to TLS, but faster)
-  - Alternatively, AES-GCM encryption of just operation headers with data checksums using a secret "salt"
-  - Authentication via client TLS (X.509) certificates
-  - Access control of clients on the OSD side
-- End-to-end encryption:
-  - Data is encrypted using AES-XTS on the client side, the Vitastor cluster has no access to plaintext data
-  - AES-XTS keys can be stored in etcd or in an external Vault/OpenBao
-
-All features are optional and disabled in the simplest configuration. By default, only
-transport-level data checksums ([proto_checksums](../config/security.en.md#proto_checksums)=payload)
-are enabled for clients that support them (>= 3.1.0). For older clients, connections
-without data checksums are allowed by default ([force_proto_checksums](../config/security.en.md#force_proto_checksums) is empty).
-
-For a quick setup, jump to the [Quick setup](#quick-setup) section.
-
-Descriptions of all security-related parameters can be found [here](../config/security.en.md).
-
-## Quick setup
-
-For a quick setup, use the `/usr/lib/vitastor/mon/make-etcd` script:
-
-1. Log in to the node where the first monitor and etcd will be located.
-2. Create `/etc/vitastor/vitastor.conf` with minimal parameters: etcd_address,
-   osd_network and, if you want to enable privileges, use_perms (note `https://`
-   in etcd addresses):
-   ```
-   {
-       "etcd_address": ["https://10.0.0.10:2379","https://10.0.0.11:2379","https://10.0.0.12:2379"],
-       "osd_network": "10.0.0.0/24",
-       "use_perms": true
-   }
-   ```
-3. Run `/usr/lib/vitastor/mon/make-etcd` without parameters or with the `--antietcd-only`
-   parameter if you want to initialize the cluster with Antietcd only, without etcd.
-4. The script will generate all necessary certificates and offer to copy them to the other
-   monitor nodes. Root ssh access to these nodes is required to do it, so agree if it's
-   available.
-5. If you don't have root ssh access from the first node to other nodes, copy configuration
-   manually (vitastor.conf and all certificates/keys, except CA `*_ca.key`) and call
-   `/usr/lib/vitastor/mon/make-etcd` on every node.
-
-After that, you can proceed with OSD initialization.
-
-If you want to understand the setup in more detail, read the [Principles of operation](#principles-of-operation)
-and [Manual setup](#manual-setup) sections below.
-
-## Principles of operation
-
-### etcd transport encryption (TLS)
-
-Possible setups:
-- Without encryption (http)
-- With encryption (https)
-- With encryption and client certificate authentication. Either the same certificate
-  used for authentication on the OSD side (`cert`+`pkey` / `osd_cert`+`osd_pkey`)
-  is used, or a separately specified certificate (`etcd_client_cert`+`etcd_client_key`).
-
-### OSD transport encryption (AES-GCM)
-
-Possible setups:
-- Unencrypted transport without checksums: `proto_checksums=none`.
-- Unencrypted transport with data checksums: `proto_checksums=payload` (may be omitted,
-  this is the default value). It's allowed to disable checksums on the client side, or
-  use an older client that does not support checksums. If you want to block connections
-  from clients without checksums, use the option `force_proto_checksums=payload`.
-- Header-only encryption with data checksums: activated when the options
-  `cert`, `pkey`, `osd_ca` are set on the client side and `osd_cert`, `osd_pkey`, `osd_ca`, `client_ca`
-  on the OSD side, with `proto_checksums=payload`. In this mode, disabling checksums on the client
-  side is forbidden by default, i.e. `force_proto_checksums=payload` is used.
-- Full transport encryption of all traffic: same as the previous option, but with `proto_checksums=gcm`.
-  In this case, clients are by default allowed to downgrade to checksums only, but this
-  can also be forbidden via `force_proto_checksums=gcm`. This is the slowest setup and
-  it's only recommended for insecure (public) networks. In particular, full traffic
-  encryption together with end-to-end AES-XTS image encryption encrypts data twice.
-
-Encryption uses the AES-256-GCM algorithm and a custom simplified key exchange protocol,
-fully analogous to TLS 1.3 ECDHE.
-
-### End-to-end image data encryption (AES-XTS)
-
-The Vitastor client supports encrypting each image's data with its own key. In this case,
-data is encrypted by the client before sending it to OSDs and OSDs can't see it in plain.
-The encryption key can be changed when cloning/creating image snapshots. For example,
-you can make a base VM image (say, Debian Linux) unencrypted, but have encrypted client VM
-images inheriting from it.
-
-Image encryption keys can be stored in etcd or in an external Vault. In the latter case,
-etcd only stores key IDs and Vitastor cluster can't decrypt the data at all. To use
-Vault, create an image with the `--enc_key vault:ID` option, specify vault_url and vault_ca
-options in the configuration, create accounts for all clients in Vault, and grant them access
-to the required v1 secrets.
-
-Once again, if AES-XTS is used together with full traffic encryption (`proto_checksums=gcm`),
-image data is encrypted twice — first with AES-XTS, and then with AES-GCM. Use it only if
-you are completely paranoid :-).
-
-### Certificate-based authentication
-
-When encryption is enabled, Vitastor clients, OSDs, and monitors authenticate via certificates
-for both etcd (Antietcd) and OSD connections.
-
-Separate certificates must be used for OSDs and monitors — either self-signed, or signed
-by separate CAs (`osd_ca` and `mon_ca`). All OSDs can use the same certificate, and all
-monitors can also use the same certificate, since the privileges of different OSDs or
-different monitors do not differ (theoretically, one could differentiate OSD certificates
-by pool, but there has been no need for this so far).
-
-Also, a monitor certificate may not be needed at all if Antietcd is embedded into the monitor
-itself. In this case, the monitor already has access to all etcd data directly in memory.
-
-### Users and access rights
-
-When transport encryption is disabled, Vitastor operates without access control, i.e.,
-any cluster client has full access to both the management layer and the data layer. This
-option is suitable for dedicated trusted storage networks.
-
-When OSD transport encryption is enabled (at least for headers), you can enable access
-control by turning on the `use_perms=true` option. When this option is enabled, each user
-(and even an OSD or a monitor) can perform only operations allowed for him.
-
-Each user, administrator, OSD or monitor must have their own certificate signed by a specific
-root certificate:
-- `client_ca` for regular users. Common Name of the certificate must be equal to the user's
-  name. Regular users can only read and modify explicitly permitted images and can't modify
-  cluster state.
-- `admin_ca` for administrators. Administrators can read and modify all images, and also
-  adminster the cluster: view overall statistics and status, create and delete OSDs, etc.
-  Common Name is not checked for admin users.
-- `osd_ca` for OSDs and `mon_ca` for monitors (if Antietcd runs separately). OSDs and monitors
-  also have distinct permission sets.
-
-User privileges for regular users are stored in etcd data and currently consist of only
-one property in `/vitastor/config/user/<name>`:
-- `groups` - List of group names the user is a member of.
-
-Images have the following properties:
-- Owner (`owner`) — the user name that is allowed to both read and modify the image
-- Owner group (`owner_group`) — the owner group name
-- Reader group (`reader_group`) — the name of the group of users allowed to read the image
-
-And there is also a property on the pool:
-- Creator group (`creator_group`) — the name of the group of users allowed to create images in the pool
-
-For the list of allowed operations on image data on the OSD side, see the
-[OSD data access rights](#osd-data-access-rights) section.
-
-### etcd privileges
-
-etcd privileges are implemented through Antietcd in all modes of operation.
-
-Built-in etcd privileges are not supported due to numerous inconveniences:
-- Certificate-based authentication does not work at all in etcd's REST interface,
-- Privileges are stored separately from k/v data and cannot participate in transactions,
-- Only the administrator (root) can change privileges,
-- There is no support for filtering range read responses by privileges.
-
-If etcd is used, Antietcd acts as a filtering proxy and can be embedded in the Vitastor
-monitor or run separately. In this case, etcd must allow incoming connections only from
-Antietcd, and all other components must connect to Antietcd.
-
-If Antietcd runs as a part of the Vitastor monitor, it is sufficient to enable the option
-`use_perms=true` and set the required certificates. If Antietcd is run separately, privileges
-have to be enabled separately using Antietcd options. For more details on the setup, see
-the [etcd/Antietcd setup options](#etcdantietcd-setup-options) section.
-
-For the list of allowed operations with etcd data, see the
-[etcd data access rights](#etcd-data-access-rights) section.
-
-## Manual setup
-
-### Configuring OSD transport encryption
-
-You need 3 certificates: one for OSDs, one for signing client certificates and one for
-signing administrator certificates. For OSDs, you can use a self-signed certificate (osd_ca.crt)
-or a separate certificate (osd.crt) signed by a trusted osd_ca.crt certificate. For clients,
-you must use separate certificates signed by a common CA certificate (client_ca.crt). One more
-CA certificate (admin_ca.crt) is required for signing administrator certificates.
-
-Add to the Vitastor configuration on OSD servers:
-- use_perms: true
-- osd_ca: osd_ca.crt
-- client_ca: client_ca.crt
-- admin_ca: admin_ca.crt
-- osd_cert: osd_ca.crt
-- osd_pkey: osd_ca.key
-
-On the client side:
-- use_perms: true
-- cert: client.crt
-- pkey: client.key
-
-### etcd/Antietcd setup options
-
-The following configuration options are available:
-
-#### Mon with embedded Antietcd
-
-The simplest option. Apart from OSD certificates, you only need 1 certificate for Antietcd (antietcd.crt).
-
-Vitastor settings (`/etc/vitastor/vitastor.conf`):
-- etcd_address: [ "http://mon1:2379", ... ] (addresses of your monitors with port 2379)
-- use_perms: true
-- use_antietcd: true
-- antietcd_cert: antietcd.crt
-- antietcd_key: antietcd.key
-- etcd_ca: antietcd.crt
-- osd_ca: osd_ca.crt
-- client_ca: client_ca.crt
-- admin_ca: admin_ca.crt
-
-#### Mon as an Etcd proxy
-
-If you want to enable privileges, but stay on etcd, you can use etcd proxy mode.
-
-You will need 2 separate certificates: one for etcd (etcd.crt) and one for antietcd (antietcd.crt).
-The etcd client port must be different from the standard 2379 — for example, you can pick 2381.
-
-Vitastor settings:
-- etcd_address: [ "http://mon1:2379", ... ] (addresses of your monitors with port 2379)
-- use_perms: true
-- use_antietcd: true
-- etcd_proxy:
-  ```
-  {
-    "urls": [ "http://mon1:2381", ... ], // addresses of your etcd with port 2381
-    "cert": "antietcd.crt",
-    "key": "antietcd.key",
-    "ca": "etcd.crt"
-  }
-  ```
-- antietcd_cert: antietcd.crt
-- antietcd_key: antietcd.key
-- etcd_ca: antietcd.crt
-- osd_ca: osd_ca.crt
-- client_ca: client_ca.crt
-- admin_ca: admin_ca.crt
-
-etcd command-line options:
-```
---advertise-client-urls=https://<ADDRESS>:2381 --listen-client-urls=https://<ADDRESS>:2381 \
---client-cert-auth --cert-file=etcd.crt --key-file=etcd.key --trusted-ca-file=antietcd.crt \
---peer-client-cert-auth --peer-cert-file=etcd.crt --peer-key-file=etcd.key --peer-trusted-ca-file=etcd.crt
-```
-
-#### Mon with a separate Antietcd Proxy
-
-If in addition to the previous option you want to offload Vitastor monitor's tasks from Antietcd,
-you can run it separately.
-
-Similar to the previous option, 2 certificates are needed: one for etcd and one for antietcd,
-plus a separate certificate for the monitor.
-
-Vitastor settings:
-- etcd_address: [ "http://mon1:2379", ... ] (addresses of your monitors with port 2379)
-- use_perms: true
-- use_antietcd: false
-- etcd_ca: antietcd.crt
-- osd_ca: osd_ca.crt
-- client_ca: client_ca.crt
-- admin_ca: admin_ca.crt
-- mon_etcd_client_cert: mon_ca.crt
-- mon_etcd_client_key: mon_ca.key
-
-Antietcd command-line options:
-```
---port 2379 --cert /etc/vitastor/antietcd.crt --key /etc/vitastor/antietcd.key \
---client_cert_auth 1 --auth_filter /usr/lib/vitastor/mon/vitastor_auth_filter.js \
---ca /etc/vitastor/client_ca.crt --admin_ca /etc/vitastor/admin_ca.crt \
---osd_ca /etc/vitastor/osd_ca.crt --mon_ca /etc/vitastor/mon_ca.crt \
---etcd_proxy url1,url2,... --etcd_ca /etc/vitastor/etcd.crt \
---etcd_cert /etc/vitastor/antietcd.crt --etcd_key /etc/vitastor/antietcd.key
-```
-
-etcd command-line options (same as in the previous option):
-```
---advertise-client-urls=https://<ADDRESS>:2381 --listen-client-urls=https://<ADDRESS>:2381 \
---client-cert-auth --cert-file=etcd.crt --key-file=etcd.key --trusted-ca-file=antietcd.crt \
---peer-client-cert-auth --peer-cert-file=etcd.crt --peer-key-file=etcd.key --peer-trusted-ca-file=etcd.crt
-```
-
-#### Standalone Antietcd without etcd
-
-Same as the previous option, but etcd and its certificate are not needed:
-
-Vitastor settings (same as in the previous option):
-- etcd_address: [ "http://mon1:2379", ... ] (addresses of your monitors with port 2379)
-- use_perms: true
-- use_antietcd: false
-- etcd_ca: antietcd.crt
-- osd_ca: osd_ca.crt
-- client_ca: client_ca.crt
-- admin_ca: admin_ca.crt
-- mon_etcd_client_cert: mon_ca.crt
-- mon_etcd_client_key: mon_ca.key
-
-Antietcd command-line options:
-```
---port 2379 --cert /etc/vitastor/antietcd.crt --key /etc/vitastor/antietcd.key \
---client_cert_auth 1 --auth_filter /usr/lib/vitastor/mon/vitastor_auth_filter.js \
---ca /etc/vitastor/client_ca.crt --admin_ca /etc/vitastor/admin_ca.crt \
---osd_ca /etc/vitastor/osd_ca.crt --mon_ca /etc/vitastor/mon_ca.crt \
---persist_filter /usr/lib/vitastor/mon/vitastor_persist_filter.js
-```
-
-### Vault/OpenBao setup
-
-To use Vault, each client that needs to get image keys from Vault needs a Vault account.
-Vitastor only supports client certificate-based authentication, so all client certificates
-(`cert`+`pkey`) must be registered in Vault, and they must be granted access to the
-corresponding secrets (v1 secrets API is supported).
-
-The required format of a Vault secret is a single `key` field as a hexadecimal string.
-The AES-256-XTS algorithm is used, so the key length is 64 bytes, i.e., the string must
-consist of 128 hexadecimal digits.
-
-To connect to Vault, set the following settings in Vitastor.conf:
-- `vault_url` — Vault address (e.g., `https://vault:8200`)
-- `vault_ca` — Vault's own certificate
-
-After that, if you create an image (`vitastor-cli create`) with the option `--enc_key vault:<ID>`,
-Vitastor clients will first contact Vault to obtain a token at `/v1/auth/cert/login`,
-and then request the actual secret from Vault at `/v1/secret/<ID>`.
-
-#### Vault setup example
-
-Step-by-step instructions for setting up a test Vault using OpenBao as an example:
-
-1. If TLS is not yet configured, generate a self-signed TLS certificate for Vault:
-   ```
-   openssl req -days 3650 -x509 -addext basicConstraints=critical,CA:TRUE,pathlen:1 --addext subjectAltName=DNS:vault \
-       -new -newkey rsa:4096 -nodes -keyout /etc/openbao/vault.key -out /etc/openbao/vault.crt
-   ```
-   Configure it in `/etc/openbao/openbao.hcl`:
-   ```
-   listener "tcp" {
-       address       = "0.0.0.0:8200"
-       tls_cert_file = "/etc/openbao/vault.crt"
-       tls_key_file  = "/etc/openbao/vault.key"
-   }
-   ```
-   And restart OpenBao (`systemctl restart openbao`).
-2. Copy Vault's TLS certificate for Vitastor:
-   ```
-   cp /etc/openbao/vault.crt /etc/vitastor/vault.crt
-   ```
-   Transfer it to all client nodes and specify it in `/etc/vitastor/vitastor.conf`:
-   ```
-   {
-       ...
-       "vault_url": "http://vault:8200",
-       "vault_ca": "/etc/vitastor/vault.crt"
-   }
-   ```
-3. Check Vault status:
-   ```
-   bao status -ca-cert /etc/openbao/vault.crt -address=https://vault:8200
-   ```
-4. Initialize Vault in test mode from 1 node (with 1 key share):
-   ```
-   bao operator init -n 1 -t 1 -ca-cert /etc/openbao/vault.crt -address=https://vault:8200
-   ```
-5. Unseal Vault:
-   ```
-   bao operator unseal -ca-cert /etc/openbao/vault.crt -address=https://vault:8200
-   ```
-6. Enable certificate-based authentication:
-   ```
-   bao auth enable -ca-cert /etc/openbao/vault.crt -address=https://vault:8200 cert
-   ```
-7. Enable v1 secrets:
-   ```
-   bao secrets enable -ca-cert /etc/openbao/vault.crt -address=https://vault:8200 -path=secret kv-v1
-   ```
-8. Create a test secret:
-   ```
-   bao kv put -ca-cert /etc/openbao/vault.crt -address=https://vault:8200 secret/vitastor/testimg3 key=$(openssl rand -hex 64)
-   ```
-9. Generate a signed certificate for a Vitastor user (on a machine where you have `client_ca.crt` and `client_ca.key`):
-   ```
-   openssl req -subj '/CN=testimg3' -nodes -new -keyout testimg3.key -out testimg3.csr
-   openssl x509 -req -days 3650 -CA client_ca.crt -CAkey client_ca.key -CAcreateserial -in testimg3.csr -out testimg3.crt
-   rm testimg3.csr
-   ```
-10. Create a user in Vault and grant it access to the secret:
-    ```
-    cat >testimg3.policy <<EOF
-    path "/secret/vitastor/testimg3" {
-        capabilities = ["read"]
-    }
-    EOF
-
-    bao policy write -ca-cert /etc/openbao/vault.crt -address=https://vault:8200 testimg3 testimg3.policy
-
-    bao write -ca-cert /etc/openbao/vault.crt -address=https://vault:8200 auth/cert/certs/testimg3 \
-        certificate=@testimg3.crt display_name=testimg3 token_ttl=24h token_policies=testimg3
-    ```
-11. Test access to the secret:
-    ```
-    curl --cacert /etc/vitastor/vault.crt --cert testimg3.crt --key testimg3.key \
-        --json '{}' https://vault:8200/v1/auth/cert/login
-    ```
-    A token will be printed, substitute it into the following request:
-    ```
-    curl --cacert /etc/vitastor/vault.crt --cert testimg3.crt --key testimg3.key \
-        -H 'X-Vault-Token: <RECEIVED TOKEN>' https://vault:8200/v1/secret/vitastor/testimg3
-    ```
-12. Create an image in Vitastor with the given secret (as an administrator or someone who
-    has the right to create images in your pool):
-    ```
-    vitastor-cli create -s 100G --enc_key vault:vitastor/testimg3 --owner testimg3 testimg3
-    ```
-13. Test access to the image as user testimg3:
-    ```
-    vitastor-cli --cert testimg3.crt --pkey testimg3.key dd if=/dev/urandom oimg=testimg3 bs=1M count=100
-    ```
-
-## Lists of allowed operations
-
-### etcd data access rights
-
-Below, all key names are given without the common prefix `/vitastor`.
-
-Allowed operations with keys in Antietcd for regular users:
-- Read-only:
-  - Always allowed:
-    - `/config/global`
-    - `/config/node_placement`
-    - `/config/pools`
-    - `/pg/config`
-    - `/osd/state/*`
-    - `/pg/state/*`
-    - `/index/maxid/*`
-  - For images [readable by the user](#users-and-access-rights):
-    - `/config/inode/*`
-    - `/index/image/*`
-    - `/inode/stats/*`
-- Read and write:
-  - For pools in which the user can create images:
-    - `/index/maxid/*`
-  - For images owned by the user:
-    - `/config/inode/*`
-    - `/index/image/*`
-
-Allowed operations with keys in Antietcd for administrators:
-- Read:
-  - `/stats`
-  - `/mon/*`
-  - `/pg/*`
-  - `/pgstats/*`
-  - `/inode/stats/*`
-  - `/pool/stats/*`
-- Read and write:
-  - `/config/*`
-  - `/osd/*`
-  - `/index/*`
-  - `/pg/config`
-  - `/pg/history/*`
-  - `/stats`
-  - `/history/last_clean_pgs`
-
-Allowed operations with keys in etcd for OSDs:
-- Read:
-  - `/pg/config`
-  - `/config/*`
-- Read and write:
-  - `/osd/*`
-  - `/pg/state/*`
-  - `/pg/history/*`
-  - `/pgstats/*`
-
-Allowed operations with keys in etcd for monitors:
-- Read:
-  - `/config/*`
-  - `/osd/*`
-  - `/pgstats/*`
-- Read and write:
-  - `/pg/config`
-  - `/stats`
-  - `/history/last_clean_pgs`
-  - `/mon/*`
-  - `/pg/history/*`
-  - `/pg/stats/*`
-  - `/pgstats/*`
-  - `/inode/stats/*`
-  - `/pool/stats/*`
-
-### OSD data access rights
-
-When the `use_perms` option and encryption are enabled, OSDs authenticate clients via
-certificates and allow each client only what is allowed by the access control model.
-
-Client operations:
-- READ — allowed for images the user has read access to.
-- WRITE, DELETE, SCRUB — allowed for images the user has write access to.
-- SYNC — the operation is not tied to an image and is always allowed.
-- DESCRIBE — the operation is allowed only for administrators (used by the commands
-  `vitastor-cli describe` and `fix`).
-- PING — the operation is always allowed.
-- SHOW_CONFIG — the operation is always allowed, however, if the client presents
-  itself as an OSD in it, then it is verified that it uses a certificate signed by `osd_ca`.
-- SEC_LIST (listing) — allowed for other OSDs and administrators with any parameters,
-  and for regular clients only allowed for requests limited to an image the user has
-  read access to.
-
-Cluster operations — allowed only for other OSDs:
-- SEC_READ
-- SEC_WRITE
-- SEC_WRITE_STABLE
-- SEC_SYNC
-- SEC_STABILIZE
-- SEC_ROLLBACK
-- SEC_DELETE
-- SEC_READ_BMP
-- SEC_LOCK
-
-### API access rights
-
-[vitastor-cli serve](../usage/cli.en.md#serve) also supports client authentication
-via certificates. Only certificates signed by `client_ca` are accepted. A separate
-certificate `api_cert` with the key `api_pkey` is used as the server certificate.
-
-For `vitastor-cli serve` to work correctly, it must use a certificate of an administrator
-(`cert`+`pkey` signed by `admin_ca`) to access Vitastor and serve all requests correctly.
-
-Regular users (with `client_ca`-signed certificates), when accessing the API, are only
-allowed operations on images available to them either for reading (for read-only operations)
-or for writing (for modification):
-
-- image/list — for images the user can read.
-- image/create — for pools in which the user is allowed to create images, or for
-  creating snapshots of images owned by the user.
-- image/delete, image/flatten, image/modify — for images owned by the user.
-
-All other operations are allowed only for administrators.
-
-## Encryption performance
-
-You may wonder — how fast is all this wonderful encryption?
-
-The answer is — it depends heavily on the CPU. On modern processors (with AVX512 with VAES
-support) it is very fast — AES encryption speed can reach 10-20 GB/s and above. This
-primarily concerns the CPU of client machines, because end-to-end encryption is performed
-entirely on the client, and even though transport encryption runs both on clients and OSDs,
-each client has only one thread, while there are many OSDs on the server side.
-
-On older processors, the speed is noticeably worse — for example, on a Xeon E5 v4 it is
-only 3 GB/s.
-
-You can evaluate the performance of your processors using the `vitastor-cli cpubench` command.
-
-Example output (💪 AMD EPYC 9575F):
-
-```
-$ vitastor-cli cpubench
-Vitastor transport encryption benchmark (AES-256-GCM, AES-256-XTS and xxhash3)
-
-Warmup...
-
-No transport encryption, data checksums enabled, e2e unencrypted image
-xxhash3 1 M block... 209000 iterations in 2001 ms = 104447.78 MB/s
-xxhash3 4 K block... 37000000 iterations in 2022 ms = 71479.35 MB/s
-
-Header encryption with payload checksums, e2e unencrypted image
-AES-256-GCM encrypt header + xxhash3 1 M block... 210000 iterations in 2015 ms = 104218.36 MB/s
-AES-256-GCM encrypt header + xxhash3 4 K block... 26000000 iterations in 2073 ms = 48993.01 MB/s
-
-Full transport encryption, e2e unencrypted image
-AES-256-GCM encrypt header and 1 M block... 54000 iterations in 2000 ms = 27000.00 MB/s
-AES-256-GCM encrypt header and 4 K block... 11700000 iterations in 2014 ms = 22692.71 MB/s
-
-No transport encryption, no checksums, e2e encrypted image
-AES-256-XTS encrypt 1 M block... 50000 iterations in 2039 ms = 24521.82 MB/s
-AES-256-XTS encrypt 4 K block... 12600000 iterations in 2009 ms = 24499.13 MB/s
-
-No transport encryption, e2e encrypted image, data checksums enabled
-AES-256-XTS encrypt + xxhash3 1 M block... 40000 iterations in 2013 ms = 19870.84 MB/s
-AES-256-XTS encrypt + xxhash3 4 K block... 10200000 iterations in 2011 ms = 19812.90 MB/s
-
-Header encryption with payload checksums, e2e encrypted image
-AES-256-GCM encrypt header + AES-256-XTS encrypt + xxhash3 1 M block... 40000 iterations in 2014 ms = 19860.97 MB/s
-AES-256-GCM encrypt header + AES-256-XTS encrypt + xxhash3 4 K block... 8700000 iterations in 2011 ms = 16899.24 MB/s
-
-Full transport encryption, e2e encrypted image
-AES-256-XTS + AES-256-GCM encrypt 1 M block... 26000 iterations in 2062 ms = 12609.12 MB/s
-AES-256-XTS + AES-256-GCM encrypt 4 K block... 6300000 iterations in 2006 ms = 12267.88 MB/s
-```
-
-And here is Xeon E5-2680v4:
-
-```
-$ vitastor-cli cpubench
-Vitastor transport encryption benchmark (AES-256-GCM, AES-256-XTS and xxhash3)
-
-Warmup...
-
-No transport encryption, data checksums enabled, e2e unencrypted image
-xxhash3 1 M block... 62000 iterations in 2021 ms = 30677.88 MB/s
-xxhash3 4 K block... 12400000 iterations in 2006 ms = 24146.31 MB/s
-
-Header encryption with payload checksums, e2e unencrypted image
-AES-256-GCM encrypt header + xxhash3 1 M block... 62000 iterations in 2027 ms = 30587.07 MB/s
-AES-256-GCM encrypt header + xxhash3 4 K block... 6800000 iterations in 2011 ms = 13208.60 MB/s
-
-Full transport encryption, e2e unencrypted image
-AES-256-GCM encrypt header and 1 M block... 7000 iterations in 2317 ms = 3021.15 MB/s
-AES-256-GCM encrypt header and 4 K block... 1500000 iterations in 2102 ms = 2787.52 MB/s
-
-No transport encryption, no checksums, e2e encrypted image
-AES-256-XTS encrypt 1 M block... 7000 iterations in 2317 ms = 3021.15 MB/s
-AES-256-XTS encrypt 4 K block... 1600000 iterations in 2088 ms = 2993.30 MB/s
-
-No transport encryption, e2e encrypted image, data checksums enabled
-AES-256-XTS encrypt + xxhash3 1 M block... 6000 iterations in 2188 ms = 2742.23 MB/s
-AES-256-XTS encrypt + xxhash3 4 K block... 1400000 iterations in 2053 ms = 2663.78 MB/s
-
-Header encryption with payload checksums, e2e encrypted image
-AES-256-GCM encrypt header + AES-256-XTS encrypt + xxhash3 1 M block... 6000 iterations in 2190 ms = 2739.73 MB/s
-AES-256-GCM encrypt header + AES-256-XTS encrypt + xxhash3 4 K block... 1300000 iterations in 2101 ms = 2417.00 MB/s
-
-Full transport encryption, e2e encrypted image
-AES-256-XTS + AES-256-GCM encrypt 1 M block... 4000 iterations in 2666 ms = 1500.38 MB/s
-AES-256-XTS + AES-256-GCM encrypt 4 K block... 800000 iterations in 2113 ms = 1478.94 MB/s
-```

docs/usage/security.ru.md

@@ -1,670 +0,0 @@
-[Документация](../../README-ru.md#документация) → Использование → Безопасность в Vitastor
-
------
-
-[Read in English](security.en.md)
-
-# Безопасность в Vitastor
-
-- [Обзор](#обзор)
-- [Быстрая настройка](#быстрая-настройка)
-- Принципы работы
-  - [Шифрование соединений с etcd (TLS)](#шифрование-соединений-с-etcd-tls)
-  - [Шифрование соединений с OSD (AES-GCM)](#шифрование-соединений-с-osd-aes-gcm)
-  - [Сквозное шифрование данных образов (AES-XTS)](#сквозное-шифрование-данных-образов-aes-xts)
-  - [Аутентификация по сертификатам](#аутентификация-по-сертификатам)
-  - [Пользователи и права доступа](#пользователи-и-права-доступа)
-  - [Привилегии etcd](#привилегии-etcd)
-- Ручная настройка
-  - [Настройка шифрования соединений OSD](#настройка-шифрования-соединений-osd)
-  - Варианты настройки etcd/Antietcd
-    - [Mon со встроенным Antietcd](#mon-со-встроенным-antietcd)
-    - [Mon в роли Etcd proxy](#mon-в-роли-etcd-proxy)
-    - [Mon с отдельным Antietcd Proxy](#mon-с-отдельным-antietcd-proxy)
-    - [Отдельный Antietcd без etcd](#отдельный-antietcd-без-etcd)
-  - [Настройка Vault/OpenBao](#настройка-vaultopenbao)
-    - [Пример настройки Vault](#пример-настройки-vault)
-- Списки разрешённых операций
-  - [Права доступа к данным etcd](#права-доступа-к-данным-etcd)
-  - [Права доступа к данным OSD](#права-доступа-к-данным-osd)
-  - [Права доступа к API](#права-доступа-к-api)
-- [Производительность шифрования](#производительность-шифрования)
-
-## Обзор
-
-Начиная с версии 3.1.0, Vitastor предоставляет полную защиту данных: защиту слоя
-управления (etcd), защиту слоя данных (OSD) и сквозное шифрование данных.
-
-- Защита слоя управления:
-  - Шифрование соединений с etcd (TLS)
-  - Аутентификация по клиентским TLS (X.509) сертификатам
-  - Контроль доступа клиентов к данным etcd
-- Защита слоя данных:
-  - Либо полное AES-GCM шифрование соединений с OSD (аналогично TLS, но быстрее)
-  - Либо шифрование AES-GCM только заголовков команд с контрольными суммами данных с секретной "солью"
-  - Аутентификация по клиентским TLS (X.509) сертификатам
-  - Контроль доступа клиентов на стороне OSD
-- Сквозное шифрование:
-  - Данные шифруются AES-XTS на стороне клиента, кластер Vitastor не имеет доступа к открытым данным
-  - Ключи AES-XTS могут храниться в etcd или во внешнем Vault/OpenBao
-
-Все функции опциональны и в простейшем варианте настройки выключены. По умолчанию включены
-только контрольные суммы данных на транспортном уровне ([proto_checksums](../config/security.ru.md#proto_checksums)=payload) для
-поддерживающих их клиентов (>= 3.1.0). Для более старых клиентов по умолчанию разрешены
-соединения без контрольных сумм данных ([force_proto_checksums](../config/security.ru.md#force_proto_checksums) пусто).
-
-Для быстрой настройки перейдите к разделу [Быстрая настройка](#быстрая-настройка).
-
-Описания всех параметров, связанных с безопасностью, читайте [здесь](../config/security.ru.md).
-
-## Быстрая настройка
-
-Для быстрой настройки используйте скрипт `/usr/lib/vitastor/mon/make-etcd`:
-
-1. Зайдите на узел, на котором будет располагаться первый монитор и etcd.
-2. Создайте там минимальный `/etc/vitastor/vitastor.conf` с параметрами etcd_address,
-   osd_network и, если хотите включить привилегии - use_perms (обратите внимание на `https://`
-   в адресах etcd):
-   ```
-   {
-       "etcd_address": ["https://10.0.0.10:2379","https://10.0.0.11:2379","https://10.0.0.12:2379"],
-       "osd_network": "10.0.0.0/24",
-       "use_perms": true
-   }
-   ```
-3. Запустите `/usr/lib/vitastor/mon/make-etcd` без параметров или с параметром `--antietcd-only`,
-   если хотите инициализировать кластер только с Antietcd без etcd.
-4. Скрипт сгенерирует все необходимые сертификаты и предложит скопировать их на остальные узлы
-   мониторов. Для этого нужен root ssh доступ к этим узлам. Если он есть - соглашайтесь, скрипт
-   автоматически скопирует конфигурацию и инициализирует все etcd и мониторы.
-5. Если root ssh доступа с первого узла на остальные узлы мониторов нет - скопируйте на них конфигурацию
-   вручную (vitastor.conf и все сертификаты и ключи, кроме ключей CA `*_ca.key`) и повторите на каждом
-   узле вызов `/usr/lib/vitastor/mon/make-etcd`.
-
-После этого можете переходить к инициализации OSD.
-
-Если хотите разобраться в настройке подробнее, читайте далее разделы [Принципы работы](#принципы-работы)
-и [Ручная настройка](#ручная-настройка).
-
-## Принципы работы
-
-### Шифрование соединений с etcd (TLS)
-
-Варианты настройки:
-- Без шифрования (http)
-- С шифрованием (https)
-- С шифрованием и аутентификацией по клиентским сертификатам. Используется либо тот
-  же сертификат, что используется для аутентификации на стороне OSD (`cert`+`pkey` / `osd_cert`+`osd_pkey`),
-  либо отдельно указанный сертификат (`etcd_client_cert`+`etcd_client_key`)
-
-### Шифрование соединений с OSD (AES-GCM)
-
-Варианты настройки:
-- Без шифрования и без контрольных сумм: `proto_checksums=none`.
-- Без шифрования, с контрольными суммами данных: `proto_checksums=payload` (можно не указывать,
-  т.к. это значение по умолчанию). При этом контрольные суммы можно отключить на стороне
-  клиента и можно использовать более старые версии клиента, не поддерживающие контрольные суммы.
-  Если нужно запретить подключение клиентов без контрольных сумм, можно использовать опцию
-  `force_proto_checksums=payload`.
-- С шифрованием заголовков и контрольными суммами данных: активируется при установленных опциях
-  `cert`, `pkey`, `osd_ca` на стороне клиента и `osd_cert`, `osd_pkey`, `osd_ca`, `client_ca`
-  на стороне OSD, при `proto_checksums=payload`. При этом по умолчанию запрещается
-  отключение контрольных сумм на уровне клиента, то есть используется `force_proto_checksums=payload`.
-- С полным шифрованием всего трафика: аналогично прошлому варианту, но с `proto_checksums=gcm`.
-  Клиенту при этом по умолчанию разрешается понизить уровень защиты до контрольных сумм, но
-  это тоже можно запретить через `force_proto_checksums=gcm`. Данный вариант самый медленный и
-  рекомендуется только для небезопасных (публичных) сетей. В том числе потому, что при использовании
-  и полного шифрования трафика, и сквозного шифрования образов AES-XTS, данные шифруются дважды.
-
-Для шифрования используется алгоритм AES-256-GCM и собственный упрощённый протокол согласования
-ключей, полностью аналогичный TLS 1.3 ECDHE.
-
-### Сквозное шифрование данных образов (AES-XTS)
-
-Клиент Vitastor поддерживает шифрование данных каждого образа своим ключом. В этом случае на OSD
-уходят уже зашифрованные данные и сами OSD не видят исходные данные клиента. При этом ключ можно
-менять при клонировании/создании снимков образов. Например, можно сделать базовый образ ВМ
-(условный Debian Linux) нешифрованным, но наследовать от него шифрованные образы клиентских ВМ.
-
-Ключи шифрования образов могут храниться либо в etcd, либо во внешнем Vault. Во втором случае
-в etcd хранятся только ID ключей, а Vitastor вообще не имеет доступа к данным образов. Для
-использования Vault нужно создать образ с опцией `--enc_key vault:ID`, в конфигурации указать
-опции vault_url и vault_ca, создать всем клиентам учётные записи в Vault и дать им доступ
-к требуемым секретам v1.
-
-Ещё раз повторимся, что если AES-XTS используется с полным шифрованием трафика (`proto_checksums=gcm`),
-то данные образов шифруются дважды - сначала AES-XTS, а потом AES-GCM. Можете использовать,
-только если вы совсем параноик :-).
-
-### Аутентификация по сертификатам
-
-При включённом шифровании клиенты, OSD и мониторы Vitastor аутентифицируются по сертификатам
-как при соединениях с etcd (Antietcd), так и с OSD.
-
-Для OSD и мониторов должны использоваться отдельные сертификаты - либо самоподписанные, либо
-подписанные отдельными CA (`osd_ca` и `mon_ca`). При этом все OSD могут использовать один и
-тот же сертификат и все мониторы тоже могут использовать один и тот же сертификат, так как
-привилегии разных OSD или разных мониторов ничем не отличаются (теоретически можно было бы
-сделать разграничение сертификатов OSD по пулам, но пока что такой необходимости не было).
-
-Также сертификат монитора может быть вообще не нужен, если Antietcd встраивается в сам монитор.
-В этом случае монитор и так имеет доступ ко всем данным etcd прямо в памяти.
-
-### Пользователи и права доступа
-
-При отключённом шифровании трафика Vitastor работает без контроля доступа, то есть,
-любой клиент кластера имеет полный доступ как к слою управлению, так и к слою данных. Такой
-вариант подходит для выделенных доверенных сетей хранения.
-
-При включённом шифровании трафика OSD (хотя бы заголовков) есть возможность задействовать
-контроль доступа, включив опцию `use_perms=true`. При включённой опции каждый пользователь
-(и даже OSD и монитор) может выполнять только те операции, которые ему разрешены.
-
-Каждый обычный пользователь, администратор, OSD или монитор должен иметь свой сертификат,
-подписанный отдельным корневым сертификатом:
-- Для обычных пользователей - `client_ca`. Common Name сертификата при этом должен быть равен
-  имени пользователя. Обычные пользователи могут только читать и модифицировать явным образом
-  разрешённые им образы и не могут менять общее состояние кластера.
-- Для администраторов - `admin_ca`. Администраторы могут читать и модифицировать все образы,
-  а также администрировать кластер: смотреть общую статистику и состояние, создавать и удалять
-  OSD и так далее.
-- Для OSD - `osd_ca`, для мониторов - `mon_ca` (если Antietcd запускаются отдельно от мониторов).
-  OSD и мониторы тоже имеют свои наборы разрешённых операций.
-
-Настройки привилегий для обычных пользователей хранятся в etcd и на данный момент состоят
-всего из одного свойства в ключах `/vitastor/config/user/<имя>`:
-- `groups` - Список имён групп, членом которых пользователь является.
-
-У образов есть следующие свойства:
-- Владелец (`owner`) - имя пользователя, которому разрешено и читать, и менять образ
-- Группа владельцев (`owner_group`) - имя группы владельцев
-- Группа читателей (`reader_group`) - имя группы пользователей, которым разрешено читать образ
-
-И также есть свойство у пула:
-- Группа создателей (`creator_group`) - имя группы пользователей, которым разрешено создавать образы в пуле
-
-Перечень разрешённых операций с данными образов на стороне OSD смотрите в разделе
-[Права доступа к данным OSD](#права-доступа-к-данным-osd).
-
-### Привилегии etcd
-
-Привилегии etcd реализуются через Antietcd во всех режимах работы.
-
-Встроенные привилегии etcd не поддерживаются по причине их многочисленных неудобств:
-- Аутентификация по сертификатам вообще не работает в REST интерфейсе etcd,
-- Привилегии хранятся отдельно от k/v данных и не могут участвовать в транзакциях,
-- Менять привилегии может только администратор (root),
-- Нет поддержки фильтрации диапазонных ответов чтения по привилегиям.
-
-Если используется etcd, то Antietcd выступает в роли фильтрующего прокси, при этом он
-может быть встроен в монитор Vitastor или запущен отдельно. В этом случае etcd должен
-разрешать входящие подключения только от Antietcd, а все остальные компоненты должны
-соединяться с Antietcd.
-
-Если Antietcd запускается в составе монитора Vitastor, то достаточно включить опцию
-`use_perms=true` и задать нужные сертификаты. Если Antietcd запускается отдельно, то
-привилегии нужно включать отдельно опциями Antietcd. Подробнее о настройке смотрите
-раздел [Варианты настройки etcd/Antietcd](#варианты-настройки-etcdantietcd).
-
-Перечень разрешённых операций с данными etcd смотрите в разделе
-[Права доступа к данным etcd](#права-доступа-к-данным-etcd).
-
-## Ручная настройка
-
-### Настройка шифрования соединений OSD
-
-Вам нужно 3 сертификата: один для OSD и по одному для подписи сертификатов клиентов и администраторов.
-Для OSD можно использовать самоподписанный сертификат (osd_ca.crt) или отдельный сертификат (osd.crt),
-подписанный доверенным сертификатом osd_ca.crt. Для клиентов нужно использовать отдельные
-сертификаты, подписанные общим доверенным (client_ca.crt), для администраторов - отдельным доверенным
-(admin_ca.crt).
-
-В конфигурацию Vitastor на серверах OSD нужно добавить:
-- use_perms: true
-- osd_ca: osd_ca.crt
-- client_ca: client_ca.crt
-- admin_ca: admin_ca.crt
-- osd_cert: osd_ca.crt
-- osd_pkey: osd_ca.key
-
-На стороне клиентов:
-- use_perms: true
-- osd_ca: osd_ca.crt
-- cert: client.crt
-- pkey: client.key
-
-### Варианты настройки etcd/Antietcd
-
-Доступны следующие варианты настройки:
-
-#### Mon со встроенным Antietcd
-
-Самый простой вариант. Кроме сертификатов OSD вам нужен всего 1 сертификат для Antietcd (antietcd.crt).
-
-Настройки Vitastor (`/etc/vitastor/vitastor.conf`):
-- etcd_address: [ "http://mon1:2379", ... ] (адреса ваших мониторов с портом 2379)
-- use_perms: true
-- use_antietcd: true
-- antietcd_cert: antietcd.crt
-- antietcd_key: antietcd.key
-- etcd_ca: antietcd.crt
-- osd_ca: osd_ca.crt
-- client_ca: client_ca.crt
-- admin_ca: admin_ca.crt
-
-#### Mon в роли Etcd proxy
-
-Если вы хотите включить привилегии, но остаться на etcd, можно задействовать режим etcd proxy.
-
-Вам понадобится 2 отдельных сертификата: один для etcd (etcd.crt) и один для antietcd (antietcd.crt).
-Клиентский порт etcd должен отличаться от стандартного 2379, например, можно выбрать 2381.
-
-Настройки Vitastor:
-- etcd_address: [ "http://mon1:2379", ... ] (адреса ваших мониторов с портом 2379)
-- use_perms: true
-- use_antietcd: true
-- etcd_proxy:
-  ```
-  {
-    "urls": [ "http://mon1:2381", ... ], // адреса ваших etcd с портом 2381
-    "cert": "antietcd.crt",
-    "key": "antietcd.key",
-    "ca": "etcd.crt"
-  }
-  ```
-- antietcd_cert: antietcd.crt
-- antietcd_key: antietcd.key
-- etcd_ca: antietcd.crt
-- osd_ca: osd_ca.crt
-- client_ca: client_ca.crt
-- admin_ca: admin_ca.crt
-
-Опции командной строки etcd:
-```
---advertise-client-urls=https://<АДРЕС>:2381 --listen-client-urls=https://<АДРЕС>:2381 \
---client-cert-auth --cert-file=etcd.crt --key-file=etcd.key --trusted-ca-file=antietcd.crt \
---peer-client-cert-auth --peer-cert-file=etcd.crt --peer-key-file=etcd.key --peer-trusted-ca-file=etcd.crt
-```
-
-#### Mon с отдельным Antietcd Proxy
-
-Если в дополнение к предыдущему варианту вы хотите разгрузить Antietcd от задач монитора Vitastor,
-можно запустить его отдельно.
-
-Аналогично предыдущему варианту нужно 2 сертификата: один для etcd и один для antietcd, плюс понадобится
-отдельный сертификат для монитора.
-
-Настройки Vitastor:
-- etcd_address: [ "http://mon1:2379", ... ] (адреса ваших мониторов с портом 2379)
-- use_perms: true
-- use_antietcd: false
-- etcd_ca: antietcd.crt
-- osd_ca: osd_ca.crt
-- client_ca: client_ca.crt
-- admin_ca: admin_ca.crt
-- mon_etcd_client_cert: mon_ca.crt
-- mon_etcd_client_key: mon_ca.key
-
-Опции командной строки Antietcd:
-```
---port 2379 --cert /etc/vitastor/antietcd.crt --key /etc/vitastor/antietcd.key \
---client_cert_auth 1 --auth_filter /usr/lib/vitastor/mon/vitastor_auth_filter.js \
---ca /etc/vitastor/client_ca.crt --admin_ca /etc/vitastor/admin_ca.crt \
---osd_ca /etc/vitastor/osd_ca.crt --mon_ca /etc/vitastor/mon_ca.crt \
---etcd_proxy url1,url2,... --etcd_ca /etc/vitastor/etcd.crt \
---etcd_cert /etc/vitastor/antietcd.crt --etcd_key /etc/vitastor/antietcd.key
-```
-
-Опции командной строки etcd (не отличаются от предыдущего варианта):
-```
---advertise-client-urls=https://<АДРЕС>:2381 --listen-client-urls=https://<АДРЕС>:2381 \
---client-cert-auth --cert-file=etcd.crt --key-file=etcd.key --trusted-ca-file=antietcd.crt \
---peer-client-cert-auth --peer-cert-file=etcd.crt --peer-key-file=etcd.key --peer-trusted-ca-file=etcd.crt
-```
-
-#### Отдельный Antietcd без etcd
-
-Аналогично предыдущему варианту, но etcd и его сертификат не нужны:
-
-Настройки Vitastor (не отличаются от предыдущего варианта):
-- etcd_address: [ "http://mon1:2379", ... ] (адреса ваших мониторов с портом 2379)
-- use_perms: true
-- use_antietcd: false
-- etcd_ca: antietcd.crt
-- osd_ca: osd_ca.crt
-- client_ca: client_ca.crt
-- admin_ca: admin_ca.crt
-- mon_etcd_client_cert: mon_ca.crt
-- mon_etcd_client_key: mon_ca.key
-
-Опции командной строки Antietcd:
-```
---port 2379 --cert /etc/vitastor/antietcd.crt --key /etc/vitastor/antietcd.key \
---client_cert_auth 1 --auth_filter /usr/lib/vitastor/mon/vitastor_auth_filter.js \
---ca /etc/vitastor/client_ca.crt --admin_ca /etc/vitastor/admin_ca.crt \
---osd_ca /etc/vitastor/osd_ca.crt --mon_ca /etc/vitastor/mon_ca.crt \
---persist_filter /usr/lib/vitastor/mon/vitastor_persist_filter.js
-```
-
-### Настройка Vault/OpenBao
-
-Для использования Vault каждому клиенту, который будет получать из Vault ключи
-образов, нужна учётная запись в Vault. Vitastor поддерживает только аутентификацию
-по клиентским сертификатам, так что все сертификаты клиентов (`cert`+`pkey`) должны
-быть зарегистрированы в Vault и им должен быть дан доступ к соответствующим секретам
-(поддерживается API секретов v1).
-
-Требуемый формат секрета Vault - одно поле `key` в формате шестнадцатеричной строки.
-Используется алгоритм AES-256-XTS, так что длина ключа - 64 байта, то есть строка
-должна состоять из 128 шестнадцатеричных цифр.
-
-Для подключения Vault включите следующие настройки в Vitastor.conf:
-- `vault_url` - адрес Vault (например, `https://vault:8200`)
-- `vault_ca` - сертификат самого Vault
-
-После этого, если создать образ (`vitastor-cli create`) с опцией `--enc_key vault:<ID>`,
-то для получения ключа клиенты Vitastor сначала обратятся к Vault для получения токена
-по адресу `/v1/auth/cert/login`, а потом запросят из Vault сам секрет по адресу `/v1/secret/<ID>`.
-
-#### Пример настройки Vault
-
-Пошаговая инструкция для настройки тестового Vault на примере OpenBao:
-
-1. Если ещё не настроен TLS, генерируем самоподписанный TLS сертификат для Vault:
-   ```
-   openssl req -days 3650 -x509 -addext basicConstraints=critical,CA:TRUE,pathlen:1 --addext subjectAltName=DNS:vault \
-       -new -newkey rsa:4096 -nodes -keyout /etc/openbao/vault.key -out /etc/openbao/vault.crt
-   ```
-   Настраиваем его в `/etc/openbao/openbao.hcl`:
-   ```
-   listener "tcp" {
-       address       = "0.0.0.0:8200"
-       tls_cert_file = "/etc/openbao/vault.crt"
-       tls_key_file  = "/etc/openbao/vault.key"
-   }
-   ```
-   И перезапускаем OpenBao (`systemctl restart openbao`).
-2. Копируем TLS сертификат Vault для Vitastor:
-   ```
-   cp /etc/openbao/vault.crt /etc/vitastor/vault.crt
-   ```
-   Переносим его на все клиентские ноды и прописываем в `/etc/vitastor/vitastor.conf`:
-   ```
-   {
-       ...
-       "vault_url": "http://vault:8200",
-       "vault_ca": "/etc/vitastor/vault.crt"
-   }
-   ```
-3. Проверяем статус Vault:
-   ```
-   bao status -ca-cert /etc/openbao/vault.crt -address=https://vault:8200
-   ```
-4. Инициализируем Vault в тестовом режиме из 1 ноды (с 1 частью ключа):
-   ```
-   bao operator init -n 1 -t 1 -ca-cert /etc/openbao/vault.crt -address=https://vault:8200
-   ```
-5. Разблокируем Vault:
-   ```
-   bao operator unseal -ca-cert /etc/openbao/vault.crt -address=https://vault:8200
-   ```
-6. Включаем аутентификацию по сертификатам:
-   ```
-   bao auth enable -ca-cert /etc/openbao/vault.crt -address=https://vault:8200 cert
-   ```
-7. Включаем секреты v1:
-   ```
-   bao secrets enable -ca-cert /etc/openbao/vault.crt -address=https://vault:8200 -path=secret kv-v1
-   ```
-8. Создаём тестовый секрет:
-   ```
-   bao kv put -ca-cert /etc/openbao/vault.crt -address=https://vault:8200 secret/vitastor/testimg3 key=$(openssl rand -hex 64)
-   ```
-9. Генерируем подписанный сертификат для пользователя Vitastor (там, где у вас есть `client_ca.crt` и `client_ca.key`):
-   ```
-   openssl req -subj '/CN=testimg3' -nodes -new -keyout testimg3.key -out testimg3.csr
-   openssl x509 -req -days 3650 -CA client_ca.crt -CAkey client_ca.key -CAcreateserial -in testimg3.csr -out testimg3.crt
-   rm testimg3.csr
-   ```
-10. Создаём пользователя в Vault и даём ему доступ к секрету:
-    ```
-    cat >testimg3.policy <<EOF
-    path "/secret/vitastor/testimg3" {
-        capabilities = ["read"]
-    }
-    EOF
-
-    bao policy write -ca-cert /etc/openbao/vault.crt -address=https://vault:8200 testimg3 testimg3.policy
-
-    bao write -ca-cert /etc/openbao/vault.crt -address=https://vault:8200 auth/cert/certs/testimg3 \
-        certificate=@testimg3.crt display_name=testimg3 token_ttl=24h token_policies=testimg3
-    ```
-11. Тестируем доступ к секрету:
-    ```
-    curl --cacert /etc/vitastor/vault.crt --cert testimg3.crt --key testimg3.key \
-        --json '{}' https://vault:8200/v1/auth/cert/login
-    ```
-    Будет выведен токен, подставляем его в следующий запрос:
-    ```
-    curl --cacert /etc/vitastor/vault.crt --cert testimg3.crt --key testimg3.key \
-        -H 'X-Vault-Token: <ПОЛУЧЕННЫЙ ТОКЕН>' https://vault:8200/v1/secret/vitastor/testimg3
-    ```
-12. Создаём образ в Vitastor с заданным секретом (от имени администратора или того, кто имеет
-    право создавать образы в вашем пуле):
-    ```
-    vitastor-cli create -s 100G --enc_key vault:vitastor/testimg3 --owner testimg3 testimg3
-    ```
-13. Тестируем доступ к образу от имени пользователя testimg3:
-    ```
-    vitastor-cli --cert testimg3.crt --pkey testimg3.key dd if=/dev/urandom oimg=testimg3 bs=1M count=100
-    ```
-
-## Списки разрешённых операций
-
-### Права доступа к данным etcd
-
-Ниже все названия ключей приведены без общего префикса `/vitastor`.
-
-Разрешённые операции с ключами в Antietcd для обычных пользователей:
-- Только чтение:
-  - Разрешено всегда:
-    - `/config/global`
-    - `/config/node_placement`
-    - `/config/pools`
-    - `/pg/config`
-    - `/osd/state/*`
-    - `/pg/state/*`
-    - `/index/maxid/*`
-  - Для образов, которые [может читать пользователь](#пользователи-и-права-доступа):
-    - `/config/inode/*`
-    - `/index/image/*`
-    - `/inode/stats/*`
-- Чтение и запись:
-  - Для пулов, в которых может создавать образы пользователь:
-    - `/index/maxid/*`
-  - Для образов, которыми владеет пользователь:
-    - `/config/inode/*`
-    - `/index/image/*`
-
-Разрешённые операции с ключами в Antietcd для администраторов:
-- Чтение:
-  - `/stats`
-  - `/mon/*`
-  - `/pg/*`
-  - `/pgstats/*`
-  - `/inode/stats/*`
-  - `/pool/stats/*`
-- Чтение и запись:
-  - `/config/*`
-  - `/osd/*`
-  - `/index/*`
-  - `/pg/config`
-  - `/pg/history/*`
-  - `/stats`
-  - `/history/last_clean_pgs`
-
-Разрешённые операции с ключами в etcd для OSD:
-- Чтение:
-  - `/pg/config`
-  - `/config/*`
-- Чтение и запись:
-  - `/osd/*`
-  - `/pg/state/*`
-  - `/pg/history/*`
-  - `/pgstats/*`
-
-Разрешённые операции с ключами в etcd для мониторов:
-- Чтение:
-  - `/config/*`
-  - `/osd/*`
-  - `/pgstats/*`
-- Чтение и запись:
-  - `/pg/config`
-  - `/stats`
-  - `/history/last_clean_pgs`
-  - `/mon/*`
-  - `/pg/history/*`
-  - `/pg/stats/*`
-  - `/pgstats/*`
-  - `/inode/stats/*`
-  - `/pool/stats/*`
-
-### Права доступа к данным OSD
-
-При включённой опции `use_perms` и шифровании OSD аутентифицирует клиентов по сертификатам
-и разрешает каждому клиенту только то, что ему разрешено согласно модели прав доступа.
-
-Клиентские операции:
-- READ - разрешено для образов, доступных пользователю на чтение.
-- WRITE, DELETE, SCRUB - разрешены для образов, доступных пользователю на запись.
-- SYNC - операция не связана с образом и разрешена всегда.
-- DESCRIBE - операция разрешена только для администраторов (используются командами
-  `vitastor-cli describe` и `fix`).
-- PING - операция разрешена всегда.
-- SHOW_CONFIG - операция разрешена всегда, однако если в ней клиент представляется
-  как OSD, то проверяется, что он использует сертификат, подписанный `osd_ca`.
-- SEC_LIST (листинг) - разрешена другим OSD и администраторам с любыми параметрами,
-  а обычным клиентам разрешена только для запросов, ограниченных образом, доступным
-  пользователю на чтение.
-
-Кластерные операции - разрешаются только другим OSD:
-- SEC_READ
-- SEC_WRITE
-- SEC_WRITE_STABLE
-- SEC_SYNC
-- SEC_STABILIZE
-- SEC_ROLLBACK
-- SEC_DELETE
-- SEC_READ_BMP
-- SEC_LOCK
-
-### Права доступа к API
-
-[vitastor-cli serve](../usage/cli.ru.md#serve) также поддерживает клиентскую
-аутентификацию по сертификатам. Принимаются только сертификаты, подписанные
-`client_ca`. В качестве серверного сертификата используется отдельный сертификат
-`api_cert` с ключом `api_pkey`.
-
-При этом для корректной работы `vitastor-cli serve` он сам должен использовать
-для доступа в Vitastor сертификат администратора (`cert`+`pkey`, подписанный `admin_ca`),
-чтобы корректно обрабатывать любые запросы.
-
-Обычным пользователям (с сертификатами, подписанными `client_ca`) при доступе к API
-разрешаются только API-операции с образами, доступными им либо на чтение (для чтения),
-либо на запись (для модификации):
-
-- image/list - для образов, которые пользователь может читать.
-- image/create - для пулов, в которых пользователю разрешено создавать образы, либо
-  для создания снимков образов, которыми пользователь владеет.
-- image/delete, image/flatten, image/modify - для образов, которыми пользователь владеет.
-
-Все остальные операции разрешаются только администраторам.
-
-## Производительность шифрования
-
-У вас может возникнуть вопрос - а как быстро всё это прекрасное шифрование работает?
-
-Ответ - сильно зависит от процессора. На современных процессорах (при наличии AVX512 с VAES)
-очень быстро - скорость шифрования AES может составлять 10-20 Гбайт/с и выше. В первую очередь
-подразумевается CPU клиентских машин, потому что сквозное шифрование выполняется целиком на
-клиенте, а транспортное хоть также и затрагивает OSD, но у клиента поток один, а OSD на стороне
-сервера много и добавить там ресурсов легче.
-
-На более старых процессорах скорость заметно хуже, например, на Xeon E5 v4 она составляет
-буквально 3 Гбайт/с.
-
-Вы можете оценить производительность своих процессоров с помощью команды `vitastor-cli cpubench`.
-
-Пример вывода (💪 AMD EPYC 9575F):
-
-```
-$ vitastor-cli cpubench
-Vitastor transport encryption benchmark (AES-256-GCM, AES-256-XTS and xxhash3)
-
-Warmup...
-
-No transport encryption, data checksums enabled, e2e unencrypted image
-xxhash3 1 M block... 209000 iterations in 2001 ms = 104447.78 MB/s
-xxhash3 4 K block... 37000000 iterations in 2022 ms = 71479.35 MB/s
-
-Header encryption with payload checksums, e2e unencrypted image
-AES-256-GCM encrypt header + xxhash3 1 M block... 210000 iterations in 2015 ms = 104218.36 MB/s
-AES-256-GCM encrypt header + xxhash3 4 K block... 26000000 iterations in 2073 ms = 48993.01 MB/s
-
-Full transport encryption, e2e unencrypted image
-AES-256-GCM encrypt header and 1 M block... 54000 iterations in 2000 ms = 27000.00 MB/s
-AES-256-GCM encrypt header and 4 K block... 11700000 iterations in 2014 ms = 22692.71 MB/s
-
-No transport encryption, no checksums, e2e encrypted image
-AES-256-XTS encrypt 1 M block... 50000 iterations in 2039 ms = 24521.82 MB/s
-AES-256-XTS encrypt 4 K block... 12600000 iterations in 2009 ms = 24499.13 MB/s
-
-No transport encryption, e2e encrypted image, data checksums enabled
-AES-256-XTS encrypt + xxhash3 1 M block... 40000 iterations in 2013 ms = 19870.84 MB/s
-AES-256-XTS encrypt + xxhash3 4 K block... 10200000 iterations in 2011 ms = 19812.90 MB/s
-
-Header encryption with payload checksums, e2e encrypted image
-AES-256-GCM encrypt header + AES-256-XTS encrypt + xxhash3 1 M block... 40000 iterations in 2014 ms = 19860.97 MB/s
-AES-256-GCM encrypt header + AES-256-XTS encrypt + xxhash3 4 K block... 8700000 iterations in 2011 ms = 16899.24 MB/s
-
-Full transport encryption, e2e encrypted image
-AES-256-XTS + AES-256-GCM encrypt 1 M block... 26000 iterations in 2062 ms = 12609.12 MB/s
-AES-256-XTS + AES-256-GCM encrypt 4 K block... 6300000 iterations in 2006 ms = 12267.88 MB/s
-```
-
-А вот Xeon E5-2680v4:
-
-```
-$ vitastor-cli cpubench
-Vitastor transport encryption benchmark (AES-256-GCM, AES-256-XTS and xxhash3)
-
-Warmup...
-
-No transport encryption, data checksums enabled, e2e unencrypted image
-xxhash3 1 M block... 62000 iterations in 2021 ms = 30677.88 MB/s
-xxhash3 4 K block... 12400000 iterations in 2006 ms = 24146.31 MB/s
-
-Header encryption with payload checksums, e2e unencrypted image
-AES-256-GCM encrypt header + xxhash3 1 M block... 62000 iterations in 2027 ms = 30587.07 MB/s
-AES-256-GCM encrypt header + xxhash3 4 K block... 6800000 iterations in 2011 ms = 13208.60 MB/s
-
-Full transport encryption, e2e unencrypted image
-AES-256-GCM encrypt header and 1 M block... 7000 iterations in 2317 ms = 3021.15 MB/s
-AES-256-GCM encrypt header and 4 K block... 1500000 iterations in 2102 ms = 2787.52 MB/s
-
-No transport encryption, no checksums, e2e encrypted image
-AES-256-XTS encrypt 1 M block... 7000 iterations in 2317 ms = 3021.15 MB/s
-AES-256-XTS encrypt 4 K block... 1600000 iterations in 2088 ms = 2993.30 MB/s
-
-No transport encryption, e2e encrypted image, data checksums enabled
-AES-256-XTS encrypt + xxhash3 1 M block... 6000 iterations in 2188 ms = 2742.23 MB/s
-AES-256-XTS encrypt + xxhash3 4 K block... 1400000 iterations in 2053 ms = 2663.78 MB/s
-
-Header encryption with payload checksums, e2e encrypted image
-AES-256-GCM encrypt header + AES-256-XTS encrypt + xxhash3 1 M block... 6000 iterations in 2190 ms = 2739.73 MB/s
-AES-256-GCM encrypt header + AES-256-XTS encrypt + xxhash3 4 K block... 1300000 iterations in 2101 ms = 2417.00 MB/s
-
-Full transport encryption, e2e encrypted image
-AES-256-XTS + AES-256-GCM encrypt 1 M block... 4000 iterations in 2666 ms = 1500.38 MB/s
-AES-256-XTS + AES-256-GCM encrypt 4 K block... 800000 iterations in 2113 ms = 1478.94 MB/s
-```

mon/antietcd_adapter.js

@@ -3,7 +3,6 @@
 
 const AntiEtcd = require('antietcd');
 
-const vitastor_auth_filter = require('./vitastor_auth_filter.js');
 const vitastor_persist_filter = require('./vitastor_persist_filter.js');
 const { b64, local_ips } = require('./utils.js');
 
@@ -28,17 +27,7 @@ class AntiEtcdAdapter
             is_local['::'] = true;
             is_local[''] = true;
             // split :, 3 -> <schema>:<//ip>:<port>
-            const selected = [];
-            for (let i = 0; i < cluster.length; i++)
-            {
-                const m = /^(https?:\/\/)?(?:\[(.*)\]|([^\[\:]+))(?::(\d+))?$/.exec(cluster[i]);
-                if (!m)
-                    continue;
-                const ip = m[3] || m[2];
-                const port = m[4] || 2379;
-                if (is_local[ip] && (!cfg_port || port == cfg_port))
-                    selected.push({ idx: i, ip, port });
-            }
+            const selected = cluster.map(s => s.split(':', 3)).filter(ip => is_local[ip[1].substr(2)] && (!cfg_port || ip[2] == cfg_port));
             if (selected.length > 1)
             {
                 console.error('More than 1 etcd_address matches local IPs, please specify port');
@@ -47,45 +36,29 @@ class AntiEtcdAdapter
             else if (selected.length == 1)
             {
                 const antietcd_config = {
-                    ip: selected[0].ip,
-                    port: selected[0].port,
+                    ip: selected[0][1].substr(2),
+                    port: selected[0][2],
                     cert: config.antietcd_cert,
                     key: config.antietcd_key,
-                    ca: config.client_ca,
-                    data: config.antietcd_data_file || ((config.antietcd_data_dir || '/var/lib/vitastor') + '/mon_'+selected[0].port+'.json.gz'),
+                    ca: config.etcd_ca,
+                    data: config.antietcd_data_file || ((config.antietcd_data_dir || '/var/lib/vitastor') + '/mon_'+selected[0][2]+'.json.gz'),
                     persist_filter: vitastor_persist_filter({ vitastor_prefix: config.etcd_prefix || '/vitastor' }),
-                    node_id: cluster[selected[0].idx].replace(/^(https?:\/\/)/, ''), // same as in <cluster> below
+                    node_id: selected[0][1].substr(2)+':'+selected[0][2], // node_id = ip:port
                     cluster: (cluster.length == 1 ? null : cluster.reduce((a, c) => { a[c.replace(/^(https?:\/\/)/, '')] = c; return a; }, {})),
                     cluster_key: (config.etcd_prefix || '/vitastor'),
                     stale_read: 1,
                     log_level: 1,
-                    logs: { cluster: true },
                 };
-                if (config.etcd_proxy)
-                {
-                    // Monitor may use the builtin etcd_proxy mode
-                    if (!config.etcd_proxy.urls)
-                    {
-                        console.error('etcd_proxy.urls are empty');
-                        process.exit(1);
-                    }
-                    antietcd_config.etcd_proxy = config.etcd_proxy.urls;
-                    antietcd_config.etcd_cert = config.etcd_proxy.cert;
-                    antietcd_config.etcd_key = config.etcd_proxy.key;
-                    antietcd_config.etcd_ca = config.etcd_proxy.ca;
-                    delete antietcd_config.data;
-                    delete antietcd_config.persist_filter;
-                    delete antietcd_config.cluster;
-                    delete antietcd_config.cluster_key;
-                }
-                if (config.use_perms)
+                if (config.use_auth)
                 {
                     antietcd_config.client_cert_auth = true;
-                    antietcd_config.auth_filter = vitastor_auth_filter;
-                    antietcd_config.ca = config.client_ca;
-                    antietcd_config.osd_ca = config.osd_ca;
-                    antietcd_config.mon_ca = config.mon_ca;
-                    antietcd_config.admin_ca = config.admin_ca;
+                    antietcd_config.auth_filter = require('./vitastor_auth_filter.js');
+                    antietcd_config.peer_ca = config.antietcd_server_ca;
+                    if (!config.antietcd_server_ca || config.antietcd_server_ca == config.etcd_ca)
+                    {
+                        console.error('Secure setup requires separate antietcd_server_ca (for signing antietcd server certificates) and etcd_ca (for signing client certificates)');
+                        process.exit(1);
+                    }
                 }
                 for (const key in config)
                 {
@@ -211,7 +184,7 @@ class AntiEtcdAdapter
                     await new Promise(ok => setTimeout(ok, timeout-(Date.now()-prev)));
                 }
                 prev = Date.now();
-                const res = await this.antietcd.api(path.replace(/^\/+/, '').replace(/\/+$/, '').replace(/\/+/g, '_'), body, { user_type: 'mon' });
+                const res = await this.antietcd.api(path.replace(/^\/+/, '').replace(/\/+$/, '').replace(/\/+/g, '_'), body, { username: 'root' });
                 if (res.error)
                 {
                     console.error('Failed to query antietcd '+path+' (retry '+retry+'/'+retries+'): '+res.error);

mon/etcd_schema.js

@@ -65,8 +65,6 @@ const etcd_tree = {
             placement_levels: { datacenter: 1, rack: 2, host: 3, osd: 4, ... },
             use_old_pg_combinator: false,
             osd_backfillfull_ratio: 0.99,
-            mon_metrics_path: '/prometheus',
-            mon_healthcheck_path: '/healthcheck',
             // client and osd
             tcp_header_buffer_size: 65536,
             use_sync_send_recv: false,

mon/lp_optimizer/lp_optimizer.js

@@ -112,10 +112,9 @@ function make_cyclic(pgs, parity_space)
 {
     if (parity_space > 1)
     {
-        for (const id in pgs)
+        for (const pg in pgs)
         {
-            const pg = pgs[id];
-            for (let i = 1; i < pg.length; i++)
+            for (let i = 1; i < pg.size; i++)
             {
                 const cyclic = [ ...pg.slice(i), ...pg.slice(0, i) ];
                 pgs['pg_'+cyclic.join('_')] = cyclic;

mon/mon.js

@@ -87,7 +87,7 @@ class Mon
             this.http = await create_http_server(this.config, (req, res) =>
             {
                 const u = new URL(req.url, 'http://'+(req.headers.host || 'localhost'));
-                if (u.pathname.replace(/\/+$/, '') == (this.config.mon_metrics_path||'/metrics'))
+                if (u.pathname.replace(/\/+$/, '') == (this.config.prometheus_path||'/metrics'))
                 {
                     if (!this.watcher_active)
                     {
@@ -100,19 +100,6 @@ class Mon
                         res.write(export_prometheus_metrics(this.state));
                     }
                 }
-                else if (u.pathname.replace(/\/+$/, '') == (this.config.mon_healthcheck_path||'/healthcheck'))
-                {
-                    if (!this.watcher_active)
-                    {
-                        res.writeHead(503);
-                        res.write('Monitor is in standby mode. Please retrieve metrics from master monitor instance\n');
-                    }
-                    else
-                    {
-                        res.setHeader('Content-Type', 'text/plain; version=0.0.4; charset=utf-8');
-                        res.write('Monitor is active');
-                    }
-                }
                 else
                 {
                     res.writeHead(404);
@@ -640,7 +627,7 @@ class Mon
                 if (this.state.pg.history[pool_id] &&
                     this.state.pg.history[pool_id][pg])
                 {
-                    pg_history[pg-1] = JSON.parse(JSON.stringify(this.state.pg.history[pool_id][pg]));
+                    pg_history[pg-1] = this.state.pg.history[pool_id][pg];
                 }
             }
             const real_prev_pgs = [];
@@ -732,7 +719,7 @@ class Mon
                 this.next_recheck_timer = null;
                 this.next_recheck_at = 0;
                 this.schedule_recheck();
-            }, (this.next_recheck_at-now)*1000);
+            }, now-this.next_recheck_at);
         }
     }
 

mon/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitastor-mon",
-  "version": "3.1.0",
+  "version": "3.0.9",
   "description": "Vitastor SDS monitor service",
   "main": "mon-main.js",
   "scripts": {
@@ -9,7 +9,7 @@
   "author": "Vitaliy Filippov",
   "license": "UNLICENSED",
   "dependencies": {
-    "antietcd": "^1.3.3",
+    "antietcd": "^1.2.4",
     "sprintf-js": "^1.1.2",
     "ws": "^7.2.5"
   },

mon/pg_utils.js

@@ -84,7 +84,7 @@ function scale_pg_history(prev_pg_history, prev_pgs, new_pgs)
         finish_pg_history(merged_history[1]);
         for (let i = 0; i < new_pg_count; i++)
         {
-            new_pg_history[i] = JSON.parse(JSON.stringify(merged_history[1]));
+            new_pg_history[i] = { ...merged_history[1] };
         }
     }
     // Mark history keys for removed PGs as removed
@@ -102,7 +102,7 @@ function scale_pg_count(prev_pgs, new_pg_count)
     {
         for (let i = prev_pgs.length; i < new_pg_count; i++)
         {
-            prev_pgs[i] = [ ...prev_pgs[i % prev_pgs.length] ];
+            prev_pgs[i] = prev_pgs[i % prev_pgs.length];
         }
     }
     else if (prev_pgs.length > new_pg_count)

mon/pool_config.js

@@ -3,9 +3,6 @@
 
 const { parse_level_indexes, parse_pg_dsl } = require('./lp_optimizer/dsl_pgs.js');
 
-const MIN_DATA_BLOCK_SIZE = 4096;
-const MAX_DATA_BLOCK_SIZE = 128*1024*1024;
-
 function validate_pool_cfg(pool_id, pool_cfg, placement_levels, warn)
 {
     pool_cfg.pg_size = Math.floor(pool_cfg.pg_size);
@@ -26,8 +23,7 @@ function validate_pool_cfg(pool_id, pool_cfg, placement_levels, warn)
             console.log('Pool '+pool_id+' has invalid coding scheme (one of "xor", "replicated", "ec" and "jerasure" required)');
         return false;
     }
-    // OSDs don't support pg_size > 64 for now
-    if (!pool_cfg.pg_size || pool_cfg.pg_size < 1 || pool_cfg.pg_size > 64 ||
+    if (!pool_cfg.pg_size || pool_cfg.pg_size < 1 || pool_cfg.pg_size > 256 ||
         pool_cfg.scheme !== 'replicated' && pool_cfg.pg_size < 3)
     {
         if (warn)
@@ -54,18 +50,6 @@ function validate_pool_cfg(pool_id, pool_cfg, placement_levels, warn)
             console.log('Pool '+pool_id+' has invalid parity_chunks (must be between 1 and pg_size-2)');
         return false;
     }
-    if (pool_cfg.block_size &&
-        (!Number(pool_cfg.block_size) || (pool_cfg.block_size & (pool_cfg.block_size-1)) ||
-        pool_cfg.block_size < MIN_DATA_BLOCK_SIZE || pool_cfg.block_size > MAX_DATA_BLOCK_SIZE ||
-        pool_cfg.scheme !== 'replicated' && pool_cfg.block_size*pool_cfg.pg_size > 0xFFFFFFFF))
-    {
-        if (warn)
-        {
-            console.log('Pool '+pool_id+' has invalid block_size (must be a power of two between '+
-                MIN_DATA_BLOCK_SIZE+' and '+MAX_DATA_BLOCK_SIZE+'; must not exceed 2^32-1 when multiplied by pg_size)');
-        }
-        return false;
-    }
     if (!pool_cfg.pg_count || pool_cfg.pg_count < 1)
     {
         if (warn)

mon/scripts/make-etcd

@@ -1,104 +1,50 @@
 #!/usr/bin/node
-// Simple Vitastor etcd / antietcd / TLS configurator
+// Simple systemd unit generator for etcd
 // Copyright (c) Vitaliy Filippov, 2019+
 // License: MIT
 
+// USAGE:
+// 1) Put the same etcd_address into /etc/vitastor/vitastor.conf on all monitor nodes
+// 2) Run ./make-etcd.js. It will create the etcd service on one of specified IPs
+
 const child_process = require('child_process');
 const fs = require('fs');
 const os = require('os');
-const path = require('path');
-const readline = require('readline');
 
-const help_text = `Initialize a Vitastor cluster (etcd, vitastor.conf and TLS certificates)
-(c) Vitaliy Filippov, 2026+ (MIT)
-
-USAGE:
-1) Create a minimal vitastor.conf with etcd_address, osd_network and (optionally) use_perms.
-   Non-encrypted: {"etcd_address":["http://10.0.0.10:2379","http://10.0.0.11:2379","http://10.0.0.12:2379"],"osd_network":"10.0.0.0/24"}
-   Encrypted: {"etcd_address":["https://10.0.0.10:2379","https://10.0.0.11:2379","https://10.0.0.12:2379"],"use_perms":true,"osd_network":"10.0.0.0/24"}
-   (Note https:// etcd URLs!)
-2) Run: ${process.argv[1]} [./vitastor.conf] [--antietcd-only]
-   You can run it on etcd/monitor nodes or on an external node.
-   It configures etcd, generates TLS certificates (on the first or external node), copies
-   them to other etcd/monitor nodes using root ssh, and updates vitastor.conf with TLS options.
-   You can also copy configuration and certificates manually.
-3) If you have OSD-only nodes, run:
-   ${process.argv[1]} --copy-to-osd-node NODE_NAME ./vitastor.conf
-   It copies vitastor.conf and required TLS certificates to that node.
-
-OPTIONS:
---antietcd-only
-    disable etcd (proxy or direct mode), use only antietcd
---gen-certs
-    force certificate generation even if it's not the first node
---no-certs
-    disable certificate generation
---copy yes|no|ask
-    copy vitastor.conf and TLS certificates for monitor&etcd to monitor nodes using scp
-    (default is ask)
---copy-to-osd-node NODE[,NODE2,...]
-    copy vitastor.conf and TLS certificates for OSDs to NODES using scp
-`;
+run().catch(e => { console.error(e); process.exit(1); });
 
 async function run()
 {
-    let config_path = '/etc/vitastor/vitastor.conf';
-    let config_dir = '/etc/vitastor';
-    let gen_certs = 'auto';
-    let antietcd_only = false;
-    let copy = 'ask';
-    let copy_to_osd = null;
-    for (let i = 2; i < process.argv.length; i++)
+    const config_path = process.argv[2] || '/etc/vitastor/vitastor.conf';
+    if (config_path == '-h' || config_path == '--help')
     {
-        const arg = process.argv[i];
-        if (arg == '-h' || arg == '--help')
-        {
-            console.log(help_text);
-            process.exit(0);
-        }
-        else if (arg == '--gen-certs')
-        {
-            gen_certs = true;
-        }
-        else if (arg == '--no-certs')
-        {
-            gen_certs = false;
-        }
-        else if (arg == '--antietcd-only')
-        {
-            antietcd_only = true;
-        }
-        else if (arg == '--copy-to-osd-node' && i < process.argv.length-1)
-        {
-            i++;
-            copy_to_osd = process.argv[i].split(/,/);
-        }
-        else if (arg == '--copy' && i < process.argv.length-1)
-        {
-            i++;
-            copy = process.argv[i];
-            if (copy !== 'ask' && copy !== 'yes' && copy !== 'no')
-            {
-                console.error('--copy should be "ask", "yes" or "no"');
-                process.exit(1);
-            }
-        }
-        else if (arg[0] == '-')
-        {
-            console.error('Unknown option: '+arg[0]);
-            process.exit(1);
-        }
-        else
-        {
-            config_path = arg;
-            config_dir = path.dirname(arg);
-        }
+        console.log(
+            'Initialize systemd etcd service for Vitastor\n'+
+            '(c) Vitaliy Filippov, 2019+ (MIT)\n'+
+            '\n'+
+            'USAGE:\n'+
+            '1) Put the same etcd_address into /etc/vitastor/vitastor.conf on all monitor nodes\n'+
+            '2) Run '+process.argv[1]+' [config_path]\n'
+        );
+        process.exit(0);
     }
     if (!fs.existsSync(config_path))
     {
         console.log(config_path+' is missing');
         process.exit(1);
     }
+    const in_docker = fs.existsSync("/etc/vitastor/etcd.conf") &&
+        fs.existsSync("/etc/vitastor/docker.conf");
+    if (!in_docker && fs.existsSync("/etc/systemd/system/vitastor-etcd.service"))
+    {
+        console.log("/etc/systemd/system/vitastor-etcd.service already exists");
+        process.exit(1);
+    }
+    if (!in_docker && fs.existsSync("/etc/systemd/system/etcd.service"))
+    {
+        console.log("/etc/systemd/system/etcd.service already exists");
+        process.exit(1);
+    }
     const config = JSON.parse(fs.readFileSync(config_path, { encoding: 'utf-8' }));
     if (!config.etcd_address)
     {
@@ -106,307 +52,30 @@ async function run()
         process.exit(1);
     }
     const etcds = (config.etcd_address instanceof Array ? config.etcd_address : (''+config.etcd_address).split(/,/))
-        .map(s => /^(https?):\/\/(\[[^\]]+\]|[^\[\]\:\/]+)(?::(\d+))?/.exec(s.toLowerCase()))
-        .filter(s => s)
-        .map(s => ({
-            scheme: s[1],
-            addr: s[2].indexOf(':') >= 0 && s[2][0] != '[' ? '['+s[2]+']' : s[2],
-            ip: s[2][0] == '[' ? s[2].substr(1, s[2].length-2) : s[2],
-            port: s[3],
-        }));
-    const tls = etcds.filter(e => e.scheme === 'https').length > 0;
-    const use_perms = tls && config.use_perms;
+        .map(s => (''+s).replace(/^https?:\/\/|(:\d+)?(\/.*)?$/g, '').replace(/^\[(.*)\]$/, '$1').toLowerCase());
     const num = select_local_etcd(etcds);
-    if (copy_to_osd)
-    {
-        copy_to_osd_nodes(copy_to_osd, config_dir, use_perms, antietcd_only);
-        process.exit(0);
-    }
-    if (tls)
-    {
-        const etcd_ca = config_dir+'/'+path.basename(config.etcd_ca || '/etc/vitastor/etcd_ca.crt');
-        if (gen_certs === true)
-        {
-            console.log('Certificate generation is requested explicitly, generating');
-        }
-        else if (gen_certs === false)
-        {
-            console.log('Certificate generation is disabled explicitly, skipping');
-        }
-        else if (num < 0)
-        {
-            gen_certs = true;
-            console.log('No matching IPs in etcd_address from '+config_path+', only generating certificates');
-        }
-        else if (config.etcd_ca && fs.existsSync(etcd_ca))
-        {
-            gen_certs = false;
-            console.log(etcd_ca+' already exists, assuming certificates are already generated');
-        }
-        else if (num === 0)
-        {
-            gen_certs = true;
-            console.log('This is monitor node 1, generating certificates');
-        }
-        else
-        {
-            console.log('This is monitor node '+(num+1)+', '+etcd_ca+' does not exist, please copy certificates to this node');
-            process.exit(1);
-        }
-        await write_auth_config(config, config_path, etcds, use_perms, antietcd_only);
-        if (gen_certs)
-        {
-            if (copy === 'ask')
-                copy = await ask_copy('Copy certificates and vitastor.conf to other nodes and start them (requires root ssh)? ');
-            copy = (copy === 'y' || copy === 'yes');
-            await make_certs(config_dir, copy, etcds, num, use_perms, antietcd_only);
-        }
-    }
-    else if (num <= 0)
-    {
-        if (copy === 'ask')
-            copy = await ask_copy('Copy vitastor.conf to other nodes and start them (requires root ssh)? ');
-        if (copy === 'y' || copy === 'yes')
-            await copy_nontls(config_dir, etcds, num);
-    }
     if (num < 0)
     {
         console.log('No matching IPs in etcd_address from '+config_path);
-        process.exit(tls && gen_certs ? 0 : 1);
+        process.exit(0);
     }
-    await configure_etcd(etcds, num, tls, use_perms);
-    process.exit(0);
-}
-
-async function ask_copy(question)
-{
-    const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout,
-        prompt: '> ',
-    });
-    let copy;
-    while (copy != 'y' && copy != 'n' && copy != 'yes' && copy != 'no')
-    {
-        if (copy)
-            console.log('Please type "yes" or "no"');
-        copy = await new Promise(ok => rl.question(question, ok));
-    }
-    return copy;
-}
-
-async function copy_to_osd_nodes(to, dir, use_perms, antietcd_only)
-{
-    const osd_to_copy = [ 'vitastor.conf' ];
-    if (!antietcd_only && !use_perms)
-        osd_to_copy.push('etcd_ca.crt');
-    else
-        osd_to_copy.push('antietcd_ca.crt');
-    if (use_perms)
-        osd_to_copy.push('osd.crt', 'osd.key', 'client_ca.crt');
-    console.warn('Copying configuration to OSD nodes '+to.join(', '));
-    for (const node of to)
-        await system("scp "+dir+"/"+osd_to_copy.join(" "+dir+"/")+" root@"+(node.indexOf(':') >= 0 ? "["+node+"]" : node)+":/etc/vitastor/");
-}
-
-async function make_certs(dir, copy, etcds, num, use_perms, antietcd_only)
-{
-    console.log(`-----
-Generating certificates in ${dir}
------
-`);
-    const to_copy = [ 'vitastor.conf' ];
-    const osd_to_copy = [ 'vitastor.conf' ];
-    if (!antietcd_only)
-    {
-        await make_ca("/O=Vitastor etcd CA", dir+"/etcd_ca");
-        await make_signed("/CN=Vitastor etcd", dir+"/etcd", dir+"/etcd_ca", etcds.map(e => "IP:"+e.ip).join(','));
-        to_copy.push('etcd_ca.crt', 'etcd.crt', 'etcd.key');
-        if (!use_perms)
-            osd_to_copy.push('etcd_ca.crt');
-    }
-    if (use_perms || antietcd_only)
-    {
-        await make_ca("/O=Vitastor Antietcd CA", dir+"/antietcd_ca");
-        await make_signed("/CN=Vitastor Antietcd", dir+"/antietcd", dir+"/antietcd_ca", etcds.map(e => "IP:"+e.ip).join(','));
-        to_copy.push('antietcd_ca.crt', 'antietcd.crt', 'antietcd.key');
-        osd_to_copy.push('antietcd_ca.crt');
-    }
-    if (use_perms)
-    {
-        await make_ca("/CN=Vitastor OSD", dir+"/osd");
-        await make_ca("/O=Vitastor Client CA", dir+"/client_ca");
-        await make_ca("/O=Vitastor Admin CA", dir+"/admin_ca");
-        await make_signed("/CN=admin", dir+"/admin", dir+"/admin_ca");
-        to_copy.push('osd.crt', 'osd.key', 'client_ca.crt', 'admin_ca.crt', 'admin.crt', 'admin.key');
-        osd_to_copy.push('osd.crt', 'osd.key', 'client_ca.crt', 'admin_ca.crt', 'admin.crt', 'admin.key');
-    }
-    console.log(`-----
-Certificates generated, commands to copy them:
-- Monitor+OSD node:
-  cd ${dir} && scp ${to_copy.join(' ')} root@NODE:/etc/vitastor/
-- Monitor node:
-  cd ${dir} && scp ${to_copy.filter(f => f != 'osd.key').join(' ')} root@NODE:/etc/vitastor/
-- OSD node:
-  cd ${dir} && scp ${osd_to_copy.join(' ')} root@NODE:/etc/vitastor/
-Then don't forget to run:
-chown vitastor:vitastor /etc/vitastor/*.key && /usr/lib/vitastor/mon/make-etcd
------
-`);
-    if (copy)
-    {
-        for (let i = 0; i < etcds.length; i++)
-        {
-            if (i == num)
-                continue;
-            const node = etcds[i];
-            await system("scp "+dir+"/"+to_copy.join(" "+dir+"/")+" root@"+(node.ip.indexOf(':') >= 0 ? "["+node.ip+"]" : node.ip)+
-                ":/etc/vitastor/ && ssh root@"+node.ip+" 'chown vitastor:vitastor /etc/vitastor/*.key && /usr/lib/vitastor/mon/make-etcd'");
-        }
-    }
-    else
-    {
-        console.warn('Certificates generated in '+dir+', please copy them to other nodes');
-    }
-}
-
-async function copy_nontls(dir, etcds, num)
-{
-    const to_copy = [ 'vitastor.conf' ];
-    for (let i = 0; i < etcds.length; i++)
-    {
-        if (i == num)
-            continue;
-        const node = etcds[i];
-        await system("scp "+dir+"/"+to_copy.join(" "+dir+"/")+" root@"+(node.ip.indexOf(':') >= 0 ? "["+node.ip+"]" : node.ip)+
-            ":/etc/vitastor/ && ssh root@"+node.ip+" '/usr/lib/vitastor/mon/make-etcd'");
-    }
-}
-
-async function write_auth_config(config, config_path, etcds, use_perms, antietcd_only)
-{
-    const auth = {};
-    if (use_perms)
-    {
-        auth["use_antietcd"] = true;
-        if (!antietcd_only)
-        {
-            auth["etcd_proxy"] = {
-                urls: etcds.map(e => (e.ip.indexOf(':') >= 0 ? '['+e.ip+']' : e.ip)+':2381'),
-                cert: "/etc/vitastor/antietcd.crt",
-                key: "/etc/vitastor/antietcd.key",
-                ca: "/etc/vitastor/etcd_ca.crt",
-            };
-        }
-        auth["antietcd_cert"] = "/etc/vitastor/antietcd.crt";
-        auth["antietcd_key"] = "/etc/vitastor/antietcd.key";
-        auth["etcd_ca"] = "/etc/vitastor/antietcd_ca.crt";
-        auth["osd_cert"] = "/etc/vitastor/osd.crt";
-        auth["osd_pkey"] = "/etc/vitastor/osd.key";
-        auth["osd_ca"] = "/etc/vitastor/osd.crt";
-        auth["client_ca"] = "/etc/vitastor/client_ca.crt";
-        auth["admin_ca"] = "/etc/vitastor/admin_ca.crt";
-        auth["cert"] = "/etc/vitastor/admin.crt";
-        auth["pkey"] = "/etc/vitastor/admin.key";
-    }
-    else
-    {
-        if (antietcd_only)
-        {
-            auth["use_antietcd"] = true;
-            auth["antietcd_cert"] = "/etc/vitastor/antietcd.crt";
-            auth["antietcd_key"] = "/etc/vitastor/antietcd.key";
-            auth["etcd_ca"] = "/etc/vitastor/antietcd_ca.crt";
-        }
-        else
-        {
-            auth["etcd_ca"] = "/etc/vitastor/etcd.crt";
-        }
-    }
-    for (const k in auth)
-    {
-        if ((k in config) && JSON.stringify(auth[k]) != JSON.stringify(config[k]))
-        {
-            // Auth options already overridden with non-default
-            console.log(k+" is already overridden in "+config_path+", skipping config update");
-            return;
-        }
-    }
-    for (const k in auth)
-    {
-        config[k] = auth[k];
-    }
-    console.log(`-----
-Updating ${config_path}
------
-`);
-    fs.writeFileSync(config_path, JSON.stringify(config, 0, 4));
-}
-
-async function configure_etcd(etcds, num, tls, use_perms)
-{
-    const in_docker = fs.existsSync("/etc/vitastor/etcd.conf") &&
-        fs.existsSync("/etc/vitastor/docker.conf");
-    if (!in_docker && fs.existsSync("/etc/systemd/system/vitastor-etcd.service") &&
-        fs.existsSync("/etc/vitastor/etcd.conf"))
-    {
-        console.log("/etc/systemd/system/vitastor-etcd.service and /etc/vitastor/etcd.conf already exists. Remove them to reinitialize the cluster");
-        process.exit(1);
-    }
-    if (!in_docker && fs.existsSync("/etc/systemd/system/etcd.service"))
-    {
-        console.log("/etc/systemd/system/etcd.service already exists");
-        process.exit(1);
-    }
-    const etcd_url = etcds[num].scheme + '://' + etcds[num].addr;
-    const options = {
-        name: 'etcd'+etcds[num].ip.replace(/[^0-9a-z_]/ig, '_'),
-        advertise_client_urls: etcd_url+':'+(use_perms ? 2381 : 2379),
-        listen_client_urls: etcd_url+':'+(use_perms ? 2381 : 2379),
-        initial_advertise_peer_urls: etcd_url+':2380',
-        listen_peer_urls: etcd_url+':2380',
-        initial_cluster_token: 'vitastor-etcd-1',
-        initial_cluster_state: 'new',
-        initial_cluster: etcds.map(e => `etcd${e.ip.replace(/[^0-9a-z_]/ig, '_')}=${e.scheme}://${e.addr}:2380`).join(','),
-        snapshot_count: 10000,
-        max_txn_ops: 100000,
-        max_request_bytes: 104857600,
-        auto_compaction_retention: 10,
-        auto_compaction_mode: 'revision',
-    };
-    if (tls)
-    {
-        options['cert_file'] = '/etc/vitastor/etcd.crt';
-        options['key_file'] = '/etc/vitastor/etcd.key';
-        if (use_perms)
-        {
-            options['client_cert_auth'] = '1';
-            options['trusted_ca_file'] = '/etc/vitastor/antietcd_ca.crt';
-        }
-        options['peer_cert_file'] = '/etc/vitastor/etcd.crt';
-        options['peer_key_file'] = '/etc/vitastor/etcd.key';
-        if (use_perms)
-        {
-            options['peer_client_cert_auth'] = '1';
-            options['peer_trusted_ca_file'] = '/etc/vitastor/etcd_ca.crt';
-        }
-    }
-    let etcd_conf = fs.existsSync("/etc/vitastor/etcd.conf")
-        ? fs.readFileSync("/etc/vitastor/etcd.conf", { encoding: 'utf-8' })
-        : "";
-    for (const k in options)
-    {
-        etcd_conf = replace_env(etcd_conf, 'ETCD_'+k.toUpperCase().replace(/-/, '_'), options[k]);
-    }
-    fs.writeFileSync("/etc/vitastor/etcd.conf", etcd_conf);
+    const etcd_url = 'http://' + (etcds[num].indexOf(':') >= 0 ? '['+etcds[num]+']' : etcds[num]);
+    const etcd_name = 'etcd'+etcds[num].replace(/[^0-9a-z_]/ig, '_');
+    const etcd_cluster = etcds.map(e => `etcd${e.replace(/[^0-9a-z_]/ig, '_')}=http://${e.indexOf(':') >= 0 ? '['+e+']' : e}:2380`).join(',');
     if (in_docker)
     {
+        let etcd_conf = fs.readFileSync("/etc/vitastor/etcd.conf", { encoding: 'utf-8' });
+        etcd_conf = replace_env(etcd_conf, 'ETCD_NAME', etcd_name);
+        etcd_conf = replace_env(etcd_conf, 'ETCD_IP', etcds[num]);
+        etcd_conf = replace_env(etcd_conf, 'ETCD_INITIAL_CLUSTER', etcd_cluster);
+        fs.writeFileSync("/etc/vitastor/etcd.conf", etcd_conf);
         console.log('etcd for Vitastor configured. Run `systemctl enable --now vitastor-etcd` to start etcd');
         process.exit(0);
     }
     await system(`mkdir -p /var/lib/etcd/vitastor`);
     fs.writeFileSync(
-        "/etc/systemd/system/vitastor-etcd.service", `[Unit]
+        "/etc/systemd/system/vitastor-etcd.service",
+`[Unit]
 Description=etcd for vitastor
 After=network-online.target local-fs.target time-sync.target
 Wants=network-online.target local-fs.target time-sync.target
@@ -414,8 +83,12 @@ Wants=network-online.target local-fs.target time-sync.target
 [Service]
 Restart=always
 Environment=GOGC=50
-EnvironmentFile=/etc/vitastor/etcd.conf
-ExecStart=etcd --data-dir /var/lib/etcd/vitastor
+ExecStart=etcd --name ${etcd_name} --data-dir /var/lib/etcd/vitastor \\
+    --snapshot-count 10000 --advertise-client-urls ${etcd_url}:2379 --listen-client-urls ${etcd_url}:2379 \\
+    --initial-advertise-peer-urls ${etcd_url}:2380 --listen-peer-urls ${etcd_url}:2380 \\
+    --initial-cluster-token vitastor-etcd-1 --initial-cluster ${etcd_cluster} \\
+    --initial-cluster-state new --max-txn-ops=100000 --max-request-bytes=104857600 \\
+    --auto-compaction-retention=10 --auto-compaction-mode=revision
 WorkingDirectory=/var/lib/etcd/vitastor
 ExecStartPre=+chown -R etcd /var/lib/etcd/vitastor
 User=etcd
@@ -429,77 +102,37 @@ RestartSec=10
 WantedBy=multi-user.target
 `);
     await system(`useradd etcd`);
-    await system(`chown vitastor:vitastor /etc/vitastor/*.key`);
-    if (options['key_file'])
-    {
-        await system(`chown etcd `+options['key_file']);
-    }
     await system(`systemctl daemon-reload`);
     // Disable distribution etcd unit and enable our one
     await system(`systemctl disable --now etcd`);
     await system(`systemctl enable --now vitastor-etcd`);
-    await system(`systemctl enable --now vitastor-mon`);
+    process.exit(0);
 }
 
 function replace_env(text, key, value)
 {
     let found = false;
     text = text.replace(new RegExp('^'+key+'\\s*=.*', 'm'), () => { found = true; return key+'='+value; });
-    if (found)
-        return text;
-    return (text != '' ? text.replace(/\s*$/, '\n') : '')+key+'='+value+'\n';
+    return found ? text : text.replace(/\s*$/, '\n')+key+'='+value+'\n';
 }
 
 function select_local_etcd(etcds)
 {
     const ifaces = os.networkInterfaces();
-    const local = {};
     for (const ifname in ifaces)
-    {
         for (const iface of ifaces[ifname])
-        {
-            const addr = iface.address;
-            if (iface.family == 'IPv6')
-                local[addr.toLowerCase()] = local['['+addr.toLowerCase()+']'] = true;
-            else
-                local[addr] = true;
-        }
-    }
-    for (let i = 0; i < etcds.length; i++)
-    {
-        if (local[etcds[i].addr])
-            return i;
-    }
+            for (let i = 0; i < etcds.length; i++)
+                if (etcds[i] == iface.address.toLowerCase())
+                    return i;
     return -1;
 }
 
 async function system(cmd)
 {
-    console.log('Running '+cmd);
-    process.stdin.pause();
     const cp = child_process.spawn(cmd, { shell: true, stdio: [ 0, 1, 2 ] });
     let finish_cb;
     cp.on('exit', () => finish_cb && finish_cb());
     if (cp.exitCode == null)
         await new Promise(ok => finish_cb = ok);
-    process.stdin.resume();
     return cp.exitCode;
 }
-
-async function make_ca(subj, filename)
-{
-    if (await system("openssl req -days 3650 -x509 -subj '"+subj+"' -addext basicConstraints=critical,CA:TRUE,pathlen:1"+
-        " -new -newkey rsa:4096 -nodes -keyout "+filename+".key -out "+filename+".crt"))
-        process.exit(1);
-}
-
-async function make_signed(subj, f, ca, san)
-{
-    if (await system(`openssl req -subj '${subj}' ${san ? "-addext 'subjectAltName="+san+"'" : ""} -nodes -new -keyout ${f}.key -out ${f}.csr`))
-        process.exit(1);
-    if (await system(`openssl x509 -req -days 3650 -copy_extensions copy -CA ${ca}.crt -CAkey ${ca}.key -CAcreateserial -in ${f}.csr -out ${f}.crt`))
-        process.exit(1);
-    fs.unlinkSync(f+".csr");
-}
-
-run().catch(e => { console.error(e); process.exit(1); });

mon/stats.js

@@ -37,7 +37,6 @@ function derive_osd_stats(st, prev, prev_diff)
         const n = c.count - BigInt(pr && pr.count||0);
         diff.recovery_stats[op] = { ...c, bps: n > 0 ? b*1000n/timediff : 0n, iops: n > 0 ? n*1000n/timediff : 0n };
     }
-    diff.inode_stats = {};
     for (const pool_id in st.inode_stats||{})
     {
         diff.inode_stats[pool_id] = {};

mon/vitastor_auth_filter.js

@@ -5,19 +5,17 @@
 // Permissions are based on:
 // 1. Users.
 //    Stored in /vitastor/config/user/<username>.
-//    Has 1 property:
+//    Has 2 properties:
+//    - type, one of: osd, mon, admin, client.
+//      osd, mon types should be used by OSDs/monitors.
+//      admin should be used for administrative access from vitastor-cli.
+//      client should be used for regular clients.
 //    - groups, a list of group names the user is included in.
 // 2. Images.
 //    Stored in /vitastor/config/inode/<pool>/<inode>. Has the following properties:
 //    - owner (user name)
 //    - owner_group (group name)
 //    - reader_group
-// 3. Certificates.
-//    - osd_ca identifies OSDs.
-//    - admin_ca (optional) identifies administrators.
-//    - mon_ca (optional) identifies monitors.
-
-const { X509Certificate } = require('node:crypto');
 
 const static_perms = {
     invalid: {
@@ -26,17 +24,17 @@ const static_perms = {
     },
     osd: {
         keys: { '/pg/config': false },
-        prefixes: { '/config/': false, '/osd/': true, '/pg/state/': true, '/pg/history/': true, '/pgstats/': true },
+        prefixes: { '/osd/': true, '/pg/state/': true, '/pg/history/': true, '/pgstats/': true },
     },
     mon: {
         keys: { '/pg/config': true, '/stats': true, '/history/last_clean_pgs': true },
         prefixes: {
             '/config/': false, '/osd/': false, '/mon/': true, '/pg/history/': true,
-            '/pg/stats/': true, '/pgstats/': true, '/inode/stats/': true, '/pool/stats/': true,
+            '/pgstats/': false, '/inode/stats/': true, '/pool/stats/': true,
         },
     },
     admin: {
-        keys: { '/pg/config': true, '/stats': true, '/history/last_clean_pgs': true },
+        keys: { '/stats': false },
         prefixes: {
             '/config/': true, '/osd/': true, '/index/': true, '/pg/history/': true,
             '/mon/': false, '/pg/': false, '/pgstats/': false, '/inode/stats/': false, '/pool/stats/': false,
@@ -44,15 +42,15 @@ const static_perms = {
     },
     client: {
         keys: { '/config/global': false, '/config/node_placement': false, '/config/pools': false, '/pg/config': false },
-        prefixes: { '/osd/state/': false, '/pg/state/': false, '/index/maxid/': false },
+        prefixes: { '/osd/stats/': false, '/pg/state/': false, '/index/maxid/': false },
     },
 };
 
 const api_perms = {
-    osd: { lease_grant: true, lease_revoke: true, lease_keepalive: true, maintenance_status: true },
-    mon: { lease_grant: true, lease_revoke: true, lease_keepalive: true, maintenance_status: true },
+    osd: { lease_grant: true, lease_revoke: true, lease_keepalive: true },
+    mon: { lease_grant: true, lease_revoke: true, lease_keepalive: true },
     admin: { maintenance_status: true },
-    client: { maintenance_status: true },
+    client: {},
 };
 
 class VitastorAuthFilter
@@ -65,47 +63,6 @@ class VitastorAuthFilter
         this.prefix_parts = this.prefix.split('/');
     }
 
-    async init()
-    {
-        if (!this.cfg.cert || !this.cfg.key || !this.cfg.ca || !this.cfg.osd_ca || !this.cfg.client_cert_auth)
-        {
-            throw new Error('Authenticated Vitastor setups require enabled client_cert_auth, cert, key'+
-                ' and separate ca (client CA), osd_ca and optionally admin_ca and mon_ca');
-        }
-        this.osd_ca = await this.antietcd.readPEM(this.cfg.osd_ca);
-        this.osd_ca_obj = new X509Certificate(this.osd_ca);
-        this.antietcd.tls.ca.push(this.osd_ca);
-        if (this.cfg.mon_ca)
-        {
-            this.mon_ca = await this.antietcd.readPEM(this.cfg.mon_ca);
-            this.mon_ca_obj = new X509Certificate(this.mon_ca);
-            this.antietcd.tls.ca.push(this.mon_ca);
-        }
-        if (this.cfg.admin_ca)
-        {
-            this.admin_ca = await this.antietcd.readPEM(this.cfg.admin_ca);
-            this.admin_ca_obj = new X509Certificate(this.admin_ca);
-            this.antietcd.tls.ca.push(this.admin_ca);
-        }
-    }
-
-    init_context(context, socket)
-    {
-        let cert = socket.getPeerX509Certificate();
-        if (cert.issuer == this.osd_ca_obj.subject && cert.verify(this.osd_ca_obj.publicKey))
-        {
-            context.user_type = 'osd';
-        }
-        else if (this.mon_ca_obj && cert.issuer == this.mon_ca_obj.subject && cert.verify(this.mon_ca_obj.publicKey))
-        {
-            context.user_type = 'mon';
-        }
-        else if (this.admin_ca_obj && cert.issuer == this.admin_ca_obj.subject && cert.verify(this.admin_ca_obj.publicKey))
-        {
-            context.user_type = 'admin';
-        }
-    }
-
     _get(path, decode)
     {
         let cur = this.antietcd.etctree.state;
@@ -149,7 +106,7 @@ class VitastorAuthFilter
         return cur;
     }
 
-    // userInfo: { name: string, perms: static_perms[type], groups: { [string]: true } }
+    // userInfo: { name: string, type: string, perms: static_perms[type], groups: { [string]: true } }
     _check_compare(check, userInfo, checked)
     {
         let key = String(check.key);
@@ -306,18 +263,6 @@ class VitastorAuthFilter
                 }
                 return false;
             }
-            if (key.substr(0, 13) == '/inode/stats/')
-            {
-                const [ pool_id, id ] = key.substr(13).split('/');
-                const inode = this._get([ ...this.prefix_parts, 'config', 'inode', pool_id, id ], true);
-                if (inode && (inode.reader_group && userInfo.groups[inode.reader_group] ||
-                    inode.owner_group && userInfo.groups[inode.owner_group] ||
-                    inode.owner === userInfo.name))
-                {
-                    return true;
-                }
-                return false;
-            }
         }
         return false;
     }
@@ -404,27 +349,19 @@ class VitastorAuthFilter
         return true;
     }
 
-    _get_user(context)
+    _get_user(username)
     {
-        if (context.user_type === 'osd' || context.user_type === 'mon' || context.user_type === 'admin')
+        if (!username)
         {
-            return {
-                name: context.user_type,
-                type: context.user_type,
-                perms: static_perms[context.user_type],
-            };
+            return null;
         }
-        if (!context.username)
-        {
-            return {};
-        }
-        let userInfo = this._get([ ...this.prefix_parts, 'config', 'user', context.username ], true);
+        let userInfo = this._get([ ...this.prefix_parts, 'config', 'user', username ], true);
         if (!userInfo)
         {
-            userInfo = {};
+            userInfo = { type: 'client' };
         }
         userInfo.perms = static_perms[userInfo.type] || static_perms['invalid'];
-        userInfo.name = context.username;
+        userInfo.name = username;
         if (userInfo.groups instanceof Array)
         {
             userInfo.groups = userInfo.groups.reduce((a, c) => { a[c] = true; return a; }, {});
@@ -436,19 +373,23 @@ class VitastorAuthFilter
         return userInfo;
     }
 
-    filter_api(context, api/*, data*/)
+    filter_api(username, api/*, data*/)
     {
-        let type = 'client';
-        if (context.user_type === 'osd' || context.user_type === 'mon' || context.user_type === 'admin')
+        if (username === 'root')
         {
-            type = context.user_type;
+            return true;
         }
-        return api_perms[type] && api_perms[type][api];
+        const userInfo = this._get([ ...this.prefix_parts, 'config', 'user', username ], true);
+        return userInfo && api_perms[userInfo.type] && api_perms[userInfo.type][api];
     }
 
-    filter_txn(context, txn)
+    filter_txn(username, txn)
     {
-        const userInfo = this._get_user(context);
+        if (username === 'root')
+        {
+            return true;
+        }
+        const userInfo = this._get_user(username);
         if (!userInfo)
         {
             return null;
@@ -484,13 +425,13 @@ class VitastorAuthFilter
         return txn;
     }
 
-    filter_txn_response(context, txn, res)
+    filter_txn_response(username, txn, res)
     {
-        if (!res.responses)
+        if (!res.responses || username === 'root')
         {
             return;
         }
-        const userInfo = this._get_user(context);
+        const userInfo = this._get_user(username);
         if (!userInfo)
         {
             for (const resp of res.responses)
@@ -511,13 +452,13 @@ class VitastorAuthFilter
         }
     }
 
-    filter_watch_message(context, msg)
+    filter_watch_message(username, msg)
     {
-        if (!msg.result || !msg.result.events)
+        if (!msg.result || !msg.result.events || username === 'root')
         {
             return;
         }
-        const userInfo = this._get_user(context);
+        const userInfo = this._get_user(username);
         if (!userInfo)
         {
             msg.result.events = [];

node-binding/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitastor",
-  "version": "3.1.0",
+  "version": "3.0.9",
   "description": "Low-level native bindings to Vitastor client library",
   "main": "index.js",
   "keywords": [

patches/VitastorPlugin.pm

@@ -366,38 +366,15 @@ sub map_volume
     my $prefix = defined $scfg->{vitastor_prefix} ? $scfg->{vitastor_prefix} : 'pve/';
 
     my ($vtype, $img_name, $vmid) = $class->parse_volname($volname);
-    my $name = $prefix.$img_name;
+    my $name = $img_name;
     $name .= '@'.$snapname if $snapname;
 
     my $mapped = run_cli($scfg, [ 'ls' ], binary => '/usr/bin/vitastor-nbd');
-    my ($kerneldev) = grep {
-        $mapped->{$_} && $mapped->{$_}->{image} && $mapped->{$_}->{image} eq $name
-    } keys %$mapped;
+    my ($kerneldev) = grep { $mapped->{$_}->{image} eq $prefix.$name } keys %$mapped;
+    return $kerneldev if $kerneldev && -b $kerneldev; # already mapped
 
-    if ($kerneldev && -b $kerneldev)
-    {
-        my $size = `/usr/sbin/blockdev --getsize64 $kerneldev`;
-        return $kerneldev if $size && $size > 0;
-    }
-
-    my $map_out = run_cli($scfg, [ 'map', '--image', $name ], binary => '/usr/bin/vitastor-nbd', json => 0);
-    $map_out =~ s/^\s+|\s+$//gso;
-
-    # Wait until the device is started
-    for (my $i = 0; $i < 100; $i++)
-    {
-        $mapped = run_cli($scfg, [ 'ls' ], binary => '/usr/bin/vitastor-nbd');
-        ($kerneldev) = grep { $mapped->{$_} && $mapped->{$_}->{image} && $mapped->{$_}->{image} eq $name } keys %$mapped;
-        if ($kerneldev && -b $kerneldev)
-        {
-            my $size = `/usr/sbin/blockdev --getsize64 $kerneldev`;
-            return $kerneldev if $size && $size > 0;
-        }
-        select(undef, undef, undef, 0.1);
-    }
-
-    die "Failed to map Vitastor image $name via NBD".
-        ($map_out ? ", vitastor-nbd map returned '$map_out'" : "")."\n";
+    $kerneldev = run_cli($scfg, [ 'map', '--image', $prefix.$name ], binary => '/usr/bin/vitastor-nbd', json => 0);
+    return $kerneldev;
 }
 
 sub unmap_volume
@@ -406,19 +383,13 @@ sub unmap_volume
     my $prefix = defined $scfg->{vitastor_prefix} ? $scfg->{vitastor_prefix} : 'pve/';
 
     my ($vtype, $name, $vmid) = $class->parse_volname($volname);
-    $name = $prefix.$name;
     $name .= '@'.$snapname if $snapname;
+
     my $mapped = run_cli($scfg, [ 'ls' ], binary => '/usr/bin/vitastor-nbd');
-
-    my @kerneldevs = grep {
-        $mapped->{$_} && $mapped->{$_}->{image} && $mapped->{$_}->{image} eq $name
-    } keys %$mapped;
-
-    for my $kerneldev (@kerneldevs)
+    my ($kerneldev) = grep { $mapped->{$_}->{image} eq $prefix.$name } keys %$mapped;
+    if ($kerneldev && -b $kerneldev)
     {
-        next if !$kerneldev || !-b $kerneldev;
-        eval { run_cli($scfg, [ 'unmap', $kerneldev ], binary => '/usr/bin/vitastor-nbd', json => 0); };
-        warn "Failed to unmap Vitastor image $name from $kerneldev: $@" if $@;
+        run_cli($scfg, [ 'unmap', $kerneldev ], binary => '/usr/bin/vitastor-nbd', json => 0);
     }
 
     return 1;
@@ -434,13 +405,7 @@ sub activate_volume
 sub deactivate_volume
 {
     my ($class, $storeid, $scfg, $volname, $snapname, $cache) = @_;
-
-    # Even with vitastor_nbd=0, Proxmox may call map_volume() for special
-    # volumes like tpmstate0 because swtpm needs a local file/block path.
-    # Therefore, always try to unmap an existing NBD mapping here.
-    # unmap_volume() is a no-op if the volume is not currently mapped.
-    $class->unmap_volume($storeid, $scfg, $volname, $snapname);
-
+    $class->unmap_volume($storeid, $scfg, $volname, $snapname) if $scfg->{vitastor_nbd};
     return 1;
 }
 

patches/cinder-vitastor.py

@@ -50,7 +50,7 @@ from cinder.volume import configuration
 from cinder.volume import driver
 from cinder.volume import volume_utils
 
-VITASTOR_VERSION = '3.1.0'
+VITASTOR_VERSION = '3.0.9'
 
 LOG = logging.getLogger(__name__)
 
@@ -608,7 +608,7 @@ class VitastorDriver(driver.CloneableImageVD,
         """Extend an existing volume."""
         vol_name = utils.convert_str(volume.name)
         size = int(new_size) * units.Gi
-        self._cli('extend volume', 'modify', vol_name, '--resize', size)
+        self._cli('extend volume', 'modify', vol_name, '--resize', new_size)
         LOG.debug(
             "Extend volume from %(old_size)s GB to %(new_size)s GB.",
             {'old_size': volume.size, 'new_size': new_size}

rpm/vitastor-el10.Dockerfile

@@ -11,10 +11,7 @@ WORKDIR /root
 RUN sed -i 's/enabled=0/enabled=1/' /etc/yum.repos.d/*.repo
 RUN dnf -y install epel-release dnf-plugins-core
 RUN dnf -y install https://vitastor.io/rpms/centos/10/vitastor-release-1.0-1.el10.noarch.rpm
-RUN sed -i 's/metalink=/#metalink=/' /etc/yum.repos.d/epel.repo
-RUN sed -i 's!#baseurl=.*epel/!baseurl=https://mirror.yandex.ru/epel/!' /etc/yum.repos.d/epel.repo
-RUN dnf -y install gcc-c++ gperftools-devel fio nodejs rpm-build jerasure-devel isa-l-devel openssl-devel libisa-l_crypto-devel \
-    gf-complete-devel rdma-core-devel cmake libnl3-devel c-ares-devel
+RUN dnf -y install gcc-c++ gperftools-devel fio nodejs rpm-build jerasure-devel isa-l-devel gf-complete-devel rdma-core-devel cmake libnl3-devel c-ares-devel
 RUN dnf download --source fio
 RUN rpm --nomd5 -i fio*.src.rpm
 RUN cd ~/rpmbuild/SPECS && dnf builddep -y --spec fio.spec

rpm/vitastor-el10.spec

@@ -1,18 +1,17 @@
 Name:           vitastor
-Version:        3.1.0
+Version:        3.0.9
 Release:        1%{?dist}
 Summary:        Vitastor, a fast software-defined clustered block storage
 
 License:        Vitastor Network Public License 1.1
 URL:            https://vitastor.io/
-Source0:        vitastor-3.1.0.el10.tar.gz
+Source0:        vitastor-3.0.9.el10.tar.gz
 
 BuildRequires:  gperftools-devel
 BuildRequires:  gcc-c++
 BuildRequires:  nodejs >= 10
 BuildRequires:  jerasure-devel
 BuildRequires:  isa-l-devel
-BuildRequires:  libisa-l_crypto-devel
 BuildRequires:  gf-complete-devel
 BuildRequires:  rdma-core-devel
 BuildRequires:  cmake
@@ -162,8 +161,6 @@ chown vitastor:vitastor /var/lib/vitastor
 %_bindir/vitastor-nbd
 %_bindir/vitastor-ublk
 %_bindir/vitastor-nfs
-%_sbindir/mount.vitastorfs
-%_sbindir/mount.vitastorblk
 %_bindir/vitastor-cli
 %_bindir/vitastor-rm
 %_bindir/vitastor-kv

rpm/vitastor-el7.Dockerfile

@@ -13,11 +13,9 @@ RUN rm -f /etc/yum.repos.d/CentOS-Media.repo
 RUN sed -i 's/^mirrorlist=/#mirrorlist=/; s!#baseurl=http://mirror.centos.org/centos/\$releasever!baseurl=http://vault.centos.org/7.9.2009!' /etc/yum.repos.d/*.repo
 RUN yum -y --enablerepo=extras install centos-release-scl epel-release yum-utils rpm-build
 RUN perl -i -pe 's!mirrorlist=!#mirrorlist=!s; s!#\s*baseurl=http://mirror.centos.org!baseurl=http://vault.centos.org!' /etc/yum.repos.d/CentOS-SCLo-scl*.repo
-RUN yum -y install https://vitastor.io/rpms/centos/7/vitastor-release-1.0-2.el7.noarch.rpm
-RUN sed -i 's/metalink=/#metalink=/' /etc/yum.repos.d/epel.repo
-RUN sed -i 's!#baseurl=.*epel/!baseurl=https://archives.fedoraproject.org/pub/archive/epel/!' /etc/yum.repos.d/epel.repo
+RUN yum -y install https://vitastor.io/rpms/centos/7/vitastor-release-1.0-1.el7.noarch.rpm
 RUN yum -y install devtoolset-9-gcc-c++ devtoolset-9-libatomic-devel gcc make cmake gperftools-devel \
-    fio rh-nodejs12 jerasure-devel libisa-l-devel openssl3-devel libisa-l_crypto-devel gf-complete-devel rdma-core-devel libnl3-devel c-ares-devel
+    fio rh-nodejs12 jerasure-devel libisa-l-devel gf-complete-devel rdma-core-devel libnl3-devel c-ares-devel
 RUN yumdownloader --disablerepo=centos-sclo-rh --source fio
 RUN rpm --nomd5 -i fio*.src.rpm
 RUN rm -f /etc/yum.repos.d/CentOS-Media.repo

rpm/vitastor-el7.spec

@@ -1,25 +1,23 @@
 Name:           vitastor
-Version:        3.1.0
+Version:        3.0.9
 Release:        1%{?dist}
 Summary:        Vitastor, a fast software-defined clustered block storage
 
 License:        Vitastor Network Public License 1.1
 URL:            https://vitastor.io/
-Source0:        vitastor-3.1.0.el7.tar.gz
+Source0:        vitastor-3.0.9.el7.tar.gz
 
 BuildRequires:  gperftools-devel
 BuildRequires:  devtoolset-9-gcc-c++
 BuildRequires:  rh-nodejs12
 BuildRequires:  rh-nodejs12-npm
 BuildRequires:  jerasure-devel
-BuildRequires:  openssl3-devel
 BuildRequires:  libisa-l-devel
-BuildRequires:  libisa-l_crypto-devel
 BuildRequires:  gf-complete-devel
 BuildRequires:  rdma-core-devel
 BuildRequires:  cmake3
 BuildRequires:  libnl3-devel
-BuildRequires:  c-ares-devel >= 1.16
+BuildRequires:  c-ares-devel
 Requires:       vitastor-osd = %{version}-%{release}
 Requires:       vitastor-mon = %{version}-%{release}
 Requires:       vitastor-client = %{version}-%{release}
@@ -107,7 +105,7 @@ Vitastor storage plugin for OpenNebula.
 
 %build
 . /opt/rh/devtoolset-9/enable
-%cmake3 . -DOPENSSL_CRYPTO_LIBRARY=%{_libdir}/openssl3/libcrypto.so -DOPENSSL_SSL_LIBRARY=%{_libdir}/openssl3/libssl.so -DOPENSSL_INCLUDE_DIR=%{_includedir}/openssl3
+%cmake3 .
 %make_build
 
 
@@ -169,8 +167,6 @@ chown vitastor:vitastor /var/lib/vitastor
 %_bindir/vitastor-nbd
 %_bindir/vitastor-ublk
 %_bindir/vitastor-nfs
-%_sbindir/mount.vitastorfs
-%_sbindir/mount.vitastorblk
 %_bindir/vitastor-cli
 %_bindir/vitastor-rm
 %_bindir/vitastor-kv

rpm/vitastor-el8.Dockerfile

@@ -11,11 +11,9 @@ RUN rm -f /etc/yum.repos.d/CentOS-Media.repo
 RUN sed -i 's/^mirrorlist=/#mirrorlist=/; s!#baseurl=http://mirror.centos.org/!baseurl=http://vault.centos.org/!' /etc/yum.repos.d/*.repo
 RUN dnf -y install centos-release-advanced-virtualization epel-release dnf-plugins-core
 RUN sed -i 's/^mirrorlist=/#mirrorlist=/; s!#baseurl=.*!baseurl=http://vault.centos.org/centos/8.4.2105/virt/$basearch/$avdir/!; s!^baseurl=.*Source/.*!baseurl=http://vault.centos.org/centos/8.4.2105/virt/Source/advanced-virtualization/!' /etc/yum.repos.d/CentOS-Advanced-Virtualization.repo
-RUN yum -y install https://vitastor.io/rpms/centos/8/vitastor-release-1.0-2.el8.noarch.rpm
-RUN sed -i 's/metalink=/#metalink=/' /etc/yum.repos.d/epel.repo
-RUN sed -i 's!#baseurl=.*epel/!baseurl=https://mirror.yandex.ru/epel/!' /etc/yum.repos.d/epel.repo
-RUN dnf -y install gcc-toolset-9 gcc-toolset-9-gcc-c++ gperftools-devel fio nodejs rpm-build jerasure-devel \
-    libisa-l-devel openssl3-devel libisa-l_crypto-devel gf-complete-devel libibverbs-devel libarchive cmake libnl3-devel c-ares-devel
+RUN yum -y install https://vitastor.io/rpms/centos/8/vitastor-release-1.0-1.el8.noarch.rpm
+RUN dnf -y install gcc-toolset-9 gcc-toolset-9-gcc-c++ gperftools-devel \
+    fio nodejs rpm-build jerasure-devel libisa-l-devel gf-complete-devel libibverbs-devel libarchive cmake libnl3-devel c-ares-devel
 RUN dnf download --source fio
 RUN rpm --nomd5 -i fio*.src.rpm
 RUN cd ~/rpmbuild/SPECS && dnf builddep -y --enablerepo=powertools --spec fio.spec

rpm/vitastor-el8.spec

@@ -1,24 +1,22 @@
 Name:           vitastor
-Version:        3.1.0
+Version:        3.0.9
 Release:        1%{?dist}
 Summary:        Vitastor, a fast software-defined clustered block storage
 
 License:        Vitastor Network Public License 1.1
 URL:            https://vitastor.io/
-Source0:        vitastor-3.1.0.el8.tar.gz
+Source0:        vitastor-3.0.9.el8.tar.gz
 
 BuildRequires:  gperftools-devel
 BuildRequires:  gcc-toolset-9-gcc-c++
 BuildRequires:  nodejs >= 10
 BuildRequires:  jerasure-devel
-BuildRequires:  openssl3-devel
 BuildRequires:  libisa-l-devel
-BuildRequires:  libisa-l_crypto-devel
 BuildRequires:  gf-complete-devel
 BuildRequires:  rdma-core-devel
 BuildRequires:  cmake
 BuildRequires:  libnl3-devel
-BuildRequires:  c-ares-devel >= 1.16
+BuildRequires:  c-ares-devel
 Requires:       vitastor-osd = %{version}-%{release}
 Requires:       vitastor-mon = %{version}-%{release}
 Requires:       vitastor-client = %{version}-%{release}
@@ -105,7 +103,7 @@ Vitastor storage plugin for OpenNebula.
 
 %build
 . /opt/rh/gcc-toolset-9/enable
-%cmake . -DOPENSSL_CRYPTO_LIBRARY=%{_libdir}/openssl3/libcrypto.so -DOPENSSL_SSL_LIBRARY=%{_libdir}/openssl3/libssl.so -DOPENSSL_INCLUDE_DIR=%{_includedir}/openssl3
+%cmake .
 %make_build
 
 
@@ -166,8 +164,6 @@ chown vitastor:vitastor /var/lib/vitastor
 %_bindir/vitastor-nbd
 %_bindir/vitastor-ublk
 %_bindir/vitastor-nfs
-%_sbindir/mount.vitastorfs
-%_sbindir/mount.vitastorblk
 %_bindir/vitastor-cli
 %_bindir/vitastor-rm
 %_bindir/vitastor-kv

rpm/vitastor-el9.Dockerfile

@@ -10,10 +10,7 @@ WORKDIR /root
 RUN sed -i 's/enabled=0/enabled=1/' /etc/yum.repos.d/*.repo
 RUN dnf -y install epel-release dnf-plugins-core
 RUN dnf -y install https://vitastor.io/rpms/centos/9/vitastor-release-1.0-1.el9.noarch.rpm
-RUN sed -i 's/metalink=/#metalink=/' /etc/yum.repos.d/epel.repo
-RUN sed -i 's!#baseurl=.*epel/!baseurl=https://mirror.yandex.ru/epel/!' /etc/yum.repos.d/epel.repo
-RUN dnf -y install gcc-c++ gperftools-devel fio nodejs rpm-build jerasure-devel libisa-l-devel \
-    openssl-devel libisa-l_crypto-devel gf-complete-devel rdma-core-devel libarchive cmake libnl3-devel c-ares-devel
+RUN dnf -y install gcc-c++ gperftools-devel fio nodejs rpm-build jerasure-devel libisa-l-devel gf-complete-devel rdma-core-devel libarchive cmake libnl3-devel c-ares-devel
 RUN dnf download --source fio
 RUN rpm --nomd5 -i fio*.src.rpm
 RUN cd ~/rpmbuild/SPECS && dnf builddep -y --spec fio.spec

rpm/vitastor-el9.spec

@@ -1,24 +1,22 @@
 Name:           vitastor
-Version:        3.1.0
+Version:        3.0.9
 Release:        1%{?dist}
 Summary:        Vitastor, a fast software-defined clustered block storage
 
 License:        Vitastor Network Public License 1.1
 URL:            https://vitastor.io/
-Source0:        vitastor-3.1.0.el9.tar.gz
+Source0:        vitastor-3.0.9.el9.tar.gz
 
 BuildRequires:  gperftools-devel
 BuildRequires:  gcc-c++
 BuildRequires:  nodejs >= 10
 BuildRequires:  jerasure-devel
-BuildRequires:  openssl-devel
 BuildRequires:  libisa-l-devel
-BuildRequires:  libisa-l_crypto-devel
 BuildRequires:  gf-complete-devel
 BuildRequires:  rdma-core-devel
 BuildRequires:  cmake
 BuildRequires:  libnl3-devel
-BuildRequires:  c-ares-devel >= 1.16
+BuildRequires:  c-ares-devel
 Requires:       vitastor-osd = %{version}-%{release}
 Requires:       vitastor-mon = %{version}-%{release}
 Requires:       vitastor-client = %{version}-%{release}
@@ -163,8 +161,6 @@ chown vitastor:vitastor /var/lib/vitastor
 %_bindir/vitastor-nbd
 %_bindir/vitastor-ublk
 %_bindir/vitastor-nfs
-%_sbindir/mount.vitastorfs
-%_sbindir/mount.vitastorblk
 %_bindir/vitastor-cli
 %_bindir/vitastor-rm
 %_bindir/vitastor-kv

src/CMakeLists.txt

@@ -11,7 +11,6 @@ set(WITH_QEMU false CACHE BOOL "Build QEMU driver inside Vitastor source tree")
 set(WITH_FIO true CACHE BOOL "Build FIO driver")
 set(QEMU_PLUGINDIR qemu CACHE STRING "QEMU plugin directory suffix (qemu-kvm on RHEL)")
 set(WITH_ASAN false CACHE BOOL "Build with AddressSanitizer")
-set(WITH_UBSAN false CACHE BOOL "Build with UBSanitizer")
 set(WITH_SYSTEM_LIBURING false CACHE BOOL "Use system liburing")
 if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/local/?$")
 	if(EXISTS "/etc/debian_version")
@@ -21,17 +20,13 @@ if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/local/?$")
 endif()
 set(ENABLE_COVERAGE false CACHE BOOL "Enable code coverage")
 
-add_definitions(-DVITASTOR_VERSION="3.1.0")
+add_definitions(-DVITASTOR_VERSION="3.0.9")
 add_definitions(-D_GNU_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wno-sign-compare -Wno-comment -Wno-parentheses -Wno-pointer-arith -fdiagnostics-color=always -fno-omit-frame-pointer -fvisibility=hidden -I ${CMAKE_SOURCE_DIR}/src)
 add_link_options(-fno-omit-frame-pointer)
 if (${WITH_ASAN})
 	add_definitions(-fsanitize=address)
 	add_link_options(-fsanitize=address -fno-omit-frame-pointer)
 endif (${WITH_ASAN})
-if (${WITH_UBSAN})
-	add_definitions(-fsanitize=undefined -fno-sanitize=alignment)
-	add_link_options(-fsanitize=undefined -fno-sanitize=alignment)
-endif (${WITH_UBSAN})
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fvisibility-inlines-hidden")
 set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -fvisibility-inlines-hidden")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fvisibility-inlines-hidden")
@@ -55,13 +50,9 @@ string(REGEX REPLACE "([\\/\\-]D) *NDEBUG" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_F
 string(REGEX REPLACE "([\\/\\-]D) *NDEBUG" "" CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL}")
 string(REGEX REPLACE "([\\/\\-]D) *NDEBUG" "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
 
-macro(install_symlink _filepath _sympath)
-	get_filename_component(_symname ${_sympath} NAME)
-	get_filename_component(_installdir ${_sympath} PATH)
-	install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
-		${_filepath} ${CMAKE_CURRENT_BINARY_DIR}/${_symname}.link)")
-	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_symname}.link DESTINATION ${_installdir} RENAME ${_symname})
-	install(CODE "file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${_symname}.link)")
+macro(install_symlink filepath sympath)
+	install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${filepath} \$ENV{DESTDIR}${sympath})")
+	install(CODE "message(\"-- Created symlink: ${sympath} -> ${filepath}\")")
 endmacro(install_symlink)
 
 check_include_file("linux/nbd-netlink.h" HAVE_NBD_NETLINK_H)
@@ -78,20 +69,17 @@ pkg_check_modules(ISAL libisal)
 if (ISAL_LIBRARIES)
 	add_definitions(-DWITH_ISAL)
 endif (ISAL_LIBRARIES)
-pkg_check_modules(ISAL_CRYPTO libisal_crypto)
-if (ISAL_CRYPTO_LIBRARIES)
-	add_definitions(-DWITH_ISAL_CRYPTO)
-endif (ISAL_CRYPTO_LIBRARIES)
 pkg_check_modules(RDMACM librdmacm)
 if (RDMACM_LIBRARIES)
 	add_definitions(-DWITH_RDMACM)
 endif (RDMACM_LIBRARIES)
 
-find_package(OpenSSL 3.0 REQUIRED)
-add_definitions(-DWITH_OPENSSL)
-include_directories(${OPENSSL_INCLUDE_DIR})
+find_package(OpenSSL REQUIRED)
+if (OPENSSL_FOUND)
+	add_definitions(-DWITH_OPENSSL)
+endif (OPENSSL_FOUND)
 
-pkg_check_modules(CARES REQUIRED libcares>=1.16)
+pkg_check_modules(CARES REQUIRED libcares)
 include_directories(${CARES_INCLUDE_DIRS})
 
 if (${WITH_SYSTEM_LIBURING})
@@ -126,7 +114,6 @@ add_subdirectory(kv)
 add_subdirectory(nfs)
 add_subdirectory(osd)
 add_subdirectory(test)
-add_subdirectory(util)
 
 ### Install
 
@@ -134,8 +121,6 @@ install(TARGETS vitastor-osd vitastor-disk vitastor-nbd vitastor-ublk vitastor-n
 install_symlink(vitastor-disk ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/vitastor-dump-journal)
 install_symlink(vitastor-cli ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/vitastor-rm)
 install_symlink(vitastor-cli ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/vita)
-install_symlink(../${CMAKE_INSTALL_BINDIR}/vitastor-nfs ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SBINDIR}/mount.vitastorfs)
-install_symlink(../${CMAKE_INSTALL_BINDIR}/vitastor-nfs ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SBINDIR}/mount.vitastorblk)
 install(
 	TARGETS vitastor_client vitastor_kv
 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

src/blockstore/CMakeLists.txt

@@ -4,6 +4,7 @@ project(vitastor)
 
 # libvitastor_blk.a
 add_library(vitastor_blk STATIC
+	../util/allocator.cpp ../util/crc32c.c ../util/ringloop.cpp
 	multilist.cpp blockstore_heap.cpp blockstore_disk.cpp
 	blockstore.cpp blockstore_impl.cpp blockstore_init.cpp blockstore_open.cpp
 	blockstore_flush.cpp blockstore_read.cpp blockstore_stable.cpp blockstore_sync.cpp blockstore_write.cpp
@@ -11,8 +12,10 @@ add_library(vitastor_blk STATIC
 )
 target_compile_options(vitastor_blk PUBLIC -fPIC)
 target_link_libraries(vitastor_blk
-	util
-	crc32c
+	${LIBURING_LIBRARIES}
+	${ISAL_LIBRARIES}
+	# for timerfd_manager
+	vitastor_common
 )
 set_target_properties(vitastor_blk PROPERTIES VERSION ${VITASTOR_VERSION} SOVERSION 0)
 
@@ -20,9 +23,9 @@ if (${WITH_FIO})
 	# libfio_vitastor_blk.so
 	add_library(fio_vitastor_blk SHARED
 		fio_engine.cpp
+		../../json11/json11.cpp
 	)
 	target_link_libraries(fio_vitastor_blk
 		vitastor_blk
-		util
 	)
 endif (${WITH_FIO})

src/blockstore/blockstore.h

@@ -77,11 +77,8 @@ Output:
 - retval = number of bytes actually read/written or negative error number
   -EINVAL = invalid input parameters
   -ENOENT = requested object/version does not exist for reads
-  -EEXIST = requested version to write already exists
   -ENOSPC = no space left in the store for writes
-  -EAGAIN = temporary failure, operation should be retried (notably, writes may be retried
-    after stabilizing some journaled entries and freeing up journal space)
-  -EDOM = checksum error
+  -EDOM = checksum error.
 - version = the version actually read or written
 
 ## BS_OP_DELETE
@@ -93,7 +90,7 @@ Input:
 - version = requested version. Treated the same as with BS_OP_WRITE
 
 Output:
-- retval = 0 or negative error number (-EINVAL, -EAGAIN)
+- retval = 0 or negative error number (-EINVAL)
 - version = the version actually written (delete is initially written as an object version)
 
 ## BS_OP_SYNC
@@ -102,7 +99,7 @@ Make sure all previously issued modifications reach physical media.
 
 Input: Nothing except opcode
 Output:
-- retval = 0 or negative error number (-EINVAL, -EAGAIN)
+- retval = 0 or negative error number (-EINVAL)
 
 ## BS_OP_STABLE / BS_OP_ROLLBACK
 
@@ -132,9 +129,7 @@ Input:
 - max_oid = max inode/stripe or 0 to list all objects
 
 Output:
-- retval = total obj_ver_id count or negative error number
-  -ENOMEM = could not allocate memory for the listing
-  -EAGAIN = pool sharding settings are incorrect, please reshard and retry
+- retval = total obj_ver_id count
 - version = stable obj_ver_id count
 - buf = obj_ver_id array allocated by the blockstore. Stable versions come first.
   You must free it yourself after usage with free().
@@ -171,7 +166,7 @@ struct __attribute__ ((visibility("default"))) blockstore_op_t
     };
     uint8_t *buf = NULL;
     uint8_t *bitmap = NULL;
-    int64_t retval = 0;
+    int retval = 0;
 
     uint8_t private_data[BS_OP_PRIVATE_DATA_SIZE];
 };

src/blockstore/blockstore_disk.cpp

@@ -12,9 +12,23 @@
 #include "blockstore_disk.h"
 #include "blockstore_heap.h"
 #include "str_util.h"
-#include "disk_util.h"
 #include "allocator.h"
 
+static uint32_t is_power_of_two(uint64_t value)
+{
+    uint32_t l = 0;
+    while (value > 1)
+    {
+        if (value & 1)
+        {
+            return 64;
+        }
+        value = value >> 1;
+        l++;
+    }
+    return l;
+}
+
 void blockstore_disk_t::parse_config(std::map<std::string, std::string> & config)
 {
     // Parse
@@ -86,7 +100,6 @@ void blockstore_disk_t::parse_config(std::map<std::string, std::string> & config
         (config["discard_on_start"] == "true" || config["discard_on_start"] == "1" || config["discard_on_start"] == "yes");
     gc_on_start = config.find("gc_on_start") == config.end() ||
         (config["gc_on_start"] == "true" || config["gc_on_start"] == "1" || config["gc_on_start"] == "yes");
-    skip_double_claim = (config["skip_double_claim"] == "true" || config["skip_double_claim"] == "1" || config["skip_double_claim"] == "yes");
     min_discard_size = parse_size(config["min_discard_size"]);
     if (!min_discard_size)
         min_discard_size = 1024*1024;
@@ -112,7 +125,7 @@ void blockstore_disk_t::parse_config(std::map<std::string, std::string> & config
     {
         data_block_size = (1 << DEFAULT_DATA_BLOCK_ORDER);
     }
-    if ((data_block_size & (data_block_size-1)) || data_block_size < MIN_DATA_BLOCK_SIZE || data_block_size >= MAX_DATA_BLOCK_SIZE)
+    if (is_power_of_two(data_block_size) >= 64 || data_block_size < MIN_DATA_BLOCK_SIZE || data_block_size >= MAX_DATA_BLOCK_SIZE)
     {
         throw std::runtime_error("Bad block size");
     }
@@ -210,32 +223,6 @@ void blockstore_disk_t::parse_config(std::map<std::string, std::string> & config
     }
 }
 
-// A metadata entry must fit into one metadata block; a large block_size with a small
-// csum_block_size otherwise inflates the entry past it and makes the callers divide by zero.
-static uint64_t entries_per_meta_block(uint64_t entry_size, uint64_t meta_block_size,
-    uint64_t data_block_size, uint32_t bitmap_granularity, uint32_t csum_block_size)
-{
-    if (entry_size && entry_size <= meta_block_size)
-    {
-        return meta_block_size / entry_size;
-    }
-    std::string msg = "Metadata entry size ("+std::to_string(entry_size)+" bytes) exceeds meta_block_size ("+
-        std::to_string(meta_block_size)+" bytes) with block_size="+std::to_string(data_block_size)+
-        ", bitmap_granularity="+std::to_string(bitmap_granularity);
-    if (csum_block_size)
-    {
-        msg += ", csum_block_size="+std::to_string(csum_block_size)+" ("+
-            std::to_string(data_block_size/csum_block_size)+" checksums per block)";
-    }
-    msg += ". Decrease block_size";
-    if (csum_block_size)
-    {
-        msg += ", increase csum_block_size";
-    }
-    msg += " or increase meta_block_size";
-    throw std::runtime_error(msg);
-}
-
 void blockstore_disk_t::calc_lengths(bool skip_meta_check)
 {
     // data
@@ -285,20 +272,17 @@ void blockstore_disk_t::calc_lengths(bool skip_meta_check)
     clean_entry_bitmap_size = (data_block_size / bitmap_granularity + 7) / 8;
     clean_dyn_size = clean_entry_bitmap_size*2 + (csum_block_size
         ? data_block_size/csum_block_size*(data_csum_type & 0xFF) : 0);
-    uint64_t entries_per_block = 0;
 recalc:
     if (meta_format == BLOCKSTORE_META_FORMAT_HEAP)
     {
-        entries_per_block = entries_per_meta_block(sizeof(heap_big_write_t) + clean_dyn_size,
-            meta_block_size, data_block_size, bitmap_granularity, csum_block_size);
+        uint32_t entries_per_block = meta_block_size / (sizeof(heap_big_write_t) + clean_dyn_size);
         min_meta_len = (block_count+entries_per_block-1) / entries_per_block * meta_block_size;
     }
     else if (meta_format == BLOCKSTORE_META_FORMAT_V1)
     {
         clean_entry_size = 24 /*sizeof(clean_disk_entry)*/ + 2*clean_entry_bitmap_size;
-        entries_per_block = entries_per_meta_block(clean_entry_size, meta_block_size,
-            data_block_size, bitmap_granularity, 0);
-        min_meta_len = (1 + (block_count - 1 + entries_per_block) / entries_per_block) * meta_block_size;
+        min_meta_len = (1 + (block_count - 1 + meta_block_size / clean_entry_size)
+            / (meta_block_size / clean_entry_size)) * meta_block_size;
         if (!skip_meta_check && meta_area_size < min_meta_len)
         {
 too_small:
@@ -310,9 +294,7 @@ too_small:
     {
         meta_format = BLOCKSTORE_META_FORMAT_V2;
         clean_entry_size = 24 /*sizeof(clean_disk_entry)*/ + clean_dyn_size + 4 /*entry_csum*/;
-        entries_per_block = entries_per_meta_block(clean_entry_size, meta_block_size,
-            data_block_size, bitmap_granularity, csum_block_size);
-        min_meta_len = (1 + (block_count - 1 + entries_per_block) / entries_per_block) * meta_block_size;
+        min_meta_len = (1 + (block_count - 1 + meta_block_size / clean_entry_size) / (meta_block_size / clean_entry_size)) * meta_block_size;
         if (!skip_meta_check && meta_area_size < min_meta_len)
         {
             if (!data_csum_type)
@@ -355,6 +337,41 @@ void blockstore_disk_t::check_lengths()
     }
 }
 
+// FIXME: Move to utils
+static void check_size(int fd, uint64_t *size, uint64_t *sectsize, std::string name)
+{
+    int sect;
+    struct stat st;
+    if (fstat(fd, &st) < 0)
+    {
+        throw std::runtime_error("Failed to stat "+name);
+    }
+    if (S_ISREG(st.st_mode))
+    {
+        *size = st.st_size;
+        if (sectsize)
+        {
+            *sectsize = st.st_blksize;
+        }
+    }
+    else if (S_ISBLK(st.st_mode))
+    {
+        if (ioctl(fd, BLKGETSIZE64, size) < 0 ||
+            ioctl(fd, BLKSSZGET, &sect) < 0)
+        {
+            throw std::runtime_error("Failed to get "+name+" size or block size: "+strerror(errno));
+        }
+        if (sectsize)
+        {
+            *sectsize = sect;
+        }
+    }
+    else
+    {
+        throw std::runtime_error(name+" is neither a file nor a block device");
+    }
+}
+
 static int bs_openmode(const std::string & mode)
 {
     if (mode == "directsync")
@@ -503,7 +520,7 @@ void blockstore_disk_t::close_all()
 
 // Sadly DISCARD only works through ioctl(), but it seems to always block the device queue,
 // so it's not a big deal that we can only run it synchronously.
-int blockstore_disk_t::trim_data(std::function<bool(uint64_t)> is_used)
+int blockstore_disk_t::trim_data(std::function<bool(uint64_t)> is_free)
 {
     if (mock_mode)
     {
@@ -514,7 +531,7 @@ int blockstore_disk_t::trim_data(std::function<bool(uint64_t)> is_used)
     uint64_t discarded = 0;
     for (; i <= block_count; i++)
     {
-        if (i >= block_count || is_used(i))
+        if (i >= block_count || is_free(i))
         {
             if (i > j && (i-j)*data_block_size >= min_discard_size)
             {
@@ -527,21 +544,17 @@ int blockstore_disk_t::trim_data(std::function<bool(uint64_t)> is_used)
                     if (range[0] % discard_granularity)
                         range[0] = range[0] + discard_granularity - (range[0] % discard_granularity);
                     if (range[0] >= range[1])
-                        range[1] = 0;
-                    else
-                        range[1] -= range[0];
+                        continue;
+                    range[1] -= range[0];
                 }
-                if (range[1] > 0)
+                r = ioctl(data_fd, BLKDISCARD, &range);
+                if (r != 0)
                 {
-                    r = ioctl(data_fd, BLKDISCARD, &range);
-                    if (r != 0)
-                    {
-                        fprintf(stderr, "Failed to execute BLKDISCARD %ju+%ju on %s: %s (code %d)\n",
-                            range[0], range[1], data_device.c_str(), strerror(-r), r);
-                        return -errno;
-                    }
-                    discarded += range[1];
+                    fprintf(stderr, "Failed to execute BLKDISCARD %ju+%ju on %s: %s (code %d)\n",
+                        range[0], range[1], data_device.c_str(), strerror(-r), r);
+                    return -errno;
                 }
+                discarded += range[1];
             }
             j = i+1;
         }

src/blockstore/blockstore_disk.h

@@ -60,8 +60,6 @@ struct blockstore_disk_t
     bool discard_on_start = false;
     // GC on start (new store)
     bool gc_on_start = true;
-    // Skip double claim conflicts on start (new store, temporary until the bug is found)
-    bool skip_double_claim = false;
     uint64_t min_discard_size = 1024*1024;
     uint64_t discard_granularity = 0;
 
@@ -84,7 +82,7 @@ struct blockstore_disk_t
     void calc_lengths(bool skip_meta_check = false);
     void check_lengths();
     void close_all();
-    int trim_data(std::function<bool(uint64_t)> is_used);
+    int trim_data(std::function<bool(uint64_t)> is_free);
 
     inline uint64_t dirty_dyn_size(uint64_t offset, uint64_t len)
     {

src/blockstore/blockstore_flush.cpp

@@ -174,18 +174,14 @@ bool journal_flusher_co::loop()
     else if (wait_state == 19) goto resume_19;
     else if (wait_state == 20) goto resume_20;
     else if (wait_state == 21) goto resume_21;
-    else if (wait_state == 22) goto resume_22;
-    else if (wait_state == 23) goto resume_23;
-    else if (wait_state == 24) goto resume_24;
-    else if (wait_state == 25) goto resume_25;
 resume_0:
     wait_state = 0;
     wait_count = 0;
     cur_oid = {};
     res = bs->heap->get_next_compact(cur_oid);
+    // Advance fsynced_lsn every <journal_trim_interval> intent writes
     if ((bs->intent_write_counter >= bs->journal_trim_interval) && co_id == 0)
     {
-        // Advance fsynced_lsn every <journal_trim_interval> intent writes
         bs->intent_write_counter = 0;
 resume_17:
 resume_18:
@@ -200,7 +196,6 @@ resume_21:
     if (res == ENOENT && flusher->force_start > 0 && co_id == 0 &&
         (!bs->dsk.disable_journal_fsync || !bs->dsk.disable_meta_fsync || !bs->dsk.disable_data_fsync))
     {
-        // When under pressure, do an additional fsync to force entries to be marked compactable
         flusher->active_flushers++;
 resume_14:
 resume_15:
@@ -264,9 +259,11 @@ resume_1:
         if (wr->type() == BS_HEAP_SMALL_WRITE ||
             wr->type() == BS_HEAP_INTENT_WRITE && bs->dsk.csum_block_size > bs->dsk.bitmap_granularity)
         {
-            bs->prepare_read(read_vec, cur_obj, wr, 0, bs->dsk.data_block_size,
+            auto res = bs->prepare_read(read_vec, cur_obj, wr, 0, bs->dsk.data_block_size,
                 wr->type() == BS_HEAP_INTENT_WRITE && bs->dsk.csum_block_size > bs->dsk.bitmap_granularity && !bs->perfect_csum_update
                 ? COPY_BUF_SKIP_CSUM : 0);
+            if (res > 0)
+                copy_count++;
         }
     });
     if (!compact_info.compact_lsn)
@@ -276,53 +273,30 @@ resume_1:
         bs->heap->unlock_entry(cur_oid);
         goto resume_0;
     }
+    mem_or(new_bmp, compact_info.clean_wr->get_int_bitmap(bs->heap), bs->dsk.clean_entry_bitmap_size);
+    if (!bitmap_copied)
+    {
+        memcpy(new_ext_bmp, compact_info.clean_wr->get_ext_bitmap(bs->heap), bs->dsk.clean_entry_bitmap_size);
+        bitmap_copied = true;
+    }
+    if (bs->dsk.csum_block_size && bs->dsk.csum_block_size <= bs->dsk.bitmap_granularity)
+    {
+        memcpy(new_csums, compact_info.clean_wr->get_checksums(bs->heap), bs->dsk.data_block_size/bs->dsk.csum_block_size * (bs->dsk.data_csum_type & 0xFF));
+        for (size_t i = csum_copy.size(); i > 0; i--)
+        {
+            auto wr = csum_copy[i-1];
+            memcpy(new_csums + wr->small().offset/bs->dsk.csum_block_size*(bs->dsk.data_csum_type & 0xFF),
+                wr->get_checksums(bs->heap), wr->small().len/bs->dsk.csum_block_size*(bs->dsk.data_csum_type & 0xFF));
+        }
+        csum_copy.clear();
+    }
+    clean_loc = compact_info.clean_wr->big_location(bs->heap);
     flusher->active_flushers++;
-    for (i = 0; i < read_vec.size(); i++)
+    if (bs->log_level > 10)
     {
-        if ((read_vec[i].copy_flags & COPY_BUF_JOURNAL) &&
-            !(read_vec[i].copy_flags & COPY_BUF_COALESCED))
-        {
-            copy_count++;
-        }
-    }
-    if (copy_count > 0 && !bs->dsk.disable_data_fsync)
-    {
-        init_fsync_data();
-    }
-    if (compact_info.do_delete)
-    {
-        if (bs->log_level > 10)
-        {
-            printf("Compacting %jx:%jx up to l%ju (delete)\n", cur_oid.inode, cur_oid.stripe, compact_info.compact_lsn);
-        }
-        clean_loc = UINT64_MAX;
-    }
-    else
-    {
-        if (bs->log_level > 10)
-        {
-            printf("Compacting %jx:%jx v%ju..v%ju / l%ju..l%ju (%d writes)\n", cur_oid.inode, cur_oid.stripe,
-                compact_info.clean_wr->version, compact_info.compact_version,
-                compact_info.clean_wr->lsn, compact_info.compact_lsn, copy_count);
-        }
-        mem_or(new_bmp, compact_info.clean_wr->get_int_bitmap(bs->heap), bs->dsk.clean_entry_bitmap_size);
-        if (!bitmap_copied)
-        {
-            memcpy(new_ext_bmp, compact_info.clean_wr->get_ext_bitmap(bs->heap), bs->dsk.clean_entry_bitmap_size);
-            bitmap_copied = true;
-        }
-        if (bs->dsk.csum_block_size && bs->dsk.csum_block_size <= bs->dsk.bitmap_granularity)
-        {
-            memcpy(new_csums, compact_info.clean_wr->get_checksums(bs->heap), bs->dsk.data_block_size/bs->dsk.csum_block_size * (bs->dsk.data_csum_type & 0xFF));
-            for (size_t i = csum_copy.size(); i > 0; i--)
-            {
-                auto wr = csum_copy[i-1];
-                memcpy(new_csums + wr->small().offset/bs->dsk.csum_block_size*(bs->dsk.data_csum_type & 0xFF),
-                    wr->get_checksums(bs->heap), wr->small().len/bs->dsk.csum_block_size*(bs->dsk.data_csum_type & 0xFF));
-            }
-            csum_copy.clear();
-        }
-        clean_loc = compact_info.clean_wr->big_location(bs->heap);
+        printf("Compacting %jx:%jx v%ju..v%ju / l%ju..l%ju (%d writes)\n", cur_oid.inode, cur_oid.stripe,
+            compact_info.clean_wr->version, compact_info.compact_version,
+            compact_info.clean_wr->lsn, compact_info.compact_lsn, copy_count);
     }
     overwrite_start = overwrite_end = 0;
     if (read_vec.size() > 0)
@@ -362,13 +336,6 @@ resume_3:
     if (res == ENOENT || res == EDOM)
     {
         // Abort compaction
-abort_compact:
-        if (copy_count > 0 && !bs->dsk.disable_data_fsync)
-        {
-            cur_sync->member_count--;
-            if (cur_sync->member_count > 0)
-                bs->ringloop->wakeup();
-        }
         flusher->flushing.erase(cur_oid);
         bs->heap->unlock_entry(cur_oid);
         flusher->active_flushers--;
@@ -382,7 +349,10 @@ resume_4:
         if (res == ENOENT)
         {
             // Abort compaction
-            goto abort_compact;
+            flusher->flushing.erase(cur_oid);
+            bs->heap->unlock_entry(cur_oid);
+            flusher->active_flushers--;
+            goto resume_0;
         }
         if (res == EAGAIN)
         {
@@ -411,14 +381,14 @@ resume_9:
     for (i = 0; i < read_vec.size(); i++)
     {
         if ((read_vec[i].copy_flags & COPY_BUF_JOURNAL) &&
-            !(read_vec[i].copy_flags & COPY_BUF_COALESCED))
+            !(read_vec[i].copy_flags & COPY_BUF_COALESCED) ||
+            (read_vec[i].copy_flags & COPY_BUF_PADDED)) // FIXME Shit, simplify these flags
         {
             assert(read_vec[i].buf);
             await_sqe(10);
             data->iov = (struct iovec){ read_vec[i].buf + (read_vec[i].copy_flags & COPY_BUF_PADDED
                 ? read_vec[i].offset - read_vec[i].disk_offset : 0), (size_t)read_vec[i].len };
             data->callback = simple_callback_w;
-            assert(clean_loc + read_vec[i].offset + data->iov.iov_len <= bs->dsk.block_count*bs->dsk.data_block_size);
             io_uring_prep_writev(sqe, bs->dsk.data_fd, &data->iov, 1, bs->dsk.data_offset + clean_loc + read_vec[i].offset);
             wait_count++;
         }
@@ -429,17 +399,6 @@ resume_11:
         wait_state = 11;
         return false;
     }
-    if (copy_count > 0 && !bs->dsk.disable_data_fsync)
-    {
-resume_22:
-resume_23:
-resume_24:
-resume_25:
-        if (!fsync_data(22))
-        {
-            return false;
-        }
-    }
     // Lock is only needed to prevent freeing the big_write because we overwrite it...
     bs->heap->unlock_entry(cur_oid);
     // Mark the object compacted, but don't free and remove small_writes
@@ -449,14 +408,12 @@ resume_25:
     if (!cur_obj)
     {
         // Abort compaction
-        flusher->active_flushers--;
         flusher->flushing.erase(cur_oid);
         goto resume_0;
     }
     if (!calc_block_checksums())
     {
         // Abort compaction
-        flusher->active_flushers--;
         flusher->flushing.erase(cur_oid);
         goto resume_0;
     }
@@ -465,7 +422,6 @@ resume_25:
     if (res == EBUSY)
     {
         // Abort compaction, object is already overwritten by something else
-        flusher->active_flushers--;
         flusher->flushing.erase(cur_oid);
         goto resume_0;
     }
@@ -630,13 +586,13 @@ int journal_flusher_co::check_and_punch_checksums()
             bs->heap->calc_block_checksums((uint32_t*)(new_csums+csum_off), vec.buf, punch_bmp, vec.offset, vec.offset+vec.len, true, NULL);
         }
     }
-    // Modified, we should punch_holes and then write the block to disk
+    // Modified, we should add_punch_holes and then write the block to disk
     return EBUSY;
 }
 
 bool journal_flusher_co::calc_block_checksums()
 {
-    if (bs->dsk.csum_block_size <= bs->dsk.bitmap_granularity || compact_info.do_delete)
+    if (bs->dsk.csum_block_size <= bs->dsk.bitmap_granularity)
     {
         return true;
     }
@@ -743,67 +699,6 @@ resume_1:
     return true;
 }
 
-void journal_flusher_co::init_fsync_data()
-{
-    cur_sync = flusher->data_syncs.begin();
-    if (cur_sync == flusher->data_syncs.end() || cur_sync->ready_count > 0)
-    {
-        cur_sync = flusher->data_syncs.emplace(cur_sync);
-    }
-    cur_sync->member_count++;
-}
-
-bool journal_flusher_co::fsync_data(int wait_base)
-{
-    if (wait_state == wait_base)
-        goto resume_0;
-    else if (wait_state == wait_base+1)
-        goto resume_1;
-    else if (wait_state == wait_base+2)
-        goto resume_2;
-    else if (wait_state == wait_base+3)
-        goto resume_3;
-    cur_sync->ready_count++;
-resume_0:
-    if (cur_sync->ready_count < cur_sync->member_count)
-    {
-        wait_state = wait_base;
-        return false;
-    }
-    if (!cur_sync->sent)
-    {
-        // Sync batch is ready. Do it.
-        await_sqe(1);
-        data->iov = { 0 };
-        data->callback = simple_callback_w;
-        io_uring_prep_fsync(sqe, bs->dsk.data_fd, IORING_FSYNC_DATASYNC);
-        cur_sync->sent = true;
-        wait_count++;
-resume_2:
-        if (wait_count > 0)
-        {
-            wait_state = wait_base+2;
-            return false;
-        }
-        cur_sync->done = true;
-        // Wake up other flushers
-        bs->ringloop->wakeup();
-    }
-resume_3:
-    if (!cur_sync->done)
-    {
-        wait_state = wait_base+3;
-        return false;
-    }
-    cur_sync->done_count++;
-    if (cur_sync->done_count >= cur_sync->member_count)
-    {
-        flusher->data_syncs.erase(cur_sync);
-        cur_sync = flusher->data_syncs.end();
-    }
-    return true;
-}
-
 bool journal_flusher_co::fsync_meta(int wait_base)
 {
     if (wait_state == wait_base)        goto resume_0;

src/blockstore/blockstore_flush.h

@@ -25,15 +25,6 @@ struct flusher_meta_write_t
     std::map<uint64_t, meta_sector_t>::iterator it;
 };
 
-struct flusher_data_sync_t
-{
-    int member_count = 0;
-    int ready_count = 0;
-    int done_count = 0;
-    bool sent = false;
-    bool done = false;
-};
-
 class journal_flusher_t;
 
 // Journal flusher coroutine
@@ -67,7 +58,6 @@ class journal_flusher_co
     int i, res;
     bool read_to_fill_incomplete;
     int copy_count;
-    std::list<flusher_data_sync_t>::iterator cur_sync;
 
     friend class journal_flusher_t;
 
@@ -78,8 +68,6 @@ class journal_flusher_co
     bool calc_block_checksums();
     bool write_meta_block(int wait_base);
     bool read_buffered(int wait_base);
-    void init_fsync_data();
-    bool fsync_data(int wait_base);
     bool fsync_meta(int wait_base);
     bool fsync_buffer(int wait_base);
     bool trim_lsn(int wait_base);
@@ -100,7 +88,6 @@ class journal_flusher_t
 
     robin_hood::unordered_flat_set<object_id> flushing;
     int active_flushers = 0;
-    std::list<flusher_data_sync_t> data_syncs;
     int wanting_meta_fsync = 0;
     bool fsyncing_meta = false;
     int syncing_buffer = 0;

src/blockstore/blockstore_heap.cpp

@@ -23,13 +23,12 @@
 
 #define HEAP_INFLIGHT_DONE 1
 #define HEAP_INFLIGHT_COMPACTABLE 2
-#define HEAP_INFLIGHT_OVERWRITE 4
+#define HEAP_INFLIGHT_COMPACTED 4
 #define HEAP_INFLIGHT_GC 8
 #define HEAP_INFLIGHT_EXPLICIT 16
 
 #define IMAP_MALLOC_LOW_BITS ((size_t)0x0F)
 #define IMAP_MAX_LOW 16
-#define POSTPONE_INSERT_COUNT 10
 
 #define list_item_overhead(a) (((a) + sizeof(heap_list_item_t) - sizeof(heap_entry_t) + sizeof(void*) + 15) & ~15)
 
@@ -123,33 +122,31 @@ uint32_t heap_entry_t::get_size(blockstore_heap_t *heap)
     }
     if (type() == BS_HEAP_SMALL_WRITE || type() == BS_HEAP_INTENT_WRITE)
     {
-        if (size < sizeof(heap_small_write_t))
-            return heap->get_small_entry_size(0, 0);
         return heap->get_small_entry_size(small().offset, small().len);
     }
     return heap->get_simple_entry_size();
 }
 
-bool heap_entry_t::is_overwrite() const
+bool heap_entry_t::is_overwrite()
 {
     return ((entry_type & ~BS_HEAP_GARBAGE) == (BS_HEAP_BIG_WRITE|BS_HEAP_STABLE) ||
         (entry_type & ~BS_HEAP_GARBAGE) == (BS_HEAP_BIG_INTENT|BS_HEAP_STABLE) ||
         (entry_type & ~BS_HEAP_GARBAGE) == (BS_HEAP_DELETE|BS_HEAP_STABLE));
 }
 
-bool heap_entry_t::is_compactable() const
+bool heap_entry_t::is_compactable()
 {
     return !is_overwrite() && (entry_type & BS_HEAP_STABLE) ||
         (entry_type & ~BS_HEAP_GARBAGE) == BS_HEAP_COMMIT ||
         (entry_type & ~BS_HEAP_GARBAGE) == BS_HEAP_ROLLBACK;
 }
 
-bool heap_entry_t::is_before(const heap_entry_t *other) const
+bool heap_entry_t::is_before(heap_entry_t *other)
 {
     return lsn < other->lsn || lsn == other->lsn && !is_overwrite() && other->is_overwrite();
 }
 
-bool heap_entry_t::is_garbage() const
+bool heap_entry_t::is_garbage()
 {
     return (entry_type & BS_HEAP_GARBAGE);
 }
@@ -347,12 +344,19 @@ corrupted_block:
                     block_num, block_offset, wr->size, sizeof(heap_entry_t));
                 goto corrupted_block;
             }
-            // Garbage collection is only performed when writing new entries into the block
-            // because it needs a fake LSN and modified blocks require consecutive modified LSNs
-            // At the same time, further modifications _after_ putting new entries into the block,
-            // but _before_ writing it, may mark some entries in it as garbage. That's why garbage
-            // entries may still be present on disk.
-            wr->entry_type &= ~BS_HEAP_GARBAGE;
+            if (wr->is_garbage())
+            {
+                // Garbage collection is only performed when writing new entries into the block
+                // because it needs a fake LSN and modified blocks require consecutive modified LSNs
+                // That's why garbage entries may persist on disk
+                if (log_level > 5)
+                {
+                    fprintf(stderr, "Notice: skipping garbage entry %jx:%jx v%ju l%ju in metadata block %u at %u\n",
+                        wr->inode, wr->stripe, wr->version, wr->lsn, block_num, block_offset);
+                }
+                block_offset += wr->size;
+                continue;
+            }
             if ((wr->entry_type & BS_HEAP_TYPE) < BS_HEAP_BIG_WRITE ||
                 (wr->entry_type & BS_HEAP_TYPE) > BS_HEAP_ROLLBACK ||
                 (wr->entry_type & ~(BS_HEAP_TYPE|BS_HEAP_STABLE)) ||
@@ -376,11 +380,14 @@ corrupted_object:
                     return EDOM;
                 }
             }
-            if (wr->size != wr->get_size(this))
+            if (((wr->entry_type & BS_HEAP_TYPE) == BS_HEAP_SMALL_WRITE ||
+                (wr->entry_type & BS_HEAP_TYPE) == BS_HEAP_INTENT_WRITE) &&
+                wr->size < sizeof(heap_small_write_t))
             {
-                // Check entry size
-                fprintf(stderr, "Error: entry %jx:%jx v%ju has invalid size in metadata block %u at %u (%u != %u bytes)\n",
-                    wr->inode, wr->stripe, wr->version, block_num, block_offset, wr->size, wr->get_size(this));
+                // Small writes require accessing offset & len to calculate correct length,
+                // so require at least sizeof(heap_small_write_t) for them
+                fprintf(stderr, "Error: entry %jx:%jx v%ju has invalid size in metadata block %u at %u (%u < min %zu bytes)\n",
+                    wr->inode, wr->stripe, wr->version, block_num, block_offset, wr->size, sizeof(heap_small_write_t));
                 goto corrupted_object;
             }
             if (wr->entry_type == BS_HEAP_COMMIT && !wr->version)
@@ -418,13 +425,6 @@ corrupted_object:
                     wr->inode, wr->stripe, wr->version, wr->big_intent().offset, wr->big_intent().len);
                 goto corrupted_object;
             }
-            if ((wr->type() == BS_HEAP_BIG_INTENT || wr->type() == BS_HEAP_BIG_WRITE) &&
-                wr->big().block_num >= dsk->block_count)
-            {
-                fprintf(stderr, "Error: big_write or big_intent entry %jx:%jx v%ju block_num is too large: %u > %lu. Metadata is incompatible with current parameters. ",
-                    wr->inode, wr->stripe, wr->version, wr->big_intent().block_num, dsk->block_count);
-                goto corrupted_object;
-            }
             handle_write(block_num, wr);
             block_offset += wr->size;
         }
@@ -451,7 +451,7 @@ int blockstore_heap_t::load_blocks(uint64_t disk_offset, uint64_t size, uint8_t
             next_lsn = wr->lsn;
         }
         entries_loaded++;
-        insert_list_items(&li, 1, true);
+        loaded_list_items.push_back(li);
         modify_alloc(block_num, [&](heap_block_info_t & inf)
         {
             if (!inf.entries.size())
@@ -557,26 +557,18 @@ bool blockstore_heap_t::validate_object(heap_entry_t *obj)
 
 void blockstore_heap_t::finish_load()
 {
-    if (postponed_items.size())
+    if (loaded_list_items.size())
     {
-        // Sort "postponed" items and load in batches
-        std::sort(postponed_items.begin(), postponed_items.end(), [this](const heap_list_item_t* a, const heap_list_item_t* b)
+        // Sort everything and load in correct order
+        std::sort(loaded_list_items.begin(), loaded_list_items.end(), [this](const heap_list_item_t* a, const heap_list_item_t* b)
         {
-            return a->entry.inode < b->entry.inode || a->entry.inode == b->entry.inode &&
-                (a->entry.stripe < b->entry.stripe || a->entry.stripe == b->entry.stripe &&
-                    !a->entry.is_before(&b->entry)); // object ASC, lsn DESC
+            return a->entry.lsn < b->entry.lsn;
         });
-        size_t s = 0, e, n = postponed_items.size();
-        for (e = 1; e <= n; e++)
+        for (auto & li: loaded_list_items)
         {
-            if (e >= n || postponed_items[e]->entry.inode != postponed_items[s]->entry.inode ||
-                postponed_items[e]->entry.stripe != postponed_items[s]->entry.stripe)
-            {
-                insert_list_items(postponed_items.data()+s, e-s, false);
-                s = e;
-            }
+            insert_list_item(li);
         }
-        postponed_items.clear();
+        loaded_list_items.clear();
     }
 }
 
@@ -589,11 +581,26 @@ void blockstore_heap_t::fill_recheck_queue()
             inode_map_iterate(ip.second, [&](heap_list_item_t *li)
             {
                 auto obj = &li->entry;
-                // Recheck only the latest intent_write (if after completed_lsn) or a series of small_writes
-                if ((obj->type() == BS_HEAP_INTENT_WRITE || obj->type() == BS_HEAP_BIG_INTENT)
-                    && obj->lsn > completed_lsn || obj->type() == BS_HEAP_SMALL_WRITE)
+                // Add object to recheck queue
+                if (obj->type() == BS_HEAP_INTENT_WRITE || obj->type() == BS_HEAP_BIG_INTENT)
                 {
-                    recheck_queue.push_back(obj);
+                    // Recheck only the latest intent_write
+                    if (obj->lsn > completed_lsn)
+                    {
+                        // Do not recheck if it's already marked as completed in the superblock
+                        recheck_queue.push_back(obj);
+                    }
+                }
+                else
+                {
+                    // Or recheck a series of small_writes
+                    for (auto wr = obj; wr && wr->type() == BS_HEAP_SMALL_WRITE; wr = prev(wr))
+                    {
+                        if (wr->small().len > 0)
+                        {
+                            recheck_queue.push_back(wr);
+                        }
+                    }
                 }
             });
         }
@@ -603,11 +610,6 @@ void blockstore_heap_t::fill_recheck_queue()
 int blockstore_heap_t::mark_used_blocks()
 {
     int res = 0;
-    std::vector<heap_list_item_t*> used_by;
-    if (dsk->skip_double_claim)
-    {
-        used_by.resize(dsk->block_count);
-    }
     for (auto & pgp: block_index)
     {
         for (auto & ip: pgp.second)
@@ -633,9 +635,8 @@ int blockstore_heap_t::mark_used_blocks()
                     li = NULL;
                 }
                 bool overwritten = false;
-                for (; li; li = li->prev)
+                for (; li; li = li->prev, wr = &li->entry)
                 {
-                    auto wr = &li->entry;
                     if (overwritten)
                     {
                         wr->set_garbage();
@@ -662,45 +663,17 @@ int blockstore_heap_t::mark_used_blocks()
                     {
                         if (is_data_used(wr->big_location(this)))
                         {
-                            if (dsk->skip_double_claim)
-                            {
-                                // There is a BUG currently:
-                                // Sometimes (under unknown conditions) deletion entries are removed from the disk
-                                // earlier than previous big_writes.
-                                // Until it's fixed, we provide a way to ignore such objects on start.
-                                auto prev_li = used_by[wr->big().block_num];
-                                assert(prev_li);
-                                // Newer LSN must be trusted. Remove the older object.
-                                fprintf(stderr, "Block %u is double-claimed by entries %jx:%jx l%ju and %jx:%jx l%ju\n",
-                                    wr->big().block_num, prev_li->entry.inode, prev_li->entry.stripe, prev_li->entry.lsn, wr->inode, wr->stripe, wr->lsn);
-                                if (init_erase_double_claim(prev_li, li))
-                                {
-                                    return;
-                                }
-                            }
-                            else
-                            {
-                                fprintf(stderr, "Error: double-claimed data block %u, second time by %jx:%jx l%ju\n",
-                                    wr->big().block_num, wr->inode, wr->stripe, wr->lsn);
-                                res = EDOM;
-                                return;
-                            }
-                        }
-                        if (dsk->skip_double_claim)
-                        {
-                            // Record the object which uses the data block
-                            used_by[wr->big().block_num] = li;
+                            fprintf(stderr, "Error: double-claimed data block %u, second time by %jx:%jx l%ju\n",
+                                wr->big().block_num, wr->inode, wr->stripe, wr->lsn);
+                            res = EDOM;
+                            return;
                         }
                         use_data(wr->inode, wr->big_location(this));
                     }
-                    if (wr->is_compactable())
+                    if (wr->is_compactable() && !added)
                     {
-                        to_compact_count++;
-                        if (!added)
-                        {
-                            compact_queue.push_back((object_id){ .inode = wr->inode, .stripe = wr->stripe });
-                            added = true;
-                        }
+                        compact_queue.push_back((object_id){ .inode = wr->inode, .stripe = wr->stripe });
+                        added = true;
                     }
                     if (wr->is_overwrite())
                     {
@@ -710,11 +683,6 @@ int blockstore_heap_t::mark_used_blocks()
             });
         }
     }
-    for (auto li: init_erase_items)
-    {
-        unlink_list_item(li);
-    }
-    init_erase_items.clear();
     if (dsk->gc_on_start)
     {
         recheck_full_gc();
@@ -722,121 +690,6 @@ int blockstore_heap_t::mark_used_blocks()
     return res;
 }
 
-void blockstore_heap_t::init_free_bad_entry(heap_entry_t *wr)
-{
-    if (wr->type() == BS_HEAP_SMALL_WRITE)
-    {
-        free_buffer_area(wr->inode, wr->small().location, wr->small().len);
-    }
-    else if (wr->type() == BS_HEAP_BIG_WRITE || wr->type() == BS_HEAP_BIG_INTENT)
-    {
-        free_data(wr->inode, wr->big_location(this));
-    }
-}
-
-void blockstore_heap_t::init_erase_bad_entry(heap_list_item_t *li)
-{
-    modify_alloc(li->block_num, [&](heap_block_info_t & inf)
-    {
-        for (size_t i = 0; i < inf.entries.size(); i++)
-        {
-            if (inf.entries[i] == li)
-            {
-                inf.entries.erase(inf.entries.begin()+i);
-                break;
-            }
-        }
-        inf.used_space -= li->entry.size;
-        inf.garbage_space -= (li->entry.is_garbage() ? li->entry.size : 0);
-    });
-    recheck_modified_blocks.insert(li->block_num);
-}
-
-bool blockstore_heap_t::init_erase_double_claim(heap_list_item_t *prev_li, heap_list_item_t *cur_li)
-{
-    bool erase_prev = false;
-    bool erase_cur = false;
-    if (prev_li->entry.lsn < cur_li->entry.lsn)
-    {
-        erase_prev = true;
-        auto latest_li = prev_li;
-        while (latest_li->next)
-        {
-            latest_li = latest_li->next;
-        }
-        if (latest_li->entry.lsn >= cur_li->entry.lsn)
-        {
-            // LSN ranges intersect, erase both
-            erase_cur = true;
-        }
-    }
-    else
-    {
-        erase_cur = true;
-        auto latest_li = cur_li;
-        while (latest_li->next)
-        {
-            latest_li = latest_li->next;
-        }
-        if ((latest_li->entry.inode != prev_li->entry.inode ||
-            latest_li->entry.stripe != prev_li->entry.stripe) &&
-            latest_li->entry.lsn >= prev_li->entry.lsn)
-        {
-            // LSN ranges intersect, erase both
-            erase_prev = true;
-        }
-    }
-    if (erase_prev)
-    {
-        fprintf(stderr, "Erasing object %jx:%jx due to double-claim\n", prev_li->entry.inode, prev_li->entry.stripe);
-        auto erase_li = prev_li;
-        while (erase_li->next)
-        {
-            erase_li = erase_li->next;
-        }
-        bool overwritten = false;
-        while (erase_li)
-        {
-            auto prev_erase_li = erase_li->prev;
-            if (!overwritten)
-            {
-                init_free_bad_entry(&erase_li->entry);
-                overwritten = erase_li->entry.is_overwrite();
-            }
-            init_erase_bad_entry(erase_li);
-            // Can't erase (mutate map) while iterating, so postpone it
-            init_erase_items.push_back(erase_li);
-            erase_li = prev_erase_li;
-        }
-    }
-    if (erase_cur)
-    {
-        fprintf(stderr, "Erasing object %jx:%jx due to double-claim\n", cur_li->entry.inode, cur_li->entry.stripe);
-        auto erase_li = cur_li->next;
-        while (erase_li)
-        {
-            // Only newer entries are marked as used
-            auto next_erase_li = erase_li->next;
-            init_free_bad_entry(&erase_li->entry);
-            init_erase_bad_entry(erase_li);
-            // Can't erase (mutate map) while iterating, so postpone it
-            init_erase_items.push_back(erase_li);
-            erase_li = next_erase_li;
-        }
-        erase_li = cur_li;
-        // Older ones are not
-        while (erase_li)
-        {
-            auto prev_erase_li = erase_li->prev;
-            init_erase_bad_entry(erase_li);
-            // Can't erase (mutate map) while iterating, so postpone it
-            init_erase_items.push_back(erase_li);
-            erase_li = prev_erase_li;
-        }
-    }
-    return erase_cur;
-}
-
 void blockstore_heap_t::recheck_full_gc()
 {
     uint32_t block_num = 0;
@@ -856,7 +709,7 @@ void blockstore_heap_t::recheck_full_gc()
                 if (inf.entries[i]->entry.is_garbage())
                 {
                     collected_garbage += inf.entries[i]->entry.size;
-                    unlink_list_item(inf.entries[i]);
+                    remove_list_item(inf.entries[i]);
                 }
                 else
                 {
@@ -877,101 +730,84 @@ void blockstore_heap_t::recheck_full_gc()
     }
 }
 
-void blockstore_heap_t::recheck_drop_entries(heap_entry_t *obj, heap_entry_t *bad_wr)
+void blockstore_heap_t::recheck_buffer(heap_entry_t *cwr, uint8_t *buf)
 {
-    // write entry is invalid, erase it and all newer entries
-    int bad_count = 1;
-    for (auto wr = obj; wr && wr != bad_wr; wr = prev(wr))
+    auto free_entry = [&](heap_list_item_t *li)
     {
-        bad_count++;
-    }
-    auto prev_wr = prev(bad_wr);
-    if (prev_wr)
-    {
-        fprintf(stderr, "Notice: %u unfinished %s to %jx:%jx v%ju since good lsn %ju, rolling back\n",
-            bad_count, bad_count > 1 ? "writes" : "write", obj->inode, obj->stripe, obj->version, prev_wr->lsn);
-    }
-    else
-    {
-        fprintf(stderr, "Notice: the whole object %jx:%jx only has unfinished writes, rolling back\n", obj->inode, obj->stripe);
-    }
-    auto li = list_item(obj);
-    while (li && prev_wr != &li->entry)
-    {
-        auto prev = li->prev;
-        assert(li->entry.type() == bad_wr->type());
-        init_erase_bad_entry(li);
-        unlink_list_item(li);
-        li = prev;
-    }
-}
-
-void blockstore_heap_t::recheck_start_reads(heap_recheck_state_t *st)
-{
-    if (st->sent_reads >= st->total_reads)
-        return;
-    while (recheck_in_progress < recheck_queue_depth)
-    {
-        auto wr = st->next_wr;
-        st->next_wr = prev(st->next_wr);
-        uint64_t loc = 0, len = 0;
-        bool from_data = false;
-        if (wr->type() == BS_HEAP_SMALL_WRITE)
+        uint32_t block_num = li->block_num;
+        auto wr_size = li->entry.size;
+        if (li->entry.is_garbage())
         {
-            loc = wr->small().location;
-            len = wr->small().len;
+            garbage_entries--;
+            garbage_memory -= list_item_overhead(wr_size);
         }
-        else if (wr->type() == BS_HEAP_BIG_INTENT)
+        live_entries--;
+        live_memory -= list_item_overhead(wr_size);
+        free(li);
+        modify_alloc(block_num, [&](heap_block_info_t & inf)
         {
-            auto & bi = wr->big_intent();
-            loc = (uint64_t)bi.block_num * dsk->data_block_size + bi.offset;
-            len = bi.len;
-            from_data = true;
+            inf.used_space -= wr_size;
+            bool found = false;
+            for (auto it = inf.entries.begin(); it != inf.entries.end(); it++)
+            {
+                if (*it == li)
+                {
+                    found = true;
+                    inf.entries.erase(it);
+                    break;
+                }
+            }
+            assert(found);
+        });
+        recheck_modified_blocks.insert(block_num);
+    };
+    if (cwr->is_garbage())
+    {
+        // already freed after rechecking one of the previous small_write entries
+        free_entry(list_item(cwr));
+    }
+    else if (!calc_checksums(cwr, buf, false))
+    {
+        // write entry is invalid, erase it and mark newer entries with garbage bit
+        auto & pg_idx = block_index[get_pg_id(cwr->inode, cwr->stripe)];
+        auto & inode_idx = pg_idx[cwr->inode];
+        heap_inode_map_t::iterator li_it;
+        heap_list_item_t *li = NULL;
+        inode_map_get(inode_idx, li_it, li, cwr->stripe);
+        int rolled_back = 1;
+        while (li && cwr != &li->entry)
+        {
+            assert(li->entry.entry_type == cwr->entry_type);
+            auto prev = li->prev;
+            li->next = li->prev = NULL;
+            if (!li->entry.is_garbage())
+            {
+                garbage_entries++;
+                garbage_memory += list_item_overhead(li->entry.size);
+                li->entry.set_garbage();
+            }
+            li = prev;
+            rolled_back++;
+        }
+        assert(li);
+        if (li->prev)
+        {
+            fprintf(stderr, "Notice: %u unfinished %s to %jx:%jx v%ju since lsn %ju, rolling back\n",
+                rolled_back, rolled_back > 1 ? "writes" : "write", cwr->inode, cwr->stripe, li->prev->entry.version, li->entry.lsn);
+            inode_map_replace(inode_idx, li_it, li->prev);
+            li->prev->next = NULL;
         }
         else
         {
-            assert(wr->type() == BS_HEAP_INTENT_WRITE);
-            auto prev_wr = prev(wr);
-            while (prev_wr && prev_wr->entry_type == wr->entry_type)
-            {
-                // Skip other intent_writes
-                prev_wr = prev(prev_wr);
-            }
-            if (!prev_wr || prev_wr->entry_type != (BS_HEAP_BIG_WRITE | (wr->entry_type & BS_HEAP_STABLE)) &&
-                prev_wr->entry_type != (BS_HEAP_BIG_INTENT | (wr->entry_type & BS_HEAP_STABLE)))
-            {
-                fprintf(stderr, "Error: intent_write entry %jx:%jx v%ju l%ju is not written over a big_write\n",
-                    wr->inode, wr->stripe, wr->version, wr->lsn);
-                exit(1);
-            }
-            loc = wr->small().offset + prev_wr->big_location(this);
-            len = wr->small().len;
-            from_data = true;
+            fprintf(stderr, "Notice: the whole object %jx:%jx only has unfinished writes, rolling back\n",
+                cwr->inode, cwr->stripe);
+            inode_map_erase(pg_idx, inode_idx, li_it, li);
         }
-        st->sent_reads++;
-        recheck_in_progress++;
-        recheck_pending_reads--;
-        bool is_last = st->sent_reads >= st->total_reads;
-        recheck_cb(from_data, loc, len, [this, st, wr](uint8_t *buf)
-        {
-            st->checked_reads++;
-            if (!calc_checksums(wr, buf, false))
-                st->bad_wr = !st->bad_wr || st->bad_wr->lsn > wr->lsn ? wr : st->bad_wr;
-            if (st->checked_reads >= st->total_reads)
-            {
-                if (st->bad_wr)
-                    recheck_drop_entries(st->obj, st->bad_wr);
-                recheck_states.erase(st->obj);
-            }
-            recheck_in_progress--;
-            recheck_small_writes(NULL, 0);
-        });
-        if (is_last)
-            break;
+        free_entry(li);
     }
 }
 
-bool blockstore_heap_t::recheck_small_writes(std::function<void(bool is_data, uint64_t offset, uint64_t len, std::function<void(uint8_t* buf)>)> read_buffer, int queue_depth)
+bool blockstore_heap_t::recheck_small_writes(std::function<void(bool is_data, uint64_t offset, uint64_t len, uint8_t* buf, std::function<void()>)> read_buffer, int queue_depth)
 {
     if (in_recheck)
     {
@@ -990,52 +826,75 @@ bool blockstore_heap_t::recheck_small_writes(std::function<void(bool is_data, ui
         recheck_queue_depth = queue_depth;
     }
     in_recheck = true;
-    while (recheck_pending_reads > 0 && recheck_in_progress < recheck_queue_depth)
-    {
-        for (auto & sp: recheck_states)
-            recheck_start_reads(&sp.second);
-    }
     while (recheck_queue.size() > 0 && recheck_in_progress < recheck_queue_depth)
     {
-        heap_entry_t *obj = recheck_queue.front();
+        heap_entry_t *wr = recheck_queue.front();
         recheck_queue.pop_front();
-        if (obj->type() == BS_HEAP_SMALL_WRITE && buffer_area)
+        bool from_data = false;
+        uint64_t loc = 0;
+        uint32_t len = 0;
+        if (wr->type() == BS_HEAP_INTENT_WRITE)
         {
-            // Check this object synchronously
-            heap_entry_t *bad_wr = NULL;
-            for (auto wr = obj; wr && wr->type() == BS_HEAP_SMALL_WRITE; wr = prev(wr))
+            auto prev_wr = prev(wr);
+            while (prev_wr && prev_wr->entry_type == wr->entry_type)
             {
-                fprintf(stderr, "Notice: rechecking %jx:%jx l%ju - %u bytes at %ju in buffer area\n",
-                    wr->inode, wr->stripe, wr->lsn, wr->small().len, wr->small().location);
-                if (!calc_checksums(wr, buffer_area + wr->small().location, false))
-                    bad_wr = wr;
+                // Skip other intent_writes
+                prev_wr = prev(prev_wr);
             }
-            if (bad_wr)
-                recheck_drop_entries(obj, bad_wr);
+            if (!prev_wr || prev_wr->entry_type != (BS_HEAP_BIG_WRITE | (wr->entry_type & BS_HEAP_STABLE)) &&
+                prev_wr->entry_type != (BS_HEAP_BIG_INTENT | (wr->entry_type & BS_HEAP_STABLE)))
+            {
+                fprintf(stderr, "Error: intent_write entry %jx:%jx v%ju l%ju is not written over a big_write\n",
+                    wr->inode, wr->stripe, wr->version, wr->lsn);
+                exit(1);
+            }
+            loc = wr->small().offset + prev_wr->big_location(this);
+            len = wr->small().len;
+            from_data = true;
+        }
+        else if (wr->type() == BS_HEAP_BIG_INTENT)
+        {
+            auto & bi = wr->big_intent();
+            loc = (uint64_t)bi.block_num * dsk->data_block_size + bi.offset;
+            len = bi.len;
+            from_data = true;
         }
         else
         {
-            // Recheck will be asynchronous. Create state and start it
-            auto & st = recheck_states[obj];
-            st.obj = obj;
-            st.next_wr = obj;
-            st.total_reads = 1;
-            if (obj->type() == BS_HEAP_SMALL_WRITE)
-                for (auto wr = prev(obj); wr && wr->type() == BS_HEAP_SMALL_WRITE; wr = prev(wr))
-                    st.total_reads++;
-            recheck_pending_reads += st.total_reads;
-            recheck_start_reads(&st);
+            assert(wr->type() == BS_HEAP_SMALL_WRITE);
+            loc = wr->small().location;
+            len = wr->small().len;
+        }
+        if (log_level > 5)
+        {
+            fprintf(stderr, "Notice: rechecking %jx:%jx l%ju - %u bytes at %ju in %s area\n",
+                wr->inode, wr->stripe, wr->lsn, len, loc, from_data ? "data" : "buffer");
+        }
+        if (!from_data && buffer_area)
+        {
+            recheck_buffer(wr, buffer_area+loc);
+        }
+        else
+        {
+            recheck_in_progress++;
+            uint8_t *buf = (uint8_t*)memalign_or_die(MEM_ALIGNMENT, len);
+            recheck_cb(from_data, loc, len, buf, [this, wr, buf]()
+            {
+                recheck_buffer(wr, buf);
+                free(buf);
+                recheck_in_progress--;
+                recheck_small_writes(NULL, 0);
+            });
         }
     }
     in_recheck = false;
     if (!recheck_queue.size() && !recheck_in_progress)
     {
-        assert(!recheck_states.size());
         auto cb = std::move(recheck_cb);
         recheck_queue_depth = 0;
         if (cb)
         {
-            cb(false, 0, 0, NULL);
+            cb(false, 0, 0, NULL, NULL);
         }
         return true;
     }
@@ -1169,9 +1028,9 @@ bool blockstore_heap_t::calc_block_checksums(uint32_t *block_csums, uint8_t *bit
     uint32_t pos = start;
     uint32_t block_end = (start/dsk->csum_block_size + 1)*dsk->csum_block_size;
     uint32_t block_crc = 0;
+    bool isset = false;
     while (pos < end)
     {
-        bool isset = false;
         uint32_t blk_start = pos;
         if (bitmap)
         {
@@ -1181,7 +1040,7 @@ bool blockstore_heap_t::calc_block_checksums(uint32_t *block_csums, uint8_t *bit
                 while (pos < end && pos < block_end && !(bitmap[pos/dsk->bitmap_granularity/8] & (1 << ((pos/dsk->bitmap_granularity) % 8))))
                     pos += dsk->bitmap_granularity;
                 // zero padding at the beginning or at the end of the block is not counted
-                if (pos > prev && prev > blk_start && pos < block_end)
+                if (pos > prev && prev > 0 && pos < block_end)
                 {
                     if (dsk->data_csum_type == BLOCKSTORE_CSUM_XXH3_32)
                     {
@@ -1552,51 +1411,43 @@ int blockstore_heap_t::allocate_entry(uint32_t entry_size, uint32_t *block_num,
     return 0;
 }
 
-void blockstore_heap_t::insert_list_items(heap_list_item_t** v, size_t count, bool postpone)
+void blockstore_heap_t::insert_list_item(heap_list_item_t *li)
 {
-    auto wr = &v[0]->entry;
-    auto & inode_idx = block_index[get_pg_id(wr->inode, wr->stripe)][wr->inode];
+    auto & inode_idx = block_index[get_pg_id(li->entry.inode, li->entry.stripe)][li->entry.inode];
     heap_inode_map_t::iterator li_it;
     heap_list_item_t *old_head = NULL;
     if (inode_idx)
-        inode_map_get(inode_idx, li_it, old_head, wr->stripe);
-    heap_list_item_t *next_li = NULL;
-    heap_list_item_t *prev_li = old_head;
-    int skips = 0;
-    // Merge entry array and inode_idx linked list (both sorted in newest first order)
-    for (size_t i = 0; i < count; i++)
+        inode_map_get(inode_idx, li_it, old_head, li->entry.stripe);
+    if (old_head && !old_head->entry.is_before(&li->entry))
     {
         // BIG_WRITE may be inserted into the middle of the sequence during compaction
         // and it overrides SMALL_WRITEs and COMMITs with the same LSN
         // However, all entries of other types (say DELETE) override previous ones
-        auto li = v[i];
+        auto next_li = old_head;
+        auto prev_li = old_head->prev;
         while (prev_li && !prev_li->entry.is_before(&li->entry))
         {
             next_li = prev_li;
             prev_li = prev_li->prev;
-            skips++;
-        }
-        if (postpone && skips > POSTPONE_INSERT_COUNT)
-        {
-            postponed_items.push_back(li);
-            return;
-        }
-        if (next_li == NULL)
-        {
-            // Replace the latest entry pointer
-            if (old_head)
-                inode_map_replace(inode_idx, li_it, li);
-            else
-                inode_map_put(inode_idx, li);
         }
         // Insert <li> between <next_li> and <prev_li>
-        li->next = next_li;
-        if (next_li)
-            next_li->prev = li;
         li->prev = prev_li;
         if (prev_li)
             prev_li->next = li;
-        next_li = li;
+        next_li->prev = li;
+        li->next = next_li;
+    }
+    else
+    {
+        li->prev = old_head;
+        li->next = NULL;
+        if (old_head)
+        {
+            old_head->next = li;
+            inode_map_replace(inode_idx, li_it, li);
+        }
+        else
+            inode_map_put(inode_idx, li);
     }
 }
 
@@ -1626,9 +1477,9 @@ int blockstore_heap_t::add_entry(uint32_t wr_size, uint32_t *modified_block,
     // Remember the object as dirty and remove older entries when this block is written and fsynced
     push_inflight_lsn(next_lsn, new_wr,
         (explicit_complete ? HEAP_INFLIGHT_EXPLICIT : 0) |
-        (new_wr->is_overwrite() ? HEAP_INFLIGHT_OVERWRITE : 0) |
+        (new_wr->is_overwrite() ? HEAP_INFLIGHT_COMPACTED : 0) |
         (new_wr->is_compactable() ? HEAP_INFLIGHT_COMPACTABLE : 0));
-    insert_list_items(&li, 1, false);
+    insert_list_item(li);
     li->block_num = block_num;
     new_wr->size = wr_size;
     new_wr->checksum = new_wr->calc_checksum(this);
@@ -1660,22 +1511,10 @@ int blockstore_heap_t::add_small_write(object_id oid, heap_entry_t **obj_ptr, ui
         wr->small().location = location;
         if (bitmap)
             memcpy(wr->get_ext_bitmap(this), bitmap, dsk->clean_entry_bitmap_size);
+        else if (obj)
+            memcpy(wr->get_ext_bitmap(this), obj->get_ext_bitmap(this), dsk->clean_entry_bitmap_size);
         else
-        {
-            bool found = false;
-            iterate_with_stable(obj, UINT64_MAX, [&](heap_entry_t *old_wr, bool stable)
-            {
-                if (old_wr->get_ext_bitmap(this))
-                {
-                    found = true;
-                    memcpy(wr->get_ext_bitmap(this), old_wr->get_ext_bitmap(this), dsk->clean_entry_bitmap_size);
-                    return false;
-                }
-                return true;
-            });
-            if (!found)
-                memset(wr->get_ext_bitmap(this), 0, dsk->clean_entry_bitmap_size);
-        }
+            memset(wr->get_ext_bitmap(this), 0, dsk->clean_entry_bitmap_size);
         calc_checksums(wr, (uint8_t*)data, true);
         *obj_ptr = wr;
     });
@@ -1836,7 +1675,6 @@ int blockstore_heap_t::punch_holes(heap_entry_t *wr, uint8_t *new_bitmap, uint8_
     *modified_block = block_num;
     memcpy(wr->get_int_bitmap(this), new_bitmap, dsk->clean_entry_bitmap_size);
     memcpy(wr->get_checksums(this), new_csums, dsk->data_block_size/dsk->csum_block_size*(dsk->data_csum_type & 0xFF));
-    wr->checksum = wr->calc_checksum(dsk);
     return 0;
 }
 
@@ -2139,10 +1977,7 @@ void blockstore_heap_t::iterate_with_stable(heap_entry_t *obj, uint64_t max_lsn,
     {
         if (old_wr->type() == BS_HEAP_ROLLBACK)
         {
-            if (rollback_version > old_wr->version)
-            {
-                rollback_version = old_wr->version;
-            }
+            rollback_version = old_wr->version;
         }
         else if (old_wr->type() == BS_HEAP_COMMIT)
         {
@@ -2194,10 +2029,7 @@ heap_compact_t blockstore_heap_t::iterate_compaction(heap_entry_t *obj, uint64_t
                 res.compact_lsn = wr->lsn;
                 res.compact_version = wr->version;
             }
-            if (rollback_version > wr->version)
-            {
-                rollback_version = wr->version;
-            }
+            rollback_version = wr->version;
             continue;
         }
         if (wr->type() == BS_HEAP_COMMIT && wr->lsn <= fsynced_lsn)
@@ -2375,7 +2207,7 @@ void blockstore_heap_t::use_data(inode_t inode, uint64_t location)
 {
     auto sh_it = pool_shard_settings.find(INODE_POOL(inode));
     if (sh_it != pool_shard_settings.end() && sh_it->second.no_inode_stats)
-        inode = INODE_WITH_POOL(INODE_POOL(inode), 0);
+        inode = (INODE_POOL(inode) << POOL_ID_BITS);
     assert(!data_alloc->get(location / dsk->data_block_size));
     data_alloc->set(location / dsk->data_block_size, true);
     inode_space_stats[inode] += dsk->data_block_size;
@@ -2386,7 +2218,7 @@ void blockstore_heap_t::free_data(inode_t inode, uint64_t location)
 {
     auto sh_it = pool_shard_settings.find(INODE_POOL(inode));
     if (sh_it != pool_shard_settings.end() && sh_it->second.no_inode_stats)
-        inode = INODE_WITH_POOL(INODE_POOL(inode), 0);
+        inode = (INODE_POOL(inode) << POOL_ID_BITS);
     assert(data_alloc->get(location / dsk->data_block_size));
     data_alloc->set(location / dsk->data_block_size, false);
     auto sp_it = inode_space_stats.find(inode);
@@ -2423,8 +2255,7 @@ void blockstore_heap_t::use_buffer_area(inode_t inode, uint64_t location, uint64
         return;
     }
     assert(!(size % dsk->bitmap_granularity));
-    bool ok = buffer_alloc->use(location / dsk->bitmap_granularity, size / dsk->bitmap_granularity);
-    assert(ok);
+    buffer_alloc->use(location / dsk->bitmap_granularity, size / dsk->bitmap_granularity);
     buffer_area_used_space += size;
 }
 
@@ -2466,7 +2297,7 @@ void blockstore_heap_t::get_meta_block(uint32_t block_num, uint8_t *buffer)
     }
 }
 
-void blockstore_heap_t::fill_block_empty_space(uint8_t *buffer, uint64_t pos)
+void blockstore_heap_t::fill_block_empty_space(uint8_t *buffer, uint32_t pos)
 {
     if (pos > dsk->meta_block_size)
     {
@@ -2554,7 +2385,7 @@ uint64_t blockstore_heap_t::get_garbage_memory()
 void blockstore_heap_t::push_inflight_lsn(uint64_t lsn, heap_entry_t *wr, uint64_t flags)
 {
     uint64_t next_inf = first_inflight_lsn + inflight_lsn.size();
-    if (flags & (HEAP_INFLIGHT_COMPACTABLE|HEAP_INFLIGHT_OVERWRITE))
+    if (flags & (HEAP_INFLIGHT_COMPACTABLE|HEAP_INFLIGHT_COMPACTED))
     {
         to_compact_count++;
     }
@@ -2621,7 +2452,7 @@ void blockstore_heap_t::mark_lsn_fsynced(uint64_t lsn)
 void blockstore_heap_t::apply_inflight(heap_inflight_lsn_t & inflight)
 {
     auto wr = inflight.wr;
-    if (inflight.flags & HEAP_INFLIGHT_OVERWRITE)
+    if (inflight.flags & HEAP_INFLIGHT_COMPACTED)
     {
         // Mark previous entries as garbage, sequentially
         mark_garbage_up_to(wr);
@@ -2637,22 +2468,11 @@ void blockstore_heap_t::apply_inflight(heap_inflight_lsn_t & inflight)
     {
         // Remove entry
         auto li = list_item(wr);
-        if (!li->next)
-        {
-            // The last freed entry must be a deletion
-            assert(!li->prev);
-            assert((li->entry.entry_type & ~BS_HEAP_GARBAGE) == (BS_HEAP_DELETE|BS_HEAP_STABLE));
-        }
-        else if (!li->prev && li->next->entry.entry_type == (BS_HEAP_DELETE|BS_HEAP_STABLE))
-        {
-            // free BS_HEAP_DELETEs when all previous entries are also freed
-            mark_garbage(li->next->block_num, &li->next->entry, UINT32_MAX);
-        }
-        unlink_list_item(li);
+        remove_list_item(li);
     }
 }
 
-void blockstore_heap_t::unlink_list_item(heap_list_item_t *li)
+void blockstore_heap_t::remove_list_item(heap_list_item_t *li)
 {
     auto prev = li->prev;
     auto next = li->next;
@@ -2662,20 +2482,25 @@ void blockstore_heap_t::unlink_list_item(heap_list_item_t *li)
     }
     if (!next)
     {
+        // The last freed entry must be a deletion
+        assert(!prev);
         auto wr = &li->entry;
+        assert(wr->entry_type == BS_HEAP_DELETE|BS_HEAP_STABLE);
         auto & pg_idx = block_index[get_pg_id(wr->inode, wr->stripe)];
         auto & inode_idx = pg_idx[wr->inode];
         heap_inode_map_t::iterator li_it;
         heap_list_item_t *old_li = NULL;
         inode_map_get(inode_idx, li_it, old_li, wr->stripe);
-        if (!prev)
-            inode_map_erase(pg_idx, inode_idx, li_it, old_li);
-        else
-            inode_map_replace(inode_idx, li_it, prev);
+        inode_map_erase(pg_idx, inode_idx, li_it, old_li);
     }
     else
     {
         next->prev = prev;
+        if (!prev && next->entry.entry_type == (BS_HEAP_DELETE|BS_HEAP_STABLE))
+        {
+            // free BS_HEAP_DELETEs when all previous entries are also freed
+            mark_garbage(next->block_num, &next->entry, UINT32_MAX);
+        }
     }
     if (li->entry.is_garbage())
     {

src/blockstore/blockstore_heap.h

@@ -57,11 +57,11 @@ struct __attribute__((__packed__)) heap_entry_t
     inline heap_small_write_t& small() { return *(heap_small_write_t*)this; }
     inline heap_big_write_t& big() { return *(heap_big_write_t*)this; }
     inline heap_big_intent_t& big_intent() { return *(heap_big_intent_t*)this; }
-    bool is_garbage() const;
+    bool is_garbage();
     void set_garbage();
-    bool is_overwrite() const;
-    bool is_compactable() const;
-    bool is_before(const heap_entry_t *other) const;
+    bool is_overwrite();
+    bool is_compactable();
+    bool is_before(heap_entry_t *other);
     uint32_t get_size(blockstore_heap_t *heap);
     uint8_t *get_ext_bitmap(blockstore_heap_t *heap);
     uint8_t *get_int_bitmap(blockstore_heap_t *heap);
@@ -159,16 +159,6 @@ struct heap_li_equal
     }
 };
 
-struct heap_recheck_state_t
-{
-    heap_entry_t *obj = NULL;
-    heap_entry_t *next_wr = NULL;
-    size_t total_reads = 0;
-    size_t sent_reads = 0;
-    size_t checked_reads = 0;
-    heap_entry_t *bad_wr = NULL;
-};
-
 using i64hash_t = robin_hood::hash<uint64_t>;
 using heap_inode_map_t = robin_hood::unordered_flat_set<heap_list_item_t*, heap_li_hash, heap_li_equal, 88>;
 using heap_block_index_t = robin_hood::unordered_flat_map<uint64_t,
@@ -219,26 +209,18 @@ class blockstore_heap_t
 
     bool marked_used_blocks = false;
     bool recheck_queue_filled = false;
-    std::vector<heap_list_item_t*> postponed_items;
-    std::vector<heap_list_item_t*> init_erase_items;
+    std::vector<heap_list_item_t*> loaded_list_items;
     std::set<uint32_t> recheck_modified_blocks;
     std::deque<heap_entry_t*> recheck_queue;
-    std::map<heap_entry_t*, heap_recheck_state_t> recheck_states;
-    size_t recheck_pending_reads = 0;
     int recheck_in_progress = 0;
     bool in_recheck = false;
-    std::function<void(bool is_data, uint64_t offset, uint64_t len, std::function<void(uint8_t*)>)> recheck_cb;
+    std::function<void(bool is_data, uint64_t offset, uint64_t len, uint8_t* buf, std::function<void()>)> recheck_cb;
     int recheck_queue_depth = 0;
 
     uint64_t get_pg_id(inode_t inode, uint64_t stripe);
     bool validate_object(heap_entry_t *obj);
     void fill_recheck_queue();
-    void recheck_drop_entries(heap_entry_t *obj, heap_entry_t *bad_wr);
-    void recheck_start_reads(heap_recheck_state_t *st);
     int mark_used_blocks();
-    void init_free_bad_entry(heap_entry_t *wr);
-    void init_erase_bad_entry(heap_list_item_t *li);
-    bool init_erase_double_claim(heap_list_item_t *prev_li, heap_list_item_t *cur_li);
     void recheck_full_gc();
     void recheck_buffer(heap_entry_t *cwr, uint8_t *buf);
     void defragment_block(uint32_t block_num);
@@ -246,8 +228,8 @@ class blockstore_heap_t
 
     void gc_block(heap_block_info_t & inf);
     int allocate_entry(uint32_t entry_size, uint32_t *block_num, bool allow_last_free);
-    void insert_list_items(heap_list_item_t** v, size_t count, bool postpone);
-    void unlink_list_item(heap_list_item_t *li);
+    void insert_list_item(heap_list_item_t *li);
+    void remove_list_item(heap_list_item_t *li);
     int add_entry(uint32_t wr_size, uint32_t *modified_block, bool allow_last_free,
         bool explicit_complete, std::function<void(heap_entry_t *wr)> fill_entry);
     int add_simple(heap_entry_t *obj, uint64_t version, uint32_t *modified_block, uint32_t entry_type);
@@ -274,7 +256,7 @@ public:
     // before finishing initialization if not R/O
     std::vector<uint32_t> get_recheck_modified_blocks();
     // recheck small write data after reading the database from disk
-    bool recheck_small_writes(std::function<void(bool is_data, uint64_t offset, uint64_t len, std::function<void(uint8_t* buf)>)> read_buffer, int queue_depth);
+    bool recheck_small_writes(std::function<void(bool is_data, uint64_t offset, uint64_t len, uint8_t* buf, std::function<void()>)> read_buffer, int queue_depth);
     int finish_recheck();
     // reshard database according to the pool's PG count
     void* reshard_start(pool_id_t pool, uint32_t pg_count, uint32_t pg_stripe_size, uint64_t chunk_limit);
@@ -362,7 +344,7 @@ public:
 
     // get metadata block data buffer and used space
     void get_meta_block(uint32_t block_num, uint8_t *buffer);
-    void fill_block_empty_space(uint8_t *buffer, uint64_t pos);
+    void fill_block_empty_space(uint8_t *buffer, uint32_t pos);
     uint32_t get_meta_block_used_space(uint32_t block_num);
 
     // get space usage statistics

src/blockstore/blockstore_impl.cpp

@@ -101,7 +101,6 @@ void blockstore_impl_t::loop()
         unsigned initial_ring_space = ringloop->space_left();
         int op_idx = 0, new_idx = 0;
         bool has_unfinished_writes = false;
-        bool has_unfinished_sync = false;
         for (; op_idx < submit_queue.size(); op_idx++, new_idx++)
         {
             auto op = submit_queue[op_idx];
@@ -139,13 +138,7 @@ void blockstore_impl_t::loop()
             else if (op->opcode == BS_OP_SYNC)
             {
                 // syncs only completed writes, so doesn't have to be blocked by anything
-                if (!has_unfinished_sync)
-                {
-                    wr_st = continue_sync(op);
-                    has_unfinished_sync = (wr_st != 2);
-                }
-                else
-                    wr_st = 0;
+                wr_st = continue_sync(op);
             }
             else if (op->opcode == BS_OP_STABLE || op->opcode == BS_OP_ROLLBACK)
             {
@@ -161,7 +154,9 @@ void blockstore_impl_t::loop()
                     wr_st = 2;
                 }
                 else
+                {
                     wr_st = 0;
+                }
             }
             if (wr_st == 2)
             {
@@ -345,7 +340,7 @@ void blockstore_impl_t::process_list(blockstore_op_t *op)
         std::sort(result, result + stable_count);
         if (stable_count > op->list_stable_limit)
         {
-            memmove(result + op->list_stable_limit, result + stable_count, unstable_count*sizeof(obj_ver_id));
+            memmove(result + op->list_stable_limit, result + stable_count, unstable_count);
             stable_count = op->list_stable_limit;
         }
     }

src/blockstore/blockstore_impl.h

@@ -9,9 +9,12 @@
 #include "ondisk_formats.h"
 
 #include <sys/types.h>
+#include <sys/ioctl.h>
 #include <sys/stat.h>
+#include <fcntl.h>
 #include <time.h>
 #include <unistd.h>
+#include <linux/fs.h>
 
 #include <vector>
 #include <list>
@@ -114,12 +117,9 @@ public:
 
     journal_flusher_t *flusher;
     int write_iodepth = 0;
+    int inflight_big = 0;
     int intent_write_counter = 0;
-    uint64_t data_fsync_next = 0;
-    uint64_t data_fsync_cur = 0;
-    uint64_t data_fsync_sent = 0;
-    uint64_t data_fsync_done = 0;
-    std::deque<bool> data_fsyncs;
+    bool fsyncing_data = false;
 
     bool live = false, queue_stall = false;
     ring_loop_i *ringloop = NULL;

src/blockstore/blockstore_init.cpp

@@ -10,6 +10,7 @@
 #define INIT_META_EMPTY 0
 #define INIT_META_READING 1
 #define INIT_META_READ_DONE 2
+#define INIT_META_WRITING 3
 
 #define GET_SQE() \
     sqe = bs->get_sqe();\
@@ -17,34 +18,19 @@
         throw std::runtime_error("io_uring is full during initialization");\
     data = ((ring_data_t*)sqe->user_data)
 
-struct blockstore_recheck_io_t
-{
-    bool is_data;
-    uint64_t offset;
-    uint64_t len;
-    uint8_t *buf;
-    std::function<void(uint8_t *buf)> cb;
-
-    blockstore_recheck_io_t(bool is_data, uint64_t offset, uint64_t len, std::function<void(uint8_t *buf)>&& cb):
-        is_data(is_data), offset(offset), len(len), buf(NULL), cb(std::move(cb))
-    {
-    }
-};
-
 blockstore_init_meta::blockstore_init_meta(blockstore_impl_t *bs)
 {
     this->bs = bs;
 }
 
-void blockstore_init_meta::handle_event(ring_data_t *data, int buf_num, const char *op)
+void blockstore_init_meta::handle_event(ring_data_t *data, int buf_num)
 {
-    if (data->res != data->iov.iov_len)
+    if (data->res < 0)
     {
-        throw std::runtime_error(strprintf(
-            "%s failed at offset %ju: got %s (code %d), but expected %zu",
-            op, (buf_num >= 0 ? bufs[buf_num].offset : last_read_offset), strerror(-data->res),
-            data->res, data->iov.iov_len
-        ));
+        throw std::runtime_error(
+            std::string("read metadata failed at offset ") + std::to_string(buf_num >= 0 ? bufs[buf_num].offset : last_read_offset) +
+            std::string(": ") + strerror(-data->res)
+        );
     }
     if (buf_num >= 0)
     {
@@ -74,7 +60,7 @@ int blockstore_init_meta::loop()
     GET_SQE();
     last_read_offset = 0;
     data->iov = { bs->meta_superblock, (size_t)bs->dsk.meta_block_size };
-    data->callback = [this](ring_data_t *data) { handle_event(data, -1, "read metadata header"); };
+    data->callback = [this](ring_data_t *data) { handle_event(data, -1); };
     io_uring_prep_readv(sqe, bs->dsk.meta_fd, &data->iov, 1, bs->dsk.meta_offset);
     bs->ringloop->submit();
     submitted++;
@@ -86,19 +72,25 @@ resume_1:
     }
     if (is_zero((uint64_t*)bs->meta_superblock, bs->dsk.meta_block_size))
     {
-        assert(bs->dsk.meta_format == BLOCKSTORE_META_FORMAT_HEAP);
-        blockstore_meta_header_v3_t *hdr = (blockstore_meta_header_v3_t *)bs->meta_superblock;
-        hdr->zero = 0;
-        hdr->magic = BLOCKSTORE_META_MAGIC_V1;
-        hdr->version = bs->dsk.meta_format;
-        hdr->meta_block_size = bs->dsk.meta_block_size;
-        hdr->data_block_size = bs->dsk.data_block_size;
-        hdr->bitmap_granularity = bs->dsk.bitmap_granularity;
-        hdr->completed_lsn = 0;
-        hdr->data_csum_type = bs->dsk.data_csum_type;
-        hdr->csum_block_size = bs->dsk.csum_block_size;
-        hdr->meta_area_size = bs->dsk.meta_area_size;
-        hdr->set_crc32c();
+        {
+            blockstore_meta_header_v3_t *hdr = (blockstore_meta_header_v3_t *)bs->meta_superblock;
+            hdr->zero = 0;
+            hdr->magic = BLOCKSTORE_META_MAGIC_V1;
+            hdr->version = bs->dsk.meta_format;
+            hdr->meta_block_size = bs->dsk.meta_block_size;
+            hdr->data_block_size = bs->dsk.data_block_size;
+            hdr->bitmap_granularity = bs->dsk.bitmap_granularity;
+            if (bs->dsk.meta_format >= BLOCKSTORE_META_FORMAT_V2)
+            {
+                hdr->data_csum_type = bs->dsk.data_csum_type;
+                hdr->csum_block_size = bs->dsk.csum_block_size;
+            }
+            if (bs->dsk.meta_format >= BLOCKSTORE_META_FORMAT_HEAP)
+            {
+                hdr->meta_area_size = bs->dsk.meta_area_size;
+            }
+            hdr->set_crc32c();
+        }
         if (bs->readonly)
         {
             printf("Skipping metadata initialization because blockstore is readonly\n");
@@ -106,8 +98,21 @@ resume_1:
         else
         {
             printf("Initializing metadata area\n");
+            GET_SQE();
+            last_read_offset = 0;
+            data->iov = (struct iovec){ bs->meta_superblock, (size_t)bs->dsk.meta_block_size };
+            data->callback = [this](ring_data_t *data) { handle_event(data, -1); };
+            io_uring_prep_writev(sqe, bs->dsk.meta_fd, &data->iov, 1, bs->dsk.meta_offset);
+            bs->ringloop->submit();
+            submitted++;
+        resume_2:
+            if (submitted > 0)
+            {
+                wait_state = 2;
+                return 1;
+            }
+            zero_on_init = true;
         }
-        zero_on_init = true;
     }
     else
     {
@@ -148,17 +153,9 @@ resume_1:
             );
             exit(1);
         }
-        uint32_t csum = hdr->header_csum;
-        hdr->header_csum = 0;
-        if (crc32c(0, hdr, sizeof(*hdr)) != csum)
-        {
-            printf("Metadata header is corrupt (checksum mismatch).\n");
-            exit(1);
-        }
-        hdr->header_csum = csum;
     }
     bs->heap->start_load(((blockstore_meta_header_v3_t *)bs->meta_superblock)->completed_lsn);
-    if (bs->dsk.inmemory_journal && !zero_on_init)
+    if (bs->dsk.inmemory_journal)
     {
         // Read buffer area
         printf("Reading buffered data\n");
@@ -170,7 +167,7 @@ resume_1:
                 bs->buffer_area + md_offset,
                 (size_t)(bs->dsk.journal_len - md_offset < bs->metadata_buf_size ? bs->dsk.journal_len - md_offset : bs->metadata_buf_size),
             };
-            data->callback = [this](ring_data_t *data) { handle_event(data, -1, "read buffer area"); };
+            data->callback = [this](ring_data_t *data) { handle_event(data, -1); };
             io_uring_prep_readv(sqe, bs->dsk.journal_fd, &data->iov, 1, bs->dsk.journal_offset + md_offset);
             md_offset += data->iov.iov_len;
             submitted++;
@@ -189,7 +186,7 @@ resume_3:
     next_offset = md_offset;
     // Read the rest of the metadata
 resume_4:
-    if (next_offset < bs->dsk.meta_area_size && submitted == 0 && (!zero_on_init || !bs->readonly))
+    if (next_offset < bs->dsk.meta_area_size && submitted == 0)
     {
         // Submit one read
         for (int i = 0; i < 2; i++)
@@ -206,15 +203,12 @@ resume_4:
                 GET_SQE();
                 assert(bufs[i].size <= 0x7fffffff);
                 data->iov = { bufs[i].buf, (size_t)bufs[i].size };
+                data->callback = [this, i](ring_data_t *data) { handle_event(data, i); };
                 if (!zero_on_init)
-                {
-                    data->callback = [this, i](ring_data_t *data) { handle_event(data, i, "read metadata"); };
                     io_uring_prep_readv(sqe, bs->dsk.meta_fd, &data->iov, 1, bs->dsk.meta_offset + bufs[i].offset);
-                }
                 else
                 {
                     // Fill metadata with empty block pattern
-                    data->callback = [this, i](ring_data_t *data) { handle_event(data, i, "clear metadata"); };
                     memset(bufs[i].buf, 0, bufs[i].size);
                     for (uint64_t o = 0; o < bufs[i].size; o += bs->dsk.meta_block_size)
                         bs->heap->fill_block_empty_space(bufs[i].buf + o, 0);
@@ -230,14 +224,11 @@ resume_4:
         if (bufs[i].state == INIT_META_READ_DONE)
         {
             // Handle result
-            if (!zero_on_init)
-            {
-                uint64_t loaded = 0;
-                int r = bs->heap->load_blocks(bufs[i].offset-bs->dsk.meta_block_size, bufs[i].size, bufs[i].buf, bs->skip_corrupted_meta_entries, loaded);
-                if (r != 0)
-                    exit(1);
-                entries_loaded += loaded;
-            }
+            uint64_t loaded = 0;
+            int r = bs->heap->load_blocks(bufs[i].offset-bs->dsk.meta_block_size, bufs[i].size, bufs[i].buf, bs->skip_corrupted_meta_entries, loaded);
+            if (r != 0)
+                exit(1);
+            entries_loaded += loaded;
             bufs[i].state = 0;
             bs->ringloop->wakeup();
         }
@@ -247,47 +238,51 @@ resume_4:
         wait_state = 4;
         return 1;
     }
-    // metadata read/clear finished
+    // metadata read finished
     bs->heap->finish_load();
     printf("Metadata entries loaded: %ju, rechecking unfinished writes and garbage entries\n", entries_loaded);
+    if (zero_on_init && !bs->dsk.disable_meta_fsync)
+    {
+        GET_SQE();
+        io_uring_prep_fsync(sqe, bs->dsk.meta_fd, IORING_FSYNC_DATASYNC);
+        last_read_offset = 0;
+        data->iov = { 0 };
+        data->callback = [this](ring_data_t *data) { handle_event(data, -1); };
+        submitted++;
+        bs->ringloop->submit();
+    resume_5:
+        if (submitted > 0)
+        {
+            wait_state = 5;
+            return 1;
+        }
+    }
     // asynchronous recheck
 resume_6:
     wait_state = 6;
-    bs->heap->recheck_small_writes([this](bool is_data, uint64_t offset, uint64_t len, std::function<void(uint8_t*)> cb)
+    bs->heap->recheck_small_writes([this](bool is_data, uint64_t offset, uint64_t len, uint8_t *buf, std::function<void()> cb)
     {
-        if (!len)
+        if (!buf)
         {
             wait_state = 7;
             bs->ringloop->wakeup();
             return;
         }
-        recheck_ios.push_back(new blockstore_recheck_io_t(is_data, offset, len, std::move(cb)));
-    }, bs->meta_write_recheck_parallelism);
-    while (recheck_ios.size())
-    {
-        blockstore_recheck_io_t* rc = recheck_ios.back();
-        sqe = bs->get_sqe();
-        if (!sqe)
-            break;
-        if (!rc->buf)
-            rc->buf = (uint8_t*)memalign_or_die(MEM_ALIGNMENT, rc->len);
-        data = ((ring_data_t*)sqe->user_data);
-        data->iov = (iovec){ rc->buf, rc->len };
-        data->callback = [this, rc](ring_data_t *data)
+        GET_SQE();
+        data->iov = (iovec){ buf, len };
+        data->callback = [offset, cb](ring_data_t *data)
         {
             if (data->res < 0)
             {
-                fprintf(stderr, "Buffer area read failed at offset %ju: %d\n", rc->offset, data->res);
+                fprintf(stderr, "Buffer area read failed at offset %ju: %d\n", offset, data->res);
                 exit(1);
             }
-            rc->cb(rc->buf);
-            free(rc->buf);
-            delete rc;
+            cb();
         };
-        io_uring_prep_readv(sqe, (rc->is_data ? bs->dsk.data_fd : bs->dsk.journal_fd), &data->iov, 1,
-            (rc->is_data ? bs->dsk.data_offset : bs->dsk.journal_offset) + rc->offset);
-        recheck_ios.pop_back();
-    }
+        io_uring_prep_readv(sqe, (is_data ? bs->dsk.data_fd : bs->dsk.journal_fd), &data->iov, 1,
+            (is_data ? bs->dsk.data_offset : bs->dsk.journal_offset) + offset);
+        bs->ringloop->submit();
+    }, bs->meta_write_recheck_parallelism);
     return 1;
 resume_7:
     if (bs->heap->finish_recheck() != 0)
@@ -316,7 +311,7 @@ resume_8:
         uint32_t block_num = recheck_mod[i];
         uint64_t block_offset = bs->dsk.meta_offset + (uint64_t)(block_num+1) * bs->dsk.meta_block_size;
         data = ((ring_data_t*)sqe->user_data);
-        uint8_t *buf = (uint8_t*)memalign_or_die(MEM_ALIGNMENT, bs->dsk.meta_block_size);
+        uint8_t *buf = (uint8_t*)malloc_or_die(bs->dsk.meta_block_size);
         bs->heap->get_meta_block(block_num, buf);
         data->iov = { buf, bs->dsk.meta_block_size };
         data->callback = [this, buf, block_offset](ring_data_t *data)
@@ -342,44 +337,6 @@ resume_9:
     }
     free(metadata_buffer);
     metadata_buffer = NULL;
-do_fsync:
-    if (!bs->dsk.disable_meta_fsync && !bs->readonly)
-    {
-        GET_SQE();
-        io_uring_prep_fsync(sqe, bs->dsk.meta_fd, IORING_FSYNC_DATASYNC);
-        last_read_offset = 0;
-        data->iov = { 0 };
-        data->callback = [this](ring_data_t *data) { handle_event(data, -1, "fsync metadata"); };
-        submitted++;
-        bs->ringloop->submit();
-    resume_5:
-        if (submitted > 0)
-        {
-            wait_state = 5;
-            return 1;
-        }
-    }
-    if (zero_on_init && !header_written && !bs->readonly)
-    {
-        GET_SQE();
-        header_written = true;
-        last_read_offset = 0;
-        data->iov = (struct iovec){ bs->meta_superblock, (size_t)bs->dsk.meta_block_size };
-        data->callback = [this](ring_data_t *data) { handle_event(data, -1, "write metadata header"); };
-        io_uring_prep_writev(sqe, bs->dsk.meta_fd, &data->iov, 1, bs->dsk.meta_offset);
-        bs->ringloop->submit();
-        submitted++;
-    resume_2:
-        if (submitted > 0)
-        {
-            wait_state = 2;
-            return 1;
-        }
-        if (!bs->dsk.disable_meta_fsync)
-        {
-            goto do_fsync;
-        }
-    }
     printf("Loading finished. Data used: %ju / %ju bytes (%s / %s)\n",
         bs->heap->get_data_used_space(), bs->dsk.block_count * bs->dsk.data_block_size,
         format_size(bs->heap->get_data_used_space()).c_str(),

src/blockstore/blockstore_init.h

@@ -11,15 +11,12 @@ struct blockstore_init_meta_buf
     int state = 0;
 };
 
-struct blockstore_recheck_io_t;
-
 class blockstore_init_meta
 {
     blockstore_impl_t *bs;
     int wait_state = 0;
     int wait_count = 0;
     bool zero_on_init = false;
-    bool header_written = false;
     void *metadata_buffer = NULL;
     blockstore_init_meta_buf bufs[2] = {};
     int submitted = 0;
@@ -30,10 +27,9 @@ class blockstore_init_meta
     uint64_t last_read_offset = 0;
     uint64_t entries_loaded = 0;
     std::vector<uint32_t> recheck_mod;
-    std::vector<blockstore_recheck_io_t*> recheck_ios;
     int i = 0, j = 0;
     bool handle_meta_block(uint8_t *buf, uint64_t count, uint64_t done_cnt);
-    void handle_event(ring_data_t *data, int buf_num, const char *op);
+    void handle_event(ring_data_t *data, int buf_num);
 public:
     blockstore_init_meta(blockstore_impl_t *bs);
     int loop();

src/blockstore/blockstore_mock.cpp

@@ -1,113 +0,0 @@
-// Copyright (c) Vitaliy Filippov, 2019+
-// License: VNPL-1.1 (see README.md for details)
-
-#include "blockstore_mock.h"
-
-blockstore_mock_t::blockstore_mock_t(const blockstore_config_t & config)
-{
-}
-
-void blockstore_mock_t::parse_config(blockstore_config_t & config)
-{
-}
-
-void* blockstore_mock_t::reshard_start(pool_id_t pool, uint32_t pg_count, uint32_t pg_stripe_size, uint64_t chunk_limit)
-{
-    return NULL;
-}
-
-bool blockstore_mock_t::reshard_continue(void *reshard_state, uint64_t chunk_limit)
-{
-    return true;
-}
-
-void blockstore_mock_t::loop()
-{
-}
-
-bool blockstore_mock_t::is_started()
-{
-    return true;
-}
-
-bool blockstore_mock_t::is_stalled()
-{
-    return false;
-}
-
-bool blockstore_mock_t::is_safe_to_stop()
-{
-    return true;
-}
-
-void blockstore_mock_t::enqueue_op(blockstore_op_t *op)
-{
-}
-
-int blockstore_mock_t::read_bitmap(object_id oid, uint64_t target_version, void *bitmap, uint64_t *result_version)
-{
-    return -EIO;
-}
-
-const std::map<uint64_t, uint64_t> & blockstore_mock_t::get_inode_space_stats()
-{
-    return inode_space;
-}
-
-void blockstore_mock_t::set_no_inode_stats(const std::vector<uint64_t> & pool_ids)
-{
-}
-
-void blockstore_mock_t::dump_diagnostics()
-{
-}
-
-std::string blockstore_mock_t::get_op_diag(blockstore_op_t *op)
-{
-    return "";
-}
-
-uint32_t blockstore_mock_t::get_block_size()
-{
-    return block_size;
-}
-
-uint64_t blockstore_mock_t::get_block_count()
-{
-    return block_count;
-}
-
-uint64_t blockstore_mock_t::get_free_block_count()
-{
-    return block_count;
-}
-
-uint64_t blockstore_mock_t::get_journal_size()
-{
-    return 32*1024*1024;
-}
-
-uint32_t blockstore_mock_t::get_bitmap_granularity()
-{
-    return bitmap_granularity;
-}
-
-uint64_t blockstore_mock_t::get_live_entries()
-{
-    return 0;
-}
-
-uint64_t blockstore_mock_t::get_live_memory()
-{
-    return 0;
-}
-
-uint64_t blockstore_mock_t::get_garbage_entries()
-{
-    return 0;
-}
-
-uint64_t blockstore_mock_t::get_garbage_memory()
-{
-    return 0;
-}

src/blockstore/blockstore_mock.h

@@ -1,39 +0,0 @@
-// Copyright (c) Vitaliy Filippov, 2019+
-// License: VNPL-1.1 (see README.md for details)
-
-#pragma once
-
-#include "blockstore.h"
-
-class blockstore_mock_t: public blockstore_i
-{
-public:
-    uint32_t block_size = 128*1024;
-    uint32_t bitmap_granularity = 4096;
-    uint64_t block_count = 100*1024*8;
-    std::map<uint64_t, uint64_t> inode_space;
-
-    blockstore_mock_t(const blockstore_config_t & config);
-    void parse_config(blockstore_config_t & config) override;
-    void* reshard_start(pool_id_t pool, uint32_t pg_count, uint32_t pg_stripe_size, uint64_t chunk_limit) override;
-    bool reshard_continue(void *reshard_state, uint64_t chunk_limit) override;
-    void loop() override;
-    bool is_started() override;
-    bool is_stalled() override;
-    bool is_safe_to_stop() override;
-    void enqueue_op(blockstore_op_t *op) override;
-    int read_bitmap(object_id oid, uint64_t target_version, void *bitmap, uint64_t *result_version = NULL) override;
-    const std::map<uint64_t, uint64_t> & get_inode_space_stats() override;
-    void set_no_inode_stats(const std::vector<uint64_t> & pool_ids) override;
-    void dump_diagnostics() override;
-    std::string get_op_diag(blockstore_op_t *op) override;
-    uint32_t get_block_size() override;
-    uint64_t get_block_count() override;
-    uint64_t get_free_block_count() override;
-    uint64_t get_journal_size() override;
-    uint32_t get_bitmap_granularity() override;
-    uint64_t get_live_entries() override;
-    uint64_t get_live_memory() override;
-    uint64_t get_garbage_entries() override;
-    uint64_t get_garbage_memory() override;
-};

src/blockstore/blockstore_open.cpp

@@ -105,12 +105,12 @@ void blockstore_impl_t::parse_config(blockstore_config_t & config, bool init)
     {
         meta_write_recheck_parallelism = 16;
     }
-    if (immediate_commit != IMMEDIATE_NONE && (!dsk.disable_journal_fsync || !dsk.disable_meta_fsync))
+    if (immediate_commit != IMMEDIATE_NONE && !dsk.disable_journal_fsync)
     {
-        throw std::runtime_error("immediate_commit requires disable_journal_fsync and disable_meta_fsync");
+        throw std::runtime_error("immediate_commit requires disable_journal_fsync");
     }
     if (immediate_commit == IMMEDIATE_ALL && !dsk.disable_data_fsync)
     {
-        throw std::runtime_error("immediate_commit=all requires disable_data_fsync");
+        throw std::runtime_error("immediate_commit=all requires disable_journal_fsync and disable_data_fsync");
     }
 }

src/blockstore/blockstore_read.cpp

@@ -134,8 +134,7 @@ int blockstore_impl_t::fulfill_read(blockstore_op_t *op)
         }
         else if ((vec.copy_flags & COPY_BUF_JOURNAL) && dsk.inmemory_journal)
         {
-            // disk_loc may be negative - make ubsan happy
-            memcpy(op->buf + vec.offset - op->offset, buffer_area + (vec.disk_loc + vec.disk_offset), vec.len);
+            memcpy(op->buf + vec.offset - op->offset, buffer_area + vec.disk_loc + vec.disk_offset, vec.len);
         }
         else
         {

src/blockstore/blockstore_stable.cpp

@@ -16,7 +16,6 @@ int blockstore_impl_t::dequeue_stable(blockstore_op_t *op)
     else if (priv->op_state == 5) goto resume_5;
     assert(!priv->op_state);
     op->retval = 0;
-    PRIV(op)->lsn = 0;
     priv->modified_block = priv->modified_block2 = UINT32_MAX;
     for (priv->stab_pos = 0; priv->stab_pos < op->len; priv->stab_pos++)
     {
@@ -28,7 +27,6 @@ int blockstore_impl_t::dequeue_stable(blockstore_op_t *op)
                 FINISH_OP(op);
                 return 2;
             }
-            priv->modified_block2 = UINT32_MAX;
             int res = op->opcode == BS_OP_STABLE
                 ? heap->add_commit(obj, v[priv->stab_pos].version, &priv->modified_block2)
                 : heap->add_rollback(obj, v[priv->stab_pos].version, &priv->modified_block2);
@@ -38,12 +36,6 @@ int blockstore_impl_t::dequeue_stable(blockstore_op_t *op)
                 FINISH_OP(op);
                 return 2;
             }
-            if (res == ENOENT)
-            {
-                op->retval = -ENOENT;
-                FINISH_OP(op);
-                return 2;
-            }
             if (res == ENOSPC)
             {
                 if (!heap->get_to_compact_count())
@@ -53,6 +45,11 @@ int blockstore_impl_t::dequeue_stable(blockstore_op_t *op)
                     FINISH_OP(op);
                     return 2;
                 }
+                if (priv->modified_block2 != UINT32_MAX)
+                {
+                    priv->stab_pos--;
+                    goto resume_1;
+                }
                 priv->wait_for = WAIT_COMPACTION;
                 priv->wait_detail = heap->get_compacted_count();
                 flusher->request_trim();

src/blockstore/blockstore_sync.cpp

@@ -9,7 +9,6 @@ int blockstore_impl_t::continue_sync(blockstore_op_t *op)
     if (!PRIV(op)->op_state)
     {
         op->retval = 0;
-        PRIV(op)->lsn = 0;
     }
     int res = do_sync(op, 0);
     if (res == 2)
@@ -29,12 +28,9 @@ bool blockstore_impl_t::has_unsynced()
 
 bool blockstore_impl_t::submit_fsyncs(int & wait_count)
 {
-    int n = (unsynced_meta_write_count > 0 && !dsk.disable_meta_fsync ? 1 : 0) +
-        (unsynced_buffer_write_count > 0 && !dsk.disable_journal_fsync &&
-            (!unsynced_meta_write_count || dsk.journal_fd != dsk.meta_fd) ? 1 : 0) +
-        (unsynced_data_write_count > 0 && !dsk.disable_data_fsync &&
-            (!unsynced_meta_write_count || dsk.data_fd != dsk.meta_fd) &&
-            (!unsynced_buffer_write_count || dsk.data_fd != dsk.journal_fd) ? 1 : 0);
+    int n = (unsynced_meta_write_count > 0 && !dsk.disable_meta_fsync) +
+        (unsynced_buffer_write_count > 0 && !dsk.disable_journal_fsync && dsk.journal_fd != dsk.meta_fd) +
+        (unsynced_data_write_count > 0 && !dsk.disable_data_fsync && dsk.data_fd != dsk.meta_fd && dsk.data_fd != dsk.journal_fd);
     if (ringloop->space_left() < n)
     {
         return false;
@@ -63,8 +59,7 @@ bool blockstore_impl_t::submit_fsyncs(int & wait_count)
         data->callback = cb;
         wait_count++;
     }
-    if (unsynced_buffer_write_count > 0 && !dsk.disable_journal_fsync &&
-        (!unsynced_meta_write_count || dsk.journal_fd != dsk.meta_fd))
+    if (unsynced_buffer_write_count > 0 && !dsk.disable_journal_fsync && dsk.meta_fd != dsk.journal_fd)
     {
         // fsync buffer
         io_uring_sqe *sqe = get_sqe();
@@ -75,9 +70,7 @@ bool blockstore_impl_t::submit_fsyncs(int & wait_count)
         data->callback = cb;
         wait_count++;
     }
-    if (unsynced_data_write_count > 0 && !dsk.disable_data_fsync &&
-        (!unsynced_meta_write_count || dsk.data_fd != dsk.meta_fd) &&
-        (!unsynced_buffer_write_count || dsk.data_fd != dsk.journal_fd))
+    if (unsynced_data_write_count > 0 && !dsk.disable_data_fsync && dsk.data_fd != dsk.meta_fd && dsk.data_fd != dsk.journal_fd)
     {
         // fsync data
         io_uring_sqe *sqe = get_sqe();
@@ -111,11 +104,9 @@ int blockstore_impl_t::do_sync(blockstore_op_t *op, int base_state)
         unsynced_data_write_count = unsynced_buffer_write_count = unsynced_meta_write_count = 0;
         return 2;
     }
-    assert(!PRIV(op)->lsn);
-    PRIV(op)->lsn = heap->get_completed_lsn();
+    PRIV(op)->modified_block = heap->get_completed_lsn();
     if (!submit_fsyncs(PRIV(op)->pending_ops))
     {
-        PRIV(op)->lsn = 0;
         PRIV(op)->wait_detail = 1;
         PRIV(op)->wait_for = WAIT_SQE;
         return 0;
@@ -127,6 +118,6 @@ resume_1:
         return 1;
     }
 resume_2:
-    heap->mark_lsn_fsynced(PRIV(op)->lsn);
+    heap->mark_lsn_fsynced(PRIV(op)->modified_block);
     return 2;
 }

src/blockstore/blockstore_write.cpp

@@ -37,7 +37,6 @@ void blockstore_impl_t::prepare_meta_block_write(uint32_t modified_block)
         heap->complete_block_write(modified_block);
         ringloop->wakeup();
     };
-    assert(((uint64_t)modified_block+2)*dsk.meta_block_size <= dsk.meta_area_size);
     io_uring_prep_writev(
         sqe, dsk.meta_fd, &data->iov, 1, dsk.meta_offset + ((uint64_t)modified_block+1)*dsk.meta_block_size
     );
@@ -178,18 +177,14 @@ enospc:
         ring_data_t *data = ((ring_data_t*)sqe->user_data);
         data->iov = (struct iovec){ op->buf, op->len };
         data->callback = [this, op](ring_data_t *data) { handle_write_event(data, op); };
-        assert(loc+op->offset+op->len <= dsk.block_count*dsk.data_block_size);
         io_uring_prep_writev(sqe, dsk.data_fd, &data->iov, 1, dsk.data_offset + loc + op->offset);
-        if (!dsk.disable_data_fsync)
-        {
-            // use PRIV->lsn for fsync_data_id
-            PRIV(op)->lsn = ++data_fsync_next;
-            data_fsyncs.push_back(false);
-        }
         PRIV(op)->pending_ops++;
         write_iodepth++;
         if (PRIV(op)->write_type == BS_HEAP_BIG_WRITE)
+        {
             PRIV(op)->op_state = 1;
+            inflight_big++;
+        }
         else
             PRIV(op)->op_state = 3;
     }
@@ -243,12 +238,6 @@ enospc:
         uint64_t loc = !op->len ? 0 : heap->find_free_buffer_area(op->len);
         if (loc == UINT64_MAX)
         {
-            if (!heap->get_to_compact_count())
-            {
-                op->retval = -EAGAIN;
-                FINISH_OP(op);
-                return 2;
-            }
             PRIV(op)->wait_for = WAIT_COMPACTION;
             PRIV(op)->wait_detail = heap->get_compacted_count();
             flusher->request_trim();
@@ -275,7 +264,6 @@ enospc:
             BS_SUBMIT_GET_SQE(sqe2, data2);
             data2->iov = (struct iovec){ op->buf, op->len };
             data2->callback = [this, op](ring_data_t *data) { handle_write_event(data, op); };
-            assert(loc+op->len <= dsk.journal_len);
             io_uring_prep_writev(sqe2, dsk.journal_fd, &data2->iov, 1, dsk.journal_offset + loc);
             PRIV(op)->pending_ops++;
         }
@@ -306,6 +294,8 @@ again:
         goto resume_10;
     else if (op_state == 11)
         goto resume_11;
+    else if (op_state == 12)
+        goto resume_12;
     else
     {
         // In progress
@@ -324,47 +314,38 @@ again:
 resume_2:
     // We must fsync all big writes to avoid complex write workflows
     // It's OK for all HDDs and for server SSDs, but slightly worse for desktop SSDs
+    inflight_big--;
     if (!dsk.disable_data_fsync)
     {
-        // Mark our data write as completed and advance data_fsync_cur
-        data_fsyncs[PRIV(op)->lsn - data_fsync_cur - 1] = true;
-        while (data_fsyncs.size() > 0 && data_fsyncs.front())
-        {
-            data_fsyncs.pop_front();
-            data_fsync_cur++;
-        }
-        PRIV(op)->op_state = 11;
-        // Then wait for all other data writes currently in progress to do less fsync calls
-        // I.e. to fsync data in batches
-        PRIV(op)->lsn = data_fsync_cur + data_fsyncs.size();
+        // fsync data in a batch
 resume_11:
-        if (data_fsync_cur < PRIV(op)->lsn)
+        if (inflight_big > 0)
         {
+            PRIV(op)->op_state = 11;
             return 1;
         }
-        if (PRIV(op)->lsn > data_fsync_sent)
+        if (fsyncing_data)
         {
-            BS_SUBMIT_GET_SQE(sqe, data);
-            io_uring_prep_fsync(sqe, dsk.data_fd, IORING_FSYNC_DATASYNC);
-            data->iov = { 0 };
-            data->callback = [this, op, fs = data_fsync_cur](ring_data_t *data)
+resume_12:
+            if (fsyncing_data)
             {
-                live = true;
-                if (data->res != 0)
-                    disk_error_abort("sync data", data->res, 0);
-                if (fs > data_fsync_done)
-                {
-                    data_fsync_done = fs;
-                    ringloop->wakeup();
-                }
-            };
-            data_fsync_sent = data_fsync_cur;
+                PRIV(op)->op_state = 12;
+                return 1;
+            }
+            goto resume_4;
         }
-        if (PRIV(op)->lsn > data_fsync_done)
+        fsyncing_data = true;
+        BS_SUBMIT_GET_SQE(sqe, data);
+        io_uring_prep_fsync(sqe, dsk.data_fd, IORING_FSYNC_DATASYNC);
+        data->iov = { 0 };
+        data->callback = [this, op](ring_data_t *data)
         {
-            return 1;
-        }
-        PRIV(op)->lsn = 0;
+            fsyncing_data = false;
+            handle_write_event(data, op);
+        };
+        PRIV(op)->pending_ops++;
+        PRIV(op)->op_state = 3;
+        return 1;
     }
 resume_4:
     {
@@ -472,7 +453,6 @@ resume_10:
     BS_SUBMIT_GET_SQE(sqe, data);
     data->iov = (struct iovec){ op->buf, op->len };
     data->callback = [this, op](ring_data_t *data) { handle_write_event(data, op); };
-    assert(PRIV(op)->location + op->offset <= dsk.block_count*dsk.data_block_size);
     io_uring_prep_writev(sqe, dsk.data_fd, &data->iov, 1, dsk.data_offset + PRIV(op)->location + op->offset);
     if (dsk.use_atomic_flag)
         sqe->rw_flags = RWF_ATOMIC;

src/blockstore/fio_engine.cpp

@@ -262,7 +262,7 @@ static enum fio_q_status _bs_queue(struct thread_data *td, struct io_u *io, bool
             bsd->inflight--;
             bsd->completed.push_back(io);
             if (bsd->trace)
-                printf("--- OP_READ %zx n=%d retval=%jd\n", (size_t)op, n, op->retval);
+                printf("--- OP_READ %zx n=%d retval=%d\n", (size_t)op, n, op->retval);
             delete op;
         };
         break;
@@ -283,7 +283,7 @@ static enum fio_q_status _bs_queue(struct thread_data *td, struct io_u *io, bool
             {
                 bs_data *bsd = ((bs_data*)((thread_data*)io->engine_data)->io_ops_data);
                 if (bsd->trace)
-                    printf("--- OP_WRITE %zx n=%d retval=%jd\n", (size_t)op, n, op->retval);
+                    printf("--- OP_WRITE %zx n=%d retval=%d\n", (size_t)op, n, op->retval);
                 if (op->retval < 0)
                 {
                     io->error = op->retval < 0 ? -op->retval : 0;
@@ -305,7 +305,7 @@ static enum fio_q_status _bs_queue(struct thread_data *td, struct io_u *io, bool
                     {
                         bs_data *bsd = ((bs_data*)((thread_data*)io->engine_data)->io_ops_data);
                         if (bsd->trace)
-                            printf("--- OP_STABLE %zx n=%d retval=%jd\n", (size_t)op, n, op->retval);
+                            printf("--- OP_STABLE %zx n=%d retval=%d\n", (size_t)op, n, op->retval);
                         io->error = op->retval < 0 ? -op->retval : 0;
                         bsd->inflight--;
                         bsd->completed.push_back(io);
@@ -323,7 +323,7 @@ static enum fio_q_status _bs_queue(struct thread_data *td, struct io_u *io, bool
             {
                 bs_data *bsd = ((bs_data*)((thread_data*)io->engine_data)->io_ops_data);
                 if (bsd->trace)
-                    printf("--- OP_WRITE_STABLE %zx n=%d retval=%jd\n", (size_t)op, n, op->retval);
+                    printf("--- OP_WRITE_STABLE %zx n=%d retval=%d\n", (size_t)op, n, op->retval);
                 io->error = op->retval < 0 ? -op->retval : 0;
                 bsd->inflight--;
                 bsd->completed.push_back(io);
@@ -342,7 +342,7 @@ static enum fio_q_status _bs_queue(struct thread_data *td, struct io_u *io, bool
             bsd->completed.push_back(io);
             bsd->inflight--;
             if (bsd->trace)
-                printf("--- OP_SYNC %zx n=%d retval=%jd\n", (size_t)op, n, op->retval);
+                printf("--- OP_SYNC %zx n=%d retval=%d\n", (size_t)op, n, op->retval);
             delete op;
         };
         bsd->last_sync = true;

src/blockstore/multilist.cpp

@@ -12,7 +12,7 @@ multilist_alloc_t::multilist_alloc_t(uint32_t count, uint32_t maxn):
     count(count), maxn(maxn)
 {
     // not-so-memory-efficient: 16 MB memory per 1 GB buffer space, but buffer spaces are small, so OK
-    assert(count > 1 && count < 0x80000000 && count >= maxn);
+    assert(count > 1 && count < 0x80000000);
     sizes.resize(count);
     nexts.resize(count); // nexts[i] = 0 -> area is used; nexts[i] = 1 -> no next; nexts[i] >= 2 -> next item
     prevs.resize(count);
@@ -171,7 +171,7 @@ void multilist_alloc_t::print()
     printf("\n");
 }
 
-bool multilist_alloc_t::use(uint32_t pos, uint32_t size)
+void multilist_alloc_t::use(uint32_t pos, uint32_t size)
 {
     assert(pos+size <= count && size > 0);
     if (sizes[pos] <= 0)
@@ -182,8 +182,7 @@ bool multilist_alloc_t::use(uint32_t pos, uint32_t size)
         else
             while (start > 0 && !sizes[start])
                 start--;
-        if (sizes[start] < size+(pos-start))
-            return false;
+        assert(sizes[start] >= size);
         use_full(start);
         uint32_t full = sizes[start];
         sizes[pos-1] = -pos+start;
@@ -200,8 +199,7 @@ bool multilist_alloc_t::use(uint32_t pos, uint32_t size)
     }
     else
     {
-        if (sizes[pos] < size)
-            return false;
+        assert(sizes[pos] >= size);
         use_full(pos);
         if (sizes[pos] > size)
         {
@@ -216,13 +214,12 @@ bool multilist_alloc_t::use(uint32_t pos, uint32_t size)
 #ifdef MULTILIST_TRACE
     print();
 #endif
-    return true;
 }
 
 void multilist_alloc_t::use_full(uint32_t pos)
 {
     uint32_t prevsize = sizes[pos];
-    assert(prevsize > 0);
+    assert(prevsize);
     assert(nexts[pos]);
     uint32_t pi = (prevsize < maxn ? prevsize : maxn)-1;
     if (heads[pi] == pos+1)

src/blockstore/multilist.h

@@ -17,7 +17,7 @@ struct multilist_alloc_t
     bool is_free(uint32_t pos);
     uint32_t find(uint32_t size);
     void use_full(uint32_t pos);
-    bool use(uint32_t pos, uint32_t size);
+    void use(uint32_t pos, uint32_t size);
     void do_free(uint32_t pos);
     void free(uint32_t pos);
     void verify();

src/blockstore/ondisk_formats.h

@@ -141,7 +141,7 @@ struct __attribute__((__packed__)) journal_entry
 inline uint32_t je_crc32(journal_entry *je)
 {
     // 0x48674bc7 = crc32(4 zero bytes)
-    return je->size < 4 ? 0 : crc32c(0x48674bc7, ((uint8_t*)je)+4, je->size-4);
+    return crc32c(0x48674bc7, ((uint8_t*)je)+4, je->size-4);
 }
 
 // "VITAstor"

src/blockstore/v1/flush.cpp

@@ -71,21 +71,6 @@ bool journal_flusher_t::is_active()
     return active_flushers > 0 || dequeuing;
 }
 
-size_t journal_flusher_t::get_queue_size()
-{
-    return flush_queue.size();
-}
-
-bool journal_flusher_t::may_advance()
-{
-    return flush_queue.size() || active_flushers > 0 || trim_possible;
-}
-
-bool journal_flusher_t::may_advance_except_one()
-{
-    return flush_queue.size() || active_flushers > 1 || trim_possible;
-}
-
 void journal_flusher_t::loop()
 {
     target_flusher_count = bs->write_iodepth*2;
@@ -200,7 +185,6 @@ void journal_flusher_t::request_trim()
 
 void journal_flusher_t::mark_trim_possible()
 {
-    trim_possible = true;
     if (trim_wanted > 0)
     {
         dequeuing = true;
@@ -400,7 +384,6 @@ stop_flusher:
         wait_state = 0;
         return true;
     }
-    copy_count = 0;
     try_trim = true;
     cur.oid = flusher->flush_queue.front();
     cur.version = flusher->flush_versions[cur.oid];
@@ -528,31 +511,6 @@ resume_2:
             {
                 uo_it->second.was_changed = true;
             }
-            if (!bs->journal.inmemory)
-            {
-                // Verify journaled data checksums (but not COALESCED)
-                for (it = v.begin(); it != v.end(); it++)
-                {
-                    if (it->copy_flags == COPY_BUF_JOURNAL)
-                    {
-                        iovec iov = { .iov_base = it->buf, .iov_len = it->len };
-                        bs->verify_journal_checksums(
-                            it->csum_buf, it->offset, &iov, 1,
-                            [&](uint32_t bad_block, uint32_t calc_csum, uint32_t stored_csum)
-                            {
-                                printf(
-                                    "Checksum mismatch in object %jx:%jx v%ju in journal at 0x%jx, checksum block #%u: got %08x, expected %08x\n",
-                                    cur.oid.inode, cur.oid.stripe, cur.version, it->disk_offset,
-                                    bad_block / bs->dsk.csum_block_size, calc_csum, stored_csum
-                                );
-                                bad_block += it->offset;
-                                assert(!(bad_block % bs->dsk.csum_block_size) && bad_block < bs->dsk.data_block_size);
-                                mangle_csum_blocks.insert(bad_block);
-                            }
-                        );
-                    }
-                }
-            }
         }
         // Submit data writes
         for (it = v.begin(); it != v.end(); it++)
@@ -562,7 +520,6 @@ resume_2:
                 await_sqe(15);
                 data->iov = (struct iovec){ it->buf, (size_t)it->len };
                 data->callback = simple_callback_w;
-                assert(clean_loc+it->offset+it->len <= bs->dsk.block_count*bs->dsk.data_block_size);
                 io_uring_prep_writev(
                     sqe, bs->dsk.data_fd, &data->iov, 1, bs->dsk.data_offset + clean_loc + it->offset
                 );
@@ -663,10 +620,9 @@ resume_2:
         flusher->sync_to_repeat.erase(repeat_it);
     trim_journal:
         // Clear unused part of the journal every <journal_trim_interval> flushes
-        if ((bs->journal_trim_interval && !((++flusher->journal_trim_counter) % bs->journal_trim_interval) ||
-            flusher->trim_wanted > 0) && flusher->trim_possible)
+        if (bs->journal_trim_interval && !((++flusher->journal_trim_counter) % bs->journal_trim_interval) ||
+            flusher->trim_wanted > 0)
         {
-            flusher->trim_possible = false;
     resume_30:
     resume_31:
     resume_32:
@@ -677,7 +633,6 @@ resume_2:
         }
         // All done
         flusher->active_flushers--;
-        copy_count = 0; // used by is_mutated()...
         wait_state = 0;
         goto resume_0;
     }
@@ -794,7 +749,6 @@ bool journal_flusher_co::write_meta_block(flusher_meta_write_t & meta_block, int
     await_sqe(0);
     data->iov = (struct iovec){ meta_block.buf, (size_t)bs->dsk.meta_block_size };
     data->callback = simple_callback_w;
-    assert(bs->dsk.meta_block_size + meta_block.sector + bs->dsk.meta_block_size <= bs->dsk.meta_area_size);
     io_uring_prep_writev(
         sqe, bs->dsk.meta_fd, &data->iov, 1, bs->dsk.meta_offset + bs->dsk.meta_block_size + meta_block.sector
     );
@@ -859,21 +813,35 @@ bool journal_flusher_co::clear_incomplete_csum_block_bits(int wait_base)
                 bs->verify_padded_checksums(new_clean_bitmap, new_clean_bitmap + 2*bs->dsk.clean_entry_bitmap_size,
                     v[i].offset, &iov, 1, [&](uint32_t bad_block, uint32_t calc_csum, uint32_t stored_csum)
                 {
-                    printf("Checksum mismatch in object %jx:%jx v%ju in data area at offset 0x%jx+0x%x during flush: got %08x, expected %08x\n",
+                    printf("Checksum mismatch in object %jx:%jx v%ju in data area at offset 0x%jx+0x%x: got %08x, expected %08x\n",
                         cur.oid.inode, cur.oid.stripe, old_clean_ver, old_clean_loc, bad_block, calc_csum, stored_csum);
-                    assert(!(bad_block % bs->dsk.csum_block_size) && bad_block < bs->dsk.data_block_size);
-                    mangle_csum_blocks.insert(bad_block);
+                    for (uint32_t j = 0; j < bs->dsk.csum_block_size; j += bs->dsk.bitmap_granularity)
+                    {
+                        // Simplest method of mangling: flip one byte in every sector
+                        ((uint8_t*)v[i].buf)[j+bad_block-v[i].offset] ^= 0xff;
+                    }
                 });
             }
             else
             {
                 bs->verify_journal_checksums(v[i].csum_buf, v[i].offset, &iov, 1, [&](uint32_t bad_block, uint32_t calc_csum, uint32_t stored_csum)
                 {
-                    printf("Checksum mismatch in object %jx:%jx v%ju in journal at offset 0x%jx+0x%x (block offset 0x%jx) during flush: got %08x, expected %08x\n",
+                    printf("Checksum mismatch in object %jx:%jx v%ju in journal at offset 0x%jx+0x%x (block offset 0x%jx): got %08x, expected %08x\n",
                         cur.oid.inode, cur.oid.stripe, old_clean_ver,
                         v[i].disk_offset, bad_block, v[i].offset, calc_csum, stored_csum);
-                    assert(!(bad_block % bs->dsk.csum_block_size) && bad_block < bs->dsk.data_block_size);
-                    mangle_csum_blocks.insert(bad_block);
+                    bad_block += (v[i].offset/bs->dsk.csum_block_size) * bs->dsk.csum_block_size;
+                    uint32_t bad_block_end = bad_block + bs->dsk.csum_block_size + (v[i].offset/bs->dsk.csum_block_size) * bs->dsk.csum_block_size;
+                    if (bad_block < v[i].offset)
+                        bad_block = v[i].offset;
+                    if (bad_block_end > v[i].offset+v[i].len)
+                        bad_block_end = v[i].offset+v[i].len;
+                    bad_block -= v[i].offset;
+                    bad_block_end -= v[i].offset;
+                    for (uint32_t j = bad_block; j < bad_block_end; j += bs->dsk.bitmap_granularity)
+                    {
+                        // Simplest method of mangling: flip one byte in every sector
+                        ((uint8_t*)v[i].buf)[j] ^= 0xff;
+                    }
                 });
             }
         }
@@ -982,11 +950,6 @@ void journal_flusher_co::calc_block_checksums(uint32_t *new_data_csums, bool ski
     }
     // `v` should contain aligned items, possibly split into pieces
     assert(!block_done);
-    for (uint32_t mangle_block: mangle_csum_blocks)
-    {
-        // Flip 1 bit
-        new_data_csums[mangle_block / bs->dsk.csum_block_size] ^= 1;
-    }
 }
 
 void journal_flusher_co::scan_dirty()
@@ -1123,8 +1086,7 @@ void journal_flusher_co::scan_dirty()
             last--;
         read_to_fill_incomplete = bs->fill_partial_checksum_blocks(
             v, fulfilled, bmp_ptr, NULL, false, NULL, v[0].offset/bs->dsk.csum_block_size * bs->dsk.csum_block_size,
-            ((v[last].offset+v[last].len-1) / bs->dsk.csum_block_size + 1) * bs->dsk.csum_block_size,
-            0, bs->dsk.data_block_size
+            ((v[last].offset+v[last].len-1) / bs->dsk.csum_block_size + 1) * bs->dsk.csum_block_size
         );
     }
     else if (fill_incomplete && clean_init_bitmap)
@@ -1154,7 +1116,6 @@ bool journal_flusher_co::read_dirty(int wait_base)
     if (wait_state == wait_base)        goto resume_0;
     else if (wait_state == wait_base+1) goto resume_1;
     wait_count = wait_journal_count = 0;
-    mangle_csum_blocks.clear();
     if (bs->journal.inmemory && !read_to_fill_incomplete)
     {
         // Happy path: nothing to read :)
@@ -1386,7 +1347,7 @@ bool journal_flusher_co::fsync_batch(bool fsync_meta, int wait_base)
         cur_sync->ready_count++;
         flusher->syncing_flushers++;
     resume_1:
-        if (cur_sync->state == 0)
+        if (!cur_sync->state)
         {
             if (flusher->syncing_flushers >= flusher->active_flushers || !flusher->flush_queue.size())
             {
@@ -1414,12 +1375,6 @@ bool journal_flusher_co::fsync_batch(bool fsync_meta, int wait_base)
                 return false;
             }
         }
-        else if (cur_sync->state == 1)
-        {
-            // Wait for fsync completion
-            wait_state = wait_base+1;
-            return false;
-        }
         flusher->syncing_flushers--;
         cur_sync->ready_count--;
         if (cur_sync->ready_count == 0)
@@ -1508,19 +1463,10 @@ bool journal_flusher_co::trim_journal(int wait_base)
                 printf("Journal flushed\n");
                 exit(0);
             }
-            bs->wakeup_wait_journal();
-        }
-        else if (!flusher->may_advance_except_one())
-        {
-            bs->wakeup_wait_journal();
         }
         flusher->journal_trim_counter = 0;
         flusher->trimming = false;
     }
-    else if (!flusher->may_advance_except_one())
-    {
-        bs->wakeup_wait_journal();
-    }
     return true;
 }
 

src/blockstore/v1/flush.h

@@ -66,7 +66,6 @@ class journal_flusher_co
     uint64_t clean_bitmap_offset, clean_bitmap_len;
     uint8_t *clean_init_dyn_ptr;
     uint8_t *new_clean_bitmap;
-    std::unordered_set<uint32_t> mangle_csum_blocks;
 
     uint64_t new_trim_pos;
 
@@ -94,7 +93,6 @@ public:
 class journal_flusher_t
 {
     int trim_wanted = 0;
-    bool trim_possible = false;
     bool dequeuing;
     int min_flusher_count, max_flusher_count, cur_flusher_count, target_flusher_count;
     int flusher_start_threshold;
@@ -118,16 +116,13 @@ class journal_flusher_t
 
     bool try_find_older(std::map<obj_ver_id, dirty_entry>::iterator & dirty_end, obj_ver_id & cur);
     bool try_find_other(std::map<obj_ver_id, dirty_entry>::iterator & dirty_end, obj_ver_id & cur);
-    bool may_advance_except_one();
 
 public:
     journal_flusher_t(blockstore_impl_t *bs);
     ~journal_flusher_t();
     void loop();
     bool is_trim_wanted() { return trim_wanted; }
-    bool may_advance();
     bool is_active();
-    size_t get_queue_size();
     void mark_trim_possible();
     void request_trim();
     void release_trim();

src/blockstore/v1/impl.cpp

@@ -6,12 +6,11 @@
 
 namespace v1 {
 
-blockstore_impl_t::blockstore_impl_t(blockstore_config_t & config, ring_loop_i *ringloop, timerfd_manager_t *tfd, bool mock_mode)
+blockstore_impl_t::blockstore_impl_t(blockstore_config_t & config, ring_loop_i *ringloop, timerfd_manager_t *tfd)
 {
     assert(sizeof(blockstore_op_private_t) <= BS_OP_PRIVATE_DATA_SIZE);
     this->tfd = tfd;
     this->ringloop = ringloop;
-    dsk.mock_mode = mock_mode;
     ring_consumer.loop = [this]() { loop(); };
     ringloop->register_consumer(&ring_consumer);
     initialized = 0;
@@ -24,7 +23,6 @@ blockstore_impl_t::blockstore_impl_t(blockstore_config_t & config, ring_loop_i *
         calc_lengths();
         alloc_dyn_data = dsk.clean_dyn_size > sizeof(void*) || dsk.csum_block_size > 0;
         zero_object = (uint8_t*)memalign_or_die(MEM_ALIGNMENT, dsk.data_block_size);
-        memset(zero_object, 0, dsk.data_block_size);
         data_alloc = new allocator_t(dsk.block_count);
     }
     catch (std::exception & e)
@@ -37,11 +35,6 @@ blockstore_impl_t::blockstore_impl_t(blockstore_config_t & config, ring_loop_i *
 
 blockstore_impl_t::~blockstore_impl_t()
 {
-    for (auto& obj: dirty_db)
-    {
-        if (obj.second.dyn_data)
-            free(obj.second.dyn_data);
-    }
     delete data_alloc;
     delete flusher;
     if (zero_object)
@@ -212,6 +205,10 @@ void blockstore_impl_t::loop()
                     // ring is full, stop submission
                     break;
                 }
+                else if (PRIV(op)->wait_for == WAIT_JOURNAL)
+                {
+                    PRIV(op)->wait_detail2 = (unstable_writes.size()+unstable_unsynced);
+                }
             }
         }
         if (op_idx != new_idx)
@@ -276,12 +273,6 @@ bool blockstore_impl_t::is_safe_to_stop()
     return true;
 }
 
-void blockstore_impl_t::wakeup_wait_journal()
-{
-    wait_journal_counter++;
-    ringloop->wakeup();
-}
-
 void blockstore_impl_t::check_wait(blockstore_op_t *op)
 {
     if (PRIV(op)->wait_for == WAIT_SQE)
@@ -298,11 +289,12 @@ void blockstore_impl_t::check_wait(blockstore_op_t *op)
     }
     else if (PRIV(op)->wait_for == WAIT_JOURNAL)
     {
-        if (wait_journal_counter == PRIV(op)->wait_detail)
+        if (journal.used_start == PRIV(op)->wait_detail &&
+            (unstable_writes.size()+unstable_unsynced) == PRIV(op)->wait_detail2)
         {
             // do not submit
 #ifdef BLOCKSTORE_DEBUG
-            printf("Still waiting for flush journal counter %ju\n", PRIV(op)->wait_detail);
+            printf("Still waiting to flush journal offset %08jx\n", PRIV(op)->wait_detail);
 #endif
             return;
         }

src/blockstore/v1/impl.h

@@ -30,8 +30,6 @@
 
 //#define BLOCKSTORE_DEBUG
 
-struct bs_test_t;
-
 namespace v1 {
 
 #include "journal.h"
@@ -93,12 +91,12 @@ struct blockstore_op_private_t
 {
     // Wait status
     int wait_for;
-    uint64_t wait_detail;
+    uint64_t wait_detail, wait_detail2;
     int pending_ops;
     int op_state;
 
     // Read
-    uint64_t clean_loc_used;
+    uint64_t clean_block_used;
     std::vector<copy_buffer_t> read_vec;
 
     // Sync, write
@@ -124,7 +122,6 @@ typedef uint64_t pool_pg_id_t;
 
 class blockstore_impl_t: public blockstore_i
 {
-    friend struct ::bs_test_t;
     blockstore_disk_t dsk;
 
     /******* OPTIONS *******/
@@ -199,6 +196,9 @@ class blockstore_impl_t: public blockstore_i
     friend class journal_flusher_co;
 
     void calc_lengths();
+    void open_data();
+    void open_meta();
+    void open_journal();
     uint8_t* get_clean_entry_bitmap(uint64_t block_loc, int offset);
 
     blockstore_clean_db_t& clean_db_shard(object_id oid);
@@ -215,14 +215,11 @@ class blockstore_impl_t: public blockstore_i
     blockstore_init_meta* metadata_init_reader;
     blockstore_init_journal* journal_init_reader;
 
-    uint64_t wait_journal_counter = 0;
-    void wakeup_wait_journal();
     void check_wait(blockstore_op_t *op);
     void init_op(blockstore_op_t *op);
 
     // Read
     int dequeue_read(blockstore_op_t *read_op);
-    void release_clean(blockstore_op_t *op);
     void find_holes(std::vector<copy_buffer_t> & read_vec, uint32_t item_start, uint32_t item_end,
         std::function<int(int, bool, uint32_t, uint32_t)> callback);
     int fulfill_read(blockstore_op_t *read_op,
@@ -233,14 +230,13 @@ class blockstore_impl_t: public blockstore_i
         uint8_t *clean_entry_bitmap, int *dyn_data,
         uint32_t item_start, uint32_t item_end, uint64_t clean_loc, uint64_t clean_ver);
     int fill_partial_checksum_blocks(std::vector<copy_buffer_t> & rv, uint64_t & fulfilled,
-        uint8_t *clean_entry_bitmap, int *dyn_data, bool from_journal, uint8_t *read_buf,
-        uint32_t read_offset, uint32_t read_end, uint32_t item_start, uint32_t item_end);
+        uint8_t *clean_entry_bitmap, int *dyn_data, bool from_journal, uint8_t *read_buf, uint64_t read_offset, uint64_t read_end);
     int pad_journal_read(std::vector<copy_buffer_t> & rv, copy_buffer_t & cp,
         uint64_t dirty_offset, uint64_t dirty_end, uint64_t dirty_loc, uint8_t *csum_ptr, int *dyn_data,
         uint64_t offset, uint64_t submit_len, uint64_t & blk_begin, uint64_t & blk_end, uint8_t* & blk_buf);
     bool read_range_fulfilled(std::vector<copy_buffer_t> & rv, uint64_t & fulfilled, uint8_t *read_buf,
         uint8_t *clean_entry_bitmap, uint32_t item_start, uint32_t item_end);
-    bool read_checksum_block(blockstore_op_t *op, int rv_pos, uint64_t &fulfilled, uint64_t clean_loc, bool padded);
+    bool read_checksum_block(blockstore_op_t *op, int rv_pos, uint64_t &fulfilled, uint64_t clean_loc);
     uint8_t* read_clean_meta_block(blockstore_op_t *read_op, uint64_t clean_loc, int rv_pos);
     bool verify_padded_checksums(uint8_t *clean_entry_bitmap, uint8_t *csum_buf, uint32_t offset,
         iovec *iov, int n_iov, std::function<void(uint32_t, uint32_t, uint32_t)> bad_block_cb);
@@ -285,7 +281,7 @@ class blockstore_impl_t: public blockstore_i
 
 public:
 
-    blockstore_impl_t(blockstore_config_t & config, ring_loop_i *ringloop, timerfd_manager_t *tfd, bool mock_mode = false);
+    blockstore_impl_t(blockstore_config_t & config, ring_loop_i *ringloop, timerfd_manager_t *tfd);
     ~blockstore_impl_t();
 
     void parse_config(blockstore_config_t & config);