Fix: #4 Fix patch to use "git am".

CMakeLists.txt

@@ -2,6 +2,6 @@ cmake_minimum_required(VERSION 2.8)
 
 project(vitastor)
 
-set(VERSION "0.6.9")
+set(VERSION "0.6.5")
 
 add_subdirectory(src)

README-ru.md

@@ -40,7 +40,7 @@ Vitastor на данный момент находится в статусе п
 - Драйвер диска для QEMU (собирается вне дерева исходников QEMU)
 - Драйвер диска для утилиты тестирования производительности fio (также собирается вне дерева исходников fio)
 - NBD-прокси для монтирования образов ядром ("блочное устройство в режиме пользователя")
-- Утилита для удаления образов/инодов (vitastor-cli rm-data)
+- Утилита удаления образов/инодов (vitastor-rm)
 - Пакеты для Debian и CentOS
 - Статистика операций ввода/вывода и занятого места в разрезе инодов
 - Именование инодов через хранение их метаданных в etcd
@@ -49,8 +49,6 @@ Vitastor на данный момент находится в статусе п
 - Поддержка RDMA/RoCEv2 через libibverbs
 - CSI-плагин для Kubernetes
 - Базовая поддержка OpenStack: драйвер Cinder, патчи для Nova и libvirt
-- Слияние снапшотов (vitastor-cli {snap-rm,flatten,merge})
-- Консольный интерфейс для управления образами (vitastor-cli {ls,create,modify})
 
 ## Планы развития
 
@@ -403,21 +401,12 @@ Vitastor с однопоточной NBD прокси на том же стен
   в этом случае пострадает.
 - Быстрая сеть, минимум 10 гбит/с
 - Для наилучшей производительности нужно отключить энергосбережение CPU: `cpupower idle-set -D 0 && cpupower frequency-set -g performance`.
-- На хостах мониторов:
+- Пропишите нужные вам значения вверху файлов `/usr/lib/vitastor/mon/make-units.sh` и `/usr/lib/vitastor/mon/make-osd.sh`.
-  - Пропишите нужные вам значения в файле `/usr/lib/vitastor/mon/make-units.sh`
+- Создайте юниты systemd для etcd и мониторов: `/usr/lib/vitastor/mon/make-units.sh`
-  - Создайте юниты systemd для etcd и мониторов: `/usr/lib/vitastor/mon/make-units.sh`
+- Создайте юниты для OSD: `/usr/lib/vitastor/mon/make-osd.sh /dev/disk/by-partuuid/XXX [/dev/disk/by-partuuid/YYY ...]`
-- Пропишите etcd_address и osd_network в `/etc/vitastor/vitastor.conf`. Например:
+- Вы можете поменять параметры OSD в юнитах systemd. Смысл некоторых параметров:
-  ```
-  {
-    "etcd_address": ["10.200.1.10:2379","10.200.1.11:2379","10.200.1.12:2379"],
-    "osd_network": "10.200.1.0/24"
-  }
-  ```
-- Создайте юниты systemd для OSD: `/usr/lib/vitastor/make-osd.sh /dev/disk/by-partuuid/XXX [/dev/disk/by-partuuid/YYY ...]`
-- Вы можете менять параметры OSD в юнитах systemd или в `vitastor.conf`. Смысл некоторых параметров:
   - `disable_data_fsync 1` - отключает fsync, используется с SSD с конденсаторами.
   - `immediate_commit all` - используется с SSD с конденсаторами.
-    Внимание: если установлено, также нужно установить его в то же значение в etcd в /vitastor/config/global
   - `disable_device_lock 1` - отключает блокировку файла устройства, нужно, только если вы запускаете
     несколько OSD на одном блочном устройстве.
   - `flusher_count 256` - "flusher" - микропоток, удаляющий старые данные из журнала.
@@ -502,10 +491,10 @@ qemu-system-x86_64 -enable-kvm -m 1024
 
 ### Удалить образ
 
-Используйте утилиту vitastor-cli rm-data. Например:
+Используйте утилиту vitastor-rm. Например:
 
 ```
-vitastor-cli rm-data --etcd_address 10.115.0.10:2379/v3 --pool 1 --inode 1 --parallel_osds 16 --iodepth 32
+vitastor-rm --etcd_address 10.115.0.10:2379/v3 --pool 1 --inode 1 --parallel_osds 16 --iodepth 32
 ```
 
 ### NBD

README.md

@@ -34,7 +34,7 @@ breaking changes in the future. However, the following is implemented:
 - QEMU driver (built out-of-tree)
 - Loadable fio engine for benchmarks (also built out-of-tree)
 - NBD proxy for kernel mounts
-- Inode removal tool (vitastor-cli rm-data)
+- Inode removal tool (vitastor-rm)
 - Packaging for Debian and CentOS
 - Per-inode I/O and space usage statistics
 - Inode metadata storage in etcd
@@ -43,8 +43,6 @@ breaking changes in the future. However, the following is implemented:
 - RDMA/RoCEv2 support via libibverbs
 - CSI plugin for Kubernetes
 - Basic OpenStack support: Cinder driver, Nova and libvirt patches
-- Snapshot merge tool (vitastor-cli {snap-rm,flatten,merge})
-- Image management CLI (vitastor-cli {ls,create,modify})
 
 ## Roadmap
 
@@ -356,21 +354,13 @@ and calculate disk offsets almost by hand. This will be fixed in near future.
   with lazy fsync, but prepare for inferior single-thread latency.
 - Get a fast network (at least 10 Gbit/s).
 - Disable CPU powersaving: `cpupower idle-set -D 0 && cpupower frequency-set -g performance`.
-- On the monitor hosts:
+- Check `/usr/lib/vitastor/mon/make-units.sh` and `/usr/lib/vitastor/mon/make-osd.sh` and
-  - Edit variables at the top of `/usr/lib/vitastor/mon/make-units.sh` to desired values.
+  put desired values into the variables at the top of these files.
-  - Create systemd units for the monitor and etcd: `/usr/lib/vitastor/mon/make-units.sh`
+- Create systemd units for the monitor and etcd: `/usr/lib/vitastor/mon/make-units.sh`
-- Put etcd_address and osd_network into `/etc/vitastor/vitastor.conf`. Example:
-  ```
-  {
-    "etcd_address": ["10.200.1.10:2379","10.200.1.11:2379","10.200.1.12:2379"],
-    "osd_network": "10.200.1.0/24"
-  }
-  ```
 - Create systemd units for your OSDs: `/usr/lib/vitastor/mon/make-osd.sh /dev/disk/by-partuuid/XXX [/dev/disk/by-partuuid/YYY ...]`
-- You can change OSD configuration in units or in `vitastor.conf`. Notable configuration variables:
+- You can edit the units and change OSD configuration. Notable configuration variables:
   - `disable_data_fsync 1` - only safe with server-grade drives with capacitors.
   - `immediate_commit all` - use this if all your drives are server-grade.
-    If all OSDs have it set to all then you should also put the same value in etcd into /vitastor/config/global
   - `disable_device_lock 1` - only required if you run multiple OSDs on one block device.
   - `flusher_count 256` - flusher is a micro-thread that removes old data from the journal.
     You don't have to worry about this parameter anymore, 256 is enough.
@@ -453,10 +443,10 @@ just like in qemu-img.
 
 ### Remove inode
 
-Use vitastor-rm / vitastor-cli rm-data. For example:
+Use vitastor-rm. For example:
 
 ```
-vitastor-cli rm-data --etcd_address 10.115.0.10:2379/v3 --pool 1 --inode 1 --parallel_osds 16 --iodepth 32
+vitastor-rm --etcd_address 10.115.0.10:2379/v3 --pool 1 --inode 1 --parallel_osds 16 --iodepth 32
 ```
 
 ### NBD

csi/.dockerignore

@@ -1,2 +1,3 @@
 vitastor-csi
+go.sum
 Dockerfile

csi/Dockerfile

@@ -1,7 +1,7 @@
 # Compile stage
 FROM golang:buster AS build
 
-ADD go.sum go.mod /app/
+ADD go.mod /app/
 RUN cd /app; CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go mod download -x
 ADD . /app
 RUN perl -i -e '$/ = undef; while(<>) { s/\n\s*(\{\s*\n)/$1\n/g; s/\}(\s*\n\s*)else\b/$1} else/g; print; }' `find /app -name '*.go'`

csi/Makefile

@@ -1,4 +1,4 @@
-VERSION ?= v0.6.9
+VERSION ?= v0.6.5
 
 all: build push
 

csi/deploy/004-csi-nodeplugin.yaml

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

csi/deploy/007-csi-provisioner.yaml

@@ -116,7 +116,7 @@ spec:
             privileged: true
             capabilities:
               add: ["SYS_ADMIN"]
-          image: vitalif/vitastor-csi:v0.6.9
+          image: vitalif/vitastor-csi:v0.6.5
           args:
             - "--node=$(NODE_ID)"
             - "--endpoint=$(CSI_ENDPOINT)"

csi/go.sum

@@ -1,448 +0,0 @@
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
-cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
-cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
-cloud.google.com/go v0.51.0/go.mod h1:hWtGJ6gnXH+KgDv+V0zFGDvpi07n3z8ZNj3T1RW0Gcw=
-cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
-cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
-cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
-github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
-github.com/Azure/go-autorest/autorest v0.9.6/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630=
-github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
-github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q=
-github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
-github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g=
-github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM=
-github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
-github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
-github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/container-storage-interface/spec v1.2.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4=
-github.com/container-storage-interface/spec v1.4.0 h1:ozAshSKxpJnYUfmkpZCTYyF/4MYeYlhdXbAvPvfGmkg=
-github.com/container-storage-interface/spec v1.4.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4=
-github.com/coreos/bbolt v1.3.5 h1:XFv7xaq7701j8ZSEzR28VohFYSlyakMyqNMU5FQH6Ac=
-github.com/coreos/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
-github.com/coreos/etcd v3.3.25+incompatible h1:0GQEw6h3YnuOVdtwygkIfJ+Omx0tZ8/QkVyXI4LkbeY=
-github.com/coreos/etcd v3.3.25+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
-github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
-github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU=
-github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg=
-github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
-github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
-github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
-github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
-github.com/go-logr/logr v0.2.0 h1:QvGt2nLcHH0WK9orKa+ppBPAxREcH364nPUedEpK0TY=
-github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
-github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
-github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
-github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
-github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
-github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
-github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7 h1:5ZkaAPbicIKTF2I64qf5Fh8Aa83Q/dnOafMYV0OMwjA=
-github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
-github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg=
-github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
-github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
-github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=
-github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
-github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
-github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ=
-github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
-github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
-github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
-github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
-github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kubernetes-csi/csi-lib-utils v0.9.1 h1:sGq6ifVujfMSkfTsMZip44Ttv8SDXvsBlFk9GdYl/b8=
-github.com/kubernetes-csi/csi-lib-utils v0.9.1/go.mod h1:8E2jVUX9j3QgspwHXa6LwyN7IHQDjW9jX3kwoWnSC+M=
-github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
-github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
-github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
-github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
-github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
-github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.7.1 h1:NTGy1Ja9pByO+xAeH/qiWnLrKtr3hJPNjaVUwnjpdpA=
-github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
-github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lNawc=
-github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFBS8=
-github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
-github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=
-github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0=
-github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
-github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 h1:uruHq4dN7GR16kFc5fp3d1RIYzJW5onx8Ybykw2YQFA=
-github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=
-github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
-go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
-go.etcd.io/etcd v3.3.25+incompatible h1:V1RzkZJj9LqsJRy+TUBgpWSbZXITLB819lstuTFoZOY=
-go.etcd.io/etcd v3.3.25+incompatible/go.mod h1:yaeTdrJi5lOmYerz05bd8+V7KubZs8YSFZfzsF9A6aI=
-go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
-go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
-go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
-go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=
-go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
-golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb h1:eBmm0M9fYhWpKZLjQUUKka/LtIxf46G4fxeEz5KJr9U=
-golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4 h1:5/PjkGUjvEU5Gl6BxmvKRPpqo2uNMv4rcHBMwzk/st8=
-golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
-google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
-google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/grpc v1.25.1 h1:wdKvqQk7IttEw92GoRyKG2IDrUIpgpj6H6m81yfeMW0=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.24.0 h1:UhZDfRO8JRQru4/+LlLE0BRKGF8L+PICnvYZmx/fEGA=
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
-gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-k8s.io/api v0.19.0/go.mod h1:I1K45XlvTrDjmj5LoM5LuP/KYrhWbjUKT/SoPG0qTjw=
-k8s.io/apimachinery v0.19.0/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
-k8s.io/client-go v0.19.0/go.mod h1:H9E/VT95blcFQnlyShFgnFT9ZnJOAceiUHM3MlRC+mU=
-k8s.io/component-base v0.19.0/go.mod h1:dKsY8BxkA+9dZIAh2aWJLL/UdASFDNtGYTCItL4LM7Y=
-k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
-k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
-k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
-k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
-k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=
-k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
-k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
-k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-k8s.io/utils v0.0.0-20210305010621-2afb4311ab10 h1:u5rPykqiCpL+LBfjRkXvnK71gOgIdmq3eHUEkPrbeTI=
-k8s.io/utils v0.0.0-20210305010621-2afb4311ab10/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
-sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
-sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
-sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=

csi/src/config.go

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

csi/src/controllerserver.go

@@ -354,9 +354,9 @@ func (cs *ControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol
         return nil, status.Error(codes.Internal, "invalid "+inodeCfgKey+" key in etcd: "+err.Error())
     }
 
-    // Delete inode data by invoking vitastor-cli
+    // Delete inode data by invoking vitastor-rm
     args := []string{
-        "rm-data", "--etcd_address", strings.Join(etcdUrl, ","),
+        "--etcd_address", strings.Join(etcdUrl, ","),
         "--pool", fmt.Sprintf("%d", idx.PoolId),
         "--inode", fmt.Sprintf("%d", idx.Id),
     }
@@ -364,7 +364,7 @@ func (cs *ControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol
     {
         args = append(args, "--config_path", ctxVars["configPath"])
     }
-    c := exec.Command("/usr/bin/vitastor-cli", args...)
+    c := exec.Command("/usr/bin/vitastor-rm", args...)
     var stderr bytes.Buffer
     c.Stdout = nil
     c.Stderr = &stderr
@@ -372,7 +372,7 @@ func (cs *ControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol
     stderrStr := string(stderr.Bytes())
     if (err != nil)
     {
-        klog.Errorf("vitastor-cli rm-data failed: %s, status %s\n", stderrStr, err)
+        klog.Errorf("vitastor-rm failed: %s, status %s\n", stderrStr, err)
         return nil, status.Error(codes.Internal, stderrStr+" (status "+err.Error()+")")
     }
 

debian/build-vitastor-bullseye.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-cat < vitastor.Dockerfile > ../Dockerfile
+sed 's/$REL/bullseye/g' < vitastor.Dockerfile > ../Dockerfile
 cd ..
 mkdir -p packages
-sudo podman build --build-arg REL=bullseye -v `pwd`/packages:/root/packages -f Dockerfile .
+sudo podman build -v `pwd`/packages:/root/packages -f Dockerfile .
 rm Dockerfile

debian/build-vitastor-buster.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-cat < vitastor.Dockerfile > ../Dockerfile
+sed 's/$REL/buster/g' < vitastor.Dockerfile > ../Dockerfile
 cd ..
 mkdir -p packages
-sudo podman build --build-arg REL=buster -v `pwd`/packages:/root/packages -f Dockerfile .
+sudo podman build -v `pwd`/packages:/root/packages -f Dockerfile .
 rm Dockerfile

debian/changelog

@@ -1,4 +1,4 @@
-vitastor (0.6.9-1) unstable; urgency=medium
+vitastor (0.6.5-1) unstable; urgency=medium
 
   * RDMA support
   * Bugfixes

debian/control

@@ -9,41 +9,9 @@ Rules-Requires-Root: no
 
 Package: vitastor
 Architecture: amd64
-Depends: vitastor-osd, vitastor-mon, vitastor-client, vitastor-client-dev, vitastor-fio
+Depends: ${shlibs:Depends}, ${misc:Depends}, fio (= ${dep:fio}), qemu (= ${dep:qemu}), nodejs (>= 10), node-sprintf-js, node-ws (>= 7), libjerasure2, lp-solve
 Description: Vitastor, a fast software-defined clustered block storage
  Vitastor is a small, simple and fast clustered block storage (storage for VM drives),
  architecturally similar to Ceph which means strong consistency, primary-replication,
  symmetric clustering and automatic data distribution over any number of drives of any
  size with configurable redundancy (replication or erasure codes/XOR).
-
-Package: vitastor-osd
-Architecture: amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, vitastor-client (= ${binary:Version})
-Description: Vitastor, a fast software-defined clustered block storage - object storage daemon
- Vitastor object storage daemon, i.e. server program that stores data.
-
-Package: vitastor-mon
-Architecture: amd64
-Depends: ${misc:Depends}, nodejs (>= 10), node-sprintf-js, node-ws (>= 7), lp-solve
-Description: Vitastor, a fast software-defined clustered block storage - monitor
- Vitastor monitor, i.e. server program responsible for watching cluster state and
- scheduling cluster-level operations.
-
-Package: vitastor-client
-Architecture: amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Vitastor, a fast software-defined clustered block storage - client
- Vitastor client library and command-line interface.
-
-Package: vitastor-client-dev
-Section: devel
-Architecture: amd64
-Depends: ${misc:Depends}, vitastor-client (= ${binary:Version})
-Description: Vitastor, a fast software-defined clustered block storage - development files
- Vitastor library headers for development.
-
-Package: vitastor-fio
-Architecture: amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, vitastor-client (= ${binary:Version}), fio (= ${dep:fio})
-Description: Vitastor, a fast software-defined clustered block storage - fio drivers
- Vitastor fio drivers for benchmarking.

debian/fio_version

@@ -1 +0,0 @@
-dep:fio=3.16-1

debian/install

@@ -1,4 +1,3 @@
 VNPL-1.1.txt usr/share/doc/vitastor
 GPL-2.0.txt usr/share/doc/vitastor
-README.md usr/share/doc/vitastor
+mon usr/lib/vitastor
-README-ru.md usr/share/doc/vitastor

debian/libvirt.Dockerfile

@@ -1,40 +0,0 @@
-# Build patched libvirt for Debian Buster or Bullseye/Sid inside a container
-# cd ..; podman build --build-arg REL=bullseye -v `pwd`/packages:/root/packages -f debian/libvirt.Dockerfile .
-
-ARG REL=
-FROM debian:$REL
-ARG REL=
-
-WORKDIR /root
-
-RUN if [ "$REL" = "buster" -o "$REL" = "bullseye" ]; then \
-        echo "deb http://deb.debian.org/debian $REL-backports main" >> /etc/apt/sources.list; \
-        echo >> /etc/apt/preferences; \
-        echo 'Package: *' >> /etc/apt/preferences; \
-        echo "Pin: release a=$REL-backports" >> /etc/apt/preferences; \
-        echo 'Pin-Priority: 500' >> /etc/apt/preferences; \
-    fi; \
-    grep '^deb ' /etc/apt/sources.list | perl -pe 's/^deb/deb-src/' >> /etc/apt/sources.list; \
-    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 devscripts
-RUN apt-get -y build-dep libvirt0
-RUN apt-get -y install libglusterfs-dev
-RUN apt-get --download-only source libvirt
-
-ADD patches/libvirt-5.0-vitastor.diff patches/libvirt-7.0-vitastor.diff patches/libvirt-7.5-vitastor.diff patches/libvirt-7.6-vitastor.diff /root
-RUN set -e; \
-    mkdir -p /root/packages/libvirt-$REL; \
-    rm -rf /root/packages/libvirt-$REL/*; \
-    cd /root/packages/libvirt-$REL; \
-    dpkg-source -x /root/libvirt*.dsc; \
-    D=$(ls -d libvirt-*/); \
-    V=$(ls -d libvirt-*/ | perl -pe 's/libvirt-(\d+\.\d+).*/$1/'); \
-    cp /root/libvirt-$V-vitastor.diff $D/debian/patches; \
-    echo libvirt-$V-vitastor.diff >> $D/debian/patches/series; \
-    cd $D; \
-    V=$(head -n1 debian/changelog | perl -pe 's/^.*\((.*?)(~bpo[\d\+]*)?(\+deb[u\d]+)?\).*$/$1/')+vitastor2; \
-    DEBEMAIL="Vitaliy Filippov <vitalif@yourcmc.ru>" dch -D $REL -v $V 'Add Vitastor support'; \
-    DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage --jobs=auto -sa; \
-    rm -rf /root/packages/libvirt-$REL/$D

debian/patched-qemu.Dockerfile

@@ -1,18 +1,20 @@
 # Build patched QEMU for Debian Buster or Bullseye/Sid inside a container
 # cd ..; podman build --build-arg REL=bullseye -v `pwd`/packages:/root/packages -f debian/patched-qemu.Dockerfile .
 
-ARG REL=
 FROM debian:$REL
-ARG REL=
 
 WORKDIR /root
 
-RUN if [ "$REL" = "buster" -o "$REL" = "bullseye" ]; then \
+RUN if [ "$REL" = "buster" ]; then \
-        echo "deb http://deb.debian.org/debian $REL-backports main" >> /etc/apt/sources.list; \
+        echo 'deb http://deb.debian.org/debian buster-backports main' >> /etc/apt/sources.list; \
         echo >> /etc/apt/preferences; \
         echo 'Package: *' >> /etc/apt/preferences; \
-        echo "Pin: release a=$REL-backports" >> /etc/apt/preferences; \
+        echo 'Pin: release a=buster-backports' >> /etc/apt/preferences; \
         echo 'Pin-Priority: 500' >> /etc/apt/preferences; \
+        echo >> /etc/apt/preferences; \
+        echo 'Package: libglvnd* libgles* libglx* libgl1 libegl* libopengl* mesa*' >> /etc/apt/preferences; \
+        echo 'Pin: release a=buster-backports' >> /etc/apt/preferences; \
+        echo 'Pin-Priority: 50' >> /etc/apt/preferences; \
     fi; \
     grep '^deb ' /etc/apt/sources.list | perl -pe 's/^deb/deb-src/' >> /etc/apt/sources.list; \
     echo 'APT::Install-Recommends false;' >> /etc/apt/apt.conf; \
@@ -21,41 +23,28 @@ RUN if [ "$REL" = "buster" -o "$REL" = "bullseye" ]; then \
 RUN apt-get update
 RUN apt-get -y install qemu fio liburing1 liburing-dev libgoogle-perftools-dev devscripts
 RUN apt-get -y build-dep qemu
+RUN apt-get -y build-dep fio
 # To build a custom version
 #RUN cp /root/packages/qemu-orig/* /root
 RUN apt-get --download-only source qemu
+RUN apt-get --download-only source fio
 
-ADD patches/qemu-5.0-vitastor.patch patches/qemu-5.1-vitastor.patch patches/qemu-6.1-vitastor.patch src/qemu_driver.c /root/vitastor/patches/
+ADD patches/qemu-5.0-vitastor.patch patches/qemu-5.1-vitastor.patch /root/vitastor/patches/
 RUN set -e; \
-    apt-get install -y wget; \
-    wget -q -O /etc/apt/trusted.gpg.d/vitastor.gpg https://vitastor.io/debian/pubkey.gpg; \
-    (echo deb http://vitastor.io/debian $REL main > /etc/apt/sources.list.d/vitastor.list); \
-    (echo "APT::Install-Recommends false;" > /etc/apt/apt.conf) && \
-    apt-get update; \
-    apt-get install -y vitastor-client vitastor-client-dev quilt; \
     mkdir -p /root/packages/qemu-$REL; \
     rm -rf /root/packages/qemu-$REL/*; \
     cd /root/packages/qemu-$REL; \
     dpkg-source -x /root/qemu*.dsc; \
-    if ls -d /root/packages/qemu-$REL/qemu-5.0*; then \
+    if [ -d /root/packages/qemu-$REL/qemu-5.0 ]; then \
-        D=$(ls -d /root/packages/qemu-$REL/qemu-5.0*); \
+        cp /root/vitastor/patches/qemu-5.0-vitastor.patch /root/packages/qemu-$REL/qemu-5.0/debian/patches; \
-        cp /root/vitastor/patches/qemu-5.0-vitastor.patch $D/debian/patches; \
+        echo qemu-5.0-vitastor.patch >> /root/packages/qemu-$REL/qemu-5.0/debian/patches/series; \
-        echo qemu-5.0-vitastor.patch >> $D/debian/patches/series; \
-    elif ls /root/packages/qemu-$REL/qemu-6.1*; then \
-        D=$(ls -d /root/packages/qemu-$REL/qemu-6.1*); \
-        cp /root/vitastor/patches/qemu-6.1-vitastor.patch $D/debian/patches; \
-        echo qemu-6.1-vitastor.patch >> $D/debian/patches/series; \
     else \
         cp /root/vitastor/patches/qemu-5.1-vitastor.patch /root/packages/qemu-$REL/qemu-*/debian/patches; \
         P=`ls -d /root/packages/qemu-$REL/qemu-*/debian/patches`; \
         echo qemu-5.1-vitastor.patch >> $P/series; \
     fi; \
     cd /root/packages/qemu-$REL/qemu-*/; \
-    quilt push -a; \
-    quilt add block/vitastor.c; \
-    cp /root/vitastor/patches/qemu_driver.c block/vitastor.c; \
-    quilt refresh; \
     V=$(head -n1 debian/changelog | perl -pe 's/^.*\((.*?)(~bpo[\d\+]*)?\).*$/$1/')+vitastor1; \
-    DEBEMAIL="Vitaliy Filippov <vitalif@yourcmc.ru>" dch -D $REL -v $V 'Plug Vitastor block driver'; \
+    DEBFULLNAME="Vitaliy Filippov <vitalif@yourcmc.ru>" dch -D $REL -v $V 'Plug Vitastor block driver'; \
     DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage --jobs=auto -sa; \
     rm -rf /root/packages/qemu-$REL/qemu-*/

debian/raw.h

@@ -1,19 +0,0 @@
-/* Removed in Linux 5.14 */
-
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef __LINUX_RAW_H
-#define __LINUX_RAW_H
-
-#include <linux/types.h>
-
-#define RAW_SETBIND	_IO( 0xac, 0 )
-#define RAW_GETBIND	_IO( 0xac, 1 )
-
-struct raw_config_request 
-{
-	int	raw_minor;
-	__u64	block_major;
-	__u64	block_minor;
-};
-
-#endif /* __LINUX_RAW_H */

debian/rules

@@ -5,6 +5,5 @@ export DH_VERBOSE = 1
 	dh $@
 
 override_dh_installdeb:
-	cat debian/fio_version >> debian/vitastor-fio.substvars
+	cat debian/substvars >> debian/vitastor.substvars
-	[ -f debian/qemu_version ] && (cat debian/qemu_version >> debian/vitastor-qemu.substvars) || true
 	dh_installdeb

debian/substvars

@@ -0,0 +1,2 @@
+dep:fio=3.16-1
+dep:qemu=1:5.1+dfsg-4+vitastor1

debian/vitastor-client-dev.install

@@ -1,2 +0,0 @@
-usr/include
-usr/lib/*/pkgconfig

debian/vitastor-client.install

@@ -1,6 +0,0 @@
-usr/bin/vita
-usr/bin/vitastor-cli
-usr/bin/vitastor-rm
-usr/bin/vitastor-nbd
-usr/lib/*/libvitastor*.so*
-mon/make-osd.sh /usr/lib/vitastor

debian/vitastor-fio.install

@@ -1 +0,0 @@
-usr/lib/*/libfio*.so*

debian/vitastor-mon.install

@@ -1 +0,0 @@
-mon usr/lib/vitastor

debian/vitastor-osd.install

@@ -1,2 +0,0 @@
-usr/bin/vitastor-osd
-usr/bin/vitastor-dump-journal

debian/vitastor.Dockerfile

@@ -1,17 +1,15 @@
 # Build Vitastor packages for Debian Buster or Bullseye/Sid inside a container
 # cd ..; podman build --build-arg REL=bullseye -v `pwd`/packages:/root/packages -f debian/vitastor.Dockerfile .
 
-ARG REL=
 FROM debian:$REL
-ARG REL=
 
 WORKDIR /root
 
-RUN if [ "$REL" = "buster" -o "$REL" = "bullseye" ]; then \
+RUN if [ "$REL" = "buster" ]; then \
-        echo "deb http://deb.debian.org/debian $REL-backports main" >> /etc/apt/sources.list; \
+        echo 'deb http://deb.debian.org/debian buster-backports main' >> /etc/apt/sources.list; \
         echo >> /etc/apt/preferences; \
         echo 'Package: *' >> /etc/apt/preferences; \
-        echo "Pin: release a=$REL-backports" >> /etc/apt/preferences; \
+        echo 'Pin: release a=buster-backports' >> /etc/apt/preferences; \
         echo 'Pin-Priority: 500' >> /etc/apt/preferences; \
     fi; \
     grep '^deb ' /etc/apt/sources.list | perl -pe 's/^deb/deb-src/' >> /etc/apt/sources.list; \
@@ -19,8 +17,10 @@ RUN if [ "$REL" = "buster" -o "$REL" = "bullseye" ]; then \
     echo 'APT::Install-Suggests false;' >> /etc/apt/apt.conf
 
 RUN apt-get update
-RUN apt-get -y install fio liburing1 liburing-dev libgoogle-perftools-dev devscripts
+RUN apt-get -y install qemu fio liburing1 liburing-dev libgoogle-perftools-dev devscripts
+RUN apt-get -y build-dep qemu
 RUN apt-get -y build-dep fio
+RUN apt-get --download-only source qemu
 RUN apt-get --download-only source fio
 RUN apt-get update && apt-get -y install libjerasure-dev cmake libibverbs-dev
 
@@ -30,25 +30,37 @@ RUN set -e -x; \
     cd /root/fio-build/; \
     rm -rf /root/fio-build/*; \
     dpkg-source -x /root/fio*.dsc; \
+    cd /root/packages/qemu-$REL/; \
+    rm -rf qemu*/; \
+    dpkg-source -x qemu*.dsc; \
+    cd /root/packages/qemu-$REL/qemu*/; \
+    debian/rules b/configure-stamp; \
+    cd b/qemu; \
+    make -j8 qapi/qapi-builtin-types.h; \
     mkdir -p /root/packages/vitastor-$REL; \
     rm -rf /root/packages/vitastor-$REL/*; \
     cd /root/packages/vitastor-$REL; \
-    cp -r /root/vitastor vitastor-0.6.9; \
+    cp -r /root/vitastor vitastor-0.6.5; \
-    cd vitastor-0.6.9; \
+    ln -s /root/packages/qemu-$REL/qemu-*/ vitastor-0.6.5/qemu; \
-    ln -s /root/fio-build/fio-*/ ./fio; \
+    ln -s /root/fio-build/fio-*/ vitastor-0.6.5/fio; \
+    cd vitastor-0.6.5; \
     FIO=$(head -n1 fio/debian/changelog | perl -pe 's/^.*\((.*?)\).*$/$1/'); \
-    ls /usr/include/linux/raw.h || cp ./debian/raw.h /usr/include/linux/raw.h; \
+    QEMU=$(head -n1 qemu/debian/changelog | perl -pe 's/^.*\((.*?)\).*$/$1/'); \
+    sh copy-qemu-includes.sh; \
     sh copy-fio-includes.sh; \
-    rm fio; \
+    rm qemu fio; \
     mkdir -p a b debian/patches; \
+    mv qemu-copy b/qemu; \
     mv fio-copy b/fio; \
-    diff -NaurpbB a b > debian/patches/fio-headers.patch || true; \
+    diff -NaurpbB a b > debian/patches/qemu-fio-headers.patch || true; \
-    echo fio-headers.patch >> debian/patches/series; \
+    echo qemu-fio-headers.patch >> debian/patches/series; \
     rm -rf a b; \
-    echo "dep:fio=$FIO" > debian/fio_version; \
+    rm -rf /root/packages/qemu-$REL/qemu*/; \
+    echo "dep:fio=$FIO" > debian/substvars; \
+    echo "dep:qemu=$QEMU" >> debian/substvars; \
     cd /root/packages/vitastor-$REL; \
-    tar --sort=name --mtime='2020-01-01' --owner=0 --group=0 --exclude=debian -cJf vitastor_0.6.9.orig.tar.xz vitastor-0.6.9; \
+    tar --sort=name --mtime='2020-01-01' --owner=0 --group=0 --exclude=debian -cJf vitastor_0.6.5.orig.tar.xz vitastor-0.6.5; \
-    cd vitastor-0.6.9; \
+    cd vitastor-0.6.5; \
     V=$(head -n1 debian/changelog | perl -pe 's/^.*\((.*?)\).*$/$1/'); \
     DEBFULLNAME="Vitaliy Filippov <vitalif@yourcmc.ru>" dch -D $REL -v "$V""$REL" "Rebuild for $REL"; \
     DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage --jobs=auto -sa; \

docker/Dockerfile

@@ -1,9 +0,0 @@
-# Build Docker image with Vitastor packages
-
-FROM debian:bullseye
-
-ADD vitastor.list /etc/apt/sources.list.d
-ADD vitastor.gpg /etc/apt/trusted.gpg.d
-ADD vitastor.pref /etc/apt/preferences.d
-ADD apt.conf /etc/apt/
-RUN apt-get update && apt-get -y install vitastor qemu-system-x86 qemu-system-common && apt-get clean

docker/apt.conf

@@ -1 +0,0 @@
-APT::Install-Recommends false;

docker/vitastor.list

@@ -1 +0,0 @@
-deb http://vitastor.io/debian bullseye main

docker/vitastor.pref

@@ -1,3 +0,0 @@
-Package: *
-Pin: origin "vitastor.io"
-Pin-Priority: 1000

mon/lp-optimizer.js

@@ -50,7 +50,7 @@ async function lp_solve(text)
     return { score, vars };
 }
 
-async function optimize_initial({ osd_tree, pg_count, pg_size = 3, pg_minsize = 2, max_combinations = 10000, parity_space = 1, round_robin = false })
+async function optimize_initial({ osd_tree, pg_count, pg_size = 3, pg_minsize = 2, max_combinations = 10000, parity_space = 1 })
 {
     if (!pg_count || !osd_tree)
     {
@@ -92,7 +92,7 @@ async function optimize_initial({ osd_tree, pg_count, pg_size = 3, pg_minsize =
         console.log(lp);
         throw new Error('Problem is infeasible or unbounded - is it a bug?');
     }
-    const int_pgs = make_int_pgs(lp_result.vars, pg_count, round_robin);
+    const int_pgs = make_int_pgs(lp_result.vars, pg_count);
     const eff = pg_list_space_efficiency(int_pgs, all_weights, pg_minsize, parity_space);
     const res = {
         score: lp_result.score,
@@ -115,7 +115,7 @@ function shuffle(array)
     }
 }
 
-function make_int_pgs(weights, pg_count, round_robin)
+function make_int_pgs(weights, pg_count)
 {
     const total_weight = Object.values(weights).reduce((a, c) => Number(a) + Number(c), 0);
     let int_pgs = [];
@@ -123,15 +123,10 @@ function make_int_pgs(weights, pg_count, round_robin)
     let weight_left = total_weight;
     for (const pg_name in weights)
     {
-        let cur_pg = pg_name.substr(3).split('_');
         let n = Math.round(weights[pg_name] / weight_left * pg_left);
         for (let i = 0; i < n; i++)
         {
-            int_pgs.push([ ...cur_pg ]);
+            int_pgs.push(pg_name.substr(3).split('_'));
-            if (round_robin)
-            {
-                cur_pg.push(cur_pg.shift());
-            }
         }
         weight_left -= weights[pg_name];
         pg_left -= n;
@@ -293,6 +288,11 @@ async function optimize_change({ prev_pgs: prev_int_pgs, osd_tree, pg_size = 3,
     lp += 'max: '+all_pg_names.map(pg_name => (
         prev_weights[pg_name] ? `${pg_size+1}*add_${pg_name} - ${pg_size+1}*del_${pg_name}` : `${pg_size+1-move_weights[pg_name]}*${pg_name}`
     )).join(' + ')+';\n';
+    lp += all_pg_names
+        .map(pg_name => (prev_weights[pg_name] ? `add_${pg_name} - del_${pg_name}` : `${pg_name}`))
+        .join(' + ')+' = '+(pg_count
+            - Object.keys(prev_weights).reduce((a, old_pg_name) => (a + (all_pgs_hash[old_pg_name] ? prev_weights[old_pg_name] : 0)), 0)
+        )+';\n';
     for (const osd in pg_per_osd)
     {
         if (osd !== NO_OSD)

mon/make-osd.sh

@@ -4,25 +4,36 @@
 # Copyright (c) Vitaliy Filippov, 2019+
 # License: MIT
 
-# USAGE:
+# USAGE: ./make-osd.sh /dev/disk/by-partuuid/xxx [ /dev/disk/by-partuuid/yyy]...
-# 1) Put etcd_address and osd_network into /etc/vitastor/vitastor.conf. Example:
+
-#    {
+IP_SUBSTR="10.200.1."
-#        "etcd_address":["http://10.200.1.10:2379/v3","http://10.200.1.11:2379/v3","http://10.200.1.12:2379/v3"],
+ETCD_HOSTS="etcd0=http://10.200.1.10:2380,etcd1=http://10.200.1.11:2380,etcd2=http://10.200.1.12:2380"
-#        "osd_network":"10.200.1.0/24"
-#    }
-# 2) Run ./make-osd.sh /dev/disk/by-partuuid/xxx [ /dev/disk/by-partuuid/yyy]...
 
 set -e -x
 
+IP=`ip -json a s | jq -r '.[].addr_info[] | select(.local | startswith("'$IP_SUBSTR'")) | .local'`
+[ "$IP" != "" ] || exit 1
+ETCD_MON=$(echo $ETCD_HOSTS | perl -pe 's/:2380/:2379/g; s/etcd\d*=//g;')
+D=`dirname $0`
+
 # Create OSDs on all passed devices
+OSD_NUM=1
 for DEV in $*; do
 
-OSD_NUM=$(vitastor-cli alloc-osd)
+# Ugly :) -> node.js rework pending
+while true; do
+    ST=$(etcdctl --endpoints="$ETCD_MON" get --print-value-only /vitastor/osd/stats/$OSD_NUM)
+    if [ "$ST" = "" ]; then
+        break
+    fi
+    OSD_NUM=$((OSD_NUM+1))
+done
+etcdctl --endpoints="$ETCD_MON" put /vitastor/osd/stats/$OSD_NUM '{}'
 
 echo Creating OSD $OSD_NUM on $DEV
 
-OPT=$(vitastor-cli simple-offsets --format options $DEV | tr '\n' ' ')
+OPT=`node $D/simple-offsets.js --device $DEV --format options | tr '\n' ' '`
-META=$(vitastor-cli simple-offsets --format json $DEV | jq .data_offset)
+META=`echo $OPT | grep -Po '(?<=data_offset )\d+'`
 dd if=/dev/zero of=$DEV bs=1048576 count=$(((META+1048575)/1048576)) oflag=direct
 
 cat >/etc/systemd/system/vitastor-osd$OSD_NUM.service <<EOF
@@ -37,6 +48,8 @@ LimitNOFILE=1048576
 LimitNPROC=1048576
 LimitMEMLOCK=infinity
 ExecStart=/usr/bin/vitastor-osd \\
+    --etcd_address $IP:2379/v3 \\
+    --bind_address $IP \\
     --osd_num $OSD_NUM \\
     --disable_data_fsync 1 \\
     --immediate_commit all \\

mon/mon-main.js

@@ -9,18 +9,17 @@ const options = {};
 
 for (let i = 2; i < process.argv.length; i++)
 {
-    if (process.argv[i] === '-h' || process.argv[i] === '--help')
+    if (process.argv[i].substr(0, 2) == '--')
-    {
-        console.error('USAGE: '+process.argv[0]+' '+process.argv[1]+' [--verbose 1]'+
-            ' [--etcd_address "http://127.0.0.1:2379,..."] [--config_file /etc/vitastor/vitastor.conf]'+
-            ' [--etcd_prefix "/vitastor"] [--etcd_start_timeout 5]');
-        process.exit();
-    }
-    else if (process.argv[i].substr(0, 2) == '--')
     {
         options[process.argv[i].substr(2)] = process.argv[i+1];
         i++;
     }
 }
 
-new Mon(options).start().catch(e => { console.error(e); process.exit(1); });
+if (!options.etcd_url)
+{
+    console.error('USAGE: '+process.argv[0]+' '+process.argv[1]+' --etcd_url "http://127.0.0.1:2379,..." --etcd_prefix "/vitastor" --etcd_start_timeout 5 [--verbose 1]');
+    process.exit();
+}
+
+new Mon(options).start().catch(e => { console.error(e); process.exit(); });

mon/mon.js

@@ -1,7 +1,6 @@
 // Copyright (c) Vitaliy Filippov, 2019+
 // License: VNPL-1.1 (see README.md for details)
 
-const fs = require('fs');
 const http = require('http');
 const crypto = require('crypto');
 const os = require('os');
@@ -34,10 +33,8 @@ const etcd_allow = new RegExp('^'+[
     'pg/state/[1-9]\\d*/[1-9]\\d*',
     'pg/stats/[1-9]\\d*/[1-9]\\d*',
     'pg/history/[1-9]\\d*/[1-9]\\d*',
-    'pool/stats/[1-9]\\d*',
     'history/last_clean_pgs',
     'inode/stats/[1-9]\\d*/[1-9]\\d*',
-    'pool/stats/[1-9]\\d*',
     'stats',
     'index/image/.*',
     'index/maxid/[1-9]\\d*',
@@ -84,13 +81,11 @@ const etcd_tree = {
             osd_ping_timeout: 5, // seconds. min: 1
             up_wait_retry_interval: 500, // ms. min: 50
             // osd
-            etcd_report_interval: 5,
+            etcd_report_interval: 30, // min: 10
             run_primary: true,
-            osd_network: null, // "192.168.7.0/24" or an array of masks
             bind_address: "0.0.0.0",
             bind_port: 0,
             autosync_interval: 5,
-            autosync_writes: 128,
             client_queue_depth: 128, // unused
             recovery_queue_depth: 4,
             recovery_sync_batch: 16,
@@ -234,7 +229,7 @@ const etcd_tree = {
             /* <pool_id>: {
                 <pg_id>: {
                     primary: osd_num_t,
-                    state: ("starting"|"peering"|"peered"|"incomplete"|"active"|"repeering"|"stopping"|"offline"|
+                    state: ("starting"|"peering"|"incomplete"|"active"|"repeering"|"stopping"|"offline"|
                         "degraded"|"has_incomplete"|"has_degraded"|"has_misplaced"|"has_unclean"|
                         "has_invalid"|"left_on_dead")[],
                 }
@@ -267,9 +262,9 @@ const etcd_tree = {
             /* <pool_id>: {
                 <inode_t>: {
                     raw_used: uint64_t, // raw used bytes on OSDs
-                    read: { count: uint64_t, usec: uint64_t, bytes: uint64_t, bps: uint64_t, iops: uint64_t, lat: uint64_t },
+                    read: { count: uint64_t, usec: uint64_t, bytes: uint64_t },
-                    write: { count: uint64_t, usec: uint64_t, bytes: uint64_t, bps: uint64_t, iops: uint64_t, lat: uint64_t },
+                    write: { count: uint64_t, usec: uint64_t, bytes: uint64_t },
-                    delete: { count: uint64_t, usec: uint64_t, bytes: uint64_t, bps: uint64_t, iops: uint64_t, lat: uint64_t },
+                    delete: { count: uint64_t, usec: uint64_t, bytes: uint64_t },
                 },
             }, */
         },
@@ -286,14 +281,14 @@ const etcd_tree = {
     },
     stats: {
         /* op_stats: {
-            <string>: { count: uint64_t, usec: uint64_t, bytes: uint64_t, bps: uint64_t, iops: uint64_t, lat: uint64_t },
+            <string>: { count: uint64_t, usec: uint64_t, bytes: uint64_t },
         },
         subop_stats: {
-            <string>: { count: uint64_t, usec: uint64_t, iops: uint64_t, lat: uint64_t },
+            <string>: { count: uint64_t, usec: uint64_t },
         },
         recovery_stats: {
-            degraded: { count: uint64_t, bytes: uint64_t, bps: uint64_t, iops: uint64_t },
+            degraded: { count: uint64_t, bytes: uint64_t },
-            misplaced: { count: uint64_t, bytes: uint64_t, bps: uint64_t, iops: uint64_t },
+            misplaced: { count: uint64_t, bytes: uint64_t },
         },
         object_counts: {
             object: uint64_t,
@@ -324,53 +319,22 @@ class Mon
 {
     constructor(config)
     {
-        this.die = (e) => this._die(e);
+        // FIXME: Maybe prefer local etcd
-        if (fs.existsSync(config.config_path||'/etc/vitastor/vitastor.conf'))
+        this.etcd_urls = [];
+        for (let url of config.etcd_url.split(/,/))
         {
-            config = {
+            let scheme = 'http';
-                ...JSON.parse(fs.readFileSync(config.config_path||'/etc/vitastor/vitastor.conf', { encoding: 'utf-8' })),
+            url = url.trim().replace(/^(https?):\/\//, (m, m1) => { scheme = m1; return ''; });
-                ...config,
+            if (!/\/[^\/]/.exec(url))
-            };
+                url += '/v3';
+            this.etcd_urls.push(scheme+'://'+url);
         }
-        this.parse_etcd_addresses(config.etcd_address||config.etcd_url);
         this.verbose = config.verbose || 0;
-        this.initConfig = config;
         this.config = {};
         this.etcd_prefix = config.etcd_prefix || '/vitastor';
         this.etcd_prefix = this.etcd_prefix.replace(/\/\/+/g, '/').replace(/^\/?(.*[^\/])\/?$/, '/$1');
         this.etcd_start_timeout = (config.etcd_start_timeout || 5) * 1000;
         this.state = JSON.parse(JSON.stringify(this.constructor.etcd_tree));
-        this.signals_set = false;
-        this.on_stop_cb = () => this.on_stop(0).catch(console.error);
-    }
-
-    parse_etcd_addresses(addrs)
-    {
-        const is_local_ip = this.local_ips(true).reduce((a, c) => { a[c] = true; return a; }, {});
-        this.etcd_local = [];
-        this.etcd_urls = [];
-        this.selected_etcd_url = null;
-        this.etcd_urls_to_try = [];
-        if (!(addrs instanceof Array))
-            addrs = addrs ? (''+(addrs||'')).split(/,/) : [];
-        if (!addrs.length)
-        {
-            console.error('Vitastor etcd address(es) not specified. Please set on the command line or in the config file');
-            process.exit(1);
-        }
-        for (let url of addrs)
-        {
-            let scheme = 'http';
-            url = url.trim().replace(/^(https?):\/\//, (m, m1) => { scheme = m1; return ''; });
-            const slash = url.indexOf('/');
-            const colon = url.indexOf(':');
-            const is_local = is_local_ip[colon >= 0 ? url.substr(0, colon) : (slash >= 0 ? url.substr(0, slash) : url)];
-            url = scheme+'://'+(slash >= 0 ? url : url+'/v3');
-            if (is_local)
-                this.etcd_local.push(url);
-            else
-                this.etcd_urls.push(url);
-        }
     }
 
     async start()
@@ -380,18 +344,7 @@ class Mon
         await this.become_master();
         await this.load_cluster_state();
         await this.start_watcher(this.config.etcd_mon_retries);
-        for (const pool_id in this.state.config.pools)
-        {
-            if (!this.state.pool.stats[pool_id] ||
-                !this.state.pool.stats[pool_id].pg_real_size)
-            {
-                // Generate missing data in etcd
-                this.state.config.pgs.hash = null;
-                break;
-            }
-        }
         await this.recheck_pgs();
-        this.schedule_update_stats();
     }
 
     async load_config()
@@ -433,6 +386,11 @@ class Mon
         {
             this.config.mon_stats_timeout = 100;
         }
+        this.config.mon_stats_interval = Number(this.config.mon_stats_interval) || 5000;
+        if (this.config.mon_stats_interval < 100)
+        {
+            this.config.mon_stats_interval = 100;
+        }
         // After this number of seconds, a dead OSD will be removed from PG distribution
         this.config.osd_out_time = Number(this.config.osd_out_time) || 0;
         if (!this.config.osd_out_time)
@@ -441,31 +399,6 @@ class Mon
         }
     }
 
-    pick_next_etcd()
-    {
-        if (this.selected_etcd_url)
-            return this.selected_etcd_url;
-        if (!this.etcd_urls_to_try || !this.etcd_urls_to_try.length)
-        {
-            this.etcd_urls_to_try = [ ...this.etcd_local ];
-            const others = [ ...this.etcd_urls ];
-            while (others.length)
-            {
-                const url = others.splice(0|(others.length*Math.random()), 1);
-                this.etcd_urls_to_try.push(url[0]);
-            }
-        }
-        this.selected_etcd_url = this.etcd_urls_to_try.shift();
-        return this.selected_etcd_url;
-    }
-
-    restart_watcher(cur_addr)
-    {
-        if (this.selected_etcd_url == cur_addr)
-            this.selected_etcd_url = null;
-        this.start_watcher(this.config.etcd_mon_retries).catch(this.die);
-    }
-
     async start_watcher(retries)
     {
         let retry = 0;
@@ -475,8 +408,7 @@ class Mon
         }
         while (retries < 0 || retry < retries)
         {
-            const cur_addr = this.pick_next_etcd();
+            const base = 'ws'+this.etcd_urls[Math.floor(Math.random()*this.etcd_urls.length)].substr(4);
-            const base = 'ws'+cur_addr.substr(4);
             const ok = await new Promise((ok, no) =>
             {
                 const timer_id = setTimeout(() =>
@@ -499,9 +431,9 @@ class Mon
                 });
             });
             if (ok)
+            {
                 break;
-            if (this.selected_etcd_url == cur_addr)
+            }
-                this.selected_etcd_url = null;
             this.ws = null;
             retry++;
         }
@@ -509,8 +441,6 @@ class Mon
         {
             this.die('Failed to open etcd watch websocket');
         }
-        const cur_addr = this.selected_etcd_url;
-        this.ws.on('error', () => this.restart_watcher(cur_addr));
         this.ws.send(JSON.stringify({
             create_request: {
                 key: b64(this.etcd_prefix+'/'),
@@ -530,25 +460,12 @@ class Mon
             catch (e)
             {
             }
-            if (!data || !data.result)
+            if (!data || !data.result || !data.result.events)
             {
-                console.error('Unknown message received from watch websocket: '+msg);
+                if (!data || !data.result || !data.result.watch_id)
-            }
-            else if (data.result.canceled)
-            {
-                // etcd watch canceled
-                if (data.result.compact_revision)
                 {
-                    // we may miss events if we proceed
+                    console.error('Garbage received from watch websocket: '+msg);
-                    console.error('Revisions before '+data.result.compact_revision+' were compacted by etcd, exiting');
-                    this.on_stop(1);
                 }
-                console.error('Watch canceled by etcd, reason: '+data.result.cancel_reason+', exiting');
-                this.on_stop(1);
-            }
-            else if (data.result.created)
-            {
-                // etcd watch created
             }
             else
             {
@@ -581,7 +498,7 @@ class Mon
                 }
                 if (pg_states_changed)
                 {
-                    this.save_last_clean().catch(this.die);
+                    this.save_last_clean().catch(console.error);
                 }
                 if (stats_changed)
                 {
@@ -636,7 +553,7 @@ class Mon
         const max_ttl = this.config.etcd_mon_ttl + this.config.etcd_mon_timeout/1000*this.config.etcd_mon_retries;
         const res = await this.etcd_call('/lease/grant', { TTL: max_ttl }, this.config.etcd_mon_timeout, -1);
         this.etcd_lease_id = res.ID;
-        this.lease_timer = setInterval(async () =>
+        setInterval(async () =>
         {
             const res = await this.etcd_call('/lease/keepalive', { ID: this.etcd_lease_id }, this.config.etcd_mon_timeout, this.config.etcd_mon_retries);
             if (!res.result.TTL)
@@ -644,19 +561,6 @@ class Mon
                 this.die('Lease expired');
             }
         }, this.config.etcd_mon_timeout);
-        if (!this.signals_set)
-        {
-            process.on('SIGINT', this.on_stop_cb);
-            process.on('SIGTERM', this.on_stop_cb);
-            this.signals_set = true;
-        }
-    }
-
-    async on_stop(status)
-    {
-        clearInterval(this.lease_timer);
-        await this.etcd_call('/lease/revoke', { ID: this.etcd_lease_id }, this.config.etcd_mon_timeout, this.config.etcd_mon_retries);
-        process.exit(status);
     }
 
     async become_master()
@@ -1094,7 +998,6 @@ class Mon
                     pg_size: pool_cfg.pg_size,
                     pg_minsize: pool_cfg.pg_minsize,
                     max_combinations: pool_cfg.max_osd_combinations,
-                    round_robin: pool_cfg.scheme != 'replicated',
                 };
                 let optimize_result;
                 if (old_pg_count > 0)
@@ -1156,9 +1059,7 @@ class Mon
                 this.state.pool.stats[pool_id] = {
                     used_raw_tb: (this.state.pool.stats[pool_id]||{}).used_raw_tb || 0,
                     total_raw_tb: optimize_result.space,
-                    pg_real_size: pg_effsize,
+                    raw_to_usable: pg_effsize / (pool_cfg.pg_size - (pool_cfg.parity_chunks||0)),
-                    raw_to_usable: pg_effsize / (pool_cfg.scheme === 'replicated'
-                        ? 1 : (pool_cfg.pg_size - (pool_cfg.parity_chunks||0))),
                     space_efficiency: optimize_result.space/(optimize_result.total_space||1),
                 };
                 etcd_request.success.push({ requestPut: {
@@ -1267,11 +1168,11 @@ class Mon
         this.recheck_timer = setTimeout(() =>
         {
             this.recheck_timer = null;
-            this.recheck_pgs().catch(this.die);
+            this.recheck_pgs().catch(console.error);
         }, this.config.mon_change_timeout || 1000);
     }
 
-    sum_op_stats(timestamp, prev_stats)
+    sum_op_stats()
     {
         const op_stats = {}, subop_stats = {}, recovery_stats = {};
         for (const osd in this.state.osd.stats)
@@ -1297,29 +1198,6 @@ class Mon
                 recovery_stats[op].bytes += BigInt(st.recovery_stats[op].bytes||0);
             }
         }
-        if (prev_stats && prev_stats.timestamp >= timestamp)
-        {
-            prev_stats = null;
-        }
-        const tm = prev_stats ? BigInt(timestamp - prev_stats.timestamp) : 0;
-        for (const op in op_stats)
-        {
-            op_stats[op].bps = prev_stats ? (op_stats[op].bytes - prev_stats.op_stats[op].bytes) * 1000n / tm : 0;
-            op_stats[op].iops = prev_stats ? (op_stats[op].count - prev_stats.op_stats[op].count) * 1000n / tm : 0;
-            op_stats[op].lat = prev_stats ? (op_stats[op].usec - prev_stats.op_stats[op].usec)
-                / ((op_stats[op].count - prev_stats.op_stats[op].count) || 1n) : 0;
-        }
-        for (const op in subop_stats)
-        {
-            subop_stats[op].iops = prev_stats ? (subop_stats[op].count - prev_stats.subop_stats[op].count) * 1000n / tm : 0;
-            subop_stats[op].lat = prev_stats ? (subop_stats[op].usec - prev_stats.subop_stats[op].usec)
-                / ((subop_stats[op].count - prev_stats.subop_stats[op].count) || 1n) : 0;
-        }
-        for (const op in recovery_stats)
-        {
-            recovery_stats[op].bps = prev_stats ? (recovery_stats[op].bytes - prev_stats.recovery_stats[op].bytes) * 1000n / tm : 0;
-            recovery_stats[op].iops = prev_stats ? (recovery_stats[op].count - prev_stats.recovery_stats[op].count) * 1000n / tm : 0;
-        }
         return { op_stats, subop_stats, recovery_stats };
     }
 
@@ -1346,7 +1224,7 @@ class Mon
         return object_counts;
     }
 
-    sum_inode_stats(prev_stats, timestamp, prev_timestamp)
+    sum_inode_stats()
     {
         const inode_stats = {};
         const inode_stub = () => ({
@@ -1355,10 +1233,8 @@ class Mon
             write: { count: 0n, usec: 0n, bytes: 0n },
             delete: { count: 0n, usec: 0n, bytes: 0n },
         });
-        const seen_pools = {};
         for (const pool_id in this.state.config.pools)
         {
-            seen_pools[pool_id] = true;
             this.state.pool.stats[pool_id] = this.state.pool.stats[pool_id] || {};
             this.state.pool.stats[pool_id].used_raw_tb = 0n;
         }
@@ -1366,12 +1242,7 @@ class Mon
         {
             for (const pool_id in this.state.osd.space[osd_num])
             {
-                this.state.pool.stats[pool_id] = this.state.pool.stats[pool_id] || {};
+                this.state.pool.stats[pool_id] = this.state.pool.stats[pool_id] || { used_raw_tb: 0n };
-                if (!seen_pools[pool_id])
-                {
-                    this.state.pool.stats[pool_id].used_raw_tb = 0n;
-                    seen_pools[pool_id] = true;
-                }
                 inode_stats[pool_id] = inode_stats[pool_id] || {};
                 for (const inode_num in this.state.osd.space[osd_num][pool_id])
                 {
@@ -1382,7 +1253,7 @@ class Mon
                 }
             }
         }
-        for (const pool_id in seen_pools)
+        for (const pool_id in this.state.config.pools)
         {
             const used = this.state.pool.stats[pool_id].used_raw_tb;
             this.state.pool.stats[pool_id].used_raw_tb = Number(used)/1024/1024/1024/1024;
@@ -1405,39 +1276,43 @@ class Mon
                 }
             }
         }
-        if (prev_stats && prev_timestamp >= timestamp)
+        return inode_stats;
+    }
+
+    fix_stat_overflows(obj, scratch)
+    {
+        for (const k in obj)
         {
-            prev_stats = null;
+            if (typeof obj[k] == 'bigint')
-        }
-        const tm = prev_stats ? BigInt(timestamp - prev_timestamp) : 0;
-        for (const pool_id in inode_stats)
-        {
-            for (const inode_num in inode_stats[pool_id])
             {
-                let nonzero = inode_stats[pool_id][inode_num].raw_used > 0;
+                if (obj[k] >= 0x10000000000000000n)
-                for (const op of [ 'read', 'write', 'delete' ])
                 {
-                    const op_st = inode_stats[pool_id][inode_num][op];
+                    if (scratch[k])
-                    const prev_st = prev_stats && prev_stats[pool_id] && prev_stats[pool_id][inode_num] && prev_stats[pool_id][inode_num][op];
+                    {
-                    op_st.bps = prev_st ? (op_st.bytes - prev_st.bytes) * 1000n / tm : 0;
+                        for (const k2 in scratch)
-                    op_st.iops = prev_st ? (op_st.count - prev_st.count) * 1000n / tm : 0;
+                        {
-                    op_st.lat = prev_st ? (op_st.usec - prev_st.usec) / ((op_st.count - prev_st.count) || 1n) : 0;
+                            obj[k2] -= scratch[k2];
-                    if (op_st.bps > 0 || op_st.iops > 0 || op_st.lat > 0)
+                            scratch[k2] = 0n;
-                        nonzero = true;
+                        }
-                }
+                    }
-                if (!nonzero && (!this.state.config.inode[pool_id] || !this.state.config.inode[pool_id][inode_num]))
+                    else
-                {
+                    {
-                    // Deleted inode (no data, no I/O, no config)
+                        for (const k2 in obj)
-                    delete inode_stats[pool_id][inode_num];
+                        {
+                            scratch[k2] = obj[k2];
+                        }
+                    }
                 }
             }
+            else if (typeof obj[k] == 'object')
+            {
+                this.fix_stat_overflows(obj[k], scratch[k] = (scratch[k] || {}));
+            }
         }
-        return inode_stats;
     }
 
     serialize_bigints(obj)
     {
-        obj = { ...obj };
         for (const k in obj)
         {
             if (typeof obj[k] == 'bigint')
@@ -1446,26 +1321,22 @@ class Mon
             }
             else if (typeof obj[k] == 'object')
             {
-                obj[k] = this.serialize_bigints(obj[k]);
+                this.serialize_bigints(obj[k]);
             }
         }
-        return obj;
     }
 
     async update_total_stats()
     {
         const txn = [];
-        const timestamp = Date.now();
+        const stats = this.sum_op_stats();
         const object_counts = this.sum_object_counts();
-        let stats = this.sum_op_stats(timestamp, this.prev_stats);
+        const inode_stats = this.sum_inode_stats();
-        let inode_stats = this.sum_inode_stats(
+        this.fix_stat_overflows(stats, (this.prev_stats = this.prev_stats || {}));
-            this.prev_stats ? this.prev_stats.inode_stats : null,
+        this.fix_stat_overflows(inode_stats, (this.prev_inode_stats = this.prev_inode_stats || {}));
-            timestamp, this.prev_stats ? this.prev_stats.timestamp : null
-        );
-        this.prev_stats = { timestamp, ...stats, inode_stats };
         stats.object_counts = object_counts;
-        stats = this.serialize_bigints(stats);
+        this.serialize_bigints(stats);
-        inode_stats = this.serialize_bigints(inode_stats);
+        this.serialize_bigints(inode_stats);
         txn.push({ requestPut: { key: b64(this.etcd_prefix+'/stats'), value: b64(JSON.stringify(stats)) } });
         for (const pool_id in inode_stats)
         {
@@ -1477,25 +1348,11 @@ class Mon
                 } });
             }
         }
-        for (const pool_id in this.state.inode.stats)
-        {
-            for (const inode_num in this.state.inode.stats[pool_id])
-            {
-                if (!inode_stats[pool_id] || !inode_stats[pool_id][inode_num])
-                {
-                    txn.push({ requestDeleteRange: {
-                        key: b64(this.etcd_prefix+'/inode/stats/'+pool_id+'/'+inode_num),
-                    } });
-                }
-            }
-        }
         for (const pool_id in this.state.pool.stats)
         {
-            const pool_stats = { ...this.state.pool.stats[pool_id] };
-            this.serialize_bigints(pool_stats);
             txn.push({ requestPut: {
                 key: b64(this.etcd_prefix+'/pool/stats/'+pool_id),
-                value: b64(JSON.stringify(pool_stats)),
+                value: b64(JSON.stringify(this.state.pool.stats[pool_id])),
             } });
         }
         if (txn.length)
@@ -1508,13 +1365,20 @@ class Mon
     {
         if (this.stats_timer)
         {
-            return;
+            clearTimeout(this.stats_timer);
+            this.stats_timer = null;
+        }
+        let sleep = (this.stats_update_next||0) - Date.now();
+        if (sleep < this.config.mon_stats_timeout)
+        {
+            sleep = this.config.mon_stats_timeout;
         }
         this.stats_timer = setTimeout(() =>
         {
             this.stats_timer = null;
+            this.stats_update_next = Date.now() + this.config.mon_stats_interval;
             this.update_total_stats().catch(console.error);
-        }, this.config.mon_stats_timeout);
+        }, sleep);
     }
 
     parse_kv(kv)
@@ -1554,7 +1418,7 @@ class Mon
         cur[key_parts[key_parts.length-1]] = kv.value;
         if (key === 'config/global')
         {
-            this.config = { ...this.initConfig, ...this.state.config.global };
+            this.config = this.state.config.global;
             this.check_config();
             for (const osd_num in this.state.osd.stats)
             {
@@ -1591,15 +1455,12 @@ class Mon
         }
         while (retries < 0 || retry < retries)
         {
-            retry++;
+            const base = this.etcd_urls[Math.floor(Math.random()*this.etcd_urls.length)];
-            const base = this.pick_next_etcd();
             const res = await POST(base+path, body, timeout);
             if (res.error)
             {
-                if (this.selected_etcd_url == base)
+                console.error('etcd returned error: '+res.error);
-                    this.selected_etcd_url = null;
+                break;
-                console.error('failed to query etcd: '+res.error);
-                continue;
             }
             if (res.json)
             {
@@ -1608,20 +1469,26 @@ class Mon
                     console.error('etcd returned error: '+res.json.error);
                     break;
                 }
+                if (this.etcd_urls.length > 1)
+                {
+                    // Stick to the same etcd for the rest of calls
+                    this.etcd_urls = [ base ];
+                }
                 return res.json;
             }
+            retry++;
         }
         this.die();
     }
 
-    _die(err)
+    die(err)
     {
         // In fact we can just try to rejoin
         console.error(new Error(err || 'Cluster connection failed'));
         process.exit(1);
     }
 
-    local_ips(all)
+    local_ips()
     {
         const ips = [];
         const ifaces = os.networkInterfaces();
@@ -1629,7 +1496,7 @@ class Mon
         {
             for (const iface of ifaces[ifname])
             {
-                if (iface.family == 'IPv4' && !iface.internal || all)
+                if (iface.family == 'IPv4' && !iface.internal)
                 {
                     ips.push(iface.address);
                 }

mon/test-optimize-unfeasible.js

@@ -1,33 +0,0 @@
-// Copyright (c) Vitaliy Filippov, 2019+
-// License: VNPL-1.1 (see README.md for details)
-
-const LPOptimizer = require('./lp-optimizer.js');
-
-const osd_tree = {
-    100: {
-        1: 0.1,
-        2: 0.1,
-        3: 0.1,
-    },
-    200: {
-        4: 0.1,
-        5: 0.1,
-        6: 0.1,
-    },
-};
-
-async function run()
-{
-    let res;
-    console.log('256 PGs, 3+3 OSDs, size=2');
-    res = await LPOptimizer.optimize_initial({ osd_tree, pg_size: 2, pg_count: 256 });
-    LPOptimizer.print_change_stats(res, false);
-
-    // Should NOT fail with the "unfeasible or unbounded" exception
-    console.log('\nRemoving osd.2');
-    delete osd_tree[100][2];
-    res = await LPOptimizer.optimize_change({ prev_pgs: res.int_pgs, osd_tree, pg_size: 2 });
-    LPOptimizer.print_change_stats(res, false);
-}
-
-run().catch(console.error);

patches/cinder-vitastor.py

@@ -50,7 +50,7 @@ from cinder.volume import configuration
 from cinder.volume import driver
 from cinder.volume import volume_utils
 
-VERSION = '0.6.9'
+VERSION = '0.6.5'
 
 LOG = logging.getLogger(__name__)
 
@@ -266,7 +266,7 @@ class VitastorDriver(driver.CloneableImageVD,
             stats['provisioned_capacity_gb'] = round(total_provisioned/1024.0/1024.0/1024.0, 2)
             pool_stats = pool_stats['responses'][0]['kvs']
             if len(pool_stats):
-                pool_stats = pool_stats[0]['value']
+                pool_stats = pool_stats[0]
                 stats['free_capacity_gb'] = round(1024.0*(pool_stats['total_raw_tb']-pool_stats['used_raw_tb'])/pool_stats['raw_to_usable'], 2)
                 stats['total_capacity_gb'] = round(1024.0*pool_stats['total_raw_tb'], 2)
             stats['backend_state'] = 'up'
@@ -275,15 +275,6 @@ class VitastorDriver(driver.CloneableImageVD,
             LOG.exception('error getting vitastor pool stats: '+str(e))
 
         self._stats = stats
-        
-    def get_volume_stats(self, refresh=False):
-        """Get volume stats.
-        If 'refresh' is True, run update the stats first.
-        """
-        if not self._stats or refresh:
-            self._update_volume_stats()
-
-        return self._stats
 
     def _next_id(self, resp):
         if len(resp['kvs']) == 0:
@@ -489,7 +480,7 @@ class VitastorDriver(driver.CloneableImageVD,
                 # FIXME use etcd_address in qemu driver
                 kk = 'etcd_host'
             if v:
-                args += ':'+kk.replace('_', '-')+'='+v.replace(':', '\\:')
+                args += ':'+kk+'='+v.replace(':', '\\:')
         return args
 
     def delete_volume(self, volume):
@@ -523,7 +514,7 @@ class VitastorDriver(driver.CloneableImageVD,
         # Clear data
         for kv in layers:
             args = [
-                'vitastor-cli', 'rm-data', '--pool', str(kv['value']['pool_id']),
+                'vitastor-rm', '--pool', str(kv['value']['pool_id']),
                 '--inode', str(kv['value']['id']), '--progress', '0',
                 *(self._vitastor_args())
             ]
@@ -658,8 +649,8 @@ class VitastorDriver(driver.CloneableImageVD,
                 'etcd_address': self.configuration.vitastor_etcd_address,
                 'etcd_prefix': self.configuration.vitastor_etcd_prefix,
                 'name': volume.name,
-                'logical_block_size': '512',
+                'logical_block_size': 512,
-                'physical_block_size': '4096',
+                'physical_block_size': 4096,
             }
         }
         LOG.debug('connection data: %s', data)

patches/libvirt-5.0-vitastor.diff

@@ -1,4 +1,4 @@
-commit 7f01510ef207940b07fac4f5fc8b9f1580b443aa
+commit bd283191b3e7a4c6d1c100d3d96e348a1ebffe55
 Author: Vitaliy Filippov <vitalif@yourcmc.ru>
 Date:   Sun Jun 27 12:52:40 2021 +0300
 
@@ -65,38 +65,10 @@ index 4bf2b5f..dbc011b 100644
  
  int                     virConnectListAllStoragePools(virConnectPtr conn,
 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 222bb8c..2c30c55 100644
+index 222bb8c..685d255 100644
 --- a/src/conf/domain_conf.c
 +++ b/src/conf/domain_conf.c
-@@ -4667,8 +4667,7 @@ virDomainDeviceDefPostParseCommon(virDomainDeviceDefPtr dev,
+@@ -8653,6 +8653,10 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
-     if (dev->type == VIR_DOMAIN_DEVICE_DISK) {
-         virDomainDiskDefPtr disk = dev->data.disk;
- 
--        /* internal snapshots and config files are currently supported
--         * only with rbd: */
-+        /* internal snapshots are currently supported only with rbd: */
-         if (virStorageSourceGetActualType(disk->src) != VIR_STORAGE_TYPE_NETWORK &&
-             disk->src->protocol != VIR_STORAGE_NET_PROTOCOL_RBD) {
-             if (disk->src->snapshot) {
-@@ -4677,11 +4676,15 @@ virDomainDeviceDefPostParseCommon(virDomainDeviceDefPtr dev,
-                                  "only with 'rbd' disks"));
-                 return -1;
-             }
--
-+        }
-+        /* config files are currently supported only with rbd and vitastor: */
-+        if (virStorageSourceGetActualType(disk->src) != VIR_STORAGE_TYPE_NETWORK &&
-+            disk->src->protocol != VIR_STORAGE_NET_PROTOCOL_RBD &&
-+            disk->src->protocol != VIR_STORAGE_NET_PROTOCOL_VITASTOR) {
-             if (disk->src->configFile) {
-                 virReportError(VIR_ERR_XML_ERROR, "%s",
-                                _("<config> element is currently supported "
--                                 "only with 'rbd' disks"));
-+                                 "only with 'rbd' and 'vitastor' disks"));
-                 return -1;
-             }
-         }
-@@ -8653,6 +8656,10 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
          goto cleanup;
      }
  
@@ -107,7 +79,7 @@ index 222bb8c..2c30c55 100644
      if ((haveTLS = virXMLPropString(node, "tls")) &&
          (src->haveTLS = virTristateBoolTypeFromString(haveTLS)) <= 0) {
          virReportError(VIR_ERR_XML_ERROR,
-@@ -23849,6 +23856,10 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attrBuf,
+@@ -23849,6 +23853,10 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attrBuf,
  
      virBufferEscapeString(attrBuf, " name='%s'", path ? path : src->path);
  
@@ -118,7 +90,7 @@ index 222bb8c..2c30c55 100644
      VIR_FREE(path);
  
      if (src->haveTLS != VIR_TRISTATE_BOOL_ABSENT &&
-@@ -30930,6 +30941,7 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
+@@ -30930,6 +30938,7 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
  
      case VIR_STORAGE_POOL_MPATH:
      case VIR_STORAGE_POOL_RBD:
@@ -244,7 +216,7 @@ index 73e988a..ab7bb81 100644
      case VIR_STORAGE_NET_PROTOCOL_NONE:
          virReportError(VIR_ERR_NO_SUPPORT,
 diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
-index cbf0aa4..f0ca9e7 100644
+index cbf0aa4..096700d 100644
 --- a/src/qemu/qemu_block.c
 +++ b/src/qemu/qemu_block.c
 @@ -959,6 +959,42 @@ qemuBlockStorageSourceGetRBDProps(virStorageSourcePtr src)
@@ -273,9 +245,9 @@ index cbf0aa4..f0ca9e7 100644
 +
 +    if (virJSONValueObjectCreate(&ret,
 +                                 "s:driver", "vitastor",
-+                                 "S:etcd-host", etcd,
++                                 "S:etcd_host", etcd,
-+                                 "S:etcd-prefix", src->relPath,
++                                 "S:etcd_prefix", src->relPath,
-+                                 "S:config-path", src->configFile,
++                                 "S:config_path", src->configFile,
 +                                 "s:image", src->path,
 +                                 NULL) < 0)
 +        goto cleanup;
@@ -303,7 +275,7 @@ index cbf0aa4..f0ca9e7 100644
              if (!(fileprops = qemuBlockStorageSourceGetSheepdogProps(src)))
                  return NULL;
 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 822d5f8..abec34e 100644
+index 822d5f8..e375cef 100644
 --- a/src/qemu/qemu_command.c
 +++ b/src/qemu/qemu_command.c
 @@ -975,6 +975,43 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src,
@@ -321,7 +293,7 @@ index 822d5f8..abec34e 100644
 +            virBufferStrcat(&buf, "vitastor:image=", src->path, NULL);
 +
 +            if (src->nhosts > 0) {
-+                virBufferAddLit(&buf, ":etcd-host=");
++                virBufferAddLit(&buf, ":etcd_host=");
 +                for (i = 0; i < src->nhosts; i++) {
 +                    if (i)
 +                        virBufferAddLit(&buf, ",");
@@ -339,10 +311,10 @@ index 822d5f8..abec34e 100644
 +            }
 +
 +            if (src->configFile)
-+                virBufferEscape(&buf, '\\', ":", ":config-path=%s", src->configFile);
++                virBufferEscape(&buf, '\\', ":", ":config_path=%s", src->configFile);
 +
 +            if (src->relPath)
-+                virBufferEscape(&buf, '\\', ":", ":etcd-prefix=%s", src->relPath);
++                virBufferEscape(&buf, '\\', ":", ":etcd_prefix=%s", src->relPath);
 +
 +            ret = virBufferContentAndReset(&buf);
 +            break;
@@ -415,7 +387,7 @@ index 4a13e90..33301c7 100644
              ignore_value(VIR_STRDUP(stable_path, data->path));
              break;
 diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
-index bd4b027..8454906 100644
+index bd4b027..b323cd6 100644
 --- a/src/util/virstoragefile.c
 +++ b/src/util/virstoragefile.c
 @@ -84,7 +84,8 @@ VIR_ENUM_IMPL(virStorageNetProtocol, VIR_STORAGE_NET_PROTOCOL_LAST,
@@ -466,16 +438,16 @@ index bd4b027..8454906 100644
 +        if (STRPREFIX(p, "image=")) {
 +            if (VIR_STRDUP(src->path, p + strlen("image=")) < 0)
 +                return -1;
-+        } else if (STRPREFIX(p, "etcd-prefix=")) {
++        } else if (STRPREFIX(p, "etcd_prefix=")) {
-+            if (VIR_STRDUP(src->relPath, p + strlen("etcd-prefix=")) < 0)
++            if (VIR_STRDUP(src->relPath, p + strlen("etcd_prefix=")) < 0)
 +                return -1;
-+        } else if (STRPREFIX(p, "config-path=")) {
++        } else if (STRPREFIX(p, "config_file=")) {
-+            if (VIR_STRDUP(src->configFile, p + strlen("config-path=")) < 0)
++            if (VIR_STRDUP(src->configFile, p + strlen("config_file=")) < 0)
 +                return -1;
-+        } else if (STRPREFIX(p, "etcd-host=")) {
++        } else if (STRPREFIX(p, "etcd_host=")) {
 +            char *h, *sep;
 +
-+            h = p + strlen("etcd-host=");
++            h = p + strlen("etcd_host=");
 +            while (h < e) {
 +                for (sep = h; sep < e; ++sep) {
 +                    if (*sep == '\\' && (sep[1] == ',' ||
@@ -535,8 +507,8 @@ index bd4b027..8454906 100644
 +{
 +    const char *filename;
 +    const char *image = virJSONValueObjectGetString(json, "image");
-+    const char *conf = virJSONValueObjectGetString(json, "config-path");
++    const char *conf = virJSONValueObjectGetString(json, "config_path");
-+    const char *etcd_prefix = virJSONValueObjectGetString(json, "etcd-prefix");
++    const char *etcd_prefix = virJSONValueObjectGetString(json, "etcd_prefix");
 +    virJSONValuePtr servers = virJSONValueObjectGetArray(json, "server");
 +    size_t nservers;
 +    size_t i;

patches/libvirt-7.0-vitastor.diff

@@ -1,4 +1,4 @@
-commit 4e74c622884e2585b2cfcdf322fbd2bff6de41ca
+commit 41cdfe8317d98f70aadedfdbb381effed2641bdd
 Author: Vitaliy Filippov <vitalif@yourcmc.ru>
 Date:   Fri Jul 9 01:31:57 2021 +0300
 
@@ -65,38 +65,10 @@ index 089e1e0..d7e7ef4 100644
  
  int                     virConnectListAllStoragePools(virConnectPtr conn,
 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 01b7187..645c758 100644
+index 01b7187..c6e9702 100644
 --- a/src/conf/domain_conf.c
 +++ b/src/conf/domain_conf.c
-@@ -5230,8 +5230,7 @@ virDomainDiskDefPostParse(virDomainDiskDefPtr disk,
+@@ -8261,7 +8261,8 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
-                           const virDomainDef *def,
-                           virDomainXMLOptionPtr xmlopt)
- {
--    /* internal snapshots and config files are currently supported
--     * only with rbd: */
-+    /* internal snapshots are currently supported only with rbd: */
-     if (virStorageSourceGetActualType(disk->src) != VIR_STORAGE_TYPE_NETWORK &&
-         disk->src->protocol != VIR_STORAGE_NET_PROTOCOL_RBD) {
-         if (disk->src->snapshot) {
-@@ -5240,11 +5239,15 @@ virDomainDiskDefPostParse(virDomainDiskDefPtr disk,
-                              "only with 'rbd' disks"));
-             return -1;
-         }
--
-+    }
-+    /* config files are currently supported only with rbd and vitastor: */
-+    if (virStorageSourceGetActualType(disk->src) != VIR_STORAGE_TYPE_NETWORK &&
-+        disk->src->protocol != VIR_STORAGE_NET_PROTOCOL_RBD &&
-+        disk->src->protocol != VIR_STORAGE_NET_PROTOCOL_VITASTOR) {
-         if (disk->src->configFile) {
-             virReportError(VIR_ERR_XML_ERROR, "%s",
-                            _("<config> element is currently supported "
--                             "only with 'rbd' disks"));
-+                             "only with 'rbd' and 'vitastor' disks"));
-             return -1;
-         }
-     }
-@@ -8261,7 +8264,8 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
      src->configFile = virXPathString("string(./config/@file)", ctxt);
  
      if (src->protocol == VIR_STORAGE_NET_PROTOCOL_HTTP ||
@@ -106,7 +78,7 @@ index 01b7187..645c758 100644
          src->query = virXMLPropString(node, "query");
  
      if (virDomainStorageNetworkParseHosts(node, ctxt, &src->hosts, &src->nhosts) < 0)
-@@ -31392,6 +31396,7 @@ virDomainStorageSourceTranslateSourcePool(virStorageSourcePtr src,
+@@ -31392,6 +31393,7 @@ virDomainStorageSourceTranslateSourcePool(virStorageSourcePtr src,
  
      case VIR_STORAGE_POOL_MPATH:
      case VIR_STORAGE_POOL_RBD:
@@ -244,7 +216,7 @@ index 17b93d0..c5a0084 100644
      case VIR_STORAGE_NET_PROTOCOL_NONE:
          virReportError(VIR_ERR_NO_SUPPORT,
 diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
-index f9c6da2..d837a05 100644
+index f9c6da2..922dde5 100644
 --- a/src/qemu/qemu_block.c
 +++ b/src/qemu/qemu_block.c
 @@ -938,6 +938,38 @@ qemuBlockStorageSourceGetRBDProps(virStorageSourcePtr src,
@@ -272,9 +244,9 @@ index f9c6da2..d837a05 100644
 +    }
 +
 +    if (virJSONValueObjectCreate(&ret,
-+                                 "S:etcd-host", etcd,
++                                 "S:etcd_host", etcd,
-+                                 "S:etcd-prefix", src->query,
++                                 "S:etcd_prefix", src->query,
-+                                 "S:config-path", src->configFile,
++                                 "S:config_path", src->configFile,
 +                                 "s:image", src->path,
 +                                 NULL) < 0)
 +        return NULL;
@@ -321,7 +293,7 @@ index f9c6da2..d837a05 100644
              driver = "sheepdog";
              if (!(location = qemuBlockStorageSourceGetSheepdogProps(src)))
 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 6f970a3..4c03fb8 100644
+index 6f970a3..10b39ca 100644
 --- a/src/qemu/qemu_command.c
 +++ b/src/qemu/qemu_command.c
 @@ -1034,6 +1034,43 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src,
@@ -339,7 +311,7 @@ index 6f970a3..4c03fb8 100644
 +            virBufferStrcat(&buf, "vitastor:image=", src->path, NULL);
 +
 +            if (src->nhosts > 0) {
-+                virBufferAddLit(&buf, ":etcd-host=");
++                virBufferAddLit(&buf, ":etcd_host=");
 +                for (i = 0; i < src->nhosts; i++) {
 +                    if (i)
 +                        virBufferAddLit(&buf, ",");
@@ -357,10 +329,10 @@ index 6f970a3..4c03fb8 100644
 +            }
 +
 +            if (src->configFile)
-+                virBufferEscape(&buf, '\\', ":", ":config-path=%s", src->configFile);
++                virBufferEscape(&buf, '\\', ":", ":config_path=%s", src->configFile);
 +
 +            if (src->query)
-+                virBufferEscape(&buf, '\\', ":", ":etcd-prefix=%s", src->query);
++                virBufferEscape(&buf, '\\', ":", ":etcd_prefix=%s", src->query);
 +
 +            ret = virBufferContentAndReset(&buf);
 +            break;
@@ -443,7 +415,7 @@ index 29c4c86..a27ad94 100644
      case VIR_STORAGE_POOL_LOGICAL:
      case VIR_STORAGE_POOL_DISK:
 diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
-index 0d3c2af..edb7f9e 100644
+index 0d3c2af..36e3afc 100644
 --- a/src/util/virstoragefile.c
 +++ b/src/util/virstoragefile.c
 @@ -91,6 +91,7 @@ VIR_ENUM_IMPL(virStorageNetProtocol,
@@ -490,14 +462,14 @@ index 0d3c2af..edb7f9e 100644
 +
 +        if (STRPREFIX(p, "image=")) {
 +            src->path = g_strdup(p + strlen("image="));
-+        } else if (STRPREFIX(p, "etcd-prefix=")) {
++        } else if (STRPREFIX(p, "etcd_prefix=")) {
-+            src->query = g_strdup(p + strlen("etcd-prefix="));
++            src->query = g_strdup(p + strlen("etcd_prefix="));
-+        } else if (STRPREFIX(p, "config-path=")) {
++        } else if (STRPREFIX(p, "config_file=")) {
-+            src->configFile = g_strdup(p + strlen("config-path="));
++            src->configFile = g_strdup(p + strlen("config_file="));
-+        } else if (STRPREFIX(p, "etcd-host=")) {
++        } else if (STRPREFIX(p, "etcd_host=")) {
 +            char *h, *sep;
 +
-+            h = p + strlen("etcd-host=");
++            h = p + strlen("etcd_host=");
 +            while (h < e) {
 +                for (sep = h; sep < e; ++sep) {
 +                    if (*sep == '\\' && (sep[1] == ',' ||
@@ -554,8 +526,8 @@ index 0d3c2af..edb7f9e 100644
 +{
 +    const char *filename;
 +    const char *image = virJSONValueObjectGetString(json, "image");
-+    const char *conf = virJSONValueObjectGetString(json, "config-path");
++    const char *conf = virJSONValueObjectGetString(json, "config_path");
-+    const char *etcd_prefix = virJSONValueObjectGetString(json, "etcd-prefix");
++    const char *etcd_prefix = virJSONValueObjectGetString(json, "etcd_prefix");
 +    virJSONValuePtr servers = virJSONValueObjectGetArray(json, "server");
 +    size_t nservers;
 +    size_t i;

patches/libvirt-7.5-vitastor.diff

@@ -1,8 +1,8 @@
-commit c97d7f2bfb7798f0d68bdba2646245dcfb940efa
+From commit c6e1958a1b4974828e8e5852beb252ce6594e670
+From: Vitaliy Filippov <vitalif@yourcmc.ru>
 Author: Vitaliy Filippov <vitalif@yourcmc.ru>
-Date:   Mon Jun 28 01:20:19 2021 +0300
+Date: Mon Jun 28 01:20:19 2021 +0300
-
+Subject: Add Vitastor support
-    Add Vitastor support
 
 diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
 index 5ea14b6..a9df168 100644
@@ -86,37 +86,6 @@ index d78f846..f7222e3 100644
      case VIR_STORAGE_POOL_SHEEPDOG:
      case VIR_STORAGE_POOL_GLUSTER:
      case VIR_STORAGE_POOL_LAST:
-diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
-index 2124d25..6acc6fa 100644
---- a/src/conf/domain_validate.c
-+++ b/src/conf/domain_validate.c
-@@ -470,7 +470,7 @@ virDomainDiskDefValidateSourceChainOne(const virStorageSource *src)
-         }
-     }
- 
--    /* internal snapshots and config files are currently supported only with rbd: */
-+    /* internal snapshots are currently supported only with rbd: */
-     if (virStorageSourceGetActualType(src) != VIR_STORAGE_TYPE_NETWORK &&
-         src->protocol != VIR_STORAGE_NET_PROTOCOL_RBD) {
-         if (src->snapshot) {
-@@ -479,11 +479,15 @@ virDomainDiskDefValidateSourceChainOne(const virStorageSource *src)
-                              "only with 'rbd' disks"));
-             return -1;
-         }
--
-+    }
-+    /* config files are currently supported only with rbd and vitastor: */
-+    if (virStorageSourceGetActualType(src) != VIR_STORAGE_TYPE_NETWORK &&
-+        src->protocol != VIR_STORAGE_NET_PROTOCOL_RBD &&
-+        src->protocol != VIR_STORAGE_NET_PROTOCOL_VITASTOR) {
-         if (src->configFile) {
-             virReportError(VIR_ERR_XML_ERROR, "%s",
-                            _("<config> element is currently supported "
--                             "only with 'rbd' disks"));
-+                             "only with 'rbd' and 'vitastor' disks"));
-             return -1;
-         }
-     }
 diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
 index 2aa9a3d..166ca1f 100644
 --- a/src/conf/storage_conf.c
@@ -279,7 +248,7 @@ index c0905b0..c172378 100644
      case VIR_STORAGE_NET_PROTOCOL_NONE:
          virReportError(VIR_ERR_NO_SUPPORT,
 diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
-index 6627d04..f769d24 100644
+index 6627d04..c33f428 100644
 --- a/src/qemu/qemu_block.c
 +++ b/src/qemu/qemu_block.c
 @@ -928,6 +928,38 @@ qemuBlockStorageSourceGetRBDProps(virStorageSource *src,
@@ -307,9 +276,9 @@ index 6627d04..f769d24 100644
 +    }
 +
 +    if (virJSONValueObjectCreate(&ret,
-+                                 "S:etcd-host", etcd,
++                                 "S:etcd_host", etcd,
-+                                 "S:etcd-prefix", src->query,
++                                 "S:etcd_prefix", src->query,
-+                                 "S:config-path", src->configFile,
++                                 "S:config_path", src->configFile,
 +                                 "s:image", src->path,
 +                                 NULL) < 0)
 +        return NULL;
@@ -356,7 +325,7 @@ index 6627d04..f769d24 100644
              driver = "sheepdog";
              if (!(location = qemuBlockStorageSourceGetSheepdogProps(src)))
 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index ea51369..d714597 100644
+index ea51369..8258632 100644
 --- a/src/qemu/qemu_command.c
 +++ b/src/qemu/qemu_command.c
 @@ -1074,6 +1074,43 @@ qemuBuildNetworkDriveStr(virStorageSource *src,
@@ -374,7 +343,7 @@ index ea51369..d714597 100644
 +            virBufferStrcat(&buf, "vitastor:image=", src->path, NULL);
 +
 +            if (src->nhosts > 0) {
-+                virBufferAddLit(&buf, ":etcd-host=");
++                virBufferAddLit(&buf, ":etcd_host=");
 +                for (i = 0; i < src->nhosts; i++) {
 +                    if (i)
 +                        virBufferAddLit(&buf, ",");
@@ -392,10 +361,10 @@ index ea51369..d714597 100644
 +            }
 +
 +            if (src->configFile)
-+                virBufferEscape(&buf, '\\', ":", ":config-path=%s", src->configFile);
++                virBufferEscape(&buf, '\\', ":", ":config_path=%s", src->configFile);
 +
 +            if (src->query)
-+                virBufferEscape(&buf, '\\', ":", ":etcd-prefix=%s", src->query);
++                virBufferEscape(&buf, '\\', ":", ":etcd_prefix=%s", src->query);
 +
 +            ret = virBufferContentAndReset(&buf);
 +            break;
@@ -466,7 +435,7 @@ index c2ff4b8..70d0689 100644
          case VIR_STORAGE_POOL_ZFS:
          case VIR_STORAGE_POOL_LAST:
 diff --git a/src/storage_file/storage_source_backingstore.c b/src/storage_file/storage_source_backingstore.c
-index e48ae72..2017ccc 100644
+index e48ae72..d7a9b72 100644
 --- a/src/storage_file/storage_source_backingstore.c
 +++ b/src/storage_file/storage_source_backingstore.c
 @@ -284,6 +284,75 @@ virStorageSourceParseRBDColonString(const char *rbdstr,
@@ -505,14 +474,14 @@ index e48ae72..2017ccc 100644
 +
 +        if (STRPREFIX(p, "image=")) {
 +            src->path = g_strdup(p + strlen("image="));
-+        } else if (STRPREFIX(p, "etcd-prefix=")) {
++        } else if (STRPREFIX(p, "etcd_prefix=")) {
-+            src->query = g_strdup(p + strlen("etcd-prefix="));
++            src->query = g_strdup(p + strlen("etcd_prefix="));
-+        } else if (STRPREFIX(p, "config-path=")) {
++        } else if (STRPREFIX(p, "config_file=")) {
-+            src->configFile = g_strdup(p + strlen("config-path="));
++            src->configFile = g_strdup(p + strlen("config_file="));
-+        } else if (STRPREFIX(p, "etcd-host=")) {
++        } else if (STRPREFIX(p, "etcd_host=")) {
 +            char *h, *sep;
 +
-+            h = p + strlen("etcd-host=");
++            h = p + strlen("etcd_host=");
 +            while (h < e) {
 +                for (sep = h; sep < e; ++sep) {
 +                    if (*sep == '\\' && (sep[1] == ',' ||
@@ -569,8 +538,8 @@ index e48ae72..2017ccc 100644
 +{
 +    const char *filename;
 +    const char *image = virJSONValueObjectGetString(json, "image");
-+    const char *conf = virJSONValueObjectGetString(json, "config-path");
++    const char *conf = virJSONValueObjectGetString(json, "config_path");
-+    const char *etcd_prefix = virJSONValueObjectGetString(json, "etcd-prefix");
++    const char *etcd_prefix = virJSONValueObjectGetString(json, "etcd_prefix");
 +    virJSONValue *servers = virJSONValueObjectGetArray(json, "server");
 +    size_t nservers;
 +    size_t i;

patches/libvirt-7.6-vitastor.diff

@@ -1,692 +0,0 @@
-commit c97d7f2bfb7798f0d68bdba2646245dcfb940efa
-Author: Vitaliy Filippov <vitalif@yourcmc.ru>
-Date:   Mon Jun 28 01:20:19 2021 +0300
-
-    Add Vitastor support
-
-Index: libvirt-7.6.0/docs/schemas/domaincommon.rng
-===================================================================
---- libvirt-7.6.0.orig/docs/schemas/domaincommon.rng
-+++ libvirt-7.6.0/docs/schemas/domaincommon.rng
-@@ -1877,6 +1877,35 @@
-     </element>
-   </define>
- 
-+  <define name="diskSourceNetworkProtocolVitastor">
-+    <element name="source">
-+      <interleave>
-+        <attribute name="protocol">
-+          <value>vitastor</value>
-+        </attribute>
-+        <ref name="diskSourceCommon"/>
-+        <optional>
-+          <attribute name="name"/>
-+        </optional>
-+        <optional>
-+          <attribute name="query"/>
-+        </optional>
-+        <zeroOrMore>
-+          <ref name="diskSourceNetworkHost"/>
-+        </zeroOrMore>
-+        <optional>
-+          <element name="config">
-+            <attribute name="file">
-+              <ref name="absFilePath"/>
-+            </attribute>
-+            <empty/>
-+          </element>
-+        </optional>
-+        <empty/>
-+      </interleave>
-+    </element>
-+  </define>
-+
-   <define name="diskSourceNetworkProtocolISCSI">
-     <element name="source">
-       <attribute name="protocol">
-@@ -2133,6 +2162,7 @@
-       <ref name="diskSourceNetworkProtocolSimple"/>
-       <ref name="diskSourceNetworkProtocolVxHS"/>
-       <ref name="diskSourceNetworkProtocolNFS"/>
-+      <ref name="diskSourceNetworkProtocolVitastor"/>
-     </choice>
-   </define>
- 
-Index: libvirt-7.6.0/include/libvirt/libvirt-storage.h
-===================================================================
---- libvirt-7.6.0.orig/include/libvirt/libvirt-storage.h
-+++ libvirt-7.6.0/include/libvirt/libvirt-storage.h
-@@ -245,6 +245,7 @@ typedef enum {
-     VIR_CONNECT_LIST_STORAGE_POOLS_ZFS           = 1 << 17,
-     VIR_CONNECT_LIST_STORAGE_POOLS_VSTORAGE      = 1 << 18,
-     VIR_CONNECT_LIST_STORAGE_POOLS_ISCSI_DIRECT  = 1 << 19,
-+    VIR_CONNECT_LIST_STORAGE_POOLS_VITASTOR      = 1 << 20,
- } virConnectListAllStoragePoolsFlags;
- 
- int                     virConnectListAllStoragePools(virConnectPtr conn,
-Index: libvirt-7.6.0/src/conf/domain_conf.c
-===================================================================
---- libvirt-7.6.0.orig/src/conf/domain_conf.c
-+++ libvirt-7.6.0/src/conf/domain_conf.c
-@@ -8268,7 +8268,8 @@ virDomainDiskSourceNetworkParse(xmlNodeP
-     src->configFile = virXPathString("string(./config/@file)", ctxt);
- 
-     if (src->protocol == VIR_STORAGE_NET_PROTOCOL_HTTP ||
--        src->protocol == VIR_STORAGE_NET_PROTOCOL_HTTPS)
-+        src->protocol == VIR_STORAGE_NET_PROTOCOL_HTTPS ||
-+        src->protocol == VIR_STORAGE_NET_PROTOCOL_VITASTOR)
-         src->query = virXMLPropString(node, "query");
- 
-     if (virDomainStorageNetworkParseHosts(node, ctxt, &src->hosts, &src->nhosts) < 0)
-@@ -30831,6 +30832,7 @@ virDomainStorageSourceTranslateSourcePoo
- 
-     case VIR_STORAGE_POOL_MPATH:
-     case VIR_STORAGE_POOL_RBD:
-+    case VIR_STORAGE_POOL_VITASTOR:
-     case VIR_STORAGE_POOL_SHEEPDOG:
-     case VIR_STORAGE_POOL_GLUSTER:
-     case VIR_STORAGE_POOL_LAST:
-Index: libvirt-7.6.0/src/conf/domain_validate.c
-===================================================================
---- libvirt-7.6.0.orig/src/conf/domain_validate.c
-+++ libvirt-7.6.0/src/conf/domain_validate.c
-@@ -470,7 +470,7 @@ virDomainDiskDefValidateSourceChainOne(c
-         }
-     }
- 
--    /* internal snapshots and config files are currently supported only with rbd: */
-+    /* internal snapshots are currently supported only with rbd: */
-     if (virStorageSourceGetActualType(src) != VIR_STORAGE_TYPE_NETWORK &&
-         src->protocol != VIR_STORAGE_NET_PROTOCOL_RBD) {
-         if (src->snapshot) {
-@@ -479,11 +479,15 @@ virDomainDiskDefValidateSourceChainOne(c
-                              "only with 'rbd' disks"));
-             return -1;
-         }
--
-+    }
-+    /* config files are currently supported only with rbd and vitastor: */
-+    if (virStorageSourceGetActualType(src) != VIR_STORAGE_TYPE_NETWORK &&
-+        src->protocol != VIR_STORAGE_NET_PROTOCOL_RBD &&
-+        src->protocol != VIR_STORAGE_NET_PROTOCOL_VITASTOR) {
-         if (src->configFile) {
-             virReportError(VIR_ERR_XML_ERROR, "%s",
-                            _("<config> element is currently supported "
--                             "only with 'rbd' disks"));
-+                             "only with 'rbd' and 'vitastor' disks"));
-             return -1;
-         }
-     }
-Index: libvirt-7.6.0/src/conf/storage_conf.c
-===================================================================
---- libvirt-7.6.0.orig/src/conf/storage_conf.c
-+++ libvirt-7.6.0/src/conf/storage_conf.c
-@@ -60,7 +60,7 @@ VIR_ENUM_IMPL(virStoragePool,
-               "logical", "disk", "iscsi",
-               "iscsi-direct", "scsi", "mpath",
-               "rbd", "sheepdog", "gluster",
--              "zfs", "vstorage",
-+              "zfs", "vstorage", "vitastor",
- );
- 
- VIR_ENUM_IMPL(virStoragePoolFormatFileSystem,
-@@ -246,6 +246,18 @@ static virStoragePoolTypeInfo poolTypeIn
-           .formatToString = virStorageFileFormatTypeToString,
-       }
-     },
-+    {.poolType = VIR_STORAGE_POOL_VITASTOR,
-+     .poolOptions = {
-+         .flags = (VIR_STORAGE_POOL_SOURCE_HOST |
-+                   VIR_STORAGE_POOL_SOURCE_NETWORK |
-+                   VIR_STORAGE_POOL_SOURCE_NAME),
-+      },
-+      .volOptions = {
-+          .defaultFormat = VIR_STORAGE_FILE_RAW,
-+          .formatFromString = virStorageVolumeFormatFromString,
-+          .formatToString = virStorageFileFormatTypeToString,
-+      }
-+    },
-     {.poolType = VIR_STORAGE_POOL_SHEEPDOG,
-      .poolOptions = {
-          .flags = (VIR_STORAGE_POOL_SOURCE_HOST |
-@@ -546,6 +558,11 @@ virStoragePoolDefParseSource(xmlXPathCon
-                        _("element 'name' is mandatory for RBD pool"));
-         return -1;
-     }
-+    if (pool_type == VIR_STORAGE_POOL_VITASTOR && source->name == NULL) {
-+        virReportError(VIR_ERR_XML_ERROR, "%s",
-+                       _("element 'name' is mandatory for Vitastor pool"));
-+        return -1;
-+    }
- 
-     if (options->formatFromString) {
-         g_autofree char *format = NULL;
-@@ -1182,6 +1199,7 @@ virStoragePoolDefFormatBuf(virBuffer *bu
-     /* RBD, Sheepdog, Gluster and Iscsi-direct devices are not local block devs nor
-      * files, so they don't have a target */
-     if (def->type != VIR_STORAGE_POOL_RBD &&
-+        def->type != VIR_STORAGE_POOL_VITASTOR &&
-         def->type != VIR_STORAGE_POOL_SHEEPDOG &&
-         def->type != VIR_STORAGE_POOL_GLUSTER &&
-         def->type != VIR_STORAGE_POOL_ISCSI_DIRECT) {
-Index: libvirt-7.6.0/src/conf/storage_conf.h
-===================================================================
---- libvirt-7.6.0.orig/src/conf/storage_conf.h
-+++ libvirt-7.6.0/src/conf/storage_conf.h
-@@ -106,6 +106,7 @@ typedef enum {
-     VIR_STORAGE_POOL_GLUSTER,  /* Gluster device */
-     VIR_STORAGE_POOL_ZFS,      /* ZFS */
-     VIR_STORAGE_POOL_VSTORAGE, /* Virtuozzo Storage */
-+    VIR_STORAGE_POOL_VITASTOR, /* Vitastor */
- 
-     VIR_STORAGE_POOL_LAST,
- } virStoragePoolType;
-@@ -465,6 +466,7 @@ VIR_ENUM_DECL(virStoragePartedFs);
-                  VIR_CONNECT_LIST_STORAGE_POOLS_SCSI     | \
-                  VIR_CONNECT_LIST_STORAGE_POOLS_MPATH    | \
-                  VIR_CONNECT_LIST_STORAGE_POOLS_RBD      | \
-+                 VIR_CONNECT_LIST_STORAGE_POOLS_VITASTOR | \
-                  VIR_CONNECT_LIST_STORAGE_POOLS_SHEEPDOG | \
-                  VIR_CONNECT_LIST_STORAGE_POOLS_GLUSTER  | \
-                  VIR_CONNECT_LIST_STORAGE_POOLS_ZFS      | \
-Index: libvirt-7.6.0/src/conf/storage_source_conf.c
-===================================================================
---- libvirt-7.6.0.orig/src/conf/storage_source_conf.c
-+++ libvirt-7.6.0/src/conf/storage_source_conf.c
-@@ -85,6 +85,7 @@ VIR_ENUM_IMPL(virStorageNetProtocol,
-               "ssh",
-               "vxhs",
-               "nfs",
-+              "vitastor",
- );
- 
- 
-@@ -1262,6 +1263,7 @@ virStorageSourceNetworkDefaultPort(virSt
-         case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
-             return 24007;
- 
-+        case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
-         case VIR_STORAGE_NET_PROTOCOL_RBD:
-             /* we don't provide a default for RBD */
-             return 0;
-Index: libvirt-7.6.0/src/conf/storage_source_conf.h
-===================================================================
---- libvirt-7.6.0.orig/src/conf/storage_source_conf.h
-+++ libvirt-7.6.0/src/conf/storage_source_conf.h
-@@ -127,6 +127,7 @@ typedef enum {
-     VIR_STORAGE_NET_PROTOCOL_SSH,
-     VIR_STORAGE_NET_PROTOCOL_VXHS,
-     VIR_STORAGE_NET_PROTOCOL_NFS,
-+    VIR_STORAGE_NET_PROTOCOL_VITASTOR,
- 
-     VIR_STORAGE_NET_PROTOCOL_LAST
- } virStorageNetProtocol;
-Index: libvirt-7.6.0/src/conf/virstorageobj.c
-===================================================================
---- libvirt-7.6.0.orig/src/conf/virstorageobj.c
-+++ libvirt-7.6.0/src/conf/virstorageobj.c
-@@ -1481,6 +1481,7 @@ virStoragePoolObjSourceFindDuplicateCb(c
-             return 1;
-         break;
- 
-+    case VIR_STORAGE_POOL_VITASTOR:
-     case VIR_STORAGE_POOL_RBD:
-     case VIR_STORAGE_POOL_LAST:
-         break;
-@@ -1980,6 +1981,8 @@ virStoragePoolObjMatch(virStoragePoolObj
-                (obj->def->type == VIR_STORAGE_POOL_MPATH))   ||
-               (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_RBD) &&
-                (obj->def->type == VIR_STORAGE_POOL_RBD))     ||
-+              (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_VITASTOR) &&
-+               (obj->def->type == VIR_STORAGE_POOL_VITASTOR)) ||
-               (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_SHEEPDOG) &&
-                (obj->def->type == VIR_STORAGE_POOL_SHEEPDOG)) ||
-               (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_GLUSTER) &&
-Index: libvirt-7.6.0/src/libvirt-storage.c
-===================================================================
---- libvirt-7.6.0.orig/src/libvirt-storage.c
-+++ libvirt-7.6.0/src/libvirt-storage.c
-@@ -92,6 +92,7 @@ virStoragePoolGetConnect(virStoragePoolP
-  * VIR_CONNECT_LIST_STORAGE_POOLS_SCSI
-  * VIR_CONNECT_LIST_STORAGE_POOLS_MPATH
-  * VIR_CONNECT_LIST_STORAGE_POOLS_RBD
-+ * VIR_CONNECT_LIST_STORAGE_POOLS_VITASTOR
-  * VIR_CONNECT_LIST_STORAGE_POOLS_SHEEPDOG
-  * VIR_CONNECT_LIST_STORAGE_POOLS_GLUSTER
-  * VIR_CONNECT_LIST_STORAGE_POOLS_ZFS
-Index: libvirt-7.6.0/src/libxl/libxl_conf.c
-===================================================================
---- libvirt-7.6.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-7.6.0/src/libxl/libxl_conf.c
-@@ -972,6 +972,7 @@ libxlMakeNetworkDiskSrcStr(virStorageSou
-     case VIR_STORAGE_NET_PROTOCOL_SSH:
-     case VIR_STORAGE_NET_PROTOCOL_VXHS:
-     case VIR_STORAGE_NET_PROTOCOL_NFS:
-+    case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
-     case VIR_STORAGE_NET_PROTOCOL_LAST:
-     case VIR_STORAGE_NET_PROTOCOL_NONE:
-         virReportError(VIR_ERR_NO_SUPPORT,
-Index: libvirt-7.6.0/src/libxl/xen_xl.c
-===================================================================
---- libvirt-7.6.0.orig/src/libxl/xen_xl.c
-+++ libvirt-7.6.0/src/libxl/xen_xl.c
-@@ -1540,6 +1540,7 @@ xenFormatXLDiskSrcNet(virStorageSource *
-     case VIR_STORAGE_NET_PROTOCOL_SSH:
-     case VIR_STORAGE_NET_PROTOCOL_VXHS:
-     case VIR_STORAGE_NET_PROTOCOL_NFS:
-+    case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
-     case VIR_STORAGE_NET_PROTOCOL_LAST:
-     case VIR_STORAGE_NET_PROTOCOL_NONE:
-         virReportError(VIR_ERR_NO_SUPPORT,
-Index: libvirt-7.6.0/src/qemu/qemu_block.c
-===================================================================
---- libvirt-7.6.0.orig/src/qemu/qemu_block.c
-+++ libvirt-7.6.0/src/qemu/qemu_block.c
-@@ -916,6 +916,38 @@ qemuBlockStorageSourceGetRBDProps(virSto
- 
- 
- static virJSONValue *
-+qemuBlockStorageSourceGetVitastorProps(virStorageSource *src)
-+{
-+    virJSONValue *ret = NULL;
-+    virStorageNetHostDef *host;
-+    size_t i;
-+    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-+    g_autofree char *etcd = NULL;
-+
-+    for (i = 0; i < src->nhosts; i++) {
-+        host = src->hosts + i;
-+        if ((virStorageNetHostTransport)host->transport != VIR_STORAGE_NET_HOST_TRANS_TCP) {
-+            return NULL;
-+        }
-+        virBufferAsprintf(&buf, i > 0 ? ",%s:%u" : "%s:%u", host->name, host->port);
-+    }
-+    if (src->nhosts > 0) {
-+        etcd = virBufferContentAndReset(&buf);
-+    }
-+
-+    if (virJSONValueObjectCreate(&ret,
-+                                 "S:etcd-host", etcd,
-+                                 "S:etcd-prefix", src->query,
-+                                 "S:config-path", src->configFile,
-+                                 "s:image", src->path,
-+                                 NULL) < 0)
-+        return NULL;
-+
-+    return ret;
-+}
-+
-+
-+static virJSONValue *
- qemuBlockStorageSourceGetSheepdogProps(virStorageSource *src)
- {
-     g_autoptr(virJSONValue) serverprops = NULL;
-@@ -1205,6 +1237,12 @@ qemuBlockStorageSourceGetBackendProps(vi
-                 return NULL;
-             break;
- 
-+        case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
-+            driver = "vitastor";
-+            if (!(fileprops = qemuBlockStorageSourceGetVitastorProps(src)))
-+                return NULL;
-+            break;
-+
-         case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
-             driver = "sheepdog";
-             if (!(fileprops = qemuBlockStorageSourceGetSheepdogProps(src)))
-@@ -2219,6 +2257,7 @@ qemuBlockGetBackingStoreString(virStorag
- 
-             case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
-             case VIR_STORAGE_NET_PROTOCOL_RBD:
-+            case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
-             case VIR_STORAGE_NET_PROTOCOL_VXHS:
-             case VIR_STORAGE_NET_PROTOCOL_NFS:
-             case VIR_STORAGE_NET_PROTOCOL_SSH:
-@@ -2596,6 +2635,12 @@ qemuBlockStorageSourceCreateGetStoragePr
-                 return -1;
-             break;
- 
-+        case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
-+            driver = "vitastor";
-+            if (!(location = qemuBlockStorageSourceGetVitastorProps(src)))
-+                return -1;
-+            break;
-+
-         case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
-             driver = "sheepdog";
-             if (!(location = qemuBlockStorageSourceGetSheepdogProps(src)))
-Index: libvirt-7.6.0/src/qemu/qemu_command.c
-===================================================================
---- libvirt-7.6.0.orig/src/qemu/qemu_command.c
-+++ libvirt-7.6.0/src/qemu/qemu_command.c
-@@ -1074,6 +1074,43 @@ qemuBuildNetworkDriveStr(virStorageSourc
-             ret = virBufferContentAndReset(&buf);
-             break;
- 
-+        case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
-+            if (strchr(src->path, ':')) {
-+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                               _("':' not allowed in Vitastor source volume name '%s'"),
-+                               src->path);
-+                return NULL;
-+            }
-+
-+            virBufferStrcat(&buf, "vitastor:image=", src->path, NULL);
-+
-+            if (src->nhosts > 0) {
-+                virBufferAddLit(&buf, ":etcd-host=");
-+                for (i = 0; i < src->nhosts; i++) {
-+                    if (i)
-+                        virBufferAddLit(&buf, ",");
-+
-+                    /* assume host containing : is ipv6 */
-+                    if (strchr(src->hosts[i].name, ':'))
-+                        virBufferEscape(&buf, '\\', ":", "[%s]",
-+                                        src->hosts[i].name);
-+                    else
-+                        virBufferAsprintf(&buf, "%s", src->hosts[i].name);
-+
-+                    if (src->hosts[i].port)
-+                        virBufferAsprintf(&buf, "\\:%u", src->hosts[i].port);
-+                }
-+            }
-+
-+            if (src->configFile)
-+                virBufferEscape(&buf, '\\', ":", ":config-path=%s", src->configFile);
-+
-+            if (src->query)
-+                virBufferEscape(&buf, '\\', ":", ":etcd-prefix=%s", src->query);
-+
-+            ret = virBufferContentAndReset(&buf);
-+            break;
-+
-         case VIR_STORAGE_NET_PROTOCOL_VXHS:
-             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                            _("VxHS protocol does not support URI syntax"));
-Index: libvirt-7.6.0/src/qemu/qemu_domain.c
-===================================================================
---- libvirt-7.6.0.orig/src/qemu/qemu_domain.c
-+++ libvirt-7.6.0/src/qemu/qemu_domain.c
-@@ -4900,7 +4900,8 @@ qemuDomainValidateStorageSource(virStora
-     if (src->query &&
-         (actualType != VIR_STORAGE_TYPE_NETWORK ||
-          (src->protocol != VIR_STORAGE_NET_PROTOCOL_HTTPS &&
--          src->protocol != VIR_STORAGE_NET_PROTOCOL_HTTP))) {
-+          src->protocol != VIR_STORAGE_NET_PROTOCOL_HTTP &&
-+          src->protocol != VIR_STORAGE_NET_PROTOCOL_VITASTOR))) {
-         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                        _("query is supported only with HTTP(S) protocols"));
-         return -1;
-@@ -10102,6 +10103,7 @@ qemuDomainPrepareStorageSourceTLS(virSto
-         break;
- 
-     case VIR_STORAGE_NET_PROTOCOL_RBD:
-+    case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
-     case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
-     case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
-     case VIR_STORAGE_NET_PROTOCOL_ISCSI:
-Index: libvirt-7.6.0/src/qemu/qemu_snapshot.c
-===================================================================
---- libvirt-7.6.0.orig/src/qemu/qemu_snapshot.c
-+++ libvirt-7.6.0/src/qemu/qemu_snapshot.c
-@@ -402,6 +402,7 @@ qemuSnapshotPrepareDiskExternalInactive(
-         case VIR_STORAGE_NET_PROTOCOL_NONE:
-         case VIR_STORAGE_NET_PROTOCOL_NBD:
-         case VIR_STORAGE_NET_PROTOCOL_RBD:
-+        case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
-         case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
-         case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
-         case VIR_STORAGE_NET_PROTOCOL_ISCSI:
-@@ -494,6 +495,7 @@ qemuSnapshotPrepareDiskExternalActive(vi
-         case VIR_STORAGE_NET_PROTOCOL_NONE:
-         case VIR_STORAGE_NET_PROTOCOL_NBD:
-         case VIR_STORAGE_NET_PROTOCOL_RBD:
-+        case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
-         case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
-         case VIR_STORAGE_NET_PROTOCOL_ISCSI:
-         case VIR_STORAGE_NET_PROTOCOL_HTTP:
-@@ -647,6 +649,7 @@ qemuSnapshotPrepareDiskInternal(virDomai
-         case VIR_STORAGE_NET_PROTOCOL_NONE:
-         case VIR_STORAGE_NET_PROTOCOL_NBD:
-         case VIR_STORAGE_NET_PROTOCOL_RBD:
-+        case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
-         case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
-         case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
-         case VIR_STORAGE_NET_PROTOCOL_ISCSI:
-Index: libvirt-7.6.0/src/storage/storage_driver.c
-===================================================================
---- libvirt-7.6.0.orig/src/storage/storage_driver.c
-+++ libvirt-7.6.0/src/storage/storage_driver.c
-@@ -1644,6 +1644,7 @@ storageVolLookupByPathCallback(virStorag
- 
-         case VIR_STORAGE_POOL_GLUSTER:
-         case VIR_STORAGE_POOL_RBD:
-+        case VIR_STORAGE_POOL_VITASTOR:
-         case VIR_STORAGE_POOL_SHEEPDOG:
-         case VIR_STORAGE_POOL_ZFS:
-         case VIR_STORAGE_POOL_LAST:
-Index: libvirt-7.6.0/src/storage_file/storage_source_backingstore.c
-===================================================================
---- libvirt-7.6.0.orig/src/storage_file/storage_source_backingstore.c
-+++ libvirt-7.6.0/src/storage_file/storage_source_backingstore.c
-@@ -285,6 +285,75 @@ virStorageSourceParseRBDColonString(cons
- 
- 
- static int
-+virStorageSourceParseVitastorColonString(const char *colonstr,
-+                                         virStorageSource *src)
-+{
-+    char *p, *e, *next;
-+    g_autofree char *options = NULL;
-+
-+    /* optionally skip the "vitastor:" prefix if provided */
-+    if (STRPREFIX(colonstr, "vitastor:"))
-+        colonstr += strlen("vitastor:");
-+
-+    options = g_strdup(colonstr);
-+
-+    p = options;
-+    while (*p) {
-+        /* find : delimiter or end of string */
-+        for (e = p; *e && *e != ':'; ++e) {
-+            if (*e == '\\') {
-+                e++;
-+                if (*e == '\0')
-+                    break;
-+            }
-+        }
-+        if (*e == '\0') {
-+            next = e;    /* last kv pair */
-+        } else {
-+            next = e + 1;
-+            *e = '\0';
-+        }
-+
-+        if (STRPREFIX(p, "image=")) {
-+            src->path = g_strdup(p + strlen("image="));
-+        } else if (STRPREFIX(p, "etcd-prefix=")) {
-+            src->query = g_strdup(p + strlen("etcd-prefix="));
-+        } else if (STRPREFIX(p, "config-path=")) {
-+            src->configFile = g_strdup(p + strlen("config-path="));
-+        } else if (STRPREFIX(p, "etcd-host=")) {
-+            char *h, *sep;
-+
-+            h = p + strlen("etcd-host=");
-+            while (h < e) {
-+                for (sep = h; sep < e; ++sep) {
-+                    if (*sep == '\\' && (sep[1] == ',' ||
-+                                         sep[1] == ';' ||
-+                                         sep[1] == ' ')) {
-+                        *sep = '\0';
-+                        sep += 2;
-+                        break;
-+                    }
-+                }
-+
-+                if (virStorageSourceRBDAddHost(src, h) < 0)
-+                    return -1;
-+
-+                h = sep;
-+            }
-+        }
-+
-+        p = next;
-+    }
-+
-+    if (!src->path) {
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
-+static int
- virStorageSourceParseNBDColonString(const char *nbdstr,
-                                     virStorageSource *src)
- {
-@@ -396,6 +465,11 @@ virStorageSourceParseBackingColon(virSto
-             return -1;
-         break;
- 
-+    case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
-+        if (virStorageSourceParseVitastorColonString(path, src) < 0)
-+            return -1;
-+        break;
-+
-     case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
-     case VIR_STORAGE_NET_PROTOCOL_LAST:
-     case VIR_STORAGE_NET_PROTOCOL_NONE:
-@@ -985,6 +1059,54 @@ virStorageSourceParseBackingJSONRBD(virS
- }
- 
- static int
-+virStorageSourceParseBackingJSONVitastor(virStorageSource *src,
-+                                         virJSONValue *json,
-+                                         const char *jsonstr G_GNUC_UNUSED,
-+                                         int opaque G_GNUC_UNUSED)
-+{
-+    const char *filename;
-+    const char *image = virJSONValueObjectGetString(json, "image");
-+    const char *conf = virJSONValueObjectGetString(json, "config-path");
-+    const char *etcd_prefix = virJSONValueObjectGetString(json, "etcd-prefix");
-+    virJSONValue *servers = virJSONValueObjectGetArray(json, "server");
-+    size_t nservers;
-+    size_t i;
-+
-+    src->type = VIR_STORAGE_TYPE_NETWORK;
-+    src->protocol = VIR_STORAGE_NET_PROTOCOL_VITASTOR;
-+
-+    /* legacy syntax passed via 'filename' option */
-+    if ((filename = virJSONValueObjectGetString(json, "filename")))
-+        return virStorageSourceParseVitastorColonString(filename, src);
-+
-+    if (!image) {
-+        virReportError(VIR_ERR_INVALID_ARG, "%s",
-+                       _("missing image name in Vitastor backing volume "
-+                         "JSON specification"));
-+        return -1;
-+    }
-+
-+    src->path = g_strdup(image);
-+    src->configFile = g_strdup(conf);
-+    src->query = g_strdup(etcd_prefix);
-+
-+    if (servers) {
-+        nservers = virJSONValueArraySize(servers);
-+
-+        src->hosts = g_new0(virStorageNetHostDef, nservers);
-+        src->nhosts = nservers;
-+
-+        for (i = 0; i < nservers; i++) {
-+            if (virStorageSourceParseBackingJSONInetSocketAddress(src->hosts + i,
-+                                                                  virJSONValueArrayGet(servers, i)) < 0)
-+                return -1;
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+static int
- virStorageSourceParseBackingJSONRaw(virStorageSource *src,
-                                     virJSONValue *json,
-                                     const char *jsonstr,
-@@ -1162,6 +1284,7 @@ static const struct virStorageSourceJSON
-     {"sheepdog", false, virStorageSourceParseBackingJSONSheepdog, 0},
-     {"ssh", false, virStorageSourceParseBackingJSONSSH, 0},
-     {"rbd", false, virStorageSourceParseBackingJSONRBD, 0},
-+    {"vitastor", false, virStorageSourceParseBackingJSONVitastor, 0},
-     {"raw", true, virStorageSourceParseBackingJSONRaw, 0},
-     {"nfs", false, virStorageSourceParseBackingJSONNFS, 0},
-     {"vxhs", false, virStorageSourceParseBackingJSONVxHS, 0},
-Index: libvirt-7.6.0/src/test/test_driver.c
-===================================================================
---- libvirt-7.6.0.orig/src/test/test_driver.c
-+++ libvirt-7.6.0/src/test/test_driver.c
-@@ -7193,6 +7193,7 @@ testStorageVolumeTypeForPool(int pooltyp
-     case VIR_STORAGE_POOL_ISCSI_DIRECT:
-     case VIR_STORAGE_POOL_GLUSTER:
-     case VIR_STORAGE_POOL_RBD:
-+    case VIR_STORAGE_POOL_VITASTOR:
-         return VIR_STORAGE_VOL_NETWORK;
-     case VIR_STORAGE_POOL_LOGICAL:
-     case VIR_STORAGE_POOL_DISK:
-Index: libvirt-7.6.0/tests/storagepoolcapsschemadata/poolcaps-fs.xml
-===================================================================
---- libvirt-7.6.0.orig/tests/storagepoolcapsschemadata/poolcaps-fs.xml
-+++ libvirt-7.6.0/tests/storagepoolcapsschemadata/poolcaps-fs.xml
-@@ -204,4 +204,11 @@
-       </enum>
-     </volOptions>
-   </pool>
-+  <pool type='vitastor' supported='no'>
-+    <volOptions>
-+      <defaultFormat type='raw'/>
-+      <enum name='targetFormatType'>
-+      </enum>
-+    </volOptions>
-+  </pool>
- </storagepoolCapabilities>
-Index: libvirt-7.6.0/tests/storagepoolcapsschemadata/poolcaps-full.xml
-===================================================================
---- libvirt-7.6.0.orig/tests/storagepoolcapsschemadata/poolcaps-full.xml
-+++ libvirt-7.6.0/tests/storagepoolcapsschemadata/poolcaps-full.xml
-@@ -204,4 +204,11 @@
-       </enum>
-     </volOptions>
-   </pool>
-+  <pool type='vitastor' supported='yes'>
-+    <volOptions>
-+      <defaultFormat type='raw'/>
-+      <enum name='targetFormatType'>
-+      </enum>
-+    </volOptions>
-+  </pool>
- </storagepoolCapabilities>
-Index: libvirt-7.6.0/tests/storagepoolxml2argvtest.c
-===================================================================
---- libvirt-7.6.0.orig/tests/storagepoolxml2argvtest.c
-+++ libvirt-7.6.0/tests/storagepoolxml2argvtest.c
-@@ -68,6 +68,7 @@ testCompareXMLToArgvFiles(bool shouldFai
-     case VIR_STORAGE_POOL_GLUSTER:
-     case VIR_STORAGE_POOL_ZFS:
-     case VIR_STORAGE_POOL_VSTORAGE:
-+    case VIR_STORAGE_POOL_VITASTOR:
-     case VIR_STORAGE_POOL_LAST:
-     default:
-         VIR_TEST_DEBUG("pool type '%s' has no xml2argv test", defTypeStr);
-Index: libvirt-7.6.0/tools/virsh-pool.c
-===================================================================
---- libvirt-7.6.0.orig/tools/virsh-pool.c
-+++ libvirt-7.6.0/tools/virsh-pool.c
-@@ -1231,6 +1231,9 @@ cmdPoolList(vshControl *ctl, const vshCm
-             case VIR_STORAGE_POOL_VSTORAGE:
-                 flags |= VIR_CONNECT_LIST_STORAGE_POOLS_VSTORAGE;
-                 break;
-+            case VIR_STORAGE_POOL_VITASTOR:
-+                flags |= VIR_CONNECT_LIST_STORAGE_POOLS_VITASTOR;
-+                break;
-             case VIR_STORAGE_POOL_LAST:
-                 break;
-             }

patches/libvirt-example.xml

@@ -15,10 +15,9 @@
       <target dev='vda' bus='virtio' />
       <driver name='qemu' type='raw' />
       <!-- name is Vitastor image name -->
+      <!-- config (optional) is the path to Vitastor's configuration file -->
       <!-- query (optional) is Vitastor's etcd_prefix -->
-      <source protocol='vitastor' name='debian9' query='/vitastor'>
+      <source protocol='vitastor' name='debian9' query='/vitastor' config='/etc/vitastor/vitastor.conf'>
-        <!-- config (optional) is the path to Vitastor's configuration file -->
-        <config file='/etc/vitastor/vitastor.conf' />
         <!-- hosts = etcd addresses -->
         <host name='192.168.7.2' port='2379' />
       </source>

patches/nova-20.diff

@@ -1,5 +1,5 @@
 diff --git a/nova/virt/image/model.py b/nova/virt/image/model.py
-index 971f7e9c07..ec3fca72cb 100644
+index 971f7e9c07..70ed70d5e2 100644
 --- a/nova/virt/image/model.py
 +++ b/nova/virt/image/model.py
 @@ -129,3 +129,22 @@ class RBDImage(Image):
@@ -19,7 +19,7 @@ index 971f7e9c07..ec3fca72cb 100644
 +        :param etcd_prefix: etcd prefix (optional)
 +        :param config_path: path to the configuration (optional)
 +        """
-+        super(VitastorImage, self).__init__(FORMAT_RAW)
++        super(RBDImage, self).__init__(FORMAT_RAW)
 +
 +        self.name = name
 +        self.etcd_address = etcd_address
@@ -48,7 +48,7 @@ index 5358f3766a..ebe3d6effb 100644
  
      info = nova.privsep.qemu.privileged_qemu_img_info(path, format=format)
 diff --git a/nova/virt/libvirt/config.py b/nova/virt/libvirt/config.py
-index f9475776b3..a2e18aab67 100644
+index f9475776b3..51573fe41d 100644
 --- a/nova/virt/libvirt/config.py
 +++ b/nova/virt/libvirt/config.py
 @@ -1060,6 +1060,8 @@ class LibvirtConfigGuestDisk(LibvirtConfigGuestDevice):
@@ -60,19 +60,18 @@ index f9475776b3..a2e18aab67 100644
          self.source_name = None
          self.source_hosts = []
          self.source_ports = []
-@@ -1189,6 +1191,10 @@ class LibvirtConfigGuestDisk(LibvirtConfigGuestDevice):
+@@ -1186,7 +1188,8 @@ class LibvirtConfigGuestDisk(LibvirtConfigGuestDevice):
-             source = etree.Element("source", protocol=self.source_protocol)
+         elif self.source_type == "mount":
+             dev.append(etree.Element("source", dir=self.source_path))
+         elif self.source_type == "network" and self.source_protocol:
+-            source = etree.Element("source", protocol=self.source_protocol)
++            source = etree.Element("source", protocol=self.source_protocol,
++                query=self.source_query, config=self.source_config)
              if self.source_name is not None:
                  source.set('name', self.source_name)
-+            if self.source_query is not None:
-+                source.set('query', self.source_query)
-+            if self.source_config is not None:
-+                source.append(etree.Element('config', file=self.source_config))
              hosts_info = zip(self.source_hosts, self.source_ports)
-             for name, port in hosts_info:
-                 host = etree.Element('host', name=name)
 diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
-index 391231c527..f38faa1608 100644
+index 391231c527..34dc60dcdd 100644
 --- a/nova/virt/libvirt/driver.py
 +++ b/nova/virt/libvirt/driver.py
 @@ -179,6 +179,7 @@ VOLUME_DRIVERS = {
@@ -125,7 +124,7 @@ index 391231c527..f38faa1608 100644
 +                            if kk == 'etcd_address':
 +                                # FIXME use etcd_address in qemu driver
 +                                kk = 'etcd_host'
-+                            path += ":"+kk.replace('_', '-')+"="+connection_info['data'][k].replace(':', '\\:')
++                            path += ":"+kk+"="+connection_info['data'][k].replace(':', '\\:')
                  else:
                      path = 'unknown'
                      raise exception.DiskNotFound(location='unknown')

patches/qemu-3.1-vitastor.patch

@@ -1,107 +1,7 @@
-diff --git a/block/Makefile.objs b/block/Makefile.objs
+Index: qemu-3.1+dfsg/qapi/block-core.json
-index 46d585cfd0..62222f25fe 100644
+===================================================================
---- a/block/Makefile.objs
+--- qemu-3.1+dfsg.orig/qapi/block-core.json
-+++ b/block/Makefile.objs
++++ qemu-3.1+dfsg/qapi/block-core.json
-@@ -29,6 +29,7 @@ block-obj-$(if $(CONFIG_LIBISCSI),y,n) += iscsi-opts.o
- block-obj-$(CONFIG_LIBNFS) += nfs.o
- block-obj-$(CONFIG_CURL) += curl.o
- block-obj-$(CONFIG_RBD) += rbd.o
-+block-obj-$(CONFIG_VITASTOR) += vitastor.o
- block-obj-$(CONFIG_GLUSTERFS) += gluster.o
- block-obj-$(CONFIG_VXHS) += vxhs.o
- block-obj-$(CONFIG_LIBSSH2) += ssh.o
-@@ -49,6 +50,8 @@ curl.o-cflags      := $(CURL_CFLAGS)
- curl.o-libs        := $(CURL_LIBS)
- rbd.o-cflags       := $(RBD_CFLAGS)
- rbd.o-libs         := $(RBD_LIBS)
-+vitastor.o-cflags  := $(VITASTOR_CFLAGS)
-+vitastor.o-libs    := $(VITASTOR_LIBS)
- gluster.o-cflags   := $(GLUSTERFS_CFLAGS)
- gluster.o-libs     := $(GLUSTERFS_LIBS)
- vxhs.o-libs        := $(VXHS_LIBS)
-diff --git a/configure b/configure
-index 1c9f6090e8..25ef89c33a 100755
---- a/configure
-+++ b/configure
-@@ -422,6 +422,7 @@ trace_backends="log"
- trace_file="trace"
- spice=""
- rbd=""
-+vitastor=""
- smartcard=""
- libusb=""
- usb_redir=""
-@@ -1282,6 +1283,10 @@ for opt do
-   ;;
-   --enable-rbd) rbd="yes"
-   ;;
-+  --disable-vitastor) vitastor="no"
-+  ;;
-+  --enable-vitastor) vitastor="yes"
-+  ;;
-   --disable-xfsctl) xfs="no"
-   ;;
-   --enable-xfsctl) xfs="yes"
-@@ -1737,6 +1742,7 @@ disabled with --disable-FEATURE, default is enabled if available:
-   vhost-crypto    vhost-crypto acceleration support
-   spice           spice
-   rbd             rados block device (rbd)
-+  vitastor        vitastor block device
-   libiscsi        iscsi support
-   libnfs          nfs support
-   smartcard       smartcard support (libcacard)
-@@ -3722,6 +3728,27 @@ EOF
-   fi
- fi
- 
-+##########################################
-+# vitastor probe
-+if test "$vitastor" != "no" ; then
-+  cat > $TMPC <<EOF
-+#include <vitastor_c.h>
-+int main(void) {
-+  vitastor_c_create_qemu(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-+  return 0;
-+}
-+EOF
-+  vitastor_libs="-lvitastor_client"
-+  if compile_prog "" "$vitastor_libs" ; then
-+    vitastor=yes
-+  else
-+    if test "$vitastor" = "yes" ; then
-+      feature_not_found "vitastor block device" "Install vitastor-client-dev"
-+    fi
-+    vitastor=no
-+  fi
-+fi
-+
- ##########################################
- # libssh2 probe
- min_libssh2_version=1.2.8
-@@ -6109,6 +6136,7 @@ echo "Trace output file $trace_file-<pid>"
- fi
- echo "spice support     $spice $(echo_version $spice $spice_protocol_version/$spice_server_version)"
- echo "rbd support       $rbd"
-+echo "vitastor support  $vitastor"
- echo "xfsctl support    $xfs"
- echo "smartcard support $smartcard"
- echo "libusb            $libusb"
-@@ -6694,6 +6722,11 @@ if test "$rbd" = "yes" ; then
-   echo "RBD_CFLAGS=$rbd_cflags" >> $config_host_mak
-   echo "RBD_LIBS=$rbd_libs" >> $config_host_mak
- fi
-+if test "$vitastor" = "yes" ; then
-+  echo "CONFIG_VITASTOR=m" >> $config_host_mak
-+  echo "VITASTOR_CFLAGS=$vitastor_cflags" >> $config_host_mak
-+  echo "VITASTOR_LIBS=$vitastor_libs" >> $config_host_mak
-+fi
- 
- echo "CONFIG_COROUTINE_BACKEND=$coroutine" >> $config_host_mak
- if test "$coroutine_pool" = "yes" ; then
-diff --git a/qapi/block-core.json b/qapi/block-core.json
-index d4fe710836..dbad3327b3 100644
---- a/qapi/block-core.json
-+++ b/qapi/block-core.json
 @@ -2617,7 +2617,7 @@
  ##
  { 'enum': 'BlockdevDriver',
@@ -111,11 +11,10 @@ index d4fe710836..dbad3327b3 100644
              'host_cdrom', 'host_device', 'http', 'https', 'iscsi', 'luks',
              'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels', 'qcow',
              'qcow2', 'qed', 'quorum', 'raw', 'rbd', 'replication', 'sheepdog',
-@@ -3366,6 +3366,28 @@
+@@ -3367,6 +3367,28 @@
-             '*snap-id': 'uint32',
              '*tag': 'str' } }
  
-+##
+ ##
 +# @BlockdevOptionsVitastor:
 +#
 +# Driver specific block device options for vitastor
@@ -124,23 +23,24 @@ index d4fe710836..dbad3327b3 100644
 +# @inode:       Inode number
 +# @pool:        Pool ID
 +# @size:        Desired image size in bytes
-+# @config-path: Path to Vitastor configuration
++# @config_path: Path to Vitastor configuration
-+# @etcd-host:   etcd connection address(es)
++# @etcd_host:   etcd connection address(es)
-+# @etcd-prefix: etcd key/value prefix
++# @etcd_prefix: etcd key/value prefix
 +##
 +{ 'struct': 'BlockdevOptionsVitastor',
 +  'data': { '*inode': 'uint64',
 +            '*pool': 'uint64',
 +            '*size': 'uint64',
 +            '*image': 'str',
-+            '*config-path': 'str',
++            '*config_path': 'str',
-+            '*etcd-host': 'str',
++            '*etcd_host': 'str',
-+            '*etcd-prefix': 'str' } }
++            '*etcd_prefix': 'str' } }
 +
- ##
++##
  # @ReplicationMode:
  #
-@@ -3713,6 +3735,7 @@
+ # An enumeration of replication modes.
+@@ -3713,6 +3731,7 @@
        'rbd':        'BlockdevOptionsRbd',
        'replication':'BlockdevOptionsReplication',
        'sheepdog':   'BlockdevOptionsSheepdog',
@@ -148,11 +48,10 @@ index d4fe710836..dbad3327b3 100644
        'ssh':        'BlockdevOptionsSsh',
        'throttle':   'BlockdevOptionsThrottle',
        'vdi':        'BlockdevOptionsGenericFormat',
-@@ -4157,6 +4180,17 @@
+@@ -4158,6 +4177,17 @@
-             '*subformat':           'BlockdevVhdxSubformat',
              '*block-state-zero':    'bool' } }
  
-+##
+ ##
 +# @BlockdevCreateOptionsVitastor:
 +#
 +# Driver specific image creation options for Vitastor.
@@ -163,10 +62,11 @@ index d4fe710836..dbad3327b3 100644
 +  'data': { 'location':         'BlockdevOptionsVitastor',
 +            'size':             'size' } }
 +
- ##
++##
  # @BlockdevVpcSubformat:
  #
-@@ -4212,6 +4246,7 @@
+ # @dynamic: Growing image file
+@@ -4212,6 +4242,7 @@
        'qed':            'BlockdevCreateOptionsQed',
        'rbd':            'BlockdevCreateOptionsRbd',
        'sheepdog':       'BlockdevCreateOptionsSheepdog',
@@ -174,3 +74,15 @@ index d4fe710836..dbad3327b3 100644
        'ssh':            'BlockdevCreateOptionsSsh',
        'vdi':            'BlockdevCreateOptionsVdi',
        'vhdx':           'BlockdevCreateOptionsVhdx',
+Index: qemu-3.1+dfsg/scripts/modules/module_block.py
+===================================================================
+--- qemu-3.1+dfsg.orig/scripts/modules/module_block.py
++++ qemu-3.1+dfsg/scripts/modules/module_block.py
+@@ -88,6 +88,7 @@ def print_bottom(fheader):
+ output_file = sys.argv[1]
+ with open(output_file, 'w') as fheader:
+     print_top(fheader)
++    add_module(fheader, "vitastor", "vitastor", "vitastor")
+ 
+     for filename in sys.argv[2:]:
+         if os.path.isfile(filename):

patches/qemu-4.2-vitastor.patch

@@ -1,105 +1,8 @@
-diff -NaurpbB qemu-4.2.0/block/Makefile.objs qemu-4.2.0-vitastor/block/Makefile.objs
+Index: qemu/qapi/block-core.json
---- qemu-4.2.0/block/Makefile.objs	2019-12-12 18:20:47.000000000 +0000
+===================================================================
-+++ qemu-4.2.0-vitastor/block/Makefile.objs	2021-12-01 21:28:47.342341760 +0000
+--- qemu.orig/qapi/block-core.json	2020-11-07 22:57:38.932613674 +0000
-@@ -29,6 +29,7 @@ block-obj-$(if $(CONFIG_LIBISCSI),y,n) +
++++ qemu.orig/qapi/block-core.json	2020-11-07 22:59:49.890722862 +0000
- block-obj-$(CONFIG_LIBNFS) += nfs.o
+@@ -2907,7 +2907,7 @@
- block-obj-$(CONFIG_CURL) += curl.o
- block-obj-$(CONFIG_RBD) += rbd.o
-+block-obj-$(CONFIG_VITASTOR) += vitastor.o
- block-obj-$(CONFIG_GLUSTERFS) += gluster.o
- block-obj-$(CONFIG_VXHS) += vxhs.o
- block-obj-$(CONFIG_LIBSSH) += ssh.o
-@@ -53,6 +54,8 @@ curl.o-cflags      := $(CURL_CFLAGS)
- curl.o-libs        := $(CURL_LIBS)
- rbd.o-cflags       := $(RBD_CFLAGS)
- rbd.o-libs         := $(RBD_LIBS)
-+vitastor.o-cflags  := $(VITASTOR_CFLAGS)
-+vitastor.o-libs    := $(VITASTOR_LIBS)
- gluster.o-cflags   := $(GLUSTERFS_CFLAGS)
- gluster.o-libs     := $(GLUSTERFS_LIBS)
- vxhs.o-libs        := $(VXHS_LIBS)
-diff -NaurpbB qemu-4.2.0/configure qemu-4.2.0-vitastor/configure
---- qemu-4.2.0/configure	2019-12-12 18:20:47.000000000 +0000
-+++ qemu-4.2.0-vitastor/configure	2021-12-01 21:30:24.605237562 +0000
-@@ -435,6 +435,7 @@ trace_backends="log"
- trace_file="trace"
- spice=""
- rbd=""
-+vitastor=""
- smartcard=""
- libusb=""
- usb_redir=""
-@@ -1312,6 +1313,10 @@ for opt do
-   ;;
-   --enable-rbd) rbd="yes"
-   ;;
-+  --disable-vitastor) vitastor="no"
-+  ;;
-+  --enable-vitastor) vitastor="yes"
-+  ;;
-   --disable-xfsctl) xfs="no"
-   ;;
-   --enable-xfsctl) xfs="yes"
-@@ -1782,6 +1787,7 @@ disabled with --disable-FEATURE, default
-   vhost-user      vhost-user backend support
-   spice           spice
-   rbd             rados block device (rbd)
-+  vitastor        vitastor block device
-   libiscsi        iscsi support
-   libnfs          nfs support
-   smartcard       smartcard support (libcacard)
-@@ -3980,6 +3986,27 @@ EOF
- fi
- 
- ##########################################
-+# vitastor probe
-+if test "$vitastor" != "no" ; then
-+  cat > $TMPC <<EOF
-+#include <vitastor_c.h>
-+int main(void) {
-+  vitastor_c_create_qemu(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-+  return 0;
-+}
-+EOF
-+  vitastor_libs="-lvitastor_client"
-+  if compile_prog "" "$vitastor_libs" ; then
-+    vitastor=yes
-+  else
-+    if test "$vitastor" = "yes" ; then
-+      feature_not_found "vitastor block device" "Install vitastor-client-dev"
-+    fi
-+    vitastor=no
-+  fi
-+fi
-+
-+##########################################
- # libssh probe
- if test "$libssh" != "no" ; then
-   if $pkg_config --exists libssh; then
-@@ -6549,6 +6576,7 @@ echo "Trace output file $trace_file-<pid
- fi
- echo "spice support     $spice $(echo_version $spice $spice_protocol_version/$spice_server_version)"
- echo "rbd support       $rbd"
-+echo "vitastor support  $vitastor"
- echo "xfsctl support    $xfs"
- echo "smartcard support $smartcard"
- echo "libusb            $libusb"
-@@ -7182,6 +7210,11 @@ if test "$rbd" = "yes" ; then
-   echo "RBD_CFLAGS=$rbd_cflags" >> $config_host_mak
-   echo "RBD_LIBS=$rbd_libs" >> $config_host_mak
- fi
-+if test "$vitastor" = "yes" ; then
-+  echo "CONFIG_VITASTOR=m" >> $config_host_mak
-+  echo "VITASTOR_CFLAGS=$vitastor_cflags" >> $config_host_mak
-+  echo "VITASTOR_LIBS=$vitastor_libs" >> $config_host_mak
-+fi
- 
- echo "CONFIG_COROUTINE_BACKEND=$coroutine" >> $config_host_mak
- if test "$coroutine_pool" = "yes" ; then
-diff -NaurpbB qemu-4.2.0/qapi/block-core.json qemu-4.2.0-vitastor/qapi/block-core.json
---- qemu-4.2.0/qapi/block-core.json	2019-12-12 18:20:48.000000000 +0000
-+++ qemu-4.2.0-vitastor/qapi/block-core.json	2021-12-01 21:27:49.213574396 +0000
-@@ -2894,7 +2894,7 @@
              'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels', 'qcow',
              'qcow2', 'qed', 'quorum', 'raw', 'rbd',
              { 'name': 'replication', 'if': 'defined(CONFIG_REPLICATION)' },
@@ -108,7 +11,7 @@ diff -NaurpbB qemu-4.2.0/qapi/block-core.json qemu-4.2.0-vitastor/qapi/block-cor
              'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }
  
  ##
-@@ -3712,6 +3712,28 @@
+@@ -3725,6 +3725,28 @@
              '*tag': 'str' } }
  
  ##
@@ -120,24 +23,24 @@ diff -NaurpbB qemu-4.2.0/qapi/block-core.json qemu-4.2.0-vitastor/qapi/block-cor
 +# @inode:       Inode number
 +# @pool:        Pool ID
 +# @size:        Desired image size in bytes
-+# @config-path: Path to Vitastor configuration
++# @config_path: Path to Vitastor configuration
-+# @etcd-host:   etcd connection address(es)
++# @etcd_host:   etcd connection address(es)
-+# @etcd-prefix: etcd key/value prefix
++# @etcd_prefix: etcd key/value prefix
 +##
 +{ 'struct': 'BlockdevOptionsVitastor',
 +  'data': { '*inode': 'uint64',
 +            '*pool': 'uint64',
 +            '*size': 'uint64',
 +            '*image': 'str',
-+            '*config-path': 'str',
++            '*config_path': 'str',
-+            '*etcd-host': 'str',
++            '*etcd_host': 'str',
-+            '*etcd-prefix': 'str' } }
++            '*etcd_prefix': 'str' } }
 +
 +##
  # @ReplicationMode:
  #
  # An enumeration of replication modes.
-@@ -4071,6 +4093,7 @@
+@@ -4084,6 +4102,7 @@
        'replication': { 'type': 'BlockdevOptionsReplication',
                         'if': 'defined(CONFIG_REPLICATION)' },
        'sheepdog':   'BlockdevOptionsSheepdog',
@@ -145,7 +48,7 @@ diff -NaurpbB qemu-4.2.0/qapi/block-core.json qemu-4.2.0-vitastor/qapi/block-cor
        'ssh':        'BlockdevOptionsSsh',
        'throttle':   'BlockdevOptionsThrottle',
        'vdi':        'BlockdevOptionsGenericFormat',
-@@ -4441,6 +4464,17 @@
+@@ -4461,6 +4480,17 @@
              '*cluster-size' :   'size' } }
  
  ##
@@ -163,7 +66,7 @@ diff -NaurpbB qemu-4.2.0/qapi/block-core.json qemu-4.2.0-vitastor/qapi/block-cor
  # @BlockdevVmdkSubformat:
  #
  # Subformat options for VMDK images
-@@ -4702,6 +4736,7 @@
+@@ -4722,6 +4752,7 @@
        'qed':            'BlockdevCreateOptionsQed',
        'rbd':            'BlockdevCreateOptionsRbd',
        'sheepdog':       'BlockdevCreateOptionsSheepdog',
@@ -171,3 +74,15 @@ diff -NaurpbB qemu-4.2.0/qapi/block-core.json qemu-4.2.0-vitastor/qapi/block-cor
        'ssh':            'BlockdevCreateOptionsSsh',
        'vdi':            'BlockdevCreateOptionsVdi',
        'vhdx':           'BlockdevCreateOptionsVhdx',
+Index: qemu/scripts/modules/module_block.py
+===================================================================
+--- qemu.orig/scripts/modules/module_block.py	2020-11-07 22:57:38.936613739 +0000
++++ qemu/scripts/modules/module_block.py	2020-11-07 22:59:49.890722862 +0000
+@@ -86,6 +86,7 @@ def print_bottom(fheader):
+ output_file = sys.argv[1]
+ with open(output_file, 'w') as fheader:
+     print_top(fheader)
++    add_module(fheader, "vitastor", "vitastor", "vitastor")
+ 
+     for filename in sys.argv[2:]:
+         if os.path.isfile(filename):

patches/qemu-5.0-vitastor.patch

@@ -1,107 +1,7 @@
-diff --git a/block/Makefile.objs b/block/Makefile.objs
+Index: qemu/qapi/block-core.json
-index 3635b6b4c1..6cdf6df6ff 100644
+===================================================================
---- a/block/Makefile.objs
+--- qemu.orig/qapi/block-core.json
-+++ b/block/Makefile.objs
++++ qemu/qapi/block-core.json
-@@ -30,6 +30,7 @@ block-obj-$(if $(CONFIG_LIBISCSI),y,n) += iscsi-opts.o
- block-obj-$(CONFIG_LIBNFS) += nfs.o
- block-obj-$(CONFIG_CURL) += curl.o
- block-obj-$(CONFIG_RBD) += rbd.o
-+block-obj-$(CONFIG_VITASTOR) += vitastor.o
- block-obj-$(CONFIG_GLUSTERFS) += gluster.o
- block-obj-$(CONFIG_VXHS) += vxhs.o
- block-obj-$(CONFIG_LIBSSH) += ssh.o
-@@ -58,6 +59,8 @@ curl.o-cflags      := $(CURL_CFLAGS)
- curl.o-libs        := $(CURL_LIBS)
- rbd.o-cflags       := $(RBD_CFLAGS)
- rbd.o-libs         := $(RBD_LIBS)
-+vitastor.o-cflags  := $(VITASTOR_CFLAGS)
-+vitastor.o-libs    := $(VITASTOR_LIBS)
- gluster.o-cflags   := $(GLUSTERFS_CFLAGS)
- gluster.o-libs     := $(GLUSTERFS_LIBS)
- vxhs.o-libs        := $(VXHS_LIBS)
-diff --git a/configure b/configure
-index 23b5e93752..7400cb9546 100755
---- a/configure
-+++ b/configure
-@@ -438,6 +438,7 @@ trace_backends="log"
- trace_file="trace"
- spice=""
- rbd=""
-+vitastor=""
- smartcard=""
- libusb=""
- usb_redir=""
-@@ -1355,6 +1356,10 @@ for opt do
-   ;;
-   --enable-rbd) rbd="yes"
-   ;;
-+  --disable-vitastor) vitastor="no"
-+  ;;
-+  --enable-vitastor) vitastor="yes"
-+  ;;
-   --disable-xfsctl) xfs="no"
-   ;;
-   --enable-xfsctl) xfs="yes"
-@@ -1848,6 +1853,7 @@ disabled with --disable-FEATURE, default is enabled if available:
-   vhost-user      vhost-user backend support
-   spice           spice
-   rbd             rados block device (rbd)
-+  vitastor        vitastor block device
-   libiscsi        iscsi support
-   libnfs          nfs support
-   smartcard       smartcard support (libcacard)
-@@ -4088,6 +4094,27 @@ EOF
-   fi
- fi
- 
-+##########################################
-+# vitastor probe
-+if test "$vitastor" != "no" ; then
-+  cat > $TMPC <<EOF
-+#include <vitastor_c.h>
-+int main(void) {
-+  vitastor_c_create_qemu(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-+  return 0;
-+}
-+EOF
-+  vitastor_libs="-lvitastor_client"
-+  if compile_prog "" "$vitastor_libs" ; then
-+    vitastor=yes
-+  else
-+    if test "$vitastor" = "yes" ; then
-+      feature_not_found "vitastor block device" "Install vitastor-client-dev"
-+    fi
-+    vitastor=no
-+  fi
-+fi
-+
- ##########################################
- # libssh probe
- if test "$libssh" != "no" ; then
-@@ -6679,6 +6706,7 @@ echo "Trace output file $trace_file-<pid>"
- fi
- echo "spice support     $spice $(echo_version $spice $spice_protocol_version/$spice_server_version)"
- echo "rbd support       $rbd"
-+echo "vitastor support  $vitastor"
- echo "xfsctl support    $xfs"
- echo "smartcard support $smartcard"
- echo "libusb            $libusb"
-@@ -7329,6 +7357,11 @@ if test "$rbd" = "yes" ; then
-   echo "RBD_CFLAGS=$rbd_cflags" >> $config_host_mak
-   echo "RBD_LIBS=$rbd_libs" >> $config_host_mak
- fi
-+if test "$vitastor" = "yes" ; then
-+  echo "CONFIG_VITASTOR=m" >> $config_host_mak
-+  echo "VITASTOR_CFLAGS=$vitastor_cflags" >> $config_host_mak
-+  echo "VITASTOR_LIBS=$vitastor_libs" >> $config_host_mak
-+fi
- 
- echo "CONFIG_COROUTINE_BACKEND=$coroutine" >> $config_host_mak
- if test "$coroutine_pool" = "yes" ; then
-diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 943df1926a..c4f23230a3 100644
---- a/qapi/block-core.json
-+++ b/qapi/block-core.json
 @@ -2798,7 +2798,7 @@
              'luks', 'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels',
              'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'rbd',
@@ -111,11 +11,10 @@ index 943df1926a..c4f23230a3 100644
              'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }
  
  ##
-@@ -3634,6 +3634,28 @@
+@@ -3635,6 +3635,28 @@
-             '*snap-id': 'uint32',
              '*tag': 'str' } }
  
-+##
+ ##
 +# @BlockdevOptionsVitastor:
 +#
 +# Driver specific block device options for vitastor
@@ -124,23 +23,24 @@ index 943df1926a..c4f23230a3 100644
 +# @inode:       Inode number
 +# @pool:        Pool ID
 +# @size:        Desired image size in bytes
-+# @config-path: Path to Vitastor configuration
++# @config_path: Path to Vitastor configuration
-+# @etcd-host:   etcd connection address(es)
++# @etcd_host:   etcd connection address(es)
-+# @etcd-prefix: etcd key/value prefix
++# @etcd_prefix: etcd key/value prefix
 +##
 +{ 'struct': 'BlockdevOptionsVitastor',
 +  'data': { '*inode': 'uint64',
 +            '*pool': 'uint64',
 +            '*size': 'uint64',
 +            '*image': 'str',
-+            '*config-path': 'str',
++            '*config_path': 'str',
-+            '*etcd-host': 'str',
++            '*etcd_host': 'str',
-+            '*etcd-prefix': 'str' } }
++            '*etcd_prefix': 'str' } }
 +
- ##
++##
  # @ReplicationMode:
  #
-@@ -3995,6 +4017,7 @@
+ # An enumeration of replication modes.
+@@ -3995,6 +4013,7 @@
        'replication': { 'type': 'BlockdevOptionsReplication',
                         'if': 'defined(CONFIG_REPLICATION)' },
        'sheepdog':   'BlockdevOptionsSheepdog',
@@ -148,11 +48,10 @@ index 943df1926a..c4f23230a3 100644
        'ssh':        'BlockdevOptionsSsh',
        'throttle':   'BlockdevOptionsThrottle',
        'vdi':        'BlockdevOptionsGenericFormat',
-@@ -4364,6 +4387,17 @@
+@@ -4365,6 +4384,17 @@
-             'size':             'size',
              '*cluster-size' :   'size' } }
  
-+##
+ ##
 +# @BlockdevCreateOptionsVitastor:
 +#
 +# Driver specific image creation options for Vitastor.
@@ -163,10 +62,11 @@ index 943df1926a..c4f23230a3 100644
 +  'data': { 'location':         'BlockdevOptionsVitastor',
 +            'size':             'size' } }
 +
- ##
++##
  # @BlockdevVmdkSubformat:
  #
-@@ -4626,6 +4660,7 @@
+ # Subformat options for VMDK images
+@@ -4626,6 +4656,7 @@
        'qed':            'BlockdevCreateOptionsQed',
        'rbd':            'BlockdevCreateOptionsRbd',
        'sheepdog':       'BlockdevCreateOptionsSheepdog',
@@ -174,3 +74,15 @@ index 943df1926a..c4f23230a3 100644
        'ssh':            'BlockdevCreateOptionsSsh',
        'vdi':            'BlockdevCreateOptionsVdi',
        'vhdx':           'BlockdevCreateOptionsVhdx',
+Index: qemu/scripts/modules/module_block.py
+===================================================================
+--- qemu.orig/scripts/modules/module_block.py
++++ qemu/scripts/modules/module_block.py
+@@ -85,6 +85,7 @@ def print_bottom(fheader):
+ output_file = sys.argv[1]
+ with open(output_file, 'w') as fheader:
+     print_top(fheader)
++    add_module(fheader, "vitastor", "vitastor", "vitastor")
+ 
+     for filename in sys.argv[2:]:
+         if os.path.isfile(filename):

patches/qemu-5.1-vitastor.patch

@@ -1,8 +1,8 @@
-Index: qemu-5.2+dfsg/qapi/block-core.json
+Index: qemu-5.1+dfsg/qapi/block-core.json
 ===================================================================
---- qemu-5.2+dfsg.orig/qapi/block-core.json
+--- qemu-5.1+dfsg.orig/qapi/block-core.json
-+++ qemu-5.2+dfsg/qapi/block-core.json
++++ qemu-5.1+dfsg/qapi/block-core.json
-@@ -2831,7 +2831,7 @@
+@@ -2807,7 +2807,7 @@
              'luks', 'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels',
              'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'rbd',
              { 'name': 'replication', 'if': 'defined(CONFIG_REPLICATION)' },
@@ -11,7 +11,7 @@ Index: qemu-5.2+dfsg/qapi/block-core.json
              'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] }
  
  ##
-@@ -3668,6 +3668,28 @@
+@@ -3644,6 +3644,28 @@
              '*tag': 'str' } }
  
  ##
@@ -23,24 +23,24 @@ Index: qemu-5.2+dfsg/qapi/block-core.json
 +# @inode:       Inode number
 +# @pool:        Pool ID
 +# @size:        Desired image size in bytes
-+# @config-path: Path to Vitastor configuration
++# @config_path: Path to Vitastor configuration
-+# @etcd-host:   etcd connection address(es)
++# @etcd_host:   etcd connection address(es)
-+# @etcd-prefix: etcd key/value prefix
++# @etcd_prefix: etcd key/value prefix
 +##
 +{ 'struct': 'BlockdevOptionsVitastor',
 +  'data': { '*inode': 'uint64',
 +            '*pool': 'uint64',
 +            '*size': 'uint64',
 +            '*image': 'str',
-+            '*config-path': 'str',
++            '*config_path': 'str',
-+            '*etcd-host': 'str',
++            '*etcd_host': 'str',
-+            '*etcd-prefix': 'str' } }
++            '*etcd_prefix': 'str' } }
 +
 +##
  # @ReplicationMode:
  #
  # An enumeration of replication modes.
-@@ -4015,6 +4037,7 @@
+@@ -3988,6 +4006,7 @@
        'replication': { 'type': 'BlockdevOptionsReplication',
                         'if': 'defined(CONFIG_REPLICATION)' },
        'sheepdog':   'BlockdevOptionsSheepdog',
@@ -48,7 +48,7 @@ Index: qemu-5.2+dfsg/qapi/block-core.json
        'ssh':        'BlockdevOptionsSsh',
        'throttle':   'BlockdevOptionsThrottle',
        'vdi':        'BlockdevOptionsGenericFormat',
-@@ -4404,6 +4427,17 @@
+@@ -4376,6 +4395,17 @@
              '*cluster-size' :   'size' } }
  
  ##
@@ -66,7 +66,7 @@ Index: qemu-5.2+dfsg/qapi/block-core.json
  # @BlockdevVmdkSubformat:
  #
  # Subformat options for VMDK images
-@@ -4665,6 +4699,7 @@
+@@ -4637,6 +4667,7 @@
        'qed':            'BlockdevCreateOptionsQed',
        'rbd':            'BlockdevCreateOptionsRbd',
        'sheepdog':       'BlockdevCreateOptionsSheepdog',
@@ -74,108 +74,15 @@ Index: qemu-5.2+dfsg/qapi/block-core.json
        'ssh':            'BlockdevCreateOptionsSsh',
        'vdi':            'BlockdevCreateOptionsVdi',
        'vhdx':           'BlockdevCreateOptionsVhdx',
-Index: qemu-5.2+dfsg/block/meson.build
+Index: qemu-5.1+dfsg/scripts/modules/module_block.py
 ===================================================================
---- qemu-5.2+dfsg.orig/block/meson.build
+--- qemu-5.1+dfsg.orig/scripts/modules/module_block.py
-+++ qemu-5.2+dfsg/block/meson.build
++++ qemu-5.1+dfsg/scripts/modules/module_block.py
-@@ -76,6 +76,7 @@ foreach m : [
+@@ -86,6 +86,7 @@ if __name__ == '__main__':
-   ['CONFIG_LIBNFS', 'nfs', libnfs, 'nfs.c'],
+     output_file = sys.argv[1]
-   ['CONFIG_LIBSSH', 'ssh', libssh, 'ssh.c'],
+     with open(output_file, 'w') as fheader:
-   ['CONFIG_RBD', 'rbd', rbd, 'rbd.c'],
+         print_top(fheader)
-+  ['CONFIG_VITASTOR', 'vitastor', vitastor, 'vitastor.c'],
++        add_module(fheader, "vitastor", "vitastor", "vitastor")
- ]
-   if config_host.has_key(m[0])
-     if enable_modules
-Index: qemu-5.2+dfsg/configure
-===================================================================
---- qemu-5.2+dfsg.orig/configure
-+++ qemu-5.2+dfsg/configure
-@@ -372,6 +372,7 @@ trace_backends="log"
- trace_file="trace"
- spice=""
- rbd=""
-+vitastor=""
- smartcard=""
- u2f="auto"
- libusb=""
-@@ -1263,6 +1264,10 @@ for opt do
-   ;;
-   --enable-rbd) rbd="yes"
-   ;;
-+  --disable-vitastor) vitastor="no"
-+  ;;
-+  --enable-vitastor) vitastor="yes"
-+  ;;
-   --disable-xfsctl) xfs="no"
-   ;;
-   --enable-xfsctl) xfs="yes"
-@@ -1827,6 +1832,7 @@ disabled with --disable-FEATURE, default
-   vhost-vdpa      vhost-vdpa kernel backend support
-   spice           spice
-   rbd             rados block device (rbd)
-+  vitastor        vitastor block device
-   libiscsi        iscsi support
-   libnfs          nfs support
-   smartcard       smartcard support (libcacard)
-@@ -3719,6 +3725,27 @@ EOF
- fi
  
- ##########################################
+         for filename in sys.argv[2:]:
-+# vitastor probe
+             if os.path.isfile(filename):
-+if test "$vitastor" != "no" ; then
-+  cat > $TMPC <<EOF
-+#include <vitastor_c.h>
-+int main(void) {
-+  vitastor_c_create_qemu(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-+  return 0;
-+}
-+EOF
-+  vitastor_libs="-lvitastor_client"
-+  if compile_prog "" "$vitastor_libs" ; then
-+    vitastor=yes
-+  else
-+    if test "$vitastor" = "yes" ; then
-+      feature_not_found "vitastor block device" "Install vitastor-client-dev"
-+    fi
-+    vitastor=no
-+  fi
-+fi
-+
-+##########################################
- # libssh probe
- if test "$libssh" != "no" ; then
-   if $pkg_config --exists libssh; then
-@@ -6456,6 +6483,10 @@ if test "$rbd" = "yes" ; then
-   echo "CONFIG_RBD=y" >> $config_host_mak
-   echo "RBD_LIBS=$rbd_libs" >> $config_host_mak
- fi
-+if test "$vitastor" = "yes" ; then
-+  echo "CONFIG_VITASTOR=y" >> $config_host_mak
-+  echo "VITASTOR_LIBS=$vitastor_libs" >> $config_host_mak
-+fi
- 
- echo "CONFIG_COROUTINE_BACKEND=$coroutine" >> $config_host_mak
- if test "$coroutine_pool" = "yes" ; then
-Index: qemu-5.2+dfsg/meson.build
-===================================================================
---- qemu-5.2+dfsg.orig/meson.build
-+++ qemu-5.2+dfsg/meson.build
-@@ -596,6 +596,10 @@ rbd = not_found
- if 'CONFIG_RBD' in config_host
-   rbd = declare_dependency(link_args: config_host['RBD_LIBS'].split())
- endif
-+vitastor = not_found
-+if 'CONFIG_VITASTOR' in config_host
-+  vitastor = declare_dependency(link_args: config_host['VITASTOR_LIBS'].split())
-+endif
- glusterfs = not_found
- if 'CONFIG_GLUSTERFS' in config_host
-   glusterfs = declare_dependency(compile_args: config_host['GLUSTERFS_CFLAGS'].split(),
-@@ -2145,6 +2149,7 @@ endif
- # TODO: add back protocol and server version
- summary_info += {'spice support':     config_host.has_key('CONFIG_SPICE')}
- summary_info += {'rbd support':       config_host.has_key('CONFIG_RBD')}
-+summary_info += {'vitastor support':  config_host.has_key('CONFIG_VITASTOR')}
- summary_info += {'xfsctl support':    config_host.has_key('CONFIG_XFS')}
- summary_info += {'smartcard support': config_host.has_key('CONFIG_SMARTCARD')}
- summary_info += {'U2F support':       u2f.found()}

patches/qemu-6.0-vitastor.patch

@@ -1,188 +0,0 @@
-diff --git a/block/meson.build b/block/meson.build
-index d21990ec95..385ac37732 100644
---- a/block/meson.build
-+++ b/block/meson.build
-@@ -78,6 +78,7 @@ foreach m : [
-   [libnfs, 'nfs', libnfs, 'nfs.c'],
-   [libssh, 'ssh', libssh, 'ssh.c'],
-   [rbd, 'rbd', rbd, 'rbd.c'],
-+  [vitastor, 'vitastor', vitastor, 'vitastor.c'],
- ]
-   if m[0].found()
-     if enable_modules
-diff --git a/configure b/configure
-index c77f7b1020..5f534e8484 100755
---- a/configure
-+++ b/configure
-@@ -389,6 +389,7 @@ trace_backends="log"
- trace_file="trace"
- spice="$default_feature"
- rbd="auto"
-+vitastor="auto"
- smartcard="$default_feature"
- u2f="auto"
- libusb="$default_feature"
-@@ -1280,6 +1281,10 @@ for opt do
-   ;;
-   --enable-rbd) rbd="enabled"
-   ;;
-+  --disable-vitastor) vitastor="disabled"
-+  ;;
-+  --enable-vitastor) vitastor="enabled"
-+  ;;
-   --disable-xfsctl) xfs="no"
-   ;;
-   --enable-xfsctl) xfs="yes"
-@@ -1867,6 +1872,7 @@ disabled with --disable-FEATURE, default is enabled if available
-   vhost-vdpa      vhost-vdpa kernel backend support
-   spice           spice
-   rbd             rados block device (rbd)
-+  vitastor        vitastor block device
-   libiscsi        iscsi support
-   libnfs          nfs support
-   smartcard       smartcard support (libcacard)
-@@ -6423,7 +6429,7 @@ NINJA=$ninja $meson setup \
-         -Dcapstone=$capstone -Dslirp=$slirp -Dfdt=$fdt -Dbrlapi=$brlapi \
-         -Dcurl=$curl -Dglusterfs=$glusterfs -Dbzip2=$bzip2 -Dlibiscsi=$libiscsi \
-         -Dlibnfs=$libnfs -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\
--        -Drbd=$rbd -Dlzo=$lzo -Dsnappy=$snappy -Dlzfse=$lzfse \
-+        -Drbd=$rbd -Dvitastor=$vitastor -Dlzo=$lzo -Dsnappy=$snappy -Dlzfse=$lzfse \
-         -Dzstd=$zstd -Dseccomp=$seccomp -Dvirtfs=$virtfs -Dcap_ng=$cap_ng \
-         -Dattr=$attr -Ddefault_devices=$default_devices \
-         -Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \
-diff --git a/meson.build b/meson.build
-index c6f4b0cf5e..3dc7f7b463 100644
---- a/meson.build
-+++ b/meson.build
-@@ -720,6 +720,26 @@ if not get_option('rbd').auto() or have_block
-   endif
- endif
- 
-+vitastor = not_found
-+if not get_option('vitastor').auto() or have_block
-+  libvitastor_client = cc.find_library('vitastor_client', has_headers: ['vitastor_c.h'],
-+    required: get_option('vitastor'), kwargs: static_kwargs)
-+  if libvitastor_client.found()
-+    if cc.links('''
-+      #include <vitastor_c.h>
-+      int main(void) {
-+        vitastor_c_create_qemu(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-+        return 0;
-+      }''', dependencies: libvitastor_client)
-+      vitastor = declare_dependency(dependencies: libvitastor_client)
-+    elif get_option('vitastor').enabled()
-+      error('could not link libvitastor_client')
-+    else
-+      warning('could not link libvitastor_client, disabling')
-+    endif
-+  endif
-+endif
-+
- glusterfs = not_found
- glusterfs_ftruncate_has_stat = false
- glusterfs_iocb_has_stat = false
-@@ -1118,6 +1138,7 @@ config_host_data.set('CONFIG_LIBCAP_NG', libcap_ng.found())
- config_host_data.set('CONFIG_LIBISCSI', libiscsi.found())
- config_host_data.set('CONFIG_LIBNFS', libnfs.found())
- config_host_data.set('CONFIG_RBD', rbd.found())
-+config_host_data.set('CONFIG_VITASTOR', vitastor.found())
- config_host_data.set('CONFIG_SDL', sdl.found())
- config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found())
- config_host_data.set('CONFIG_SECCOMP', seccomp.found())
-@@ -2683,6 +2704,7 @@ summary_info += {'libcap-ng support': libcap_ng.found()}
- # TODO: add back protocol and server version
- summary_info += {'spice support':     config_host.has_key('CONFIG_SPICE')}
- summary_info += {'rbd support':       rbd.found()}
-+summary_info += {'vitastor support':  vitastor.found()}
- summary_info += {'xfsctl support':    config_host.has_key('CONFIG_XFS')}
- summary_info += {'smartcard support': config_host.has_key('CONFIG_SMARTCARD')}
- summary_info += {'U2F support':       u2f.found()}
-diff --git a/meson_options.txt b/meson_options.txt
-index 9734019995..bc93963b27 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -80,6 +80,8 @@ option('lzo', type : 'feature', value : 'auto',
-        description: 'lzo compression support')
- option('rbd', type : 'feature', value : 'auto',
-        description: 'Ceph block device driver')
-+option('vitastor', type : 'feature', value : 'auto',
-+       description: 'Vitastor block device driver')
- option('gtk', type : 'feature', value : 'auto',
-        description: 'GTK+ user interface')
- option('sdl', type : 'feature', value : 'auto',
-diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 6d227924d0..d14b29aa43 100644
---- a/qapi/block-core.json
-+++ b/qapi/block-core.json
-@@ -2819,7 +2819,7 @@
-             'preallocate', 'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'rbd',
-             { 'name': 'replication', 'if': 'defined(CONFIG_REPLICATION)' },
-             'sheepdog',
--            'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] }
-+            'ssh', 'throttle', 'vdi', 'vhdx', 'vitastor', 'vmdk', 'vpc', 'vvfat' ] }
- 
- ##
- # @BlockdevOptionsFile:
-@@ -3671,6 +3671,28 @@
-             '*snap-id': 'uint32',
-             '*tag': 'str' } }
- 
-+##
-+# @BlockdevOptionsVitastor:
-+#
-+# Driver specific block device options for vitastor
-+#
-+# @image:       Image name
-+# @inode:       Inode number
-+# @pool:        Pool ID
-+# @size:        Desired image size in bytes
-+# @config-path: Path to Vitastor configuration
-+# @etcd-host:   etcd connection address(es)
-+# @etcd-prefix: etcd key/value prefix
-+##
-+{ 'struct': 'BlockdevOptionsVitastor',
-+  'data': { '*inode': 'uint64',
-+            '*pool': 'uint64',
-+            '*size': 'uint64',
-+            '*image': 'str',
-+            '*config-path': 'str',
-+            '*etcd-host': 'str',
-+            '*etcd-prefix': 'str' } }
-+
- ##
- # @ReplicationMode:
- #
-@@ -4042,6 +4064,7 @@
-       'throttle':   'BlockdevOptionsThrottle',
-       'vdi':        'BlockdevOptionsGenericFormat',
-       'vhdx':       'BlockdevOptionsGenericFormat',
-+      'vitastor':   'BlockdevOptionsVitastor',
-       'vmdk':       'BlockdevOptionsGenericCOWFormat',
-       'vpc':        'BlockdevOptionsGenericFormat',
-       'vvfat':      'BlockdevOptionsVVFAT'
-@@ -4426,6 +4449,17 @@
-             'size':             'size',
-             '*cluster-size' :   'size' } }
- 
-+##
-+# @BlockdevCreateOptionsVitastor:
-+#
-+# Driver specific image creation options for Vitastor.
-+#
-+# @size: Size of the virtual disk in bytes
-+##
-+{ 'struct': 'BlockdevCreateOptionsVitastor',
-+  'data': { 'location':         'BlockdevOptionsVitastor',
-+            'size':             'size' } }
-+
- ##
- # @BlockdevVmdkSubformat:
- #
-@@ -4691,6 +4725,7 @@
-       'ssh':            'BlockdevCreateOptionsSsh',
-       'vdi':            'BlockdevCreateOptionsVdi',
-       'vhdx':           'BlockdevCreateOptionsVhdx',
-+      'vitastor':       'BlockdevCreateOptionsVitastor',
-       'vmdk':           'BlockdevCreateOptionsVmdk',
-       'vpc':            'BlockdevCreateOptionsVpc'
-   } }

patches/qemu-6.1-vitastor.patch

@@ -1,188 +0,0 @@
-Index: qemu-6.1+dfsg/qapi/block-core.json
-===================================================================
---- qemu-6.1+dfsg.orig/qapi/block-core.json
-+++ qemu-6.1+dfsg/qapi/block-core.json
-@@ -2838,7 +2838,7 @@
-             'luks', 'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels',
-             'preallocate', 'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'rbd',
-             { 'name': 'replication', 'if': 'defined(CONFIG_REPLICATION)' },
--            'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] }
-+            'ssh', 'throttle', 'vdi', 'vhdx', 'vitastor', 'vmdk', 'vpc', 'vvfat' ] }
- 
- ##
- # @BlockdevOptionsFile:
-@@ -3763,6 +3763,28 @@
-             '*server': ['InetSocketAddressBase'] } }
- 
- ##
-+# @BlockdevOptionsVitastor:
-+#
-+# Driver specific block device options for vitastor
-+#
-+# @image:       Image name
-+# @inode:       Inode number
-+# @pool:        Pool ID
-+# @size:        Desired image size in bytes
-+# @config-path: Path to Vitastor configuration
-+# @etcd-host:   etcd connection address(es)
-+# @etcd-prefix: etcd key/value prefix
-+##
-+{ 'struct': 'BlockdevOptionsVitastor',
-+  'data': { '*inode': 'uint64',
-+            '*pool': 'uint64',
-+            '*size': 'uint64',
-+            '*image': 'str',
-+            '*config-path': 'str',
-+            '*etcd-host': 'str',
-+            '*etcd-prefix': 'str' } }
-+
-+##
- # @ReplicationMode:
- #
- # An enumeration of replication modes.
-@@ -4134,6 +4156,7 @@
-       'throttle':   'BlockdevOptionsThrottle',
-       'vdi':        'BlockdevOptionsGenericFormat',
-       'vhdx':       'BlockdevOptionsGenericFormat',
-+      'vitastor':   'BlockdevOptionsVitastor',
-       'vmdk':       'BlockdevOptionsGenericCOWFormat',
-       'vpc':        'BlockdevOptionsGenericFormat',
-       'vvfat':      'BlockdevOptionsVVFAT'
-@@ -4523,6 +4546,17 @@
-             '*encrypt' :        'RbdEncryptionCreateOptions' } }
- 
- ##
-+# @BlockdevCreateOptionsVitastor:
-+#
-+# Driver specific image creation options for Vitastor.
-+#
-+# @size: Size of the virtual disk in bytes
-+##
-+{ 'struct': 'BlockdevCreateOptionsVitastor',
-+  'data': { 'location':         'BlockdevOptionsVitastor',
-+            'size':             'size' } }
-+
-+##
- # @BlockdevVmdkSubformat:
- #
- # Subformat options for VMDK images
-@@ -4718,6 +4752,7 @@
-       'ssh':            'BlockdevCreateOptionsSsh',
-       'vdi':            'BlockdevCreateOptionsVdi',
-       'vhdx':           'BlockdevCreateOptionsVhdx',
-+      'vitastor':       'BlockdevCreateOptionsVitastor',
-       'vmdk':           'BlockdevCreateOptionsVmdk',
-       'vpc':            'BlockdevCreateOptionsVpc'
-   } }
-Index: qemu-6.1+dfsg/block/meson.build
-===================================================================
---- qemu-6.1+dfsg.orig/block/meson.build
-+++ qemu-6.1+dfsg/block/meson.build
-@@ -78,6 +78,7 @@ foreach m : [
-   [libnfs, 'nfs', files('nfs.c')],
-   [libssh, 'ssh', files('ssh.c')],
-   [rbd, 'rbd', files('rbd.c')],
-+  [vitastor, 'vitastor', files('vitastor.c')],
- ]
-   if m[0].found()
-     module_ss = ss.source_set()
-Index: qemu-6.1+dfsg/configure
-===================================================================
---- qemu-6.1+dfsg.orig/configure
-+++ qemu-6.1+dfsg/configure
-@@ -375,6 +375,7 @@ trace_file="trace"
- spice="$default_feature"
- spice_protocol="auto"
- rbd="auto"
-+vitastor="auto"
- smartcard="auto"
- u2f="auto"
- libusb="auto"
-@@ -1292,6 +1293,10 @@ for opt do
-   ;;
-   --enable-rbd) rbd="enabled"
-   ;;
-+  --disable-vitastor) vitastor="disabled"
-+  ;;
-+  --enable-vitastor) vitastor="enabled"
-+  ;;
-   --disable-xfsctl) xfs="no"
-   ;;
-   --enable-xfsctl) xfs="yes"
-@@ -1916,6 +1921,7 @@ disabled with --disable-FEATURE, default
-   spice           spice
-   spice-protocol  spice-protocol
-   rbd             rados block device (rbd)
-+  vitastor        vitastor block device
-   libiscsi        iscsi support
-   libnfs          nfs support
-   smartcard       smartcard support (libcacard)
-@@ -5202,7 +5208,7 @@ if test "$skip_meson" = no; then
-         -Dcapstone=$capstone -Dslirp=$slirp -Dfdt=$fdt -Dbrlapi=$brlapi \
-         -Dcurl=$curl -Dglusterfs=$glusterfs -Dbzip2=$bzip2 -Dlibiscsi=$libiscsi \
-         -Dlibnfs=$libnfs -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\
--        -Drbd=$rbd -Dlzo=$lzo -Dsnappy=$snappy -Dlzfse=$lzfse -Dlibxml2=$libxml2 \
-+        -Drbd=$rbd -Dvitastor=$vitastor -Dlzo=$lzo -Dsnappy=$snappy -Dlzfse=$lzfse -Dlibxml2=$libxml2 \
-         -Dlibdaxctl=$libdaxctl -Dlibpmem=$libpmem -Dlinux_io_uring=$linux_io_uring \
-         -Dgnutls=$gnutls -Dnettle=$nettle -Dgcrypt=$gcrypt -Dauth_pam=$auth_pam \
-         -Dzstd=$zstd -Dseccomp=$seccomp -Dvirtfs=$virtfs -Dcap_ng=$cap_ng \
-Index: qemu-6.1+dfsg/meson.build
-===================================================================
---- qemu-6.1+dfsg.orig/meson.build
-+++ qemu-6.1+dfsg/meson.build
-@@ -729,6 +729,26 @@ if not get_option('rbd').auto() or have_
-   endif
- endif
- 
-+vitastor = not_found
-+if not get_option('vitastor').auto() or have_block
-+  libvitastor_client = cc.find_library('vitastor_client', has_headers: ['vitastor_c.h'],
-+    required: get_option('vitastor'), kwargs: static_kwargs)
-+  if libvitastor_client.found()
-+    if cc.links('''
-+      #include <vitastor_c.h>
-+      int main(void) {
-+        vitastor_c_create_qemu(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-+        return 0;
-+      }''', dependencies: libvitastor_client)
-+      vitastor = declare_dependency(dependencies: libvitastor_client)
-+    elif get_option('vitastor').enabled()
-+      error('could not link libvitastor_client')
-+    else
-+      warning('could not link libvitastor_client, disabling')
-+    endif
-+  endif
-+endif
-+
- glusterfs = not_found
- glusterfs_ftruncate_has_stat = false
- glusterfs_iocb_has_stat = false
-@@ -1264,6 +1284,7 @@ config_host_data.set('CONFIG_LIBNFS', li
- config_host_data.set('CONFIG_LINUX_IO_URING', linux_io_uring.found())
- config_host_data.set('CONFIG_LIBPMEM', libpmem.found())
- config_host_data.set('CONFIG_RBD', rbd.found())
-+config_host_data.set('CONFIG_VITASTOR', vitastor.found())
- config_host_data.set('CONFIG_SDL', sdl.found())
- config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found())
- config_host_data.set('CONFIG_SECCOMP', seccomp.found())
-@@ -3075,6 +3096,7 @@ summary_info += {'bpf support': libbpf.f
- # TODO: add back protocol and server version
- summary_info += {'spice support':     config_host.has_key('CONFIG_SPICE')}
- summary_info += {'rbd support':       rbd.found()}
-+summary_info += {'vitastor support':  vitastor.found()}
- summary_info += {'xfsctl support':    config_host.has_key('CONFIG_XFS')}
- summary_info += {'smartcard support': cacard.found()}
- summary_info += {'U2F support':       u2f.found()}
-Index: qemu-6.1+dfsg/meson_options.txt
-===================================================================
---- qemu-6.1+dfsg.orig/meson_options.txt
-+++ qemu-6.1+dfsg/meson_options.txt
-@@ -102,6 +102,8 @@ option('lzo', type : 'feature', value :
-        description: 'lzo compression support')
- option('rbd', type : 'feature', value : 'auto',
-        description: 'Ceph block device driver')
-+option('vitastor', type : 'feature', value : 'auto',
-+       description: 'Vitastor block device driver')
- option('gtk', type : 'feature', value : 'auto',
-        description: 'GTK+ user interface')
- option('sdl', type : 'feature', value : 'auto',

rpm/build-tarball.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Vitastor depends on QEMU and/or FIO headers, but QEMU and FIO don't have -devel packages
+# Vitastor depends on QEMU and FIO headers, but QEMU and FIO don't have -devel packages
 # So we have to copy their headers into the source tarball
 
 set -e
@@ -18,11 +18,34 @@ else
 fi
 cd ~/rpmbuild/SPECS
 rpmbuild -bp fio.spec
+perl -i -pe 's/^make V=1/exit 0; make V=1/' qemu*.spec
+rpmbuild -bc qemu*.spec
+perl -i -pe 's/^exit 0; make V=1/make V=1/' qemu*.spec
+cd ~/rpmbuild/BUILD/qemu*/
+rm -rf $VITASTOR/qemu $VITASTOR/fio
+mkdir -p $VITASTOR/qemu/b/qemu
+make -j8 config-host.h
+cp config-host.h $VITASTOR/qemu/b/qemu
+cp -r include $VITASTOR/qemu
+if [ -f qapi-schema.json ]; then
+    # QEMU 2.0
+    make qapi-types.h
+    cp qapi-types.h $VITASTOR/qemu/b/qemu
+else
+    # QEMU 3.0+
+    make qapi
+    cp -r qapi $VITASTOR/qemu/b/qemu
+fi
 cd $VITASTOR
+sh copy-qemu-includes.sh
+rm -rf qemu
+mv qemu-copy qemu
 ln -s ~/rpmbuild/BUILD/fio*/ fio
 sh copy-fio-includes.sh
 rm fio
 mv fio-copy fio
 FIO=`rpm -qi fio | perl -e 'while(<>) { /^Epoch[\s:]+(\S+)/ && print "$1:"; /^Version[\s:]+(\S+)/ && print $1; /^Release[\s:]+(\S+)/ && print "-$1"; }'`
+QEMU=`rpm -qi qemu qemu-kvm | perl -e 'while(<>) { /^Epoch[\s:]+(\S+)/ && print "$1:"; /^Version[\s:]+(\S+)/ && print $1; /^Release[\s:]+(\S+)/ && print "-$1"; }'`
 perl -i -pe 's/(Requires:\s*fio)([^\n]+)?/$1 = '$FIO'/' $VITASTOR/rpm/vitastor-el$EL.spec
-tar --transform 's#^#vitastor-0.6.9/#' --exclude 'rpm/*.rpm' -czf $VITASTOR/../vitastor-0.6.9$(rpm --eval '%dist').tar.gz *
+perl -i -pe 's/(Requires:\s*qemu(?:-kvm)?)([^\n]+)?/$1 = '$QEMU'/' $VITASTOR/rpm/vitastor-el$EL.spec
+tar --transform 's#^#vitastor-0.6.5/#' --exclude 'rpm/*.rpm' -czf $VITASTOR/../vitastor-0.6.5$(rpm --eval '%dist').tar.gz *

rpm/qemu-el8.Dockerfile

@@ -1,6 +1,3 @@
-# This is an attempt to automatically build patched RPM specs
-# More or less broken, better use *.spec.patch for now (and copy src/qemu_driver.c to SOURCES/qemu-vitastor.c)
-
 # Build packages for CentOS 8 inside a container
 # cd ..; podman build -t qemu-el8 -v `pwd`/packages:/root/packages -f rpm/qemu-el8.Dockerfile .
 

rpm/qemu-kvm-4.2-el8.spec.patch

@@ -1,112 +0,0 @@
---- qemu-kvm.spec.orig	2021-12-01 22:10:58.967935539 +0000
-+++ qemu-kvm.spec	2021-12-01 22:14:38.530117175 +0000
-@@ -57,6 +57,7 @@ Requires: %{name}-block-gluster = %{epoc
- %endif                                                           \
- Requires: %{name}-block-iscsi = %{epoch}:%{version}-%{release}   \
- Requires: %{name}-block-rbd = %{epoch}:%{version}-%{release}     \
-+Requires: %{name}-block-vitastor = %{epoch}:%{version}-%{release}\
- Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release}
- 
- # Macro to properly setup RHEL/RHEV conflict handling
-@@ -67,7 +68,7 @@ Obsoletes: %1-rhev
- Summary: QEMU is a machine emulator and virtualizer
- Name: qemu-kvm
- Version: 4.2.0
--Release: 29%{?dist}.6
-+Release: 32.vitastor%{?dist}.6
- # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
- Epoch: 15
- License: GPLv2 and GPLv2+ and CC-BY
-@@ -102,6 +103,7 @@ Source33: qemu-pr-helper.socket
- Source34: 81-kvm-rhel.rules
- Source35: udev-kvm-check.c
- Source36: README.tests
-+Source37: qemu-vitastor.c
- 
- 
- Patch0005: 0005-Initial-redhat-build.patch
-@@ -825,6 +827,7 @@ Patch331: kvm-Drop-bogus-IPv6-messages.p
- Patch333: kvm-virtiofsd-Whitelist-fchmod.patch
- # For bz#1883869 - virtiofsd core dump in KATA Container [rhel-8.2.1.z]
- Patch334: kvm-virtiofsd-avoid-proc-self-fd-tempdir.patch
-+Patch335: qemu-4.2-vitastor.patch
- 
- BuildRequires: wget
- BuildRequires: rpm-build
-@@ -861,6 +864,7 @@ BuildRequires: libcurl-devel
- BuildRequires: libssh-devel
- BuildRequires: librados-devel
- BuildRequires: librbd-devel
-+BuildRequires: vitastor-client-devel
- %if %{have_gluster}
- # For gluster block driver
- BuildRequires: glusterfs-api-devel
-@@ -1095,6 +1099,14 @@ Install this package if you want to acce
- using the rbd protocol.
- 
- 
-+%package  block-vitastor
-+Summary: QEMU Vitastor block driver
-+Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
-+
-+%description block-vitastor
-+This package provides the additional Vitastor block driver for QEMU.
-+
-+
- %package  block-ssh
- Summary: QEMU SSH block driver
- Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
-@@ -1109,6 +1121,7 @@ the Secure Shell (SSH) protocol.
- %prep
- %setup -n qemu-%{version}
- %autopatch -p1
-+cp %{SOURCE37} ./block/vitastor.c
- 
- %build
- %global buildarch %{kvm_target}-softmmu
-@@ -1116,7 +1129,7 @@ the Secure Shell (SSH) protocol.
- # --build-id option is used for giving info to the debug packages.
- buildldflags="VL_LDFLAGS=-Wl,--build-id"
- 
--%global block_drivers_list qcow2,raw,file,host_device,nbd,iscsi,rbd,blkdebug,luks,null-co,nvme,copy-on-read,throttle
-+%global block_drivers_list qcow2,raw,file,host_device,nbd,iscsi,rbd,vitastor,blkdebug,luks,null-co,nvme,copy-on-read,throttle
- 
- %if 0%{have_gluster}
-     %global block_drivers_list %{block_drivers_list},gluster
-@@ -1131,7 +1144,7 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
-  --docdir="%{qemudocdir}" \
-  --libexecdir="%{_libexecdir}" \
-  --extra-ldflags="-Wl,--build-id -Wl,-z,relro -Wl,-z,now" \
-- --extra-cflags="%{optflags}" \
-+ --extra-cflags="%{optflags} -DRHEL_BDRV_CO_TRUNCATE_FLAGS" \
-  --with-pkgversion="%{name}-%{version}-%{release}" \
-  --with-confsuffix=/"%{name}" \
-  --firmwarepath=%{_prefix}/share/qemu-firmware \
-@@ -1152,6 +1165,7 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
-   --disable-numa \
- %endif
-   --enable-rbd \
-+  --enable-vitastor \
- %if 0%{have_librdma}
-   --enable-rdma \
- %else
-@@ -1192,9 +1206,7 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
- %endif
-   --python=%{__python3} \
-   --target-list="%{buildarch}" \
--  --block-drv-rw-whitelist=%{block_drivers_list} \
-   --audio-drv-list= \
--  --block-drv-ro-whitelist=vmdk,vhdx,vpc,https,ssh \
-   --with-coroutine=ucontext \
-   --tls-priority=NORMAL \
-   --disable-bluez \
-@@ -1750,6 +1762,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s
- %files block-rbd
- %{_libdir}/qemu-kvm/block-rbd.so
- 
-+%files block-vitastor
-+%{_libdir}/qemu-kvm/block-vitastor.so
-+
- %files block-ssh
- %{_libdir}/qemu-kvm/block-ssh.so
- 

rpm/qemu-kvm-6.0-el8.spec.patch

@@ -1,103 +0,0 @@
---- qemu-kvm_6.0.spec.orig	2021-10-22 13:22:07.000000000 +0000
-+++ qemu-kvm_6.0.spec	2021-12-01 22:43:26.095508618 +0000
-@@ -67,6 +67,7 @@ Requires: %{name}-hw-usbredir = %{epoch}
- %endif                                                           \
- Requires: %{name}-block-iscsi = %{epoch}:%{version}-%{release}   \
- Requires: %{name}-block-rbd = %{epoch}:%{version}-%{release}     \
-+Requires: %{name}-block-vitastor = %{epoch}:%{version}-%{release}\
- Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release}
- 
- # Macro to properly setup RHEL/RHEV conflict handling
-@@ -77,7 +78,7 @@ Obsoletes: %1-rhev <= %{epoch}:%{version
- Summary: QEMU is a machine emulator and virtualizer
- Name: qemu-kvm
- Version: 6.0.0
--Release: 33%{?dist}
-+Release: 33.vitastor%{?dist}
- # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
- Epoch: 15
- License: GPLv2 and GPLv2+ and CC-BY
-@@ -112,6 +113,7 @@ Source33: qemu-pr-helper.socket
- Source34: 81-kvm-rhel.rules
- Source35: udev-kvm-check.c
- Source36: README.tests
-+Source37: qemu-vitastor.c
- 
- 
- Patch0001: 0001-redhat-Adding-slirp-to-the-exploded-tree.patch
-@@ -342,6 +344,7 @@ Patch109: kvm-virtio-balloon-Fix-page-po
- Patch110: kvm-virtio-net-fix-use-after-unmap-free-for-sg.patch
- # For bz#1999141 - migration fails with: "qemu-kvm: get_pci_config_device: Bad config data: i=0x9a read: 3 device: 2 cmask: ff wmask: 0 w1cmask:0"
- Patch111: kvm-Fix-virtio-net-pci-vectors-compat.patch
-+Patch112: qemu-6.0-vitastor.patch
- 
- BuildRequires: wget
- BuildRequires: rpm-build
-@@ -379,6 +382,7 @@ BuildRequires: libcurl-devel
- BuildRequires: libssh-devel
- BuildRequires: librados-devel
- BuildRequires: librbd-devel
-+BuildRequires: vitastor-client-devel
- %if %{have_gluster}
- # For gluster block driver
- BuildRequires: glusterfs-api-devel
-@@ -625,6 +629,14 @@ Install this package if you want to acce
- using the rbd protocol.
- 
- 
-+%package  block-vitastor
-+Summary: QEMU Vitastor block driver
-+Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
-+
-+%description block-vitastor
-+This package provides the additional Vitastor block driver for QEMU.
-+
-+
- %package  block-ssh
- Summary: QEMU SSH block driver
- Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
-@@ -678,6 +690,7 @@ This package provides usbredir support.
- rm -fr slirp
- mkdir slirp
- %autopatch -p1
-+cp %{SOURCE37} ./block/vitastor.c
- 
- %global qemu_kvm_build qemu_kvm_build
- %global qemu_kiwi_build qemu_kiwi_src/build
-@@ -701,7 +714,7 @@ mkdir -p %{qemu_kvm_build}
- # --build-id option is used for giving info to the debug packages.
- buildldflags="VL_LDFLAGS=-Wl,--build-id"
- 
--%global block_drivers_list qcow2,raw,file,host_device,nbd,iscsi,rbd,blkdebug,luks,null-co,nvme,copy-on-read,throttle
-+%global block_drivers_list qcow2,raw,file,host_device,nbd,iscsi,rbd,vitastor,blkdebug,luks,null-co,nvme,copy-on-read,throttle
- 
- %if 0%{have_gluster}
-     %global block_drivers_list %{block_drivers_list},gluster
-@@ -894,6 +907,7 @@ pushd %{qemu_kvm_build}
- %endif
-   --enable-pie \
-   --enable-rbd \
-+  --enable-vitastor \
- %if 0%{have_librdma}
-   --enable-rdma \
- %endif
-@@ -977,9 +991,7 @@ find ../default-configs -name "*-rh-devi
-   --firmwarepath=%{_prefix}/share/qemu-firmware \
-   --meson="%{__meson}" \
-   --target-list="%{buildarch}" \
--  --block-drv-rw-whitelist=%{block_drivers_list} \
-   --audio-drv-list= \
--  --block-drv-ro-whitelist=vmdk,vhdx,vpc,https,ssh \
-   --with-coroutine=ucontext \
-   --with-git=git \
-   --tls-priority=@QEMU,SYSTEM \
-@@ -1584,6 +1596,9 @@ sh %{_sysconfdir}/sysconfig/modules/kvm.
- %files block-rbd
- %{_libdir}/qemu-kvm/block-rbd.so
- 
-+%files block-vitastor
-+%{_libdir}/qemu-kvm/block-vitastor.so
-+
- %files block-ssh
- %{_libdir}/qemu-kvm/block-ssh.so
- 

rpm/qemu-kvm-el7.spec.patch

@@ -1,5 +1,5 @@
 --- qemu-kvm.spec.orig	2020-11-09 23:41:03.000000000 +0000
-+++ qemu-kvm.spec	2021-12-01 21:53:30.895747529 +0000
++++ qemu-kvm.spec	2020-12-06 10:44:24.207640963 +0000
 @@ -2,7 +2,7 @@
  %global SLOF_gittagcommit 899d9883
  
@@ -9,24 +9,25 @@
  %global have_opengl   1
  %global have_fdt      0
  %global have_gluster  1
-@@ -57,6 +57,7 @@ Requires: %{name}-block-gluster = %{epoc
+@@ -56,7 +56,7 @@ Requires: %{name}-block-curl = %{epoch}:
+ Requires: %{name}-block-gluster = %{epoch}:%{version}-%{release} \
  %endif                                                           \
  Requires: %{name}-block-iscsi = %{epoch}:%{version}-%{release}   \
- Requires: %{name}-block-rbd = %{epoch}:%{version}-%{release}     \
+-Requires: %{name}-block-rbd = %{epoch}:%{version}-%{release}     \
-+Requires: %{name}-block-vitastor = %{epoch}:%{version}-%{release}\
++#Requires: %{name}-block-rbd = %{epoch}:%{version}-%{release}     \
  Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release}
  
  # Macro to properly setup RHEL/RHEV conflict handling
-@@ -67,7 +68,7 @@ Obsoletes: %1-rhev
+@@ -67,7 +67,7 @@ Obsoletes: %1-rhev
  Summary: QEMU is a machine emulator and virtualizer
  Name: qemu-kvm
  Version: 4.2.0
 -Release: 29.vitastor%{?dist}.6
-+Release: 32.vitastor%{?dist}.6
++Release: 30.vitastor%{?dist}.6
  # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
  Epoch: 15
  License: GPLv2 and GPLv2+ and CC-BY
-@@ -99,9 +100,10 @@ Source30: kvm-s390x.conf
+@@ -99,8 +99,8 @@ Source30: kvm-s390x.conf
  Source31: kvm-x86.conf
  Source32: qemu-pr-helper.service
  Source33: qemu-pr-helper.socket
@@ -35,11 +36,9 @@
 +#Source34: 81-kvm-rhel.rules
 +#Source35: udev-kvm-check.c
  Source36: README.tests
-+Source37: qemu-vitastor.c
  
  
- Patch0005: 0005-Initial-redhat-build.patch
+@@ -825,7 +825,9 @@ Patch331: kvm-Drop-bogus-IPv6-messages.p
-@@ -825,7 +827,9 @@ Patch331: kvm-Drop-bogus-IPv6-messages.p
  Patch333: kvm-virtiofsd-Whitelist-fchmod.patch
  # For bz#1883869 - virtiofsd core dump in KATA Container [rhel-8.2.1.z]
  Patch334: kvm-virtiofsd-avoid-proc-self-fd-tempdir.patch
@@ -50,7 +49,7 @@
  
  BuildRequires: wget
  BuildRequires: rpm-build
-@@ -842,7 +846,8 @@ BuildRequires: pciutils-devel
+@@ -842,7 +844,8 @@ BuildRequires: pciutils-devel
  BuildRequires: libiscsi-devel
  BuildRequires: ncurses-devel
  BuildRequires: libattr-devel
@@ -60,7 +59,7 @@
  %if %{have_usbredir}
  BuildRequires: usbredir-devel >= 0.7.1
  %endif
-@@ -856,12 +861,13 @@ BuildRequires: virglrenderer-devel
+@@ -856,12 +859,12 @@ BuildRequires: virglrenderer-devel
  # For smartcard NSS support
  BuildRequires: nss-devel
  %endif
@@ -71,13 +70,12 @@
  BuildRequires: libssh-devel
 -BuildRequires: librados-devel
 -BuildRequires: librbd-devel
-+BuildRequires: librados2-devel
++#BuildRequires: librados-devel
-+BuildRequires: librbd1-devel
++#BuildRequires: librbd-devel
-+BuildRequires: vitastor-client-devel
  %if %{have_gluster}
  # For gluster block driver
  BuildRequires: glusterfs-api-devel
-@@ -955,25 +961,25 @@ hardware for a full system such as a PC
+@@ -955,25 +958,25 @@ hardware for a full system such as a PC
  
  %package -n qemu-kvm-core
  Summary: qemu-kvm core components
@@ -107,35 +105,38 @@
  # For compressed guest memory dumps
  Requires: lzo snappy
  %if %{have_kvm_setup}
-@@ -1096,6 +1102,14 @@ Install this package if you want to acce
+@@ -1085,15 +1088,15 @@ This package provides the additional iSC
- using the rbd protocol.
+ Install this package if you want to access iSCSI volumes.
+ 
+ 
+-%package  block-rbd
+-Summary: QEMU Ceph/RBD block driver
+-Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
+-
+-%description block-rbd
+-This package provides the additional Ceph/RBD block driver for QEMU.
+-
+-Install this package if you want to access remote Ceph volumes
+-using the rbd protocol.
++#%package  block-rbd
++#Summary: QEMU Ceph/RBD block driver
++#Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
++#
++#%description block-rbd
++#This package provides the additional Ceph/RBD block driver for QEMU.
++#
++#Install this package if you want to access remote Ceph volumes
++#using the rbd protocol.
  
  
-+%package  block-vitastor
-+Summary: QEMU Vitastor block driver
-+Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
-+
-+%description block-vitastor
-+This package provides the additional Vitastor block driver for QEMU.
-+
-+
  %package  block-ssh
- Summary: QEMU SSH block driver
+@@ -1117,12 +1120,14 @@ the Secure Shell (SSH) protocol.
- Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
-@@ -1110,6 +1124,7 @@ the Secure Shell (SSH) protocol.
- %prep
- %setup -n qemu-%{version}
- %autopatch -p1
-+cp %{SOURCE37} ./block/vitastor.c
- 
- %build
- %global buildarch %{kvm_target}-softmmu
-@@ -1117,12 +1132,13 @@ the Secure Shell (SSH) protocol.
  # --build-id option is used for giving info to the debug packages.
  buildldflags="VL_LDFLAGS=-Wl,--build-id"
  
 -%global block_drivers_list qcow2,raw,file,host_device,nbd,iscsi,rbd,blkdebug,luks,null-co,nvme,copy-on-read,throttle
-+%global block_drivers_list qcow2,raw,file,host_device,nbd,iscsi,rbd,vitastor,blkdebug,luks,null-co,nvme,copy-on-read,throttle
++#%global block_drivers_list qcow2,raw,file,host_device,nbd,iscsi,rbd,blkdebug,luks,null-co,nvme,copy-on-read,throttle
++%global block_drivers_list qcow2,raw,file,host_device,nbd,iscsi,blkdebug,luks,null-co,nvme,copy-on-read,throttle
  
  %if 0%{have_gluster}
      %global block_drivers_list %{block_drivers_list},gluster
@@ -145,20 +146,12 @@
  ./configure  \
   --prefix="%{_prefix}" \
   --libdir="%{_libdir}" \
-@@ -1132,7 +1148,7 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
+@@ -1152,15 +1157,15 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
-  --docdir="%{qemudocdir}" \
+ %else
-  --libexecdir="%{_libexecdir}" \
-  --extra-ldflags="-Wl,--build-id -Wl,-z,relro -Wl,-z,now" \
-- --extra-cflags="%{optflags}" \
-+ --extra-cflags="%{optflags} -DRHEL_BDRV_CO_TRUNCATE_FLAGS" \
-  --with-pkgversion="%{name}-%{version}-%{release}" \
-  --with-confsuffix=/"%{name}" \
-  --firmwarepath=%{_prefix}/share/qemu-firmware \
-@@ -1153,14 +1169,15 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
    --disable-numa \
  %endif
-   --enable-rbd \
+-  --enable-rbd \
-+  --enable-vitastor \
++  --disable-rbd \
  %if 0%{have_librdma}
    --enable-rdma \
  %else
@@ -172,7 +165,7 @@
    --enable-spice \
    --enable-smartcard \
    --enable-virglrenderer \
-@@ -1179,7 +1196,7 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
+@@ -1179,7 +1184,7 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
  %else
    --disable-usb-redir \
  %endif
@@ -181,7 +174,7 @@
  %ifarch x86_64
    --enable-libpmem \
  %else
-@@ -1193,9 +1210,7 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
+@@ -1193,9 +1198,7 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
  %endif
    --python=%{__python3} \
    --target-list="%{buildarch}" \
@@ -191,7 +184,7 @@
    --with-coroutine=ucontext \
    --tls-priority=NORMAL \
    --disable-bluez \
-@@ -1262,7 +1277,7 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
+@@ -1262,7 +1265,7 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
    --disable-sanitizers \
    --disable-hvf \
    --disable-whpx \
@@ -200,7 +193,7 @@
    --disable-membarrier \
    --disable-vhost-crypto \
    --disable-libxml2 \
-@@ -1308,7 +1323,7 @@ make V=1 %{?_smp_mflags} $buildldflags
+@@ -1308,7 +1311,7 @@ make V=1 %{?_smp_mflags} $buildldflags
  cp -a %{kvm_target}-softmmu/qemu-system-%{kvm_target} qemu-kvm
  
  gcc %{SOURCE6} $RPM_OPT_FLAGS $RPM_LD_FLAGS -o ksmctl
@@ -209,7 +202,7 @@
  
  %install
  %define _udevdir %(pkg-config --variable=udevdir udev)
-@@ -1343,8 +1358,8 @@ mkdir -p $RPM_BUILD_ROOT%{testsdir}/test
+@@ -1343,8 +1346,8 @@ mkdir -p $RPM_BUILD_ROOT%{testsdir}/test
  mkdir -p $RPM_BUILD_ROOT%{testsdir}/tests/qemu-iotests
  mkdir -p $RPM_BUILD_ROOT%{testsdir}/scripts/qmp
  
@@ -220,7 +213,7 @@
  
  install -m 0644 scripts/dump-guest-memory.py \
                  $RPM_BUILD_ROOT%{_datadir}/%{name}
-@@ -1562,6 +1577,8 @@ rm -rf $RPM_BUILD_ROOT%{qemudocdir}/inte
+@@ -1562,6 +1565,8 @@ rm -rf $RPM_BUILD_ROOT%{qemudocdir}/inte
  # Remove spec
  rm -rf $RPM_BUILD_ROOT%{qemudocdir}/specs
  
@@ -229,7 +222,7 @@
  %check
  export DIFF=diff; make check V=1
  
-@@ -1645,8 +1662,8 @@ useradd -r -u 107 -g qemu -G kvm -d / -s
+@@ -1645,8 +1650,8 @@ useradd -r -u 107 -g qemu -G kvm -d / -s
  %config(noreplace) %{_sysconfdir}/sysconfig/ksm
  %{_unitdir}/ksmtuned.service
  %{_sbindir}/ksmtuned
@@ -240,7 +233,7 @@
  %ghost %{_sysconfdir}/kvm
  %config(noreplace) %{_sysconfdir}/ksmtuned.conf
  %dir %{_sysconfdir}/%{name}
-@@ -1711,8 +1728,8 @@ useradd -r -u 107 -g qemu -G kvm -d / -s
+@@ -1711,8 +1716,8 @@ useradd -r -u 107 -g qemu -G kvm -d / -s
  %{_libexecdir}/vhost-user-gpu
  %{_datadir}/%{name}/vhost-user/50-qemu-gpu.json
  %endif
@@ -251,13 +244,14 @@
  
  %files -n qemu-img
  %defattr(-,root,root)
-@@ -1751,6 +1768,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s
+@@ -1748,8 +1753,8 @@ useradd -r -u 107 -g qemu -G kvm -d / -s
- %files block-rbd
+ %files block-iscsi
- %{_libdir}/qemu-kvm/block-rbd.so
+ %{_libdir}/qemu-kvm/block-iscsi.so
+ 
+-%files block-rbd
+-%{_libdir}/qemu-kvm/block-rbd.so
++#%files block-rbd
++#%{_libdir}/qemu-kvm/block-rbd.so
  
-+%files block-vitastor
-+%{_libdir}/qemu-kvm/block-vitastor.so
-+
  %files block-ssh
  %{_libdir}/qemu-kvm/block-ssh.so
- 

rpm/qemu-kvm.spec.patch

@@ -0,0 +1,29 @@
+--- qemu-kvm.spec	2020-12-05 13:13:54.388623517 +0000
++++ qemu-kvm.spec	2020-12-05 13:13:58.728696598 +0000
+@@ -67,7 +67,7 @@ Obsoletes: %1-rhev
+ Summary: QEMU is a machine emulator and virtualizer
+ Name: qemu-kvm
+ Version: 4.2.0
+-Release: 29%{?dist}.6
++Release: 29.vitastor%{?dist}.6
+ # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
+ Epoch: 15
+ License: GPLv2 and GPLv2+ and CC-BY
+@@ -825,6 +825,7 @@ Patch331: kvm-Drop-bogus-IPv6-messages.p
+ Patch333: kvm-virtiofsd-Whitelist-fchmod.patch
+ # For bz#1883869 - virtiofsd core dump in KATA Container [rhel-8.2.1.z]
+ Patch334: kvm-virtiofsd-avoid-proc-self-fd-tempdir.patch
++Patch335: qemu-4.2-vitastor.patch
+ 
+ BuildRequires: wget
+ BuildRequires: rpm-build
+@@ -1192,9 +1193,7 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
+ %endif
+   --python=%{__python3} \
+   --target-list="%{buildarch}" \
+-  --block-drv-rw-whitelist=%{block_drivers_list} \
+   --audio-drv-list= \
+-  --block-drv-ro-whitelist=vmdk,vhdx,vpc,https,ssh \
+   --with-coroutine=ucontext \
+   --tls-priority=NORMAL \
+   --disable-bluez \

rpm/vitastor-el7.Dockerfile

@@ -9,11 +9,15 @@ WORKDIR /root
 RUN rm -f /etc/yum.repos.d/CentOS-Media.repo
 RUN yum -y --enablerepo=extras install centos-release-scl epel-release yum-utils rpm-build
 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 gf-complete-devel rdma-core-devel
+RUN yum -y install devtoolset-9-gcc-c++ devtoolset-9-libatomic-devel gperftools-devel qemu-kvm fio rh-nodejs12 jerasure-devel gf-complete-devel
+RUN yumdownloader --disablerepo=centos-sclo-rh --source qemu-kvm
 RUN yumdownloader --disablerepo=centos-sclo-rh --source fio
+RUN rpm --nomd5 -i qemu*.src.rpm
 RUN rpm --nomd5 -i fio*.src.rpm
 RUN rm -f /etc/yum.repos.d/CentOS-Media.repo
+RUN cd ~/rpmbuild/SPECS && yum-builddep -y qemu-kvm.spec
 RUN cd ~/rpmbuild/SPECS && yum-builddep -y fio.spec
+RUN yum -y install rdma-core-devel
 
 ADD https://vitastor.io/rpms/liburing-el7/liburing-0.7-2.el7.src.rpm /root
 
@@ -34,7 +38,7 @@ ADD . /root/vitastor
 RUN set -e; \
     cd /root/vitastor/rpm; \
     sh build-tarball.sh; \
-    cp /root/vitastor-0.6.9.el7.tar.gz ~/rpmbuild/SOURCES; \
+    cp /root/vitastor-0.6.5.el7.tar.gz ~/rpmbuild/SOURCES; \
     cp vitastor-el7.spec ~/rpmbuild/SPECS/vitastor.spec; \
     cd ~/rpmbuild/SPECS/; \
     rpmbuild -ba vitastor.spec; \

rpm/vitastor-el7.spec

@@ -1,11 +1,11 @@
 Name:           vitastor
-Version:        0.6.9
+Version:        0.6.5
 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-0.6.9.el7.tar.gz
+Source0:        vitastor-0.6.5.el7.tar.gz
 
 BuildRequires:  liburing-devel >= 0.6
 BuildRequires:  gperftools-devel
@@ -16,11 +16,13 @@ BuildRequires:  jerasure-devel
 BuildRequires:  gf-complete-devel
 BuildRequires:  libibverbs-devel
 BuildRequires:  cmake
-Requires:       vitastor-osd = %{version}-%{release}
+Requires:       fio = 3.7-1.el7
-Requires:       vitastor-mon = %{version}-%{release}
+Requires:       qemu-kvm = 2.0.0-1.el7.6
-Requires:       vitastor-client = %{version}-%{release}
+Requires:       rh-nodejs12
-Requires:       vitastor-client-devel = %{version}-%{release}
+Requires:       rh-nodejs12-npm
-Requires:       vitastor-fio = %{version}-%{release}
+Requires:       liburing >= 0.6
+Requires:       libJerasure2
+Requires:       lpsolve
 
 %description
 Vitastor is a small, simple and fast clustered block storage (storage for VM drives),
@@ -29,66 +31,13 @@ symmetric clustering and automatic data distribution over any number of drives o
 size with configurable redundancy (replication or erasure codes/XOR).
 
 
-%package -n vitastor-osd
-Summary:        Vitastor - OSD
-Requires:       libJerasure2
-Requires:       liburing >= 0.6
-Requires:       vitastor-client = %{version}-%{release}
-
-
-%description -n vitastor-osd
-Vitastor object storage daemon, i.e. server program that stores data.
-
-
-%package -n vitastor-mon
-Summary:        Vitastor - monitor
-Requires:       rh-nodejs12
-Requires:       rh-nodejs12-npm
-Requires:       lpsolve
-
-
-%description -n vitastor-mon
-Vitastor monitor, i.e. server program responsible for watching cluster state and
-scheduling cluster-level operations.
-
-
-%package -n vitastor-client
-Summary:        Vitastor - client
-Requires:       liburing >= 0.6
-
-
-%description -n vitastor-client
-Vitastor client library and command-line interface.
-
-
-%package -n vitastor-client-devel
-Summary:        Vitastor - development files
-Group:          Development/Libraries
-Requires:       vitastor-client = %{version}-%{release}
-
-
-%description -n vitastor-client-devel
-Vitastor library headers for development.
-
-
-%package -n vitastor-fio
-Summary:        Vitastor - fio drivers
-Group:          Development/Libraries
-Requires:       vitastor-client = %{version}-%{release}
-Requires:       fio = 3.7-1.el7
-
-
-%description -n vitastor-fio
-Vitastor fio drivers for benchmarking.
-
-
 %prep
 %setup -q
 
 
 %build
 . /opt/rh/devtoolset-9/enable
-%cmake .
+%cmake . -DQEMU_PLUGINDIR=qemu-kvm
 %make_build
 
 
@@ -100,42 +49,23 @@ cd mon
 npm install
 cd ..
 mkdir -p %buildroot/usr/lib/vitastor
-cp mon/make-osd.sh %buildroot/usr/lib/vitastor
+cp -r mon %buildroot/usr/lib/vitastor/mon
-cp -r mon %buildroot/usr/lib/vitastor
 
 
 %files
-%doc GPL-2.0.txt VNPL-1.1.txt README.md README-ru.md
+%doc
-
-
-%files -n vitastor-osd
-%_bindir/vitastor-osd
 %_bindir/vitastor-dump-journal
-
-
-%files -n vitastor-mon
-/usr/lib/vitastor/mon
-
-
-%files -n vitastor-client
 %_bindir/vitastor-nbd
-%_bindir/vitastor-cli
+%_bindir/vitastor-osd
 %_bindir/vitastor-rm
-%_bindir/vita
+%_libdir/qemu-kvm/block-vitastor.so
-%_libdir/libvitastor_blk.so*
-%_libdir/libvitastor_client.so*
-/usr/lib/vitastor/make-osd.sh
-
-
-%files -n vitastor-client-devel
-%_includedir/vitastor_c.h
-%_libdir/pkgconfig
-
-
-%files -n vitastor-fio
 %_libdir/libfio_vitastor.so
 %_libdir/libfio_vitastor_blk.so
 %_libdir/libfio_vitastor_sec.so
+%_libdir/libvitastor_blk.so*
+%_libdir/libvitastor_client.so*
+%_includedir/vitastor_c.h
+/usr/lib/vitastor
 
 
 %changelog

rpm/vitastor-el8.Dockerfile

@@ -8,11 +8,14 @@ WORKDIR /root
 RUN rm -f /etc/yum.repos.d/CentOS-Media.repo
 RUN dnf -y install centos-release-advanced-virtualization epel-release dnf-plugins-core
 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 \
+RUN dnf --enablerepo='centos-advanced-virtualization' -y install gcc-toolset-9 gcc-toolset-9-gcc-c++ gperftools-devel qemu-kvm fio nodejs rpm-build jerasure-devel gf-complete-devel
-    fio nodejs rpm-build jerasure-devel gf-complete-devel libibverbs-devel libarchive cmake
+RUN rm -rf /var/lib/dnf/*; dnf download --disablerepo='*' --enablerepo='vitastor' --source qemu-kvm
 RUN dnf download --source fio
+RUN rpm --nomd5 -i qemu*.src.rpm
 RUN rpm --nomd5 -i fio*.src.rpm
-RUN cd ~/rpmbuild/SPECS && dnf builddep -y --enablerepo=powertools --spec fio.spec
+RUN cd ~/rpmbuild/SPECS && dnf builddep -y --enablerepo=powertools --spec qemu-kvm.spec
+RUN cd ~/rpmbuild/SPECS && dnf builddep -y --enablerepo=powertools --spec fio.spec && dnf install -y cmake
+RUN yum -y install libibverbs-devel libarchive
 
 ADD https://vitastor.io/rpms/liburing-el7/liburing-0.7-2.el7.src.rpm /root
 
@@ -26,14 +29,14 @@ RUN set -e; \
     cp ~/rpmbuild/RPMS/*/liburing* /root/packages/liburing-el8/; \
     cp ~/rpmbuild/SRPMS/liburing* /root/packages/liburing-el8/
 
-RUN rpm -i `ls /root/packages/liburing-el8/liburing-*.x86_64.rpm | grep -v debug`
+RUN rpm -i `ls /root/packages/liburing-el7/liburing-*.x86_64.rpm | grep -v debug`
 
 ADD . /root/vitastor
 
 RUN set -e; \
     cd /root/vitastor/rpm; \
     sh build-tarball.sh; \
-    cp /root/vitastor-0.6.9.el8.tar.gz ~/rpmbuild/SOURCES; \
+    cp /root/vitastor-0.6.5.el8.tar.gz ~/rpmbuild/SOURCES; \
     cp vitastor-el8.spec ~/rpmbuild/SPECS/vitastor.spec; \
     cd ~/rpmbuild/SPECS/; \
     rpmbuild -ba vitastor.spec; \

rpm/vitastor-el8.spec

@@ -1,11 +1,11 @@
 Name:           vitastor
-Version:        0.6.9
+Version:        0.6.5
 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-0.6.9.el8.tar.gz
+Source0:        vitastor-0.6.5.el8.tar.gz
 
 BuildRequires:  liburing-devel >= 0.6
 BuildRequires:  gperftools-devel
@@ -15,11 +15,12 @@ BuildRequires:  jerasure-devel
 BuildRequires:  gf-complete-devel
 BuildRequires:  libibverbs-devel
 BuildRequires:  cmake
-Requires:       vitastor-osd = %{version}-%{release}
+Requires:       fio = 3.7-3.el8
-Requires:       vitastor-mon = %{version}-%{release}
+Requires:       qemu-kvm = 4.2.0-29.el8.6
-Requires:       vitastor-client = %{version}-%{release}
+Requires:       nodejs >= 10
-Requires:       vitastor-client-devel = %{version}-%{release}
+Requires:       liburing >= 0.6
-Requires:       vitastor-fio = %{version}-%{release}
+Requires:       libJerasure2
+Requires:       lpsolve
 
 %description
 Vitastor is a small, simple and fast clustered block storage (storage for VM drives),
@@ -28,65 +29,13 @@ symmetric clustering and automatic data distribution over any number of drives o
 size with configurable redundancy (replication or erasure codes/XOR).
 
 
-%package -n vitastor-osd
-Summary:        Vitastor - OSD
-Requires:       libJerasure2
-Requires:       liburing >= 0.6
-Requires:       vitastor-client = %{version}-%{release}
-
-
-%description -n vitastor-osd
-Vitastor object storage daemon, i.e. server program that stores data.
-
-
-%package -n vitastor-mon
-Summary:        Vitastor - monitor
-Requires:       nodejs >= 10
-Requires:       lpsolve
-
-
-%description -n vitastor-mon
-Vitastor monitor, i.e. server program responsible for watching cluster state and
-scheduling cluster-level operations.
-
-
-%package -n vitastor-client
-Summary:        Vitastor - client
-Requires:       liburing >= 0.6
-
-
-%description -n vitastor-client
-Vitastor client library and command-line interface.
-
-
-%package -n vitastor-client-devel
-Summary:        Vitastor - development files
-Group:          Development/Libraries
-Requires:       vitastor-client = %{version}-%{release}
-
-
-%description -n vitastor-client-devel
-Vitastor library headers for development.
-
-
-%package -n vitastor-fio
-Summary:        Vitastor - fio drivers
-Group:          Development/Libraries
-Requires:       vitastor-client = %{version}-%{release}
-Requires:       fio = 3.7-3.el8
-
-
-%description -n vitastor-fio
-Vitastor fio drivers for benchmarking.
-
-
 %prep
 %setup -q
 
 
 %build
 . /opt/rh/gcc-toolset-9/enable
-%cmake .
+%cmake . -DQEMU_PLUGINDIR=qemu-kvm
 %make_build
 
 
@@ -97,42 +46,23 @@ cd mon
 npm install
 cd ..
 mkdir -p %buildroot/usr/lib/vitastor
-cp mon/make-osd.sh %buildroot/usr/lib/vitastor
 cp -r mon %buildroot/usr/lib/vitastor
 
 
 %files
-%doc GPL-2.0.txt VNPL-1.1.txt README.md README-ru.md
+%doc
-
-
-%files -n vitastor-osd
-%_bindir/vitastor-osd
 %_bindir/vitastor-dump-journal
-
-
-%files -n vitastor-mon
-/usr/lib/vitastor/mon
-
-
-%files -n vitastor-client
 %_bindir/vitastor-nbd
-%_bindir/vitastor-cli
+%_bindir/vitastor-osd
 %_bindir/vitastor-rm
-%_bindir/vita
+%_libdir/qemu-kvm/block-vitastor.so
-%_libdir/libvitastor_blk.so*
-%_libdir/libvitastor_client.so*
-/usr/lib/vitastor/make-osd.sh
-
-
-%files -n vitastor-client-devel
-%_includedir/vitastor_c.h
-%_libdir/pkgconfig
-
-
-%files -n vitastor-fio
 %_libdir/libfio_vitastor.so
 %_libdir/libfio_vitastor_blk.so
 %_libdir/libfio_vitastor_sec.so
+%_libdir/libvitastor_blk.so*
+%_libdir/libvitastor_client.so*
+%_includedir/vitastor_c.h
+/usr/lib/vitastor
 
 
 %changelog

src/CMakeLists.txt

@@ -4,7 +4,7 @@ project(vitastor)
 
 include(GNUInstallDirs)
 
-set(WITH_QEMU false CACHE BOOL "Build QEMU driver inside Vitastor source tree")
+set(WITH_QEMU true CACHE BOOL "Build QEMU driver")
 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")
@@ -15,8 +15,8 @@ if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/local/?$")
 	set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
 endif()
 
-add_definitions(-DVERSION="0.6.9")
+add_definitions(-DVERSION="0.6.5")
-add_definitions(-Wall -Wno-sign-compare -Wno-comment -Wno-parentheses -Wno-pointer-arith -fdiagnostics-color=always -I ${CMAKE_SOURCE_DIR}/src)
+add_definitions(-Wall -Wno-sign-compare -Wno-comment -Wno-parentheses -Wno-pointer-arith -I ${CMAKE_SOURCE_DIR}/src)
 if (${WITH_ASAN})
 	add_definitions(-fsanitize=address -fno-omit-frame-pointer)
 	add_link_options(-fsanitize=address -fno-omit-frame-pointer)
@@ -36,11 +36,6 @@ 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)
-	install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${filepath} \$ENV{DESTDIR}${sympath})")
-	install(CODE "message(\"-- Created symlink: ${sympath} -> ${filepath}\")")
-endmacro(install_symlink)
-
 find_package(PkgConfig)
 pkg_check_modules(LIBURING REQUIRED liburing)
 if (${WITH_QEMU})
@@ -121,7 +116,6 @@ endif (${WITH_FIO})
 # libvitastor_client.so
 add_library(vitastor_client SHARED
 	cluster_client.cpp
-	cluster_client_list.cpp
 	vitastor_c.cpp
 )
 set_target_properties(vitastor_client PROPERTIES PUBLIC_HEADER "vitastor_c.h")
@@ -151,15 +145,13 @@ target_link_libraries(vitastor-nbd
 	vitastor_client
 )
 
-# vitastor-cli
+# vitastor-rm
-add_executable(vitastor-cli
+add_executable(vitastor-rm
-	cli.cpp cli_alloc_osd.cpp cli_simple_offsets.cpp
+	rm_inode.cpp
-	cli_ls.cpp cli_create.cpp cli_modify.cpp cli_flatten.cpp cli_merge.cpp cli_rm.cpp cli_snap_rm.cpp
 )
-target_link_libraries(vitastor-cli
+target_link_libraries(vitastor-rm
 	vitastor_client
 )
-configure_file(vitastor.pc.in vitastor.pc @ONLY)
 
 # vitastor-dump-journal
 add_executable(vitastor-dump-journal
@@ -171,7 +163,6 @@ if (${WITH_QEMU})
 	add_library(qemu_vitastor SHARED
 		qemu_driver.c
 	)
-	target_compile_options(qemu_vitastor PUBLIC -DVITASTOR_SOURCE_TREE)
 	target_include_directories(qemu_vitastor PUBLIC
 		../qemu/b/qemu
 		../qemu/include
@@ -229,7 +220,7 @@ target_link_libraries(test_cas
 # test_cluster_client
 add_executable(test_cluster_client
 	test_cluster_client.cpp
-	pg_states.cpp osd_ops.cpp cluster_client.cpp cluster_client_list.cpp msgr_op.cpp mock/messenger.cpp msgr_stop.cpp
+	pg_states.cpp osd_ops.cpp cluster_client.cpp msgr_op.cpp mock/messenger.cpp msgr_stop.cpp
 	etcd_state_client.cpp timerfd_manager.cpp ../json11/json11.cpp
 )
 target_compile_definitions(test_cluster_client PUBLIC -D__MOCK__)
@@ -243,15 +234,12 @@ target_include_directories(test_cluster_client PUBLIC ${CMAKE_SOURCE_DIR}/src/mo
 
 ### Install
 
-install(TARGETS vitastor-osd vitastor-dump-journal vitastor-nbd vitastor-cli RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(TARGETS vitastor-osd vitastor-dump-journal vitastor-nbd vitastor-rm RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-install_symlink(vitastor-cli ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/vitastor-rm)
-install_symlink(vitastor-cli ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/vita)
 install(
 	TARGETS vitastor_blk vitastor_client
 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 	PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
 )
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/vitastor.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 if (${WITH_FIO})
 	install(TARGETS fio_vitastor fio_vitastor_blk fio_vitastor_sec LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif (${WITH_FIO})

src/blockstore.cpp

@@ -48,11 +48,6 @@ std::map<uint64_t, uint64_t> & blockstore_t::get_inode_space_stats()
     return impl->inode_space_stats;
 }
 
-void blockstore_t::dump_diagnostics()
-{
-    return impl->dump_diagnostics();
-}
-
 uint32_t blockstore_t::get_block_size()
 {
     return impl->get_block_size();
@@ -68,11 +63,6 @@ uint64_t blockstore_t::get_free_block_count()
     return impl->get_free_block_count();
 }
 
-uint64_t blockstore_t::get_journal_size()
-{
-    return impl->get_journal_size();
-}
-
 uint32_t blockstore_t::get_bitmap_granularity()
 {
     return impl->get_bitmap_granularity();

src/blockstore.h

@@ -186,15 +186,10 @@ public:
     // Get per-inode space usage statistics
     std::map<uint64_t, uint64_t> & get_inode_space_stats();
 
-    // Print diagnostics to stdout
-    void dump_diagnostics();
-
     // FIXME rename to object_size
     uint32_t get_block_size();
     uint64_t get_block_count();
     uint64_t get_free_block_count();
 
-    uint64_t get_journal_size();
-
     uint32_t get_bitmap_granularity();
 };

src/blockstore_flush.cpp

@@ -182,75 +182,6 @@ void journal_flusher_t::release_trim()
     trim_wanted--;
 }
 
-void journal_flusher_t::dump_diagnostics()
-{
-    const char *unflushable_type = "";
-    obj_ver_id unflushable = { 0 };
-    // Try to find out if there is a flushable object for information
-    for (object_id cur_oid: flush_queue)
-    {
-        obj_ver_id cur = { .oid = cur_oid, .version = flush_versions[cur_oid] };
-        auto dirty_end = bs->dirty_db.find(cur);
-        if (dirty_end == bs->dirty_db.end())
-        {
-            // Already flushed
-            continue;
-        }
-        auto repeat_it = sync_to_repeat.find(cur.oid);
-        if (repeat_it != sync_to_repeat.end())
-        {
-            // Someone is already flushing it
-            unflushable_type = "locked,";
-            unflushable = cur;
-            break;
-        }
-        if (dirty_end->second.journal_sector >= bs->journal.dirty_start &&
-            (bs->journal.dirty_start >= bs->journal.used_start ||
-            dirty_end->second.journal_sector < bs->journal.used_start))
-        {
-            // Object is more recent than possible to flush
-            bool found = try_find_older(dirty_end, cur);
-            if (!found)
-            {
-                unflushable_type = "dirty,";
-                unflushable = cur;
-                break;
-            }
-        }
-        unflushable_type = "ok,";
-        unflushable = cur;
-        break;
-    }
-    printf(
-        "Flusher: queued=%ld first=%s%lx:%lx trim_wanted=%d dequeuing=%d trimming=%d cur=%d target=%d active=%d syncing=%d\n",
-        flush_queue.size(), unflushable_type, unflushable.oid.inode, unflushable.oid.stripe,
-        trim_wanted, dequeuing, trimming, cur_flusher_count, target_flusher_count,
-        active_flushers, syncing_flushers
-    );
-}
-
-bool journal_flusher_t::try_find_older(std::map<obj_ver_id, dirty_entry>::iterator & dirty_end, obj_ver_id & cur)
-{
-    bool found = false;
-    while (dirty_end != bs->dirty_db.begin())
-    {
-        dirty_end--;
-        if (dirty_end->first.oid != cur.oid)
-        {
-            break;
-        }
-        if (!(dirty_end->second.journal_sector >= bs->journal.dirty_start &&
-            (bs->journal.dirty_start >= bs->journal.used_start ||
-            dirty_end->second.journal_sector < bs->journal.used_start)))
-        {
-            found = true;
-            cur.version = dirty_end->first.version;
-            break;
-        }
-    }
-    return found;
-}
-
 #define await_sqe(label) \
     resume_##label:\
         sqe = bs->get_sqe();\
@@ -355,15 +286,30 @@ stop_flusher:
             // And it may even block writes if we don't flush the older version
             // (if it's in the beginning of the journal)...
             // So first try to find an older version of the same object to flush.
-            bool found = flusher->try_find_older(dirty_end, cur);
+            bool found = false;
+            while (dirty_end != bs->dirty_db.begin())
+            {
+                dirty_end--;
+                if (dirty_end->first.oid != cur.oid)
+                {
+                    break;
+                }
+                if (!(dirty_end->second.journal_sector >= bs->journal.dirty_start &&
+                    (bs->journal.dirty_start >= bs->journal.used_start ||
+                    dirty_end->second.journal_sector < bs->journal.used_start)))
+                {
+                    found = true;
+                    cur.version = dirty_end->first.version;
+                    break;
+                }
+            }
             if (!found)
             {
                 // Try other objects
                 flusher->sync_to_repeat.erase(cur.oid);
                 int search_left = flusher->flush_queue.size() - 1;
 #ifdef BLOCKSTORE_DEBUG
-                printf("Flusher overran writers (%lx:%lx v%lu, dirty_start=%08lx) - searching for older flushes (%d left)\n",
+                printf("Flusher overran writers (dirty_start=%08lx) - searching for older flushes (%d left)\n", bs->journal.dirty_start, search_left);
-                    cur.oid.inode, cur.oid.stripe, cur.version, bs->journal.dirty_start, search_left);
 #endif
                 while (search_left > 0)
                 {
@@ -386,12 +332,7 @@ stop_flusher:
                         else
                         {
                             repeat_it = flusher->sync_to_repeat.find(cur.oid);
-                            if (repeat_it != flusher->sync_to_repeat.end())
+                            if (repeat_it == flusher->sync_to_repeat.end())
-                            {
-                                if (repeat_it->second < cur.version)
-                                    repeat_it->second = cur.version;
-                            }
-                            else
                             {
                                 flusher->sync_to_repeat[cur.oid] = 0;
                                 break;
@@ -743,15 +684,12 @@ bool journal_flusher_co::scan_dirty(int wait_base)
                 offset = dirty_it->second.offset;
                 end_offset = dirty_it->second.offset + dirty_it->second.len;
                 it = v.begin();
-                while (end_offset > offset)
+                while (1)
                 {
                     for (; it != v.end(); it++)
-                        if (it->offset+it->len > offset)
+                        if (it->offset >= offset)
                             break;
-                    // If all items end before offset or if the found item starts after end_offset, just insert the buffer
+                    if (it == v.end() || it->offset > offset && it->len > 0)
-                    // If (offset < it->offset < end_offset) insert (offset..it->offset) part
-                    // If (it->offset <= offset <= it->offset+it->len) then just skip to it->offset+it->len
-                    if (it == v.end() || it->offset > offset)
                     {
                         submit_offset = dirty_it->second.location + offset - dirty_it->second.offset;
                         submit_len = it == v.end() || it->offset >= end_offset ? end_offset-offset : it->offset-offset;
@@ -775,7 +713,7 @@ bool journal_flusher_co::scan_dirty(int wait_base)
                         }
                     }
                     offset = it->offset+it->len;
-                    if (it == v.end())
+                    if (it == v.end() || offset >= end_offset)
                         break;
                 }
             }

src/blockstore_flush.h

@@ -97,9 +97,6 @@ class journal_flusher_t
     std::map<uint64_t, meta_sector_t> meta_sectors;
     std::deque<object_id> flush_queue;
     std::map<object_id, uint64_t> flush_versions;
-
-    bool try_find_older(std::map<obj_ver_id, dirty_entry>::iterator & dirty_end, obj_ver_id & cur);
-
 public:
     journal_flusher_t(blockstore_impl_t *bs);
     ~journal_flusher_t();
@@ -111,5 +108,4 @@ public:
     void enqueue_flush(obj_ver_id oid);
     void unshift_flush(obj_ver_id oid, bool force);
     void remove_flush(object_id oid);
-    void dump_diagnostics();
 };

src/blockstore_impl.cpp

@@ -595,9 +595,3 @@ void blockstore_impl_t::process_list(blockstore_op_t *op)
     op->buf = stable;
     FINISH_OP(op);
 }
-
-void blockstore_impl_t::dump_diagnostics()
-{
-    journal.dump_diagnostics();
-    flusher->dump_diagnostics();
-}

src/blockstore_impl.h

@@ -361,12 +361,8 @@ public:
     // Space usage statistics
     std::map<uint64_t, uint64_t> inode_space_stats;
 
-    // Print diagnostics to stdout
-    void dump_diagnostics();
-
     inline uint32_t get_block_size() { return block_size; }
     inline uint64_t get_block_count() { return block_count; }
     inline uint64_t get_free_block_count() { return data_alloc->get_free_count(); }
     inline uint32_t get_bitmap_granularity() { return disk_alignment; }
-    inline uint64_t get_journal_size() { return journal.len; }
 };

src/blockstore_journal.cpp

@@ -218,19 +218,3 @@ uint64_t journal_t::get_trim_pos()
     // Can't trim journal
     return used_start;
 }
-
-void journal_t::dump_diagnostics()
-{
-    auto journal_used_it = used_sectors.lower_bound(used_start);
-    if (journal_used_it == used_sectors.end())
-    {
-        // Journal is cleared to its end, restart from the beginning
-        journal_used_it = used_sectors.begin();
-    }
-    printf(
-        "Journal: used_start=%08lx next_free=%08lx dirty_start=%08lx trim_to=%08lx trim_to_refs=%ld\n",
-        used_start, next_free, dirty_start,
-        journal_used_it == used_sectors.end() ? 0 : journal_used_it->first,
-        journal_used_it == used_sectors.end() ? 0 : journal_used_it->second
-    );
-}

src/blockstore_journal.h

@@ -180,7 +180,6 @@ struct journal_t
     ~journal_t();
     bool trim();
     uint64_t get_trim_pos();
-    void dump_diagnostics();
     inline bool entry_fits(int size)
     {
         return !(block_size - in_sector_pos < size ||

src/blockstore_write.cpp

@@ -478,15 +478,15 @@ resume_2:
     }
 resume_4:
     // Switch object state
+#ifdef BLOCKSTORE_DEBUG
+    printf("Ack write %lx:%lx v%lu = state 0x%x\n", op->oid.inode, op->oid.stripe, op->version, dirty_it->second.state);
+#endif
     {
         auto dirty_it = dirty_db.find((obj_ver_id){
             .oid = op->oid,
             .version = op->version,
         });
         assert(dirty_it != dirty_db.end());
-#ifdef BLOCKSTORE_DEBUG
-        printf("Ack write %lx:%lx v%lu = state 0x%x\n", op->oid.inode, op->oid.stripe, op->version, dirty_it->second.state);
-#endif
         bool is_big = (dirty_it->second.state & BS_ST_TYPE_MASK) == BS_ST_BIG_WRITE;
         bool imm = is_big ? (immediate_commit == IMMEDIATE_ALL) : (immediate_commit != IMMEDIATE_NONE);
         if (imm)

src/cli.cpp

@@ -1,348 +0,0 @@
-// Copyright (c) Vitaliy Filippov, 2019+
-// License: VNPL-1.1 (see README.md for details)
-
-/**
- * CLI tool
- * Currently can (a) remove inodes and (b) merge snapshot/clone layers
- */
-
-#include <vector>
-#include <algorithm>
-
-#include "cli.h"
-#include "epoll_manager.h"
-#include "cluster_client.h"
-#include "pg_states.h"
-#include "base64.h"
-
-static const char *exe_name = NULL;
-
-json11::Json::object cli_tool_t::parse_args(int narg, const char *args[])
-{
-    json11::Json::object cfg;
-    json11::Json::array cmd;
-    cfg["progress"] = "1";
-    for (int i = 1; i < narg; i++)
-    {
-        if (!strcmp(args[i], "-h") || !strcmp(args[i], "--help"))
-        {
-            help();
-        }
-        else if (args[i][0] == '-' && args[i][1] == 'l')
-        {
-            cfg["long"] = "1";
-        }
-        else if (args[i][0] == '-' && args[i][1] == 'n')
-        {
-            cfg["count"] = args[++i];
-        }
-        else if (args[i][0] == '-' && args[i][1] == 'p')
-        {
-            cfg["pool"] = args[++i];
-        }
-        else if (args[i][0] == '-' && args[i][1] == 's')
-        {
-            cfg["size"] = args[++i];
-        }
-        else if (args[i][0] == '-' && args[i][1] == 'r')
-        {
-            cfg["reverse"] = "1";
-        }
-        else if (args[i][0] == '-' && args[i][1] == 'f')
-        {
-            cfg["force"] = "1";
-        }
-        else if (args[i][0] == '-' && args[i][1] == '-')
-        {
-            const char *opt = args[i]+2;
-            cfg[opt] = i == narg-1 || !strcmp(opt, "json") || !strcmp(opt, "wait-list") ||
-                !strcmp(opt, "long") || !strcmp(opt, "del") || !strcmp(opt, "no-color") ||
-                !strcmp(opt, "force") || !strcmp(opt, "reverse") ||
-                !strcmp(opt, "writers-stopped") && strcmp("1", args[i+1]) != 0
-                ? "1" : args[++i];
-        }
-        else
-        {
-            cmd.push_back(std::string(args[i]));
-        }
-    }
-    if (!cmd.size())
-    {
-        std::string exe(exe_name);
-        if (exe.substr(exe.size()-11) == "vitastor-rm")
-        {
-            cmd.push_back("rm-data");
-        }
-    }
-    cfg["command"] = cmd;
-    return cfg;
-}
-
-void cli_tool_t::help()
-{
-    printf(
-        "Vitastor command-line tool\n"
-        "(c) Vitaliy Filippov, 2019+ (VNPL-1.1)\n"
-        "\n"
-        "USAGE:\n"
-        "%s ls [-l] [-p POOL] [--sort FIELD] [-r] [-n N] [<name> ...]\n"
-        "  List images (only specified if <name> passed).\n"
-        "  -p|--pool POOL  Filter images by pool ID or name\n"
-        "  -l|--long       Also report allocated size and I/O statistics\n"
-        "  --del           Also include delete operation statistics\n"
-        "  --sort FIELD    Sort by specified field (name, size, used_size, <read|write|delete>_<iops|bps|lat|queue>)\n"
-        "  -r|--reverse    Sort in descending order\n"
-        "  -n|--count N    Only list first N items\n"
-        "\n"
-        "%s create -s|--size <size> [-p|--pool <id|name>] [--parent <parent_name>[@<snapshot>]] <name>\n"
-        "  Create an image. You may use K/M/G/T suffixes for <size>. If --parent is specified,\n"
-        "  a copy-on-write image clone is created. Parent must be a snapshot (readonly image).\n"
-        "  Pool must be specified if there is more than one pool.\n"
-        "\n"
-        "%s create --snapshot <snapshot> [-p|--pool <id|name>] <image>\n"
-        "%s snap-create [-p|--pool <id|name>] <image>@<snapshot>\n"
-        "  Create a snapshot of image <name>. May be used live if only a single writer is active.\n"
-        "\n"
-        "%s modify <name> [--rename <new-name>] [-s|--size <size>] [--readonly | --readwrite] [-f|--force]\n"
-        "  Rename, resize image or change its readonly status. Images with children can't be made read-write.\n"
-        "  If the new size is smaller than the old size, extra data will be purged.\n"
-        "  You should resize file system in the image, if present, before shrinking it.\n"
-        "  -f|--force  Proceed with shrinking or setting readwrite flag even if the image has children.\n"
-        "\n"
-        "%s rm <from> [<to>] [--writers-stopped]\n"
-        "  Remove <from> or all layers between <from> and <to> (<to> must be a child of <from>),\n"
-        "  rebasing all their children accordingly. --writers-stopped allows merging to be a bit\n"
-        "  more effective in case of a single 'slim' read-write child and 'fat' removed parent:\n"
-        "  the child is merged into parent and parent is renamed to child in that case.\n"
-        "  In other cases parent layers are always merged into children.\n"
-        "\n"
-        "%s flatten <layer>\n"
-        "  Flatten a layer, i.e. merge data and detach it from parents.\n"
-        "\n"
-        "%s rm-data --pool <pool> --inode <inode> [--wait-list] [--min-offset <offset>]\n"
-        "  Remove inode data without changing metadata.\n"
-        "  --wait-list   Retrieve full objects listings before starting to remove objects.\n"
-        "                Requires more memory, but allows to show correct removal progress.\n"
-        "  --min-offset  Purge only data starting with specified offset.\n"
-        "\n"
-        "%s merge-data <from> <to> [--target <target>]\n"
-        "  Merge layer data without changing metadata. Merge <from>..<to> to <target>.\n"
-        "  <to> must be a child of <from> and <target> may be one of the layers between\n"
-        "  <from> and <to>, including <from> and <to>.\n"
-        "\n"
-        "%s alloc-osd\n"
-        "  Allocate a new OSD number and reserve it by creating empty /osd/stats/<n> key.\n"
-        "%s simple-offsets <device>\n"
-        "  Calculate offsets for simple&stupid (no superblock) OSD deployment. Options:\n"
-        "  --object_size 128k       Set blockstore block size\n"
-        "  --bitmap_granularity 4k  Set bitmap granularity\n"
-        "  --journal_size 16M       Set journal size\n"
-        "  --device_block_size 4k   Set device block size\n"
-        "  --journal_offset 0       Set journal offset\n"
-        "  --device_size 0          Set device size\n"
-        "  --format text            Result format: json, options, env, or text\n"
-        "\n"
-        "GLOBAL OPTIONS:\n"
-        "  --etcd_address <etcd_address>\n"
-        "  --iodepth N         Send N operations in parallel to each OSD when possible (default 32)\n"
-        "  --parallel_osds M   Work with M osds in parallel when possible (default 4)\n"
-        "  --progress 1|0      Report progress (default 1)\n"
-        "  --cas 1|0           Use online CAS writes when possible (default auto)\n"
-        "  --no-color          Disable colored output\n"
-        "  --json              JSON output\n"
-        ,
-        exe_name, exe_name, exe_name, exe_name, exe_name, exe_name, exe_name, exe_name, exe_name, exe_name, exe_name
-    );
-    exit(0);
-}
-
-void cli_tool_t::change_parent(inode_t cur, inode_t new_parent)
-{
-    auto cur_cfg_it = cli->st_cli.inode_config.find(cur);
-    if (cur_cfg_it == cli->st_cli.inode_config.end())
-    {
-        fprintf(stderr, "Inode 0x%lx disappeared\n", cur);
-        exit(1);
-    }
-    inode_config_t new_cfg = cur_cfg_it->second;
-    std::string cur_name = new_cfg.name;
-    std::string cur_cfg_key = base64_encode(cli->st_cli.etcd_prefix+
-        "/config/inode/"+std::to_string(INODE_POOL(cur))+
-        "/"+std::to_string(INODE_NO_POOL(cur)));
-    new_cfg.parent_id = new_parent;
-    json11::Json::object cur_cfg_json = cli->st_cli.serialize_inode_cfg(&new_cfg);
-    waiting++;
-    cli->st_cli.etcd_txn(json11::Json::object {
-        { "compare", json11::Json::array {
-            json11::Json::object {
-                { "target", "MOD" },
-                { "key", cur_cfg_key },
-                { "result", "LESS" },
-                { "mod_revision", new_cfg.mod_revision+1 },
-            },
-        } },
-        { "success", json11::Json::array {
-            json11::Json::object {
-                { "request_put", json11::Json::object {
-                    { "key", cur_cfg_key },
-                    { "value", base64_encode(json11::Json(cur_cfg_json).dump()) },
-                } }
-            },
-        } },
-    }, ETCD_SLOW_TIMEOUT, [this, new_parent, cur, cur_name](std::string err, json11::Json res)
-    {
-        if (err != "")
-        {
-            fprintf(stderr, "Error changing parent of %s: %s\n", cur_name.c_str(), err.c_str());
-            exit(1);
-        }
-        if (!res["succeeded"].bool_value())
-        {
-            fprintf(stderr, "Inode %s was modified during snapshot deletion\n", cur_name.c_str());
-            exit(1);
-        }
-        if (new_parent)
-        {
-            auto new_parent_it = cli->st_cli.inode_config.find(new_parent);
-            std::string new_parent_name = new_parent_it != cli->st_cli.inode_config.end()
-                ? new_parent_it->second.name : "<unknown>";
-            printf(
-                "Parent of layer %s (inode %lu in pool %u) changed to %s (inode %lu in pool %u)\n",
-                cur_name.c_str(), INODE_NO_POOL(cur), INODE_POOL(cur),
-                new_parent_name.c_str(), INODE_NO_POOL(new_parent), INODE_POOL(new_parent)
-            );
-        }
-        else
-        {
-            printf(
-                "Parent of layer %s (inode %lu in pool %u) detached\n",
-                cur_name.c_str(), INODE_NO_POOL(cur), INODE_POOL(cur)
-            );
-        }
-        waiting--;
-        ringloop->wakeup();
-    });
-}
-
-inode_config_t* cli_tool_t::get_inode_cfg(const std::string & name)
-{
-    for (auto & ic: cli->st_cli.inode_config)
-    {
-        if (ic.second.name == name)
-        {
-            return &ic.second;
-        }
-    }
-    fprintf(stderr, "Layer %s not found\n", name.c_str());
-    exit(1);
-}
-
-void cli_tool_t::run(json11::Json cfg)
-{
-    json11::Json::array cmd = cfg["command"].array_items();
-    if (!cmd.size())
-    {
-        fprintf(stderr, "command is missing\n");
-        exit(1);
-    }
-    else if (cmd[0] == "ls")
-    {
-        // List images
-        action_cb = start_ls(cfg);
-    }
-    else if (cmd[0] == "create" || cmd[0] == "snap-create")
-    {
-        // Create image/snapshot
-        action_cb = start_create(cfg);
-    }
-    else if (cmd[0] == "modify")
-    {
-        // Modify image
-        action_cb = start_modify(cfg);
-    }
-    else if (cmd[0] == "rm-data")
-    {
-        // Delete inode data
-        action_cb = start_rm(cfg);
-    }
-    else if (cmd[0] == "merge-data")
-    {
-        // Merge layer data without affecting metadata
-        action_cb = start_merge(cfg);
-    }
-    else if (cmd[0] == "flatten")
-    {
-        // Merge layer data without affecting metadata
-        action_cb = start_flatten(cfg);
-    }
-    else if (cmd[0] == "rm")
-    {
-        // Remove multiple snapshots and rebase their children
-        action_cb = start_snap_rm(cfg);
-    }
-    else if (cmd[0] == "alloc-osd")
-    {
-        // Allocate a new OSD number
-        action_cb = start_alloc_osd(cfg);
-    }
-    else if (cmd[0] == "simple-offsets")
-    {
-        // Calculate offsets for simple & stupid OSD deployment without superblock
-        action_cb = simple_offsets(cfg);
-    }
-    else
-    {
-        fprintf(stderr, "unknown command: %s\n", cmd[0].string_value().c_str());
-        exit(1);
-    }
-    color = !cfg["no-color"].bool_value();
-    json_output = cfg["json"].bool_value();
-    iodepth = cfg["iodepth"].uint64_value();
-    if (!iodepth)
-        iodepth = 32;
-    parallel_osds = cfg["parallel_osds"].uint64_value();
-    if (!parallel_osds)
-        parallel_osds = 4;
-    log_level = cfg["log_level"].int64_value();
-    progress = cfg["progress"].uint64_value() ? true : false;
-    list_first = cfg["wait-list"].uint64_value() ? true : false;
-    // Create client
-    ringloop = new ring_loop_t(512);
-    epmgr = new epoll_manager_t(ringloop);
-    cli = new cluster_client_t(ringloop, epmgr->tfd, cfg);
-    cli->on_ready([this]()
-    {
-        // Initialize job
-        consumer.loop = [this]()
-        {
-            if (action_cb != NULL)
-            {
-                bool done = action_cb();
-                if (done)
-                {
-                    action_cb = NULL;
-                }
-            }
-            ringloop->submit();
-        };
-        ringloop->register_consumer(&consumer);
-        consumer.loop();
-    });
-    // Loop until it completes
-    while (action_cb != NULL)
-    {
-        ringloop->loop();
-        if (action_cb != NULL)
-            ringloop->wait();
-    }
-}
-
-int main(int narg, const char *args[])
-{
-    setvbuf(stdout, NULL, _IONBF, 0);
-    setvbuf(stderr, NULL, _IONBF, 0);
-    exe_name = args[0];
-    cli_tool_t *p = new cli_tool_t();
-    p->run(cli_tool_t::parse_args(narg, args));
-    return 0;
-}

src/cli.h

@@ -1,65 +0,0 @@
-// Copyright (c) Vitaliy Filippov, 2019+
-// License: VNPL-1.1 (see README.md for details)
-
-// Common CLI tool header
-
-#pragma once
-
-#include "json11/json11.hpp"
-#include "object_id.h"
-#include "ringloop.h"
-#include <functional>
-
-struct rm_inode_t;
-struct snap_merger_t;
-struct snap_flattener_t;
-struct snap_remover_t;
-
-class epoll_manager_t;
-class cluster_client_t;
-struct inode_config_t;
-
-class cli_tool_t
-{
-public:
-    uint64_t iodepth = 0, parallel_osds = 0;
-    bool progress = true;
-    bool list_first = false;
-    bool json_output = false;
-    int log_level = 0;
-    bool color = false;
-
-    ring_loop_t *ringloop = NULL;
-    epoll_manager_t *epmgr = NULL;
-    cluster_client_t *cli = NULL;
-
-    int waiting = 0;
-    ring_consumer_t consumer;
-    std::function<bool(void)> action_cb;
-
-    void run(json11::Json cfg);
-
-    void change_parent(inode_t cur, inode_t new_parent);
-    inode_config_t* get_inode_cfg(const std::string & name);
-
-    static json11::Json::object parse_args(int narg, const char *args[]);
-    static void help();
-
-    friend struct rm_inode_t;
-    friend struct snap_merger_t;
-    friend struct snap_flattener_t;
-    friend struct snap_remover_t;
-
-    std::function<bool(void)> start_ls(json11::Json);
-    std::function<bool(void)> start_create(json11::Json);
-    std::function<bool(void)> start_modify(json11::Json);
-    std::function<bool(void)> start_rm(json11::Json);
-    std::function<bool(void)> start_merge(json11::Json);
-    std::function<bool(void)> start_flatten(json11::Json);
-    std::function<bool(void)> start_snap_rm(json11::Json);
-    std::function<bool(void)> start_alloc_osd(json11::Json cfg, uint64_t *out = NULL);
-    std::function<bool(void)> simple_offsets(json11::Json cfg);
-};
-
-std::string format_size(uint64_t size);
-uint64_t parse_size(std::string size_str);

src/cli_alloc_osd.cpp

@@ -1,141 +0,0 @@
-// Copyright (c) Vitaliy Filippov, 2019+
-// License: VNPL-1.1 (see README.md for details)
-
-#include <ctype.h>
-#include "cli.h"
-#include "cluster_client.h"
-#include "base64.h"
-
-#include <algorithm>
-
-// Safely allocate an OSD number
-struct alloc_osd_t
-{
-    cli_tool_t *parent;
-
-    json11::Json result;
-    uint64_t new_id = 1;
-
-    int state = 0;
-
-    bool is_done()
-    {
-        return state == 100;
-    }
-
-    void loop()
-    {
-        if (state == 1)
-            goto resume_1;
-        do
-        {
-            etcd_txn(json11::Json::object {
-                { "compare", json11::Json::array {
-                    json11::Json::object {
-                        { "target", "VERSION" },
-                        { "version", 0 },
-                        { "key", base64_encode(
-                            parent->cli->st_cli.etcd_prefix+"/osd/stats/"+std::to_string(new_id)
-                        ) },
-                    },
-                } },
-                { "success", json11::Json::array {
-                    json11::Json::object {
-                        { "request_put", json11::Json::object {
-                            { "key", base64_encode(
-                                parent->cli->st_cli.etcd_prefix+"/osd/stats/"+std::to_string(new_id)
-                            ) },
-                            { "value", base64_encode("{}") },
-                        } },
-                    },
-                } },
-                { "failure", json11::Json::array {
-                    json11::Json::object {
-                        { "request_range", json11::Json::object {
-                            { "key", base64_encode(parent->cli->st_cli.etcd_prefix+"/osd/stats/") },
-                            { "range_end", base64_encode(parent->cli->st_cli.etcd_prefix+"/osd/stats0") },
-                            { "keys_only", true },
-                        } },
-                    },
-                } },
-            });
-        resume_1:
-            state = 1;
-            if (parent->waiting > 0)
-                return;
-            if (!result["succeeded"].bool_value())
-            {
-                std::vector<osd_num_t> used;
-                for (auto kv: result["responses"][0]["response_range"]["kvs"].array_items())
-                {
-                    std::string key = base64_decode(kv["key"].string_value());
-                    osd_num_t cur_osd;
-                    char null_byte = 0;
-                    sscanf(key.c_str() + parent->cli->st_cli.etcd_prefix.length(), "/osd/stats/%lu%c", &cur_osd, &null_byte);
-                    if (!cur_osd || null_byte != 0)
-                    {
-                        fprintf(stderr, "Invalid key in etcd: %s\n", key.c_str());
-                        continue;
-                    }
-                    used.push_back(cur_osd);
-                }
-                std::sort(used.begin(), used.end());
-                if (used[used.size()-1] == used.size())
-                {
-                    new_id = used.size()+1;
-                }
-                else
-                {
-                    int s = 0, e = used.size();
-                    while (e > s+1)
-                    {
-                        int c = (s+e)/2;
-                        if (used[c] == c+1)
-                            s = c;
-                        else
-                            e = c;
-                    }
-                    new_id = used[e-1]+1;
-                }
-            }
-        } while (!result["succeeded"].bool_value());
-        state = 100;
-    }
-
-    void etcd_txn(json11::Json txn)
-    {
-        parent->waiting++;
-        parent->cli->st_cli.etcd_txn(txn, ETCD_SLOW_TIMEOUT, [this](std::string err, json11::Json res)
-        {
-            parent->waiting--;
-            if (err != "")
-            {
-                fprintf(stderr, "Error reading from etcd: %s\n", err.c_str());
-                exit(1);
-            }
-            this->result = res;
-            parent->ringloop->wakeup();
-        });
-    }
-};
-
-std::function<bool(void)> cli_tool_t::start_alloc_osd(json11::Json cfg, uint64_t *out)
-{
-    json11::Json::array cmd = cfg["command"].array_items();
-    auto alloc_osd = new alloc_osd_t();
-    alloc_osd->parent = this;
-    return [alloc_osd, out]()
-    {
-        alloc_osd->loop();
-        if (alloc_osd->is_done())
-        {
-            if (out)
-                *out = alloc_osd->new_id;
-            else if (alloc_osd->new_id)
-                printf("%lu\n", alloc_osd->new_id);
-            delete alloc_osd;
-            return true;
-        }
-        return false;
-    };
-}

src/cli_create.cpp

@@ -1,527 +0,0 @@
-// Copyright (c) Vitaliy Filippov, 2019+
-// License: VNPL-1.1 (see README.md for details)
-
-#include <ctype.h>
-#include "cli.h"
-#include "cluster_client.h"
-#include "base64.h"
-
-// Create an image, snapshot or clone
-//
-// Snapshot creation performs a etcd transaction which:
-// - Checks that the image exists
-// - Checks that the snapshot doesn't exist
-// - Renames the inode to a new name with snapshot (say, testimg -> testimg@0)
-// - Sets the readonly flag for the old inode
-// - Creates a new inode with the same name pointing to the old inode as parent
-// - Adjusts /index/image/*
-//
-// The same algorithm can be easily implemented in any other language or even via etcdctl,
-// however we have it here for completeness
-struct image_creator_t
-{
-    cli_tool_t *parent;
-
-    pool_id_t new_pool_id = 0;
-    std::string new_pool_name;
-    std::string image_name, new_snap, new_parent;
-    uint64_t size;
-
-    pool_id_t old_pool_id = 0;
-    inode_t new_parent_id = 0;
-    inode_t new_id = 0, old_id = 0;
-    uint64_t max_id_mod_rev = 0, cfg_mod_rev = 0, idx_mod_rev = 0;
-    json11::Json result;
-
-    int state = 0;
-
-    bool is_done()
-    {
-        return state == 100;
-    }
-
-    void loop()
-    {
-        if (state >= 1)
-            goto resume_1;
-        if (new_pool_id)
-        {
-            auto & pools = parent->cli->st_cli.pool_config;
-            if (pools.find(new_pool_id) == pools.end())
-            {
-                fprintf(stderr, "Pool %u does not exist\n", new_pool_id);
-                exit(1);
-            }
-        }
-        else if (new_pool_name != "")
-        {
-            for (auto & ic: parent->cli->st_cli.pool_config)
-            {
-                if (ic.second.name == new_pool_name)
-                {
-                    new_pool_id = ic.first;
-                    break;
-                }
-            }
-            if (!new_pool_id)
-            {
-                fprintf(stderr, "Pool %s does not exist\n", new_pool_name.c_str());
-                exit(1);
-            }
-        }
-        else if (parent->cli->st_cli.pool_config.size() == 1)
-        {
-            auto it = parent->cli->st_cli.pool_config.begin();
-            new_pool_id = it->first;
-        }
-        state = 1;
-    resume_1:
-        if (new_snap == "")
-            create_image();
-        else
-            create_snapshot();
-    }
-
-    void create_image()
-    {
-        if (state == 2)
-            goto resume_2;
-        else if (state == 3)
-            goto resume_3;
-        if (!new_pool_id)
-        {
-            fprintf(stderr, "Pool name or ID is missing\n");
-            exit(1);
-        }
-        if (!size)
-        {
-            fprintf(stderr, "Image size is missing\n");
-            exit(1);
-        }
-        for (auto & ic: parent->cli->st_cli.inode_config)
-        {
-            if (ic.second.name == image_name)
-            {
-                fprintf(stderr, "Image %s already exists\n", image_name.c_str());
-                exit(1);
-            }
-        }
-        do
-        {
-            etcd_txn(json11::Json::object {
-                { "success", json11::Json::array { get_next_id() } }
-            });
-            state = 2;
-resume_2:
-            if (parent->waiting > 0)
-                return;
-            extract_next_id(result["responses"][0]);
-            attempt_create();
-            state = 3;
-resume_3:
-            if (parent->waiting > 0)
-                return;
-            if (!result["succeeded"].bool_value() &&
-                result["responses"][0]["response_range"]["kvs"].array_items().size() > 0)
-            {
-                fprintf(stderr, "Image %s already exists\n", image_name.c_str());
-                exit(1);
-            }
-        } while (!result["succeeded"].bool_value());
-        if (parent->progress)
-        {
-            printf("Image %s created\n", image_name.c_str());
-        }
-        state = 100;
-    }
-
-    void create_snapshot()
-    {
-        if (state == 2)
-            goto resume_2;
-        else if (state == 3)
-            goto resume_3;
-        else if (state == 4)
-            goto resume_4;
-        for (auto & ic: parent->cli->st_cli.inode_config)
-        {
-            if (ic.second.name == image_name+"@"+new_snap)
-            {
-                fprintf(stderr, "Snapshot %s@%s already exists\n", image_name.c_str(), new_snap.c_str());
-                exit(1);
-            }
-        }
-        do
-        {
-            // In addition to next_id, get: size, old_id, old_pool_id, new_parent, cfg_mod_rev, idx_mod_rev
-resume_2:
-resume_3:
-            get_image_details();
-            if (parent->waiting > 0)
-                return;
-            if (!old_id)
-            {
-                fprintf(stderr, "Image %s does not exist\n", image_name.c_str());
-                exit(1);
-            }
-            if (!new_pool_id)
-            {
-                // Create snapshot in the same pool by default
-                new_pool_id = old_pool_id;
-            }
-            attempt_create();
-            state = 4;
-resume_4:
-            if (parent->waiting > 0)
-                return;
-            if (!result["succeeded"].bool_value() &&
-                result["responses"][0]["response_range"]["kvs"].array_items().size() > 0)
-            {
-                fprintf(stderr, "Snapshot %s@%s already exists\n", image_name.c_str(), new_snap.c_str());
-                exit(1);
-            }
-        } while (!result["succeeded"].bool_value());
-        if (parent->progress)
-        {
-            printf("Snapshot %s@%s created\n", image_name.c_str(), new_snap.c_str());
-        }
-        state = 100;
-    }
-
-    json11::Json::object get_next_id()
-    {
-        return json11::Json::object {
-            { "request_range", json11::Json::object {
-                { "key", base64_encode(
-                    parent->cli->st_cli.etcd_prefix+"/index/maxid/"+std::to_string(new_pool_id)
-                ) },
-            } },
-        };
-    }
-
-    void extract_next_id(json11::Json response)
-    {
-        new_id = 1;
-        max_id_mod_rev = 0;
-        if (response["response_range"]["kvs"].array_items().size() > 0)
-        {
-            auto kv = parent->cli->st_cli.parse_etcd_kv(response["response_range"]["kvs"][0]);
-            new_id = 1+INODE_NO_POOL(kv.value.uint64_value());
-            max_id_mod_rev = kv.mod_revision;
-        }
-        auto ino_it = parent->cli->st_cli.inode_config.lower_bound(INODE_WITH_POOL(new_pool_id, 0));
-        if (ino_it != parent->cli->st_cli.inode_config.begin())
-        {
-            ino_it--;
-            if (INODE_POOL(ino_it->first) == new_pool_id && new_id < 1+INODE_NO_POOL(ino_it->first))
-                new_id = 1+INODE_NO_POOL(ino_it->first);
-        }
-    }
-
-    void get_image_details()
-    {
-        if (state == 2)
-            goto resume_2;
-        else if (state == 3)
-            goto resume_3;
-        etcd_txn(json11::Json::object { { "success", json11::Json::array {
-            get_next_id(),
-            json11::Json::object {
-                { "request_range", json11::Json::object {
-                    { "key", base64_encode(
-                        parent->cli->st_cli.etcd_prefix+"/index/image/"+image_name
-                    ) },
-                } },
-            },
-        } } });
-        state = 2;
-resume_2:
-        if (parent->waiting > 0)
-            return;
-        extract_next_id(result["responses"][0]);
-        old_id = 0;
-        old_pool_id = 0;
-        cfg_mod_rev = idx_mod_rev = 0;
-        if (result["responses"][1]["response_range"]["kvs"].array_items().size() == 0)
-        {
-            for (auto & ic: parent->cli->st_cli.inode_config)
-            {
-                if (ic.second.name == image_name)
-                {
-                    old_id = INODE_NO_POOL(ic.first);
-                    old_pool_id = INODE_POOL(ic.first);
-                    size = ic.second.size;
-                    new_parent_id = ic.second.parent_id;
-                    cfg_mod_rev = ic.second.mod_revision;
-                    break;
-                }
-            }
-        }
-        else
-        {
-            // FIXME: Parse kvs in etcd_state_client automatically
-            {
-                auto kv = parent->cli->st_cli.parse_etcd_kv(result["responses"][1]["response_range"]["kvs"][0]);
-                old_id = INODE_NO_POOL(kv.value["id"].uint64_value());
-                old_pool_id = (pool_id_t)kv.value["pool_id"].uint64_value();
-                idx_mod_rev = kv.mod_revision;
-                if (!old_id || !old_pool_id || old_pool_id >= POOL_ID_MAX)
-                {
-                    fprintf(stderr, "Invalid pool or inode ID in etcd key %s\n", kv.key.c_str());
-                    exit(1);
-                }
-            }
-            etcd_txn(json11::Json::object {
-                { "success", json11::Json::array {
-                    json11::Json::object {
-                        { "request_range", json11::Json::object {
-                            { "key", base64_encode(
-                                parent->cli->st_cli.etcd_prefix+"/config/inode/"+
-                                std::to_string(old_pool_id)+"/"+std::to_string(old_id)
-                            ) },
-                        } },
-                    },
-                } },
-            });
-            state = 3;
-resume_3:
-            if (parent->waiting > 0)
-                return;
-            {
-                auto kv = parent->cli->st_cli.parse_etcd_kv(result["responses"][0]["response_range"]["kvs"][0]);
-                size = kv.value["size"].uint64_value();
-                new_parent_id = kv.value["parent_id"].uint64_value();
-                uint64_t parent_pool_id = kv.value["parent_pool_id"].uint64_value();
-                if (new_parent_id)
-                {
-                    new_parent_id = INODE_WITH_POOL(parent_pool_id ? parent_pool_id : old_pool_id, new_parent_id);
-                }
-                cfg_mod_rev = kv.mod_revision;
-            }
-        }
-    }
-
-    void attempt_create()
-    {
-        inode_config_t new_cfg = {
-            .num = INODE_WITH_POOL(new_pool_id, new_id),
-            .name = image_name,
-            .size = size,
-            .parent_id = (new_snap != "" ? INODE_WITH_POOL(old_pool_id, old_id) : new_parent_id),
-            .readonly = false,
-        };
-        json11::Json::array checks = json11::Json::array {
-            json11::Json::object {
-                { "target", "VERSION" },
-                { "version", 0 },
-                { "key", base64_encode(
-                    parent->cli->st_cli.etcd_prefix+"/config/inode/"+
-                    std::to_string(new_pool_id)+"/"+std::to_string(new_id)
-                ) },
-            },
-            json11::Json::object {
-                { "target", "VERSION" },
-                { "version", 0 },
-                { "key", base64_encode(
-                    parent->cli->st_cli.etcd_prefix+"/index/image/"+image_name+
-                    (new_snap != "" ? "@"+new_snap : "")
-                ) },
-            },
-            json11::Json::object {
-                { "target", "MOD" },
-                { "mod_revision", max_id_mod_rev },
-                { "key", base64_encode(parent->cli->st_cli.etcd_prefix+"/index/maxid/"+std::to_string(new_pool_id)) },
-            },
-        };
-        json11::Json::array success = json11::Json::array {
-            json11::Json::object {
-                { "request_put", json11::Json::object {
-                    { "key", base64_encode(
-                        parent->cli->st_cli.etcd_prefix+"/config/inode/"+
-                        std::to_string(new_pool_id)+"/"+std::to_string(new_id)
-                    ) },
-                    { "value", base64_encode(
-                        json11::Json(parent->cli->st_cli.serialize_inode_cfg(&new_cfg)).dump()
-                    ) },
-                } },
-            },
-            json11::Json::object {
-                { "request_put", json11::Json::object {
-                    { "key", base64_encode(parent->cli->st_cli.etcd_prefix+"/index/image/"+image_name) },
-                    { "value", base64_encode(json11::Json(json11::Json::object{
-                        { "id", new_id },
-                        { "pool_id", (uint64_t)new_pool_id },
-                    }).dump()) },
-                } },
-            },
-            json11::Json::object {
-                { "request_put", json11::Json::object {
-                    { "key", base64_encode(
-                        parent->cli->st_cli.etcd_prefix+"/index/maxid/"+
-                        std::to_string(new_pool_id)
-                    ) },
-                    { "value", base64_encode(std::to_string(new_id)) }
-                } },
-            },
-        };
-        json11::Json::array failure = json11::Json::array {
-            json11::Json::object {
-                { "request_range", json11::Json::object {
-                    { "key", base64_encode(
-                        parent->cli->st_cli.etcd_prefix+"/index/image/"+
-                        image_name+(new_snap != "" ? "@"+new_snap : "")
-                    ) },
-                } },
-            },
-        };
-        if (new_snap != "")
-        {
-            inode_config_t snap_cfg = {
-                .num = INODE_WITH_POOL(old_pool_id, old_id),
-                .name = image_name+"@"+new_snap,
-                .size = size,
-                .parent_id = new_parent_id,
-                .readonly = true,
-            };
-            checks.push_back(json11::Json::object {
-                { "target", "MOD" },
-                { "mod_revision", cfg_mod_rev },
-                { "key", base64_encode(
-                    parent->cli->st_cli.etcd_prefix+"/config/inode/"+
-                    std::to_string(old_pool_id)+"/"+std::to_string(old_id)
-                ) },
-            });
-            checks.push_back(json11::Json::object {
-                { "target", "MOD" },
-                { "mod_revision", idx_mod_rev },
-                { "key", base64_encode(parent->cli->st_cli.etcd_prefix+"/index/image/"+image_name) }
-            });
-            success.push_back(json11::Json::object {
-                { "request_put", json11::Json::object {
-                    { "key", base64_encode(
-                        parent->cli->st_cli.etcd_prefix+"/config/inode/"+
-                        std::to_string(old_pool_id)+"/"+std::to_string(old_id)
-                    ) },
-                    { "value", base64_encode(
-                        json11::Json(parent->cli->st_cli.serialize_inode_cfg(&snap_cfg)).dump()
-                    ) },
-                } },
-            });
-            success.push_back(json11::Json::object {
-                { "request_put", json11::Json::object {
-                    { "key", base64_encode(parent->cli->st_cli.etcd_prefix+"/index/image/"+image_name+"@"+new_snap) },
-                    { "value", base64_encode(json11::Json(json11::Json::object{
-                        { "id", old_id },
-                        { "pool_id", (uint64_t)old_pool_id },
-                    }).dump()) },
-                } },
-            });
-        };
-        etcd_txn(json11::Json::object {
-            { "compare", checks },
-            { "success", success },
-            { "failure", failure },
-        });
-    }
-
-    void etcd_txn(json11::Json txn)
-    {
-        parent->waiting++;
-        parent->cli->st_cli.etcd_txn(txn, ETCD_SLOW_TIMEOUT, [this](std::string err, json11::Json res)
-        {
-            parent->waiting--;
-            if (err != "")
-            {
-                fprintf(stderr, "Error reading from etcd: %s\n", err.c_str());
-                exit(1);
-            }
-            this->result = res;
-            parent->ringloop->wakeup();
-        });
-    }
-};
-
-uint64_t parse_size(std::string size_str)
-{
-    uint64_t mul = 1;
-    char type_char = tolower(size_str[size_str.length()-1]);
-    if (type_char == 'k' || type_char == 'm' || type_char == 'g' || type_char == 't')
-    {
-        if (type_char == 'k')
-            mul = 1l<<10;
-        else if (type_char == 'm')
-            mul = 1l<<20;
-        else if (type_char == 'g')
-            mul = 1l<<30;
-        else /*if (type_char == 't')*/
-            mul = 1l<<40;
-        size_str = size_str.substr(0, size_str.length()-1);
-    }
-    uint64_t size = json11::Json(size_str).uint64_value() * mul;
-    if (size == 0 && size_str != "0" && (size_str != "" || mul != 1))
-    {
-        fprintf(stderr, "Invalid syntax for size: %s\n", size_str.c_str());
-        exit(1);
-    }
-    return size;
-}
-
-std::function<bool(void)> cli_tool_t::start_create(json11::Json cfg)
-{
-    json11::Json::array cmd = cfg["command"].array_items();
-    auto image_creator = new image_creator_t();
-    image_creator->parent = this;
-    image_creator->image_name = cmd.size() > 1 ? cmd[1].string_value() : "";
-    image_creator->new_pool_id = cfg["pool"].uint64_value();
-    image_creator->new_pool_name = cfg["pool"].string_value();
-    if (cfg["snapshot"].string_value() != "")
-    {
-        image_creator->new_snap = cfg["snapshot"].string_value();
-    }
-    else if (cmd[0] == "snap-create")
-    {
-        int p = image_creator->image_name.find('@');
-        if (p == std::string::npos || p == image_creator->image_name.length()-1)
-        {
-            fprintf(stderr, "Please specify new snapshot name after @\n");
-            exit(1);
-        }
-        image_creator->new_snap = image_creator->image_name.substr(p + 1);
-        image_creator->image_name = image_creator->image_name.substr(0, p);
-    }
-    image_creator->new_parent = cfg["parent"].string_value();
-    if (cfg["size"].string_value() != "")
-    {
-        image_creator->size = parse_size(cfg["size"].string_value());
-        if (image_creator->size % 4096)
-        {
-            fprintf(stderr, "Size should be a multiple of 4096\n");
-            exit(1);
-        }
-        if (image_creator->new_snap != "")
-        {
-            fprintf(stderr, "--size can't be specified for snapshots\n");
-            exit(1);
-        }
-    }
-    if (image_creator->image_name == "")
-    {
-        fprintf(stderr, "Image name is missing\n");
-        exit(1);
-    }
-    if (image_creator->image_name.find('@') != std::string::npos)
-    {
-        fprintf(stderr, "Image name can't contain @ character\n");
-        exit(1);
-    }
-    return [image_creator]()
-    {
-        image_creator->loop();
-        if (image_creator->is_done())
-        {
-            delete image_creator;
-            return true;
-        }
-        return false;
-    };
-}

src/cli_flatten.cpp

@@ -1,124 +0,0 @@
-// Copyright (c) Vitaliy Filippov, 2019+
-// License: VNPL-1.1 (see README.md for details)
-
-#include "cli.h"
-#include "cluster_client.h"
-
-// Flatten a layer: merge all parents into a layer and break the connection completely
-struct snap_flattener_t
-{
-    cli_tool_t *parent;
-
-    // target to flatten
-    std::string target_name;
-    // writers are stopped, we can safely change writable layers
-    bool writers_stopped = false;
-    // use CAS writes (0 = never, 1 = auto, 2 = always)
-    int use_cas = 1;
-    // interval between fsyncs
-    int fsync_interval = 128;
-
-    std::string top_parent_name;
-    inode_t target_id = 0;
-    int state = 0;
-    std::function<bool(void)> merger_cb;
-
-    void get_merge_parents()
-    {
-        // Get all parents of target
-        inode_config_t *target_cfg = parent->get_inode_cfg(target_name);
-        target_id = target_cfg->num;
-        std::vector<inode_t> chain_list;
-        inode_config_t *cur = target_cfg;
-        chain_list.push_back(cur->num);
-        while (cur->parent_id != 0 && cur->parent_id != target_cfg->num)
-        {
-            auto it = parent->cli->st_cli.inode_config.find(cur->parent_id);
-            if (it == parent->cli->st_cli.inode_config.end())
-            {
-                fprintf(stderr, "Parent inode of layer %s (id %ld) not found\n", cur->name.c_str(), cur->parent_id);
-                exit(1);
-            }
-            cur = &it->second;
-            chain_list.push_back(cur->num);
-        }
-        if (cur->parent_id != 0)
-        {
-            fprintf(stderr, "Layer %s has a loop in parents\n", target_name.c_str());
-            exit(1);
-        }
-        top_parent_name = cur->name;
-    }
-
-    bool is_done()
-    {
-        return state == 5;
-    }
-
-    void loop()
-    {
-        if (state == 1)
-            goto resume_1;
-        else if (state == 2)
-            goto resume_2;
-        else if (state == 3)
-            goto resume_3;
-        // Get parent layers
-        get_merge_parents();
-        // Start merger
-        merger_cb = parent->start_merge(json11::Json::object {
-            { "command", json11::Json::array{ "merge-data", top_parent_name, target_name } },
-            { "target", target_name },
-            { "delete-source", false },
-            { "cas", use_cas },
-            { "fsync-interval", fsync_interval },
-        });
-        // Wait for it
-resume_1:
-        while (!merger_cb())
-        {
-            state = 1;
-            return;
-        }
-        merger_cb = NULL;
-        // Change parent
-        parent->change_parent(target_id, 0);
-        // Wait for it to complete
-        state = 2;
-resume_2:
-        if (parent->waiting > 0)
-            return;
-        state = 3;
-resume_3:
-        // Done
-        return;
-    }
-};
-
-std::function<bool(void)> cli_tool_t::start_flatten(json11::Json cfg)
-{
-    json11::Json::array cmd = cfg["command"].array_items();
-    auto flattener = new snap_flattener_t();
-    flattener->parent = this;
-    flattener->target_name = cmd.size() > 1 ? cmd[1].string_value() : "";
-    if (flattener->target_name == "")
-    {
-        fprintf(stderr, "Layer to flatten argument is missing\n");
-        exit(1);
-    }
-    flattener->fsync_interval = cfg["fsync-interval"].uint64_value();
-    if (!flattener->fsync_interval)
-        flattener->fsync_interval = 128;
-    if (!cfg["cas"].is_null())
-        flattener->use_cas = cfg["cas"].uint64_value() ? 2 : 0;
-    return [flattener]()
-    {
-        flattener->loop();
-        if (flattener->is_done())
-        {
-            delete flattener;
-            return true;
-        }
-        return false;
-    };
-}

src/cli_ls.cpp

@@ -1,522 +0,0 @@
-// Copyright (c) Vitaliy Filippov, 2019+
-// License: VNPL-1.1 (see README.md for details)
-
-#include <algorithm>
-#include "cli.h"
-#include "cluster_client.h"
-#include "base64.h"
-
-#define MIN(a, b) ((a) < (b) ? (b) : (a))
-
-std::string print_table(json11::Json items, json11::Json header, bool use_esc);
-
-std::string format_size(uint64_t size);
-
-std::string format_lat(uint64_t lat);
-
-std::string format_q(double depth);
-
-// List existing images
-//
-// Again, you can just look into etcd, but this console tool incapsulates it
-struct image_lister_t
-{
-    cli_tool_t *parent;
-
-    pool_id_t list_pool_id = 0;
-    std::string list_pool_name;
-    std::string sort_field;
-    std::set<std::string> only_names;
-    bool reverse = false;
-    int max_count = 0;
-    bool show_stats = false, show_delete = false;
-
-    int state = 0;
-    std::map<inode_t, json11::Json::object> stats;
-    json11::Json space_info;
-
-    bool is_done()
-    {
-        return state == 100;
-    }
-
-    void get_list()
-    {
-        if (list_pool_name != "")
-        {
-            for (auto & ic: parent->cli->st_cli.pool_config)
-            {
-                if (ic.second.name == list_pool_name)
-                {
-                    list_pool_id = ic.first;
-                    break;
-                }
-            }
-            if (!list_pool_id)
-            {
-                fprintf(stderr, "Pool %s does not exist\n", list_pool_name.c_str());
-                exit(1);
-            }
-        }
-        for (auto & ic: parent->cli->st_cli.inode_config)
-        {
-            if (list_pool_id && INODE_POOL(ic.second.num) != list_pool_id)
-            {
-                continue;
-            }
-            auto & pool_cfg = parent->cli->st_cli.pool_config.at(INODE_POOL(ic.second.num));
-            auto item = json11::Json::object {
-                { "name", ic.second.name },
-                { "size", ic.second.size },
-                { "used_size", 0 },
-                { "readonly", ic.second.readonly },
-                { "pool_id", (uint64_t)INODE_POOL(ic.second.num) },
-                { "pool_name", pool_cfg.name },
-                { "inode_num", INODE_NO_POOL(ic.second.num) },
-                { "inode_id", ic.second.num },
-            };
-            if (ic.second.parent_id)
-            {
-                auto p_it = parent->cli->st_cli.inode_config.find(ic.second.parent_id);
-                item["parent_name"] = p_it != parent->cli->st_cli.inode_config.end()
-                    ? p_it->second.name : "";
-                item["parent_pool_id"] = (uint64_t)INODE_POOL(ic.second.parent_id);
-                item["parent_inode_num"] = INODE_NO_POOL(ic.second.parent_id);
-            }
-            stats[ic.second.num] = item;
-        }
-    }
-
-    void get_stats()
-    {
-        if (state == 1)
-            goto resume_1;
-        // Space statistics
-        // inode/stats/<pool>/<inode>::raw_used divided by pool/stats/<pool>::pg_real_size
-        // multiplied by 1 or number of data drives
-        parent->waiting++;
-        parent->cli->st_cli.etcd_txn(json11::Json::object {
-            { "success", json11::Json::array {
-                json11::Json::object {
-                    { "request_range", json11::Json::object {
-                        { "key", base64_encode(
-                            parent->cli->st_cli.etcd_prefix+"/pool/stats"+
-                            (list_pool_id ? "/"+std::to_string(list_pool_id) : "")+"/"
-                        ) },
-                        { "range_end", base64_encode(
-                            parent->cli->st_cli.etcd_prefix+"/pool/stats"+
-                            (list_pool_id ? "/"+std::to_string(list_pool_id) : "")+"0"
-                        ) },
-                    } },
-                },
-                json11::Json::object {
-                    { "request_range", json11::Json::object {
-                        { "key", base64_encode(
-                            parent->cli->st_cli.etcd_prefix+"/inode/stats"+
-                            (list_pool_id ? "/"+std::to_string(list_pool_id) : "")+"/"
-                        ) },
-                        { "range_end", base64_encode(
-                            parent->cli->st_cli.etcd_prefix+"/inode/stats"+
-                            (list_pool_id ? "/"+std::to_string(list_pool_id) : "")+"0"
-                        ) },
-                    } },
-                },
-            } },
-        }, ETCD_SLOW_TIMEOUT, [this](std::string err, json11::Json res)
-        {
-            parent->waiting--;
-            if (err != "")
-            {
-                fprintf(stderr, "Error reading from etcd: %s\n", err.c_str());
-                exit(1);
-            }
-            space_info = res;
-            parent->ringloop->wakeup();
-        });
-        state = 1;
-resume_1:
-        if (parent->waiting > 0)
-            return;
-        std::map<pool_id_t, uint64_t> pool_pg_real_size;
-        for (auto & kv_item: space_info["responses"][0]["response_range"]["kvs"].array_items())
-        {
-            auto kv = parent->cli->st_cli.parse_etcd_kv(kv_item);
-            // pool ID
-            pool_id_t pool_id;
-            char null_byte = 0;
-            sscanf(kv.key.substr(parent->cli->st_cli.etcd_prefix.length()).c_str(), "/pool/stats/%u%c", &pool_id, &null_byte);
-            if (!pool_id || pool_id >= POOL_ID_MAX || null_byte != 0)
-            {
-                fprintf(stderr, "Invalid key in etcd: %s\n", kv.key.c_str());
-                continue;
-            }
-            // pg_real_size
-            pool_pg_real_size[pool_id] = kv.value["pg_real_size"].uint64_value();
-        }
-        for (auto & kv_item: space_info["responses"][1]["response_range"]["kvs"].array_items())
-        {
-            auto kv = parent->cli->st_cli.parse_etcd_kv(kv_item);
-            // pool ID & inode number
-            pool_id_t pool_id;
-            inode_t only_inode_num;
-            char null_byte = 0;
-            sscanf(kv.key.substr(parent->cli->st_cli.etcd_prefix.length()).c_str(),
-                "/inode/stats/%u/%lu%c", &pool_id, &only_inode_num, &null_byte);
-            if (!pool_id || pool_id >= POOL_ID_MAX || INODE_POOL(only_inode_num) != 0 || null_byte != 0)
-            {
-                fprintf(stderr, "Invalid key in etcd: %s\n", kv.key.c_str());
-                continue;
-            }
-            inode_t inode_num = INODE_WITH_POOL(pool_id, only_inode_num);
-            uint64_t used_size = kv.value["raw_used"].uint64_value();
-            // save stats
-            auto pool_it = parent->cli->st_cli.pool_config.find(pool_id);
-            if (pool_it != parent->cli->st_cli.pool_config.end())
-            {
-                auto & pool_cfg = pool_it->second;
-                used_size = used_size / pool_pg_real_size[pool_id]
-                    * (pool_cfg.scheme == POOL_SCHEME_REPLICATED ? 1 : pool_cfg.pg_size-pool_cfg.parity_chunks);
-            }
-            auto stat_it = stats.find(inode_num);
-            if (stat_it == stats.end())
-            {
-                stats[inode_num] = json11::Json::object {
-                    { "name", "Pool:"+std::to_string(pool_id)+",ID:"+std::to_string(only_inode_num) },
-                    { "size", 0 },
-                    { "readonly", false },
-                    { "pool_id", (uint64_t)INODE_POOL(inode_num) },
-                    { "pool_name", pool_it == parent->cli->st_cli.pool_config.end()
-                        ? (pool_it->second.name == "" ? "<Unnamed>" : pool_it->second.name) : "?" },
-                    { "inode_num", INODE_NO_POOL(inode_num) },
-                    { "inode_id", inode_num },
-                };
-                stat_it = stats.find(inode_num);
-            }
-            stat_it->second["used_size"] = used_size;
-            stat_it->second["read_iops"] = kv.value["read"]["iops"];
-            stat_it->second["read_bps"] = kv.value["read"]["bps"];
-            stat_it->second["read_lat"] = kv.value["read"]["lat"];
-            stat_it->second["read_queue"] = kv.value["read"]["iops"].number_value() * kv.value["read"]["lat"].number_value() / 1000000;
-            stat_it->second["write_iops"] = kv.value["write"]["iops"];
-            stat_it->second["write_bps"] = kv.value["write"]["bps"];
-            stat_it->second["write_lat"] = kv.value["write"]["lat"];
-            stat_it->second["write_queue"] = kv.value["write"]["iops"].number_value() * kv.value["write"]["lat"].number_value() / 1000000;
-            stat_it->second["delete_iops"] = kv.value["delete"]["iops"];
-            stat_it->second["delete_bps"] = kv.value["delete"]["bps"];
-            stat_it->second["delete_lat"] = kv.value["delete"]["lat"];
-            stat_it->second["delete_queue"] = kv.value["delete"]["iops"].number_value() * kv.value["delete"]["lat"].number_value() / 1000000;
-        }
-    }
-
-    json11::Json::array to_list()
-    {
-        json11::Json::array list;
-        for (auto & kv: stats)
-        {
-            if (!only_names.size() || only_names.find(kv.second["name"].string_value()) != only_names.end())
-            {
-                list.push_back(kv.second);
-            }
-        }
-        if (sort_field == "name" || sort_field == "pool_name")
-        {
-            std::sort(list.begin(), list.end(), [this](json11::Json a, json11::Json b)
-            {
-                auto av = a[sort_field].as_string();
-                auto bv = b[sort_field].as_string();
-                return reverse ? av > bv : av < bv;
-            });
-        }
-        else
-        {
-            std::sort(list.begin(), list.end(), [this](json11::Json a, json11::Json b)
-            {
-                auto av = a[sort_field].number_value();
-                auto bv = b[sort_field].number_value();
-                return reverse ? av > bv : av < bv;
-            });
-        }
-        if (max_count > 0 && list.size() > max_count)
-        {
-            list.resize(max_count);
-        }
-        return list;
-    }
-
-    void loop()
-    {
-        if (state == 1)
-            goto resume_1;
-        get_list();
-        if (show_stats)
-        {
-resume_1:
-            get_stats();
-            if (parent->waiting > 0)
-                return;
-        }
-        if (parent->json_output)
-        {
-            // JSON output
-            printf("%s\n", json11::Json(to_list()).dump().c_str());
-            state = 100;
-            return;
-        }
-        // Table output: name, size_fmt, [used_size_fmt], ro, parent_name
-        json11::Json::array cols;
-        cols.push_back(json11::Json::object{
-            { "key", "name" },
-            { "title", "NAME" },
-        });
-        if (!list_pool_id)
-        {
-            cols.push_back(json11::Json::object{
-                { "key", "pool_name" },
-                { "title", "POOL" },
-            });
-        }
-        cols.push_back(json11::Json::object{
-            { "key", "size_fmt" },
-            { "title", "SIZE" },
-        });
-        if (show_stats)
-        {
-            cols.push_back(json11::Json::object{
-                { "key", "used_size_fmt" },
-                { "title", "USED" },
-            });
-            cols.push_back(json11::Json::object{
-                { "key", "read_bw" },
-                { "title", "READ" },
-            });
-            cols.push_back(json11::Json::object{
-                { "key", "read_iops" },
-                { "title", "IOPS" },
-            });
-            cols.push_back(json11::Json::object{
-                { "key", "read_q" },
-                { "title", "QUEUE" },
-            });
-            cols.push_back(json11::Json::object{
-                { "key", "read_lat_f" },
-                { "title", "LAT" },
-            });
-            cols.push_back(json11::Json::object{
-                { "key", "write_bw" },
-                { "title", "WRITE" },
-            });
-            cols.push_back(json11::Json::object{
-                { "key", "write_iops" },
-                { "title", "IOPS" },
-            });
-            cols.push_back(json11::Json::object{
-                { "key", "write_q" },
-                { "title", "QUEUE" },
-            });
-            cols.push_back(json11::Json::object{
-                { "key", "write_lat_f" },
-                { "title", "LAT" },
-            });
-            if (show_delete)
-            {
-                cols.push_back(json11::Json::object{
-                    { "key", "delete_bw" },
-                    { "title", "DEL" },
-                });
-                cols.push_back(json11::Json::object{
-                    { "key", "delete_iops" },
-                    { "title", "IOPS" },
-                });
-                cols.push_back(json11::Json::object{
-                    { "key", "delete_q" },
-                    { "title", "QUEUE" },
-                });
-                cols.push_back(json11::Json::object{
-                    { "key", "delete_lat_f" },
-                    { "title", "LAT" },
-                });
-            }
-        }
-        cols.push_back(json11::Json::object{
-            { "key", "ro" },
-            { "title", "FLAGS" },
-            { "right", true },
-        });
-        cols.push_back(json11::Json::object{
-            { "key", "parent_name" },
-            { "title", "PARENT" },
-        });
-        json11::Json::array list;
-        for (auto & kv: stats)
-        {
-            if (show_stats)
-            {
-                kv.second["used_size_fmt"] = format_size(kv.second["used_size"].uint64_value());
-                kv.second["read_bw"] = format_size(kv.second["read_bps"].uint64_value())+"/s";
-                kv.second["write_bw"] = format_size(kv.second["write_bps"].uint64_value())+"/s";
-                kv.second["delete_bw"] = format_size(kv.second["delete_bps"].uint64_value())+"/s";
-                kv.second["read_lat_f"] = format_lat(kv.second["read_lat"].uint64_value());
-                kv.second["write_lat_f"] = format_lat(kv.second["write_lat"].uint64_value());
-                kv.second["delete_lat_f"] = format_lat(kv.second["delete_lat"].uint64_value());
-                kv.second["read_q"] = format_q(kv.second["read_queue"].number_value());
-                kv.second["write_q"] = format_q(kv.second["write_queue"].number_value());
-                kv.second["delete_q"] = format_q(kv.second["delete_queue"].number_value());
-            }
-            kv.second["size_fmt"] = format_size(kv.second["size"].uint64_value());
-            kv.second["ro"] = kv.second["readonly"].bool_value() ? "RO" : "-";
-        }
-        printf("%s", print_table(to_list(), cols, parent->color).c_str());
-        state = 100;
-    }
-};
-
-std::string print_table(json11::Json items, json11::Json header, bool use_esc)
-{
-    std::vector<int> sizes;
-    for (int i = 0; i < header.array_items().size(); i++)
-    {
-        sizes.push_back(header[i]["title"].string_value().length());
-    }
-    for (auto & item: items.array_items())
-    {
-        for (int i = 0; i < header.array_items().size(); i++)
-        {
-            int l = item[header[i]["key"].string_value()].as_string().length();
-            sizes[i] = sizes[i] < l ? l : sizes[i];
-        }
-    }
-    std::string str = use_esc ? "\033[1m" : "";
-    for (int i = 0; i < header.array_items().size(); i++)
-    {
-        if (i > 0)
-        {
-            // Separator
-            str += "  ";
-        }
-        int pad = sizes[i]-header[i]["title"].string_value().length();
-        if (header[i]["right"].bool_value())
-        {
-            // Align right
-            for (int j = 0; j < pad; j++)
-                str += ' ';
-            str += header[i]["title"].string_value();
-        }
-        else
-        {
-            // Align left
-            str += header[i]["title"].string_value();
-            for (int j = 0; j < pad; j++)
-                str += ' ';
-        }
-    }
-    if (use_esc)
-        str += "\033[0m";
-    str += "\n";
-    for (auto & item: items.array_items())
-    {
-        for (int i = 0; i < header.array_items().size(); i++)
-        {
-            if (i > 0)
-            {
-                // Separator
-                str += "  ";
-            }
-            int pad = sizes[i] - item[header[i]["key"].string_value()].as_string().length();
-            if (header[i]["right"].bool_value())
-            {
-                // Align right
-                for (int j = 0; j < pad; j++)
-                    str += ' ';
-                str += item[header[i]["key"].string_value()].as_string();
-            }
-            else
-            {
-                // Align left
-                str += item[header[i]["key"].string_value()].as_string();
-                for (int j = 0; j < pad; j++)
-                    str += ' ';
-            }
-        }
-        str += "\n";
-    }
-    return str;
-}
-
-static uint64_t size_thresh[] = { 1024l*1024*1024*1024, 1024l*1024*1024, 1024l*1024, 1024, 0 };
-static const char *size_unit = "TGMKB";
-
-std::string format_size(uint64_t size)
-{
-    char buf[256];
-    for (int i = 0; i < sizeof(size_thresh)/sizeof(size_thresh[0]); i++)
-    {
-        if (size >= size_thresh[i] || i >= sizeof(size_thresh)/sizeof(size_thresh[0])-1)
-        {
-            double value = size_thresh[i] ? (double)size/size_thresh[i] : size;
-            int l = snprintf(buf, sizeof(buf), "%.1f", value);
-            assert(l < sizeof(buf)-2);
-            if (buf[l-1] == '0')
-                l -= 2;
-            buf[l] = ' ';
-            buf[l+1] = size_unit[i];
-            buf[l+2] = 0;
-            break;
-        }
-    }
-    return std::string(buf);
-}
-
-std::string format_lat(uint64_t lat)
-{
-    char buf[256];
-    int l = 0;
-    if (lat < 100)
-        l = snprintf(buf, sizeof(buf), "%lu us", lat);
-    else if (lat < 500000)
-        l = snprintf(buf, sizeof(buf), "%.2f ms", (double)lat/1000);
-    else
-        l = snprintf(buf, sizeof(buf), "%.2f s", (double)lat/1000000);
-    assert(l < sizeof(buf));
-    return std::string(buf);
-}
-
-std::string format_q(double depth)
-{
-    char buf[256];
-    int l = snprintf(buf, sizeof(buf), "%.2f", depth);
-    assert(l < sizeof(buf));
-    if (buf[l-1] == '0')
-        l--;
-    if (buf[l-1] == '0')
-        l -= 2;
-    buf[l] = 0;
-    return std::string(buf);
-}
-
-std::function<bool(void)> cli_tool_t::start_ls(json11::Json cfg)
-{
-    json11::Json::array cmd = cfg["command"].array_items();
-    auto lister = new image_lister_t();
-    lister->parent = this;
-    lister->list_pool_id = cfg["pool"].uint64_value();
-    lister->list_pool_name = lister->list_pool_id ? "" : cfg["pool"].as_string();
-    lister->show_stats = cfg["long"].bool_value();
-    lister->show_delete = cfg["del"].bool_value();
-    lister->sort_field = cfg["sort"].string_value();
-    lister->reverse = cfg["reverse"].bool_value();
-    lister->max_count = cfg["count"].uint64_value();
-    for (int i = 1; i < cmd.size(); i++)
-    {
-        lister->only_names.insert(cmd[i].string_value());
-    }
-    return [lister]()
-    {
-        lister->loop();
-        if (lister->is_done())
-        {
-            delete lister;
-            return true;
-        }
-        return false;
-    };
-}

src/cli_merge.cpp

@@ -1,583 +0,0 @@
-// Copyright (c) Vitaliy Filippov, 2019+
-// License: VNPL-1.1 (see README.md for details)
-
-#include "cli.h"
-#include "cluster_client.h"
-#include "cpp-btree/safe_btree_set.h"
-
-struct snap_rw_op_t
-{
-    uint64_t offset = 0;
-    void *buf = NULL;
-    cluster_op_t op;
-    int todo = 0;
-    uint32_t start = 0, end = 0;
-};
-
-// Layer merge is the base for multiple operations:
-// 1) Delete snapshot "up" = merge child layer into the parent layer, remove the child
-//    and rename the parent to the child
-// 2) Delete snapshot "down" = merge parent layer into the child layer and remove the parent
-// 3) Flatten image = merge parent layers into the child layer and break the connection
-struct snap_merger_t
-{
-    cli_tool_t *parent;
-
-    // -- CONFIGURATION --
-    // merge from..to into target (target may be one of from..to)
-    std::string from_name, to_name, target_name;
-    // inode=>rank (bigger rank means child layers)
-    std::map<inode_t,int> sources;
-    // delete merged source inode data during merge
-    bool delete_source = false;
-    // use CAS writes (0 = never, 1 = auto, 2 = always)
-    int use_cas = 1;
-    // don't necessarily delete source data, but perform checks as if we were to do it
-    bool check_delete_source = false;
-    // interval between fsyncs
-    int fsync_interval = 128;
-
-    // -- STATE --
-    inode_t target;
-    int target_rank;
-    bool inside_continue = false;
-    int state = 0;
-    int lists_todo = 0;
-    uint64_t target_block_size = 0;
-    btree::safe_btree_set<uint64_t> merge_offsets;
-    btree::safe_btree_set<uint64_t>::iterator oit;
-    std::map<inode_t, std::vector<uint64_t>> layer_lists;
-    std::map<inode_t, uint64_t> layer_block_size;
-    std::map<inode_t, uint64_t> layer_list_pos;
-    int in_flight = 0;
-    uint64_t last_fsync_offset = 0;
-    uint64_t last_written_offset = 0;
-    int deleted_unsynced = 0;
-    uint64_t processed = 0, to_process = 0;
-
-    void start_merge()
-    {
-        check_delete_source = delete_source || check_delete_source;
-        inode_config_t *from_cfg = parent->get_inode_cfg(from_name);
-        inode_config_t *to_cfg = parent->get_inode_cfg(to_name);
-        inode_config_t *target_cfg = target_name == "" ? from_cfg : parent->get_inode_cfg(target_name);
-        if (to_cfg->num == from_cfg->num)
-        {
-            fprintf(stderr, "Only one layer specified, nothing to merge\n");
-            exit(1);
-        }
-        // Check that to_cfg is actually a child of from_cfg and target_cfg is somewhere between them
-        std::vector<inode_t> chain_list;
-        inode_config_t *cur = to_cfg;
-        chain_list.push_back(cur->num);
-        layer_block_size[cur->num] = get_block_size(cur->num);
-        while (cur->parent_id != from_cfg->num &&
-            cur->parent_id != to_cfg->num &&
-            cur->parent_id != 0)
-        {
-            auto it = parent->cli->st_cli.inode_config.find(cur->parent_id);
-            if (it == parent->cli->st_cli.inode_config.end())
-            {
-                fprintf(stderr, "Parent inode of layer %s (id %ld) not found\n", cur->name.c_str(), cur->parent_id);
-                exit(1);
-            }
-            cur = &it->second;
-            chain_list.push_back(cur->num);
-            layer_block_size[cur->num] = get_block_size(cur->num);
-        }
-        if (cur->parent_id != from_cfg->num)
-        {
-            fprintf(stderr, "Layer %s is not a child of %s\n", to_name.c_str(), from_name.c_str());
-            exit(1);
-        }
-        chain_list.push_back(from_cfg->num);
-        layer_block_size[from_cfg->num] = get_block_size(from_cfg->num);
-        int i = chain_list.size()-1;
-        for (inode_t item: chain_list)
-        {
-            sources[item] = i--;
-        }
-        if (sources.find(target_cfg->num) == sources.end())
-        {
-            fprintf(stderr, "Layer %s is not between %s and %s\n", target_name.c_str(), to_name.c_str(), from_name.c_str());
-            exit(1);
-        }
-        target = target_cfg->num;
-        target_rank = sources.at(target);
-        int to_rank = sources.at(to_cfg->num);
-        bool to_has_children = false;
-        // Check that there are no other inodes dependent on altered layers
-        //
-        // 1) everything between <target> and <to> except <to> is not allowed
-        //    to have children other than <to> if <to> is a child of <target>:
-        //
-        //    <target> - <layer 3> - <to>
-        //            \- <layer 4> <--------X--------- NOT ALLOWED
-        //
-        // 2) everything between <from> and <target>, except <target>, is not allowed
-        //    to have children other than <target> if sources are to be deleted after merging:
-        //
-        //    <from> - <layer 1> - <target> - <to>
-        //          \- <layer 2> <---------X-------- NOT ALLOWED
-        for (auto & ic: parent->cli->st_cli.inode_config)
-        {
-            auto it = sources.find(ic.second.num);
-            if (it == sources.end() && ic.second.parent_id != 0)
-            {
-                it = sources.find(ic.second.parent_id);
-                if (it != sources.end())
-                {
-                    int parent_rank = it->second;
-                    if (parent_rank < to_rank && (parent_rank >= target_rank || check_delete_source))
-                    {
-                        fprintf(
-                            stderr, "Layers at or above %s, but below %s are not allowed"
-                                " to have other children, but %s is a child of %s\n",
-                            (check_delete_source ? from_name.c_str() : target_name.c_str()),
-                            to_name.c_str(), ic.second.name.c_str(),
-                            parent->cli->st_cli.inode_config.at(ic.second.parent_id).name.c_str()
-                        );
-                        exit(1);
-                    }
-                    if (parent_rank >= to_rank)
-                    {
-                        to_has_children = true;
-                    }
-                }
-            }
-        }
-        if ((target_rank < to_rank || to_has_children) && use_cas == 1)
-        {
-            // <to> has children itself, no need for CAS
-            use_cas = 0;
-        }
-        sources.erase(target);
-        printf(
-            "Merging %ld layer(s) into target %s%s (inode %lu in pool %u)\n",
-            sources.size(), target_cfg->name.c_str(),
-            use_cas ? " online (with CAS)" : "", INODE_NO_POOL(target), INODE_POOL(target)
-        );
-        target_block_size = get_block_size(target);
-    }
-
-    uint64_t get_block_size(inode_t inode)
-    {
-        auto & pool_cfg = parent->cli->st_cli.pool_config.at(INODE_POOL(inode));
-        uint64_t pg_data_size = (pool_cfg.scheme == POOL_SCHEME_REPLICATED ? 1 : pool_cfg.pg_size-pool_cfg.parity_chunks);
-        return parent->cli->get_bs_block_size() * pg_data_size;
-    }
-
-    void continue_merge_reent()
-    {
-        if (!inside_continue)
-        {
-            inside_continue = true;
-            continue_merge();
-            inside_continue = false;
-        }
-    }
-
-    bool is_done()
-    {
-        return state == 6;
-    }
-
-    void continue_merge()
-    {
-        if (state == 1)
-            goto resume_1;
-        else if (state == 2)
-            goto resume_2;
-        else if (state == 3)
-            goto resume_3;
-        else if (state == 4)
-            goto resume_4;
-        else if (state == 5)
-            goto resume_5;
-        else if (state == 6)
-            goto resume_6;
-        // Get parents and so on
-        start_merge();
-        // First list lower layers
-        list_layers(true);
-        state = 1;
-    resume_1:
-        while (lists_todo > 0)
-        {
-            // Wait for lists
-            return;
-        }
-        if (merge_offsets.size() > 0)
-        {
-            state = 2;
-            oit = merge_offsets.begin();
-            processed = 0;
-            to_process = merge_offsets.size();
-    resume_2:
-            // Then remove blocks already filled in target by issuing zero-length reads and checking bitmaps
-            while (in_flight < parent->iodepth*parent->parallel_osds && oit != merge_offsets.end())
-            {
-                in_flight++;
-                check_if_full(*oit);
-                oit++;
-                processed++;
-                if (parent->progress && !(processed % 128))
-                {
-                    printf("\rFiltering target blocks: %lu/%lu", processed, to_process);
-                }
-            }
-            if (in_flight > 0 || oit != merge_offsets.end())
-            {
-                // Wait until reads finish
-                return;
-            }
-            if (parent->progress)
-            {
-                printf("\r%lu full blocks of target filtered out\n", to_process-merge_offsets.size());
-            }
-        }
-        state = 3;
-    resume_3:
-        // Then list upper layers
-        list_layers(false);
-        state = 4;
-    resume_4:
-        while (lists_todo > 0)
-        {
-            // Wait for lists
-            return;
-        }
-        state = 5;
-        processed = 0;
-        to_process = merge_offsets.size();
-        oit = merge_offsets.begin();
-    resume_5:
-        // Now read, overwrite and optionally delete offsets one by one
-        while (in_flight < parent->iodepth*parent->parallel_osds && oit != merge_offsets.end())
-        {
-            in_flight++;
-            read_and_write(*oit);
-            oit++;
-            processed++;
-            if (parent->progress && !(processed % 128))
-            {
-                printf("\rOverwriting blocks: %lu/%lu", processed, to_process);
-            }
-        }
-        if (in_flight > 0 || oit != merge_offsets.end())
-        {
-            // Wait until overwrites finish
-            return;
-        }
-        if (parent->progress)
-        {
-            printf("\rOverwriting blocks: %lu/%lu\n", to_process, to_process);
-        }
-        // Done
-        printf("Done, layers from %s to %s merged into %s\n", from_name.c_str(), to_name.c_str(), target_name.c_str());
-        state = 6;
-    resume_6:
-        return;
-    }
-
-    void list_layers(bool lower)
-    {
-        for (auto & sp: sources)
-        {
-            inode_t src = sp.first;
-            if (lower ? (sp.second < target_rank) : (sp.second > target_rank))
-            {
-                lists_todo++;
-                inode_list_t* lst = parent->cli->list_inode_start(src, [this, src](
-                    inode_list_t *lst, std::set<object_id>&& objects, pg_num_t pg_num, osd_num_t primary_osd, int status)
-                {
-                    uint64_t layer_block = layer_block_size.at(src);
-                    for (object_id obj: objects)
-                    {
-                        merge_offsets.insert(obj.stripe - obj.stripe % target_block_size);
-                        for (int i = target_block_size; i < layer_block; i += target_block_size)
-                        {
-                            merge_offsets.insert(obj.stripe - obj.stripe % target_block_size + i);
-                        }
-                    }
-                    if (delete_source)
-                    {
-                        // Also store individual lists
-                        auto & layer_list = layer_lists[src];
-                        int pos = layer_list.size();
-                        layer_list.resize(pos + objects.size());
-                        for (object_id obj: objects)
-                        {
-                            layer_list[pos++] = obj.stripe;
-                        }
-                    }
-                    if (status & INODE_LIST_DONE)
-                    {
-                        auto & name = parent->cli->st_cli.inode_config.at(src).name;
-                        printf("Got listing of layer %s (inode %lu in pool %u)\n", name.c_str(), INODE_NO_POOL(src), INODE_POOL(src));
-                        if (delete_source)
-                        {
-                            // Sort the inode listing
-                            std::sort(layer_lists[src].begin(), layer_lists[src].end());
-                        }
-                        lists_todo--;
-                        continue_merge_reent();
-                    }
-                    else
-                    {
-                        parent->cli->list_inode_next(lst, 1);
-                    }
-                });
-                parent->cli->list_inode_next(lst, parent->parallel_osds);
-            }
-        }
-    }
-
-    // Check if <offset> is fully written in <target> and remove it from merge_offsets if so
-    void check_if_full(uint64_t offset)
-    {
-        cluster_op_t *op = new cluster_op_t;
-        op->opcode = OSD_OP_READ_BITMAP;
-        op->inode = target;
-        op->offset = offset;
-        op->len = 0;
-        op->callback = [this](cluster_op_t *op)
-        {
-            if (op->retval < 0)
-            {
-                fprintf(stderr, "error reading target bitmap at offset %lx: %s\n", op->offset, strerror(-op->retval));
-            }
-            else
-            {
-                uint64_t bitmap_bytes = target_block_size/parent->cli->get_bs_bitmap_granularity()/8;
-                int i;
-                for (i = 0; i < bitmap_bytes; i++)
-                {
-                    if (((uint8_t*)op->bitmap_buf)[i] != 0xff)
-                    {
-                        break;
-                    }
-                }
-                if (i == bitmap_bytes)
-                {
-                    // full
-                    merge_offsets.erase(op->offset);
-                }
-            }
-            delete op;
-            in_flight--;
-            continue_merge_reent();
-        };
-        parent->cli->execute(op);
-    }
-
-    // Read <offset> from <to>, write it to <target> and optionally delete it
-    // from all layers except <target> after fsync'ing
-    void read_and_write(uint64_t offset)
-    {
-        snap_rw_op_t *rwo = new snap_rw_op_t;
-        // Initialize counter to 1 to later allow write_subop() to return immediately
-        // (even though it shouldn't really do that)
-        rwo->todo = 1;
-        rwo->buf = malloc(target_block_size);
-        rwo->offset = offset;
-        rwo_read(rwo);
-    }
-
-    void rwo_read(snap_rw_op_t *rwo)
-    {
-        cluster_op_t *op = &rwo->op;
-        op->opcode = OSD_OP_READ;
-        op->inode = target;
-        op->offset = rwo->offset;
-        op->len = target_block_size;
-        op->iov.push_back(rwo->buf, target_block_size);
-        op->callback = [this, rwo](cluster_op_t *op)
-        {
-            if (op->retval != op->len)
-            {
-                fprintf(stderr, "error reading target at offset %lx: %s\n", op->offset, strerror(-op->retval));
-                exit(1);
-            }
-            next_write(rwo);
-        };
-        parent->cli->execute(op);
-    }
-
-    void next_write(snap_rw_op_t *rwo)
-    {
-        // Write each non-empty range using an individual operation
-        // FIXME: Allow to use single write with "holes" (OSDs don't allow it yet)
-        uint32_t gran = parent->cli->get_bs_bitmap_granularity();
-        uint64_t bitmap_size = target_block_size / gran;
-        while (rwo->end < bitmap_size)
-        {
-            auto bit = ((*(uint8_t*)(rwo->op.bitmap_buf + (rwo->end >> 3))) & (1 << (rwo->end & 0x7)));
-            if (!bit)
-            {
-                if (rwo->end > rwo->start)
-                {
-                    // write start->end
-                    rwo->todo++;
-                    write_subop(rwo, rwo->start*gran, rwo->end*gran, use_cas ? 1+rwo->op.version : 0);
-                    rwo->start = rwo->end;
-                    if (use_cas)
-                    {
-                        // Submit one by one if using CAS writes
-                        return;
-                    }
-                }
-                rwo->start = rwo->end = rwo->end+1;
-            }
-            else
-            {
-                rwo->end++;
-            }
-        }
-        if (rwo->end > rwo->start)
-        {
-            // write start->end
-            rwo->todo++;
-            write_subop(rwo, rwo->start*gran, rwo->end*gran, use_cas ? 1+rwo->op.version : 0);
-            rwo->start = rwo->end;
-            if (use_cas)
-            {
-                return;
-            }
-        }
-        rwo->todo--;
-        // Just in case, if everything is done
-        autofree_op(rwo);
-    }
-
-    void write_subop(snap_rw_op_t *rwo, uint32_t start, uint32_t end, uint64_t version)
-    {
-        cluster_op_t *subop = new cluster_op_t;
-        subop->opcode = OSD_OP_WRITE;
-        subop->inode = target;
-        subop->offset = rwo->offset+start;
-        subop->len = end-start;
-        subop->version = version;
-        subop->flags = OSD_OP_IGNORE_READONLY;
-        subop->iov.push_back(rwo->buf+start, end-start);
-        subop->callback = [this, rwo](cluster_op_t *subop)
-        {
-            rwo->todo--;
-            if (subop->retval != subop->len)
-            {
-                if (use_cas && subop->retval == -EINTR)
-                {
-                    // CAS failure - reread and repeat optimistically
-                    rwo->start = subop->offset - rwo->offset;
-                    rwo_read(rwo);
-                    delete subop;
-                    return;
-                }
-                fprintf(stderr, "error writing target at offset %lx: %s\n", subop->offset, strerror(-subop->retval));
-                exit(1);
-            }
-            // Increment CAS version
-            rwo->op.version++;
-            if (use_cas)
-                next_write(rwo);
-            else
-                autofree_op(rwo);
-            delete subop;
-        };
-        parent->cli->execute(subop);
-    }
-
-    void delete_offset(inode_t inode_num, uint64_t offset)
-    {
-        cluster_op_t *subop = new cluster_op_t;
-        subop->opcode = OSD_OP_DELETE;
-        subop->inode = inode_num;
-        subop->offset = offset;
-        subop->len = 0;
-        subop->flags = OSD_OP_IGNORE_READONLY;
-        subop->callback = [this](cluster_op_t *subop)
-        {
-            if (subop->retval != 0)
-            {
-                fprintf(stderr, "error deleting from layer 0x%lx at offset %lx: %s", subop->inode, subop->offset, strerror(-subop->retval));
-            }
-            delete subop;
-        };
-        parent->cli->execute(subop);
-    }
-
-    void autofree_op(snap_rw_op_t *rwo)
-    {
-        if (!rwo->todo)
-        {
-            if (last_written_offset < rwo->op.offset+target_block_size)
-            {
-                last_written_offset = rwo->op.offset+target_block_size;
-            }
-            if (delete_source)
-            {
-                deleted_unsynced++;
-                if (deleted_unsynced >= fsync_interval)
-                {
-                    uint64_t from = last_fsync_offset, to = last_written_offset;
-                    cluster_op_t *subop = new cluster_op_t;
-                    subop->opcode = OSD_OP_SYNC;
-                    subop->callback = [this, from, to](cluster_op_t *subop)
-                    {
-                        delete subop;
-                        // We can now delete source data between <from> and <to>
-                        // But to do this we have to keep all object lists in memory :-(
-                        for (auto & lp: layer_list_pos)
-                        {
-                            auto & layer_list = layer_lists.at(lp.first);
-                            uint64_t layer_block = layer_block_size.at(lp.first);
-                            int cur_pos = lp.second;
-                            while (cur_pos < layer_list.size() && layer_list[cur_pos]+layer_block < to)
-                            {
-                                delete_offset(lp.first, layer_list[cur_pos]);
-                                cur_pos++;
-                            }
-                            lp.second = cur_pos;
-                        }
-                    };
-                    parent->cli->execute(subop);
-                }
-            }
-            free(rwo->buf);
-            delete rwo;
-            in_flight--;
-            continue_merge_reent();
-        }
-    }
-};
-
-std::function<bool(void)> cli_tool_t::start_merge(json11::Json cfg)
-{
-    json11::Json::array cmd = cfg["command"].array_items();
-    auto merger = new snap_merger_t();
-    merger->parent = this;
-    merger->from_name = cmd.size() > 1 ? cmd[1].string_value() : "";
-    merger->to_name = cmd.size() > 2 ? cmd[2].string_value() : "";
-    merger->target_name = cfg["target"].string_value();
-    if (merger->from_name == "" || merger->to_name == "")
-    {
-        fprintf(stderr, "Beginning or end of the merge sequence is missing\n");
-        exit(1);
-    }
-    merger->delete_source = cfg["delete-source"].string_value() != "";
-    merger->fsync_interval = cfg["fsync-interval"].uint64_value();
-    if (!merger->fsync_interval)
-        merger->fsync_interval = 128;
-    if (!cfg["cas"].is_null())
-        merger->use_cas = cfg["cas"].uint64_value() ? 2 : 0;
-    return [merger]()
-    {
-        merger->continue_merge_reent();
-        if (merger->is_done())
-        {
-            delete merger;
-            return true;
-        }
-        return false;
-    };
-}

src/cli_modify.cpp

@@ -1,231 +0,0 @@
-// Copyright (c) Vitaliy Filippov, 2019+
-// License: VNPL-1.1 (see README.md for details)
-
-#include "cli.h"
-#include "cluster_client.h"
-#include "base64.h"
-
-// Rename, resize image (and purge extra data on shrink) or change its readonly status
-struct image_changer_t
-{
-    cli_tool_t *parent;
-
-    std::string image_name;
-    std::string new_name;
-    uint64_t new_size = 0;
-    bool set_readonly = false, set_readwrite = false, force = false;
-    // interval between fsyncs
-    int fsync_interval = 128;
-
-    uint64_t inode_num = 0;
-    inode_config_t cfg;
-    json11::Json::array checks, success;
-    bool has_children = false;
-
-    int state = 0;
-    std::function<bool(void)> cb;
-
-    bool is_done()
-    {
-        return state == 100;
-    }
-
-    void loop()
-    {
-        if (state == 1)
-            goto resume_1;
-        else if (state == 2)
-            goto resume_2;
-        for (auto & ic: parent->cli->st_cli.inode_config)
-        {
-            if (ic.second.name == image_name)
-            {
-                inode_num = ic.first;
-                cfg = ic.second;
-                break;
-            }
-            if (new_name != "" && ic.second.name == new_name)
-            {
-                fprintf(stderr, "Image %s already exists\n", new_name.c_str());
-                exit(1);
-            }
-        }
-        if (!inode_num)
-        {
-            fprintf(stderr, "Image %s does not exist\n", image_name.c_str());
-            exit(1);
-        }
-        for (auto & ic: parent->cli->st_cli.inode_config)
-        {
-            if (ic.second.parent_id == inode_num)
-            {
-                has_children = true;
-                break;
-            }
-        }
-        if (new_size != 0)
-        {
-            if (cfg.size >= new_size)
-            {
-                // Check confirmation when trimming an image with children
-                if (has_children && !force)
-                {
-                    fprintf(stderr, "Image %s has children. Refusing to shrink it without --force\n", image_name.c_str());
-                    exit(1);
-                }
-                // Shrink the image first
-                cb = parent->start_rm(json11::Json::object {
-                    { "inode", INODE_NO_POOL(inode_num) },
-                    { "pool", (uint64_t)INODE_POOL(inode_num) },
-                    { "fsync-interval", fsync_interval },
-                    { "min-offset", new_size },
-                });
-resume_1:
-                while (!cb())
-                {
-                    state = 1;
-                    return;
-                }
-                cb = NULL;
-            }
-            cfg.size = new_size;
-        }
-        if (set_readonly)
-        {
-            cfg.readonly = true;
-        }
-        if (set_readwrite)
-        {
-            cfg.readonly = false;
-            // Check confirmation when making an image with children read-write
-            if (has_children && !force)
-            {
-                fprintf(stderr, "Image %s has children. Refusing to make it read-write without --force\n", image_name.c_str());
-                exit(1);
-            }
-        }
-        if (new_name != "")
-        {
-            cfg.name = new_name;
-        }
-        {
-            std::string cur_cfg_key = base64_encode(parent->cli->st_cli.etcd_prefix+
-                "/config/inode/"+std::to_string(INODE_POOL(inode_num))+
-                "/"+std::to_string(INODE_NO_POOL(inode_num)));
-            checks.push_back(json11::Json::object {
-                { "target", "MOD" },
-                { "key", cur_cfg_key },
-                { "result", "LESS" },
-                { "mod_revision", cfg.mod_revision+1 },
-            });
-            success.push_back(json11::Json::object {
-                { "request_put", json11::Json::object {
-                    { "key", cur_cfg_key },
-                    { "value", base64_encode(json11::Json(
-                        parent->cli->st_cli.serialize_inode_cfg(&cfg)
-                    ).dump()) },
-                } }
-            });
-        }
-        if (new_name != "")
-        {
-            std::string old_idx_key = base64_encode(
-                parent->cli->st_cli.etcd_prefix+"/index/image/"+image_name
-            );
-            std::string new_idx_key = base64_encode(
-                parent->cli->st_cli.etcd_prefix+"/index/image/"+new_name
-            );
-            checks.push_back(json11::Json::object {
-                { "target", "MOD" },
-                { "key", old_idx_key },
-                { "result", "LESS" },
-                { "mod_revision", cfg.mod_revision+1 },
-            });
-            checks.push_back(json11::Json::object {
-                { "target", "VERSION" },
-                { "version", 0 },
-                { "key", new_idx_key },
-            });
-            success.push_back(json11::Json::object {
-                { "request_delete_range", json11::Json::object {
-                    { "key", old_idx_key },
-                } }
-            });
-            success.push_back(json11::Json::object {
-                { "request_put", json11::Json::object {
-                    { "key", new_idx_key },
-                    { "value", base64_encode(json11::Json(json11::Json::object{
-                        { "id", INODE_NO_POOL(inode_num) },
-                        { "pool_id", (uint64_t)INODE_POOL(inode_num) },
-                    }).dump()) },
-                } }
-            });
-        }
-        parent->waiting++;
-        parent->cli->st_cli.etcd_txn(json11::Json::object {
-            { "compare", checks },
-            { "success", success },
-        }, ETCD_SLOW_TIMEOUT, [this](std::string err, json11::Json res)
-        {
-            if (err != "")
-            {
-                fprintf(stderr, "Error changing %s: %s\n", image_name.c_str(), err.c_str());
-                exit(1);
-            }
-            if (!res["succeeded"].bool_value())
-            {
-                fprintf(stderr, "Image %s was modified by someone else, please repeat your request\n", image_name.c_str());
-                exit(1);
-            }
-            parent->waiting--;
-            parent->ringloop->wakeup();
-        });
-        state = 2;
-resume_2:
-        if (parent->waiting > 0)
-            return;
-        printf("Image %s modified\n", image_name.c_str());
-        state = 100;
-    }
-};
-
-std::function<bool(void)> cli_tool_t::start_modify(json11::Json cfg)
-{
-    json11::Json::array cmd = cfg["command"].array_items();
-    auto changer = new image_changer_t();
-    changer->parent = this;
-    changer->image_name = cmd.size() > 1 ? cmd[1].string_value() : "";
-    if (changer->image_name == "")
-    {
-        fprintf(stderr, "Image name is missing\n");
-        exit(1);
-    }
-    changer->new_name = cfg["rename"].string_value();
-    if (changer->new_name == changer->image_name)
-    {
-        changer->new_name = "";
-    }
-    changer->new_size = cfg["size"].uint64_value();
-    if (changer->new_size != 0 && (changer->new_size % 4096))
-    {
-        fprintf(stderr, "Image size should be a multiple of 4096\n");
-        exit(1);
-    }
-    changer->force = cfg["force"].bool_value();
-    changer->set_readonly = cfg["readonly"].bool_value();
-    changer->set_readwrite = cfg["readwrite"].bool_value();
-    changer->fsync_interval = cfg["fsync-interval"].uint64_value();
-    if (!changer->fsync_interval)
-        changer->fsync_interval = 128;
-    // FIXME Check that the image doesn't have children when shrinking
-    return [changer]()
-    {
-        changer->loop();
-        if (changer->is_done())
-        {
-            delete changer;
-            return true;
-        }
-        return false;
-    };
-}

src/cli_rm.cpp

@@ -1,213 +0,0 @@
-// Copyright (c) Vitaliy Filippov, 2019+
-// License: VNPL-1.1 (see README.md for details)
-
-#include "cli.h"
-#include "cluster_client.h"
-
-#define RM_LISTING 1
-#define RM_REMOVING 2
-#define RM_END 3
-
-struct rm_pg_t
-{
-    pg_num_t pg_num;
-    osd_num_t rm_osd_num;
-    std::set<object_id> objects;
-    std::set<object_id>::iterator obj_pos;
-    uint64_t obj_count = 0, obj_done = 0;
-    int state = 0;
-    int in_flight = 0;
-};
-
-struct rm_inode_t
-{
-    uint64_t inode = 0;
-    pool_id_t pool_id = 0;
-    uint64_t min_offset = 0;
-
-    cli_tool_t *parent = NULL;
-    inode_list_t *lister = NULL;
-    std::vector<rm_pg_t*> lists;
-    uint64_t total_count = 0, total_done = 0, total_prev_pct = 0;
-    uint64_t pgs_to_list = 0;
-    bool lists_done = false;
-    int state = 0;
-
-    void start_delete()
-    {
-        lister = parent->cli->list_inode_start(inode, [this](inode_list_t *lst,
-            std::set<object_id>&& objects, pg_num_t pg_num, osd_num_t primary_osd, int status)
-        {
-            rm_pg_t *rm = new rm_pg_t((rm_pg_t){
-                .pg_num = pg_num,
-                .rm_osd_num = primary_osd,
-                .objects = objects,
-                .obj_count = objects.size(),
-                .obj_done = 0,
-            });
-            if (min_offset == 0)
-            {
-                total_count += objects.size();
-            }
-            else
-            {
-                for (object_id oid: objects)
-                {
-                    if (oid.stripe >= min_offset)
-                    {
-                        total_count++;
-                    }
-                }
-            }
-            rm->obj_pos = rm->objects.begin();
-            lists.push_back(rm);
-            if (parent->list_first)
-            {
-                parent->cli->list_inode_next(lister, 1);
-            }
-            if (status & INODE_LIST_DONE)
-            {
-                lists_done = true;
-            }
-            pgs_to_list--;
-            continue_delete();
-        });
-        if (!lister)
-        {
-            fprintf(stderr, "Failed to list inode %lu from pool %u objects\n", INODE_NO_POOL(inode), INODE_POOL(inode));
-            exit(1);
-        }
-        pgs_to_list = parent->cli->list_pg_count(lister);
-        parent->cli->list_inode_next(lister, parent->parallel_osds);
-    }
-
-    void send_ops(rm_pg_t *cur_list)
-    {
-        if (parent->cli->msgr.osd_peer_fds.find(cur_list->rm_osd_num) ==
-            parent->cli->msgr.osd_peer_fds.end())
-        {
-            // Initiate connection
-            parent->cli->msgr.connect_peer(cur_list->rm_osd_num, parent->cli->st_cli.peer_states[cur_list->rm_osd_num]);
-            return;
-        }
-        while (cur_list->in_flight < parent->iodepth && cur_list->obj_pos != cur_list->objects.end())
-        {
-            if (cur_list->obj_pos->stripe >= min_offset)
-            {
-                osd_op_t *op = new osd_op_t();
-                op->op_type = OSD_OP_OUT;
-                op->peer_fd = parent->cli->msgr.osd_peer_fds[cur_list->rm_osd_num];
-                op->req = (osd_any_op_t){
-                    .rw = {
-                        .header = {
-                            .magic = SECONDARY_OSD_OP_MAGIC,
-                            .id = parent->cli->next_op_id(),
-                            .opcode = OSD_OP_DELETE,
-                        },
-                        .inode = cur_list->obj_pos->inode,
-                        .offset = cur_list->obj_pos->stripe,
-                        .len = 0,
-                    },
-                };
-                op->callback = [this, cur_list](osd_op_t *op)
-                {
-                    cur_list->in_flight--;
-                    if (op->reply.hdr.retval < 0)
-                    {
-                        fprintf(stderr, "Failed to remove object %lx:%lx from PG %u (OSD %lu) (retval=%ld)\n",
-                            op->req.rw.inode, op->req.rw.offset,
-                            cur_list->pg_num, cur_list->rm_osd_num, op->reply.hdr.retval);
-                    }
-                    delete op;
-                    cur_list->obj_done++;
-                    total_done++;
-                    continue_delete();
-                };
-                cur_list->in_flight++;
-                parent->cli->msgr.outbox_push(op);
-            }
-            cur_list->obj_pos++;
-        }
-    }
-
-    void continue_delete()
-    {
-        if (parent->list_first && !lists_done)
-        {
-            return;
-        }
-        for (int i = 0; i < lists.size(); i++)
-        {
-            if (!lists[i]->in_flight && lists[i]->obj_pos == lists[i]->objects.end())
-            {
-                delete lists[i];
-                lists.erase(lists.begin()+i, lists.begin()+i+1);
-                i--;
-                if (!lists_done)
-                {
-                    parent->cli->list_inode_next(lister, 1);
-                }
-            }
-            else
-            {
-                send_ops(lists[i]);
-            }
-        }
-        if (parent->progress && total_count > 0 && total_done*1000/total_count != total_prev_pct)
-        {
-            printf("\rRemoved %lu/%lu objects, %lu more PGs to list...", total_done, total_count, pgs_to_list);
-            total_prev_pct = total_done*1000/total_count;
-        }
-        if (lists_done && !lists.size())
-        {
-            printf("Done, inode %lu in pool %u data removed\n", INODE_NO_POOL(inode), pool_id);
-            state = 2;
-        }
-    }
-
-    bool loop()
-    {
-        if (state == 0)
-        {
-            start_delete();
-            state = 1;
-        }
-        else if (state == 1)
-        {
-            continue_delete();
-        }
-        else if (state == 2)
-        {
-            return true;
-        }
-        return false;
-    }
-};
-
-std::function<bool(void)> cli_tool_t::start_rm(json11::Json cfg)
-{
-    auto remover = new rm_inode_t();
-    remover->parent = this;
-    remover->inode = cfg["inode"].uint64_value();
-    remover->pool_id = cfg["pool"].uint64_value();
-    if (remover->pool_id)
-    {
-        remover->inode = (remover->inode & ((1l << (64-POOL_ID_BITS)) - 1)) | (((uint64_t)remover->pool_id) << (64-POOL_ID_BITS));
-    }
-    remover->pool_id = INODE_POOL(remover->inode);
-    if (!remover->pool_id)
-    {
-        fprintf(stderr, "pool is missing\n");
-        exit(1);
-    }
-    remover->min_offset = cfg["min-offset"].uint64_value();
-    return [remover]()
-    {
-        if (remover->loop())
-        {
-            delete remover;
-            return true;
-        }
-        return false;
-    };
-}

src/cli_simple_offsets.cpp

@@ -1,143 +0,0 @@
-// Copyright (c) Vitaliy Filippov, 2019+
-// License: VNPL-1.1 (see README.md for details)
-
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <ctype.h>
-#include <unistd.h>
-#include "cli.h"
-#include "cluster_client.h"
-#include "base64.h"
-
-// Calculate offsets for a block device and print OSD command line parameters
-std::function<bool(void)> cli_tool_t::simple_offsets(json11::Json cfg)
-{
-    std::string device = cfg["command"][1].string_value();
-    uint64_t object_size = parse_size(cfg["object_size"].string_value());
-    uint64_t bitmap_granularity = parse_size(cfg["bitmap_granularity"].string_value());
-    uint64_t journal_size = parse_size(cfg["journal_size"].string_value());
-    uint64_t device_block_size = parse_size(cfg["device_block_size"].string_value());
-    uint64_t journal_offset = parse_size(cfg["journal_offset"].string_value());
-    uint64_t device_size = parse_size(cfg["device_size"].string_value());
-    std::string format = cfg["format"].string_value();
-    if (json_output)
-        format = "json";
-    if (!object_size)
-        object_size = DEFAULT_BLOCK_SIZE;
-    if (!bitmap_granularity)
-        bitmap_granularity = DEFAULT_BITMAP_GRANULARITY;
-    if (!journal_size)
-        journal_size = 16*1024*1024;
-    if (!device_block_size)
-        device_block_size = 4096;
-    uint64_t orig_device_size = device_size;
-    if (!device_size)
-    {
-        struct stat st;
-        if (stat(device.c_str(), &st) < 0)
-        {
-            fprintf(stderr, "Can't stat %s: %s\n", device.c_str(), strerror(errno));
-            exit(1);
-        }
-        if (S_ISBLK(st.st_mode))
-        {
-            int fd = open(device.c_str(), O_DIRECT|O_RDONLY);
-            if (fd < 0 || ioctl(fd, BLKGETSIZE64, &device_size) < 0)
-            {
-                fprintf(stderr, "Failed to get device size for %s: %s\n", device.c_str(), strerror(errno));
-                exit(1);
-            }
-            close(fd);
-            if (st.st_blksize < device_block_size)
-            {
-                fprintf(
-                    stderr, "Warning: %s reports %lu byte blocks, but we use %lu."
-                    " Set --device_block_size=%lu if you're sure it works well with %lu byte blocks.\n",
-                    device.c_str(), st.st_blksize, device_block_size, st.st_blksize, st.st_blksize
-                );
-            }
-        }
-        else if (S_ISREG(st.st_mode))
-        {
-            device_size = st.st_size;
-        }
-        else
-        {
-            fprintf(stderr, "%s is neither a block device nor a regular file\n", device.c_str());
-            exit(1);
-        }
-    }
-    if (!device_size)
-    {
-        fprintf(stderr, "Failed to get device size for %s\n", device.c_str());
-        exit(1);
-    }
-    if (device_block_size < 512 || device_block_size > 1048576 ||
-        device_block_size & (device_block_size-1) != 0)
-    {
-        fprintf(stderr, "Invalid device block size specified: %lu\n", device_block_size);
-        exit(1);
-    }
-    if (object_size < device_block_size || object_size > MAX_BLOCK_SIZE ||
-        object_size & (object_size-1) != 0)
-    {
-        fprintf(stderr, "Invalid object size specified: %lu\n", object_size);
-        exit(1);
-    }
-    if (bitmap_granularity < device_block_size || bitmap_granularity > object_size ||
-        bitmap_granularity & (bitmap_granularity-1) != 0)
-    {
-        fprintf(stderr, "Invalid bitmap granularity specified: %lu\n", bitmap_granularity);
-        exit(1);
-    }
-    journal_offset = ((journal_offset+device_block_size-1)/device_block_size)*device_block_size;
-    uint64_t meta_offset = journal_offset + ((journal_size+device_block_size-1)/device_block_size)*device_block_size;
-    uint64_t entries_per_block = (device_block_size / (24 + 2*object_size/bitmap_granularity/8));
-    uint64_t object_count = ((device_size-meta_offset)/object_size);
-    uint64_t meta_size = (1 + (object_count+entries_per_block-1)/entries_per_block) * device_block_size;
-    uint64_t data_offset = meta_offset + meta_size;
-    if (format == "json")
-    {
-        // JSON
-        printf("%s\n", json11::Json(json11::Json::object {
-            { "meta_block_size", device_block_size },
-            { "journal_block_size", device_block_size },
-            { "data_size", device_size-data_offset },
-            { "data_device", device },
-            { "journal_offset", journal_offset },
-            { "meta_offset", meta_offset },
-            { "data_offset", data_offset },
-        }).dump().c_str());
-    }
-    else if (format == "env")
-    {
-        // Env
-        printf(
-            "meta_block_size=%lu\njournal_block_size=%lu\ndata_size=%lu\n"
-            "data_device=%s\njournal_offset=%lu\nmeta_offset=%lu\ndata_offset=%lu\n",
-            device_block_size, device_block_size, device_size-data_offset,
-            device.c_str(), journal_offset, meta_offset, data_offset
-        );
-    }
-    else
-    {
-        // OSD command-line options
-        if (format != "options")
-        {
-            fprintf(stderr, "Metadata size: %s\nOptions for the OSD:\n", format_size(meta_size).c_str());
-        }
-        if (device_block_size != 4096)
-        {
-            printf("--meta_block_size %lu\n--journal_block_size %lu\n", device_block_size, device_block_size);
-        }
-        if (orig_device_size)
-        {
-            printf("--data_size %lu\n", device_size-data_offset);
-        }
-        printf(
-            "--data_device %s\n--journal_offset %lu\n--meta_offset %lu\n--data_offset %lu\n",
-            device.c_str(), journal_offset, meta_offset, data_offset
-        );
-    }
-    return NULL;
-}

src/cli_snap_rm.cpp

@@ -1,568 +0,0 @@
-// Copyright (c) Vitaliy Filippov, 2019+
-// License: VNPL-1.1 (see README.md for details)
-
-#include <fcntl.h>
-#include "cli.h"
-#include "cluster_client.h"
-#include "base64.h"
-
-// Remove layer(s): similar to merge, but alters metadata and processes multiple merge targets
-//
-// Exactly one child of the requested layers may be merged using the "inverted" workflow,
-// where we merge it "down" into one of the "to-be-removed" layers and then rename the
-// "to-be-removed" layer to the child. It may be done either if all writers are stopped
-// before trying to delete layers (which is signaled by --writers-stopped) or if that child
-// is a read-only layer (snapshot) itself.
-//
-// This "inverted" workflow trades copying data of one of the deleted layers for copying
-// data of one child of the chain which is also a child of the "traded" layer. So we
-// choose the (parent,child) pair which has the largest difference between "parent" and
-// "child" inode sizes.
-//
-// All other children of the chain are processed by iterating though them, merging removed
-// parents into them and rebasing them to the last layer which isn't a member of the removed
-// chain.
-//
-// Example:
-//
-// <parent> - <from> - <layer 2> - <to> - <child 1>
-//                 \           \       \- <child 2>
-//                  \           \- <child 3>
-//                   \-<child 4>
-//
-// 1) Find optimal pair for the "reverse" scenario
-//    Imagine that it's (<layer 2>, <child 1>) in this example
-// 2) Process all children except <child 1>:
-//    - Merge <from>..<to> to <child 2>
-//    - Set <child 2> parent to <parent>
-//    - Repeat for others
-// 3) Process <child 1>:
-//    - Merge <from>..<child 1> to <layer 2>
-//    - Set <layer 2> parent to <parent>
-//    - Rename <layer 2> to <child 1>
-// 4) Delete other layers of the chain (<from>, <to>)
-struct snap_remover_t
-{
-    cli_tool_t *parent;
-
-    // remove from..to
-    std::string from_name, to_name;
-    // writers are stopped, we can safely change writable layers
-    bool writers_stopped = false;
-    // use CAS writes (0 = never, 1 = auto, 2 = always)
-    int use_cas = 1;
-    // interval between fsyncs
-    int fsync_interval = 128;
-
-    std::map<inode_t,int> sources;
-    std::map<inode_t,uint64_t> inode_used;
-    std::vector<inode_t> merge_children;
-    std::vector<inode_t> chain_list;
-    std::map<inode_t,int> inverse_candidates;
-    inode_t inverse_parent = 0, inverse_child = 0;
-    inode_t new_parent = 0;
-    int state = 0;
-    int current_child = 0;
-    std::function<bool(void)> cb;
-
-    bool is_done()
-    {
-        return state == 9;
-    }
-
-    void loop()
-    {
-        if (state == 1)
-            goto resume_1;
-        else if (state == 2)
-            goto resume_2;
-        else if (state == 3)
-            goto resume_3;
-        else if (state == 4)
-            goto resume_4;
-        else if (state == 5)
-            goto resume_5;
-        else if (state == 6)
-            goto resume_6;
-        else if (state == 7)
-            goto resume_7;
-        else if (state == 8)
-            goto resume_8;
-        else if (state == 9)
-            goto resume_9;
-        // Get children to merge
-        get_merge_children();
-        // Try to select an inode for the "inverse" optimized scenario
-        // Read statistics from etcd to do it
-        read_stats();
-        state = 1;
-resume_1:
-        if (parent->waiting > 0)
-            return;
-        choose_inverse_candidate();
-        // Merge children one by one, except our "inverse" child
-        for (current_child = 0; current_child < merge_children.size(); current_child++)
-        {
-            if (merge_children[current_child] == inverse_child)
-                continue;
-            start_merge_child(merge_children[current_child], merge_children[current_child]);
-resume_2:
-            while (!cb())
-            {
-                state = 2;
-                return;
-            }
-            cb = NULL;
-            parent->change_parent(merge_children[current_child], new_parent);
-            state = 3;
-resume_3:
-            if (parent->waiting > 0)
-                return;
-        }
-        // Merge our "inverse" child into our "inverse" parent
-        if (inverse_child != 0)
-        {
-            start_merge_child(inverse_child, inverse_parent);
-resume_4:
-            while (!cb())
-            {
-                state = 4;
-                return;
-            }
-            cb = NULL;
-            // Delete "inverse" child data
-            start_delete_source(inverse_child);
-resume_5:
-            while (!cb())
-            {
-                state = 5;
-                return;
-            }
-            cb = NULL;
-            // Delete "inverse" child metadata, rename parent over it,
-            // and also change parent links of the previous "inverse" child
-            rename_inverse_parent();
-            state = 6;
-resume_6:
-            if (parent->waiting > 0)
-                return;
-        }
-        // Delete parents, except the "inverse" one
-        for (current_child = 0; current_child < chain_list.size(); current_child++)
-        {
-            if (chain_list[current_child] == inverse_parent)
-                continue;
-            start_delete_source(chain_list[current_child]);
-resume_7:
-            while (!cb())
-            {
-                state = 7;
-                return;
-            }
-            cb = NULL;
-            delete_inode_config(chain_list[current_child]);
-            state = 8;
-resume_8:
-            if (parent->waiting > 0)
-                return;
-        }
-        state = 9;
-resume_9:
-        // Done
-        return;
-    }
-
-    void get_merge_children()
-    {
-        // Get all children of from..to
-        inode_config_t *from_cfg = parent->get_inode_cfg(from_name);
-        inode_config_t *to_cfg = parent->get_inode_cfg(to_name);
-        // Check that to_cfg is actually a child of from_cfg
-        // FIXME de-copypaste the following piece of code with snap_merger_t
-        inode_config_t *cur = to_cfg;
-        chain_list.push_back(cur->num);
-        while (cur->num != from_cfg->num && cur->parent_id != 0)
-        {
-            auto it = parent->cli->st_cli.inode_config.find(cur->parent_id);
-            if (it == parent->cli->st_cli.inode_config.end())
-            {
-                fprintf(stderr, "Parent inode of layer %s (id %ld) not found\n", cur->name.c_str(), cur->parent_id);
-                exit(1);
-            }
-            cur = &it->second;
-            chain_list.push_back(cur->num);
-        }
-        if (cur->num != from_cfg->num)
-        {
-            fprintf(stderr, "Layer %s is not a child of %s\n", to_name.c_str(), from_name.c_str());
-            exit(1);
-        }
-        new_parent = from_cfg->parent_id;
-        // Calculate ranks
-        int i = chain_list.size()-1;
-        for (inode_t item: chain_list)
-        {
-            sources[item] = i--;
-        }
-        for (auto & ic: parent->cli->st_cli.inode_config)
-        {
-            if (!ic.second.parent_id)
-            {
-                continue;
-            }
-            auto it = sources.find(ic.second.parent_id);
-            if (it != sources.end() && sources.find(ic.second.num) == sources.end())
-            {
-                merge_children.push_back(ic.second.num);
-                if (ic.second.readonly || writers_stopped)
-                {
-                    inverse_candidates[ic.second.num] = it->second;
-                }
-            }
-        }
-    }
-
-    void read_stats()
-    {
-        if (inverse_candidates.size() == 0)
-        {
-            return;
-        }
-        json11::Json::array reads;
-        for (auto cp: inverse_candidates)
-        {
-            inode_t inode = cp.first;
-            reads.push_back(json11::Json::object {
-                { "request_range", json11::Json::object {
-                    { "key", base64_encode(
-                        parent->cli->st_cli.etcd_prefix+
-                        "/inode/stats/"+std::to_string(INODE_POOL(inode))+
-                        "/"+std::to_string(INODE_NO_POOL(inode))
-                    ) },
-                } }
-            });
-        }
-        for (auto cp: sources)
-        {
-            inode_t inode = cp.first;
-            reads.push_back(json11::Json::object {
-                { "request_range", json11::Json::object {
-                    { "key", base64_encode(
-                        parent->cli->st_cli.etcd_prefix+
-                        "/inode/stats/"+std::to_string(INODE_POOL(inode))+
-                        "/"+std::to_string(INODE_NO_POOL(inode))
-                    ) },
-                } }
-            });
-        }
-        parent->waiting++;
-        parent->cli->st_cli.etcd_txn(json11::Json::object {
-            { "success", reads },
-        }, ETCD_SLOW_TIMEOUT, [this](std::string err, json11::Json data)
-        {
-            parent->waiting--;
-            if (err != "")
-            {
-                fprintf(stderr, "Error reading layer statistics from etcd: %s\n", err.c_str());
-                exit(1);
-            }
-            for (auto inode_result: data["responses"].array_items())
-            {
-                auto kv = parent->cli->st_cli.parse_etcd_kv(inode_result["kvs"][0]);
-                pool_id_t pool_id = 0;
-                inode_t inode = 0;
-                char null_byte = 0;
-                sscanf(kv.key.c_str() + parent->cli->st_cli.etcd_prefix.length()+13, "%u/%lu%c", &pool_id, &inode, &null_byte);
-                if (!inode || null_byte != 0)
-                {
-                    fprintf(stderr, "Bad key returned from etcd: %s\n", kv.key.c_str());
-                    exit(1);
-                }
-                auto pool_cfg_it = parent->cli->st_cli.pool_config.find(pool_id);
-                if (pool_cfg_it == parent->cli->st_cli.pool_config.end())
-                {
-                    fprintf(stderr, "Pool %u does not exist\n", pool_id);
-                    exit(1);
-                }
-                inode = INODE_WITH_POOL(pool_id, inode);
-                auto & pool_cfg = pool_cfg_it->second;
-                uint64_t used_bytes = kv.value["raw_used"].uint64_value() / pool_cfg.pg_size;
-                if (pool_cfg.scheme != POOL_SCHEME_REPLICATED)
-                {
-                    used_bytes *= (pool_cfg.pg_size - pool_cfg.parity_chunks);
-                }
-                inode_used[inode] = used_bytes;
-            }
-            parent->ringloop->wakeup();
-        });
-    }
-
-    void choose_inverse_candidate()
-    {
-        uint64_t max_diff = 0;
-        for (auto cp: inverse_candidates)
-        {
-            inode_t child = cp.first;
-            uint64_t child_used = inode_used[child];
-            int rank = cp.second;
-            for (int i = chain_list.size()-rank; i < chain_list.size(); i++)
-            {
-                inode_t parent = chain_list[i];
-                uint64_t parent_used = inode_used[parent];
-                if (parent_used > child_used && (!max_diff || max_diff < (parent_used-child_used)))
-                {
-                    max_diff = (parent_used-child_used);
-                    inverse_parent = parent;
-                    inverse_child = child;
-                }
-            }
-        }
-    }
-
-    void rename_inverse_parent()
-    {
-        auto child_it = parent->cli->st_cli.inode_config.find(inverse_child);
-        if (child_it == parent->cli->st_cli.inode_config.end())
-        {
-            fprintf(stderr, "Inode %ld disappeared\n", inverse_child);
-            exit(1);
-        }
-        auto target_it = parent->cli->st_cli.inode_config.find(inverse_parent);
-        if (target_it == parent->cli->st_cli.inode_config.end())
-        {
-            fprintf(stderr, "Inode %ld disappeared\n", inverse_parent);
-            exit(1);
-        }
-        inode_config_t *child_cfg = &child_it->second;
-        inode_config_t *target_cfg = &target_it->second;
-        std::string child_name = child_cfg->name;
-        std::string target_name = target_cfg->name;
-        std::string child_cfg_key = base64_encode(
-            parent->cli->st_cli.etcd_prefix+
-            "/config/inode/"+std::to_string(INODE_POOL(inverse_child))+
-            "/"+std::to_string(INODE_NO_POOL(inverse_child))
-        );
-        std::string target_cfg_key = base64_encode(
-            parent->cli->st_cli.etcd_prefix+
-            "/config/inode/"+std::to_string(INODE_POOL(inverse_parent))+
-            "/"+std::to_string(INODE_NO_POOL(inverse_parent))
-        );
-        // Fill new configuration
-        inode_config_t new_cfg = *child_cfg;
-        new_cfg.num = target_cfg->num;
-        new_cfg.parent_id = new_parent;
-        json11::Json::array cmp = json11::Json::array {
-            json11::Json::object {
-                { "target", "MOD" },
-                { "key", child_cfg_key },
-                { "result", "LESS" },
-                { "mod_revision", child_cfg->mod_revision+1 },
-            },
-            json11::Json::object {
-                { "target", "MOD" },
-                { "key", target_cfg_key },
-                { "result", "LESS" },
-                { "mod_revision", target_cfg->mod_revision+1 },
-            },
-        };
-        json11::Json::array txn = json11::Json::array {
-            json11::Json::object {
-                { "request_delete_range", json11::Json::object {
-                    { "key", child_cfg_key },
-                } },
-            },
-            json11::Json::object {
-                { "request_put", json11::Json::object {
-                    { "key", target_cfg_key },
-                    { "value", base64_encode(json11::Json(parent->cli->st_cli.serialize_inode_cfg(&new_cfg)).dump()) },
-                } },
-            },
-            json11::Json::object {
-                { "request_put", json11::Json::object {
-                    { "key", base64_encode(parent->cli->st_cli.etcd_prefix+"/index/image/"+child_cfg->name) },
-                    { "value", base64_encode(json11::Json({
-                        { "id", INODE_NO_POOL(inverse_parent) },
-                        { "pool_id", (uint64_t)INODE_POOL(inverse_parent) },
-                    }).dump()) },
-                } },
-            },
-        };
-        // Reparent children of inverse_child
-        for (auto & cp: parent->cli->st_cli.inode_config)
-        {
-            if (cp.second.parent_id == child_cfg->num)
-            {
-                auto cp_cfg = cp.second;
-                cp_cfg.parent_id = inverse_parent;
-                auto cp_key = base64_encode(
-                    parent->cli->st_cli.etcd_prefix+
-                    "/config/inode/"+std::to_string(INODE_POOL(cp.second.num))+
-                    "/"+std::to_string(INODE_NO_POOL(cp.second.num))
-                );
-                cmp.push_back(json11::Json::object {
-                    { "target", "MOD" },
-                    { "key", cp_key },
-                    { "result", "LESS" },
-                    { "mod_revision", cp.second.mod_revision+1 },
-                });
-                txn.push_back(json11::Json::object {
-                    { "request_put", json11::Json::object {
-                        { "key", cp_key },
-                        { "value", base64_encode(json11::Json(parent->cli->st_cli.serialize_inode_cfg(&cp_cfg)).dump()) },
-                    } },
-                });
-            }
-        }
-        parent->waiting++;
-        parent->cli->st_cli.etcd_txn(json11::Json::object {
-            { "compare", cmp },
-            { "success", txn },
-        }, ETCD_SLOW_TIMEOUT, [this, target_name, child_name](std::string err, json11::Json res)
-        {
-            parent->waiting--;
-            if (err != "")
-            {
-                fprintf(stderr, "Error renaming %s to %s: %s\n", target_name.c_str(), child_name.c_str(), err.c_str());
-                exit(1);
-            }
-            if (!res["succeeded"].bool_value())
-            {
-                fprintf(
-                    stderr, "Parent (%s), child (%s), or one of its children"
-                    " configuration was modified during rename\n", target_name.c_str(), child_name.c_str()
-                );
-                exit(1);
-            }
-            printf("Layer %s renamed to %s\n", target_name.c_str(), child_name.c_str());
-            parent->ringloop->wakeup();
-        });
-    }
-
-    void delete_inode_config(inode_t cur)
-    {
-        auto cur_cfg_it = parent->cli->st_cli.inode_config.find(cur);
-        if (cur_cfg_it == parent->cli->st_cli.inode_config.end())
-        {
-            fprintf(stderr, "Inode 0x%lx disappeared\n", cur);
-            exit(1);
-        }
-        inode_config_t *cur_cfg = &cur_cfg_it->second;
-        std::string cur_name = cur_cfg->name;
-        std::string cur_cfg_key = base64_encode(
-            parent->cli->st_cli.etcd_prefix+
-            "/config/inode/"+std::to_string(INODE_POOL(cur))+
-            "/"+std::to_string(INODE_NO_POOL(cur))
-        );
-        parent->waiting++;
-        parent->cli->st_cli.etcd_txn(json11::Json::object {
-            { "compare", json11::Json::array {
-                json11::Json::object {
-                    { "target", "MOD" },
-                    { "key", cur_cfg_key },
-                    { "result", "LESS" },
-                    { "mod_revision", cur_cfg->mod_revision+1 },
-                },
-            } },
-            { "success", json11::Json::array {
-                json11::Json::object {
-                    { "request_delete_range", json11::Json::object {
-                        { "key", cur_cfg_key },
-                    } },
-                },
-                json11::Json::object {
-                    { "request_delete_range", json11::Json::object {
-                        { "key", base64_encode(parent->cli->st_cli.etcd_prefix+"/index/image/"+cur_name) },
-                    } },
-                },
-            } },
-        }, ETCD_SLOW_TIMEOUT, [this, cur_name](std::string err, json11::Json res)
-        {
-            parent->waiting--;
-            if (err != "")
-            {
-                fprintf(stderr, "Error deleting %s: %s\n", cur_name.c_str(), err.c_str());
-                exit(1);
-            }
-            if (!res["succeeded"].bool_value())
-            {
-                fprintf(stderr, "Layer %s configuration was modified during deletion\n", cur_name.c_str());
-                exit(1);
-            }
-            printf("Layer %s deleted\n", cur_name.c_str());
-            parent->ringloop->wakeup();
-        });
-    }
-
-    void start_merge_child(inode_t child_inode, inode_t target_inode)
-    {
-        auto child_it = parent->cli->st_cli.inode_config.find(child_inode);
-        if (child_it == parent->cli->st_cli.inode_config.end())
-        {
-            fprintf(stderr, "Inode %ld disappeared\n", child_inode);
-            exit(1);
-        }
-        auto target_it = parent->cli->st_cli.inode_config.find(target_inode);
-        if (target_it == parent->cli->st_cli.inode_config.end())
-        {
-            fprintf(stderr, "Inode %ld disappeared\n", target_inode);
-            exit(1);
-        }
-        cb = parent->start_merge(json11::Json::object {
-            { "command", json11::Json::array{ "merge-data", from_name, child_it->second.name } },
-            { "target", target_it->second.name },
-            { "delete-source", false },
-            { "cas", use_cas },
-            { "fsync-interval", fsync_interval },
-        });
-    }
-
-    void start_delete_source(inode_t inode)
-    {
-        auto source = parent->cli->st_cli.inode_config.find(inode);
-        if (source == parent->cli->st_cli.inode_config.end())
-        {
-            fprintf(stderr, "Inode %ld disappeared\n", inode);
-            exit(1);
-        }
-        cb = parent->start_rm(json11::Json::object {
-            { "inode", inode },
-            { "pool", (uint64_t)INODE_POOL(inode) },
-            { "fsync-interval", fsync_interval },
-        });
-    }
-};
-
-std::function<bool(void)> cli_tool_t::start_snap_rm(json11::Json cfg)
-{
-    json11::Json::array cmd = cfg["command"].array_items();
-    auto snap_remover = new snap_remover_t();
-    snap_remover->parent = this;
-    snap_remover->from_name = cmd.size() > 1 ? cmd[1].string_value() : "";
-    snap_remover->to_name = cmd.size() > 2 ? cmd[2].string_value() : "";
-    if (snap_remover->from_name == "")
-    {
-        fprintf(stderr, "Layer to remove argument is missing\n");
-        exit(1);
-    }
-    if (snap_remover->to_name == "")
-    {
-        snap_remover->to_name = snap_remover->from_name;
-    }
-    snap_remover->fsync_interval = cfg["fsync-interval"].uint64_value();
-    if (!snap_remover->fsync_interval)
-        snap_remover->fsync_interval = 128;
-    if (!cfg["cas"].is_null())
-        snap_remover->use_cas = cfg["cas"].uint64_value() ? 2 : 0;
-    if (!cfg["writers_stopped"].is_null())
-        snap_remover->writers_stopped = true;
-    return [snap_remover]()
-    {
-        snap_remover->loop();
-        if (snap_remover->is_done())
-        {
-            delete snap_remover;
-            return true;
-        }
-        return false;
-    };
-}

src/cluster_client.cpp

@@ -12,7 +12,7 @@
 #define CACHE_DIRTY 1
 #define CACHE_FLUSHING 2
 #define CACHE_REPEATING 3
-#define OP_FLUSH_BUFFER 0x02
+#define OP_FLUSH_BUFFER 2
 
 cluster_client_t::cluster_client_t(ring_loop_t *ringloop, timerfd_manager_t *tfd, json11::Json & config)
 {
@@ -31,7 +31,6 @@ cluster_client_t::cluster_client_t(ring_loop_t *ringloop, timerfd_manager_t *tfd
         {
             // peer_osd just connected
             continue_ops();
-            continue_lists();
         }
         else if (dirty_buffers.size())
         {
@@ -64,7 +63,6 @@ cluster_client_t::cluster_client_t(ring_loop_t *ringloop, timerfd_manager_t *tfd
     st_cli.on_change_osd_state_hook = [this](uint64_t peer_osd) { on_change_osd_state_hook(peer_osd); };
     st_cli.on_change_hook = [this](std::map<std::string, etcd_kv_t> & changes) { on_change_hook(changes); };
     st_cli.on_load_pgs_hook = [this](bool success) { on_load_pgs_hook(success); };
-    st_cli.on_reload_hook = [this]() { st_cli.load_global_config(); };
 
     st_cli.parse_config(config);
     st_cli.load_global_config();
@@ -141,7 +139,7 @@ void cluster_client_t::calc_wait(cluster_op_t *op)
         if (!op->prev_wait && pgs_loaded)
             continue_sync(op);
     }
-    else /* if (op->opcode == OSD_OP_READ || op->opcode == OSD_OP_READ_BITMAP) */
+    else
     {
         for (auto prev = op->prev; prev; prev = prev->prev)
         {
@@ -149,7 +147,7 @@ void cluster_client_t::calc_wait(cluster_op_t *op)
             {
                 op->prev_wait++;
             }
-            else if (prev->opcode == OSD_OP_WRITE || prev->opcode == OSD_OP_READ || prev->opcode == OSD_OP_READ_BITMAP)
+            else if (prev->opcode == OSD_OP_WRITE || prev->opcode == OSD_OP_READ)
             {
                 // Flushes are always in the beginning
                 break;
@@ -169,7 +167,7 @@ void cluster_client_t::inc_wait(uint64_t opcode, uint64_t flags, cluster_op_t *n
             auto n2 = next->next;
             if (next->opcode == OSD_OP_SYNC ||
                 next->opcode == OSD_OP_WRITE && (flags & OP_FLUSH_BUFFER) && !(next->flags & OP_FLUSH_BUFFER) ||
-                (next->opcode == OSD_OP_READ || next->opcode == OSD_OP_READ_BITMAP) && (flags & OP_FLUSH_BUFFER))
+                next->opcode == OSD_OP_READ && (flags & OP_FLUSH_BUFFER))
             {
                 next->prev_wait += inc;
                 if (!next->prev_wait)
@@ -359,7 +357,7 @@ void cluster_client_t::on_change_hook(std::map<std::string, etcd_kv_t> & changes
             // And now they have to be resliced!
             for (auto op = op_queue_head; op; op = op->next)
             {
-                if ((op->opcode == OSD_OP_WRITE || op->opcode == OSD_OP_READ || op->opcode == OSD_OP_READ_BITMAP) &&
+                if ((op->opcode == OSD_OP_WRITE || op->opcode == OSD_OP_READ) &&
                     INODE_POOL(op->cur_inode) == pool_item.first)
                 {
                     op->needs_reslice = true;
@@ -419,8 +417,7 @@ void cluster_client_t::on_ready(std::function<void(void)> fn)
  */
 void cluster_client_t::execute(cluster_op_t *op)
 {
-    if (op->opcode != OSD_OP_SYNC && op->opcode != OSD_OP_READ &&
+    if (op->opcode != OSD_OP_SYNC && op->opcode != OSD_OP_READ && op->opcode != OSD_OP_WRITE)
-        op->opcode != OSD_OP_READ_BITMAP && op->opcode != OSD_OP_WRITE)
     {
         op->retval = -EINVAL;
         std::function<void(cluster_op_t*)>(op->callback)(op);
@@ -560,7 +557,7 @@ void cluster_client_t::flush_buffer(const object_id & oid, cluster_buffer_t *wr)
 {
     wr->state = CACHE_REPEATING;
     cluster_op_t *op = new cluster_op_t;
-    op->flags = OSD_OP_IGNORE_READONLY|OP_FLUSH_BUFFER;
+    op->flags = OP_FLUSH_BUFFER;
     op->opcode = OSD_OP_WRITE;
     op->cur_inode = op->inode = oid.inode;
     op->offset = oid.stripe;
@@ -597,8 +594,7 @@ int cluster_client_t::continue_rw(cluster_op_t *op)
     else if (op->state == 3)
         goto resume_3;
 resume_0:
-    if ((op->opcode == OSD_OP_READ || op->opcode == OSD_OP_WRITE) && !op->len ||
+    if (!op->len || op->offset % bs_bitmap_granularity || op->len % bs_bitmap_granularity)
-        op->offset % bs_bitmap_granularity || op->len % bs_bitmap_granularity)
     {
         op->retval = -EINVAL;
         erase_op(op);
@@ -619,19 +615,16 @@ resume_0:
             return 0;
         }
     }
-    if (op->opcode == OSD_OP_WRITE || op->opcode == OSD_OP_DELETE)
+    if (op->opcode == OSD_OP_WRITE)
     {
-        if (!(op->flags & OSD_OP_IGNORE_READONLY))
+        auto ino_it = st_cli.inode_config.find(op->inode);
+        if (ino_it != st_cli.inode_config.end() && ino_it->second.readonly)
         {
-            auto ino_it = st_cli.inode_config.find(op->inode);
+            op->retval = -EINVAL;
-            if (ino_it != st_cli.inode_config.end() && ino_it->second.readonly)
+            erase_op(op);
-            {
+            return 1;
-                op->retval = -EINVAL;
-                erase_op(op);
-                return 1;
-            }
         }
-        if (op->opcode == OSD_OP_WRITE && !immediate_commit && !(op->flags & OP_FLUSH_BUFFER))
+        if (!immediate_commit && !(op->flags & OP_FLUSH_BUFFER))
         {
             copy_write(op, dirty_buffers);
         }
@@ -640,7 +633,7 @@ resume_1:
     // Slice the operation into parts
     slice_rw(op);
     op->needs_reslice = false;
-    if ((op->opcode == OSD_OP_WRITE || op->opcode == OSD_OP_DELETE) && op->version && op->parts.size() > 1)
+    if (op->opcode == OSD_OP_WRITE && op->version && op->parts.size() > 1)
     {
         // Atomic writes to multiple stripes are unsupported
         op->retval = -EINVAL;
@@ -800,13 +793,13 @@ void cluster_client_t::slice_rw(cluster_op_t *op)
     uint32_t pg_data_size = (pool_cfg.scheme == POOL_SCHEME_REPLICATED ? 1 : pool_cfg.pg_size-pool_cfg.parity_chunks);
     uint64_t pg_block_size = bs_block_size * pg_data_size;
     uint64_t first_stripe = (op->offset / pg_block_size) * pg_block_size;
-    uint64_t last_stripe = op->len > 0 ? ((op->offset + op->len - 1) / pg_block_size) * pg_block_size : first_stripe;
+    uint64_t last_stripe = ((op->offset + op->len + pg_block_size - 1) / pg_block_size - 1) * pg_block_size;
     op->retval = 0;
     op->parts.resize((last_stripe - first_stripe) / pg_block_size + 1);
-    if (op->opcode == OSD_OP_READ || op->opcode == OSD_OP_READ_BITMAP)
+    if (op->opcode == OSD_OP_READ)
     {
         // Allocate memory for the bitmap
-        unsigned object_bitmap_size = (((op->opcode == OSD_OP_READ_BITMAP ? pg_block_size : op->len) / bs_bitmap_granularity + 7) / 8);
+        unsigned object_bitmap_size = ((op->len / bs_bitmap_granularity + 7) / 8);
         object_bitmap_size = (object_bitmap_size < 8 ? 8 : object_bitmap_size);
         unsigned bitmap_mem = object_bitmap_size + (bs_bitmap_size * pg_data_size) * op->parts.size();
         if (op->bitmap_buf_size < bitmap_mem)
@@ -870,13 +863,13 @@ void cluster_client_t::slice_rw(cluster_op_t *op)
             if (end == begin)
                 op->done_count++;
         }
-        else if (op->opcode != OSD_OP_READ_BITMAP && op->opcode != OSD_OP_DELETE)
+        else
         {
             add_iov(end-begin, false, op, iov_idx, iov_pos, op->parts[i].iov, NULL, 0);
         }
         op->parts[i].parent = op;
         op->parts[i].offset = begin;
-        op->parts[i].len = op->opcode == OSD_OP_READ_BITMAP || op->opcode == OSD_OP_DELETE ? 0 : (uint32_t)(end - begin);
+        op->parts[i].len = (uint32_t)(end - begin);
         op->parts[i].pg_num = pg_num;
         op->parts[i].osd_num = 0;
         op->parts[i].flags = 0;
@@ -890,7 +883,7 @@ bool cluster_client_t::affects_osd(uint64_t inode, uint64_t offset, uint64_t len
     uint32_t pg_data_size = (pool_cfg.scheme == POOL_SCHEME_REPLICATED ? 1 : pool_cfg.pg_size-pool_cfg.parity_chunks);
     uint64_t pg_block_size = bs_block_size * pg_data_size;
     uint64_t first_stripe = (offset / pg_block_size) * pg_block_size;
-    uint64_t last_stripe = len > 0 ? ((offset + len - 1) / pg_block_size) * pg_block_size : first_stripe;
+    uint64_t last_stripe = ((offset + len + pg_block_size - 1) / pg_block_size - 1) * pg_block_size;
     for (uint64_t stripe = first_stripe; stripe <= last_stripe; stripe += pg_block_size)
     {
         pg_num_t pg_num = (stripe/pool_cfg.pg_stripe_size) % pool_cfg.real_pg_count + 1; // like map_to_pg()
@@ -923,12 +916,9 @@ bool cluster_client_t::try_send(cluster_op_t *op, int i)
                 pool_cfg.scheme == POOL_SCHEME_REPLICATED ? 1 : pool_cfg.pg_size-pool_cfg.parity_chunks
             );
             uint64_t meta_rev = 0;
-            if (op->opcode != OSD_OP_READ_BITMAP && op->opcode != OSD_OP_DELETE)
+            auto ino_it = st_cli.inode_config.find(op->inode);
-            {
+            if (ino_it != st_cli.inode_config.end())
-                auto ino_it = st_cli.inode_config.find(op->inode);
+                meta_rev = ino_it->second.mod_revision;
-                if (ino_it != st_cli.inode_config.end())
-                    meta_rev = ino_it->second.mod_revision;
-            }
             part->op = (osd_op_t){
                 .op_type = OSD_OP_OUT,
                 .peer_fd = peer_fd,
@@ -936,16 +926,16 @@ bool cluster_client_t::try_send(cluster_op_t *op, int i)
                     .header = {
                         .magic = SECONDARY_OSD_OP_MAGIC,
                         .id = op_id++,
-                        .opcode = op->opcode == OSD_OP_READ_BITMAP ? OSD_OP_READ : op->opcode,
+                        .opcode = op->opcode,
                     },
                     .inode = op->cur_inode,
                     .offset = part->offset,
                     .len = part->len,
                     .meta_revision = meta_rev,
-                    .version = op->opcode == OSD_OP_WRITE || op->opcode == OSD_OP_DELETE ? op->version : 0,
+                    .version = op->opcode == OSD_OP_WRITE ? op->version : 0,
                 } },
-                .bitmap = (op->opcode == OSD_OP_READ || op->opcode == OSD_OP_READ_BITMAP ? op->part_bitmaps + pg_bitmap_size*i : NULL),
+                .bitmap = op->opcode == OSD_OP_WRITE ? NULL : op->part_bitmaps + pg_bitmap_size*i,
-                .bitmap_len = (unsigned)(op->opcode == OSD_OP_READ || op->opcode == OSD_OP_READ_BITMAP ? pg_bitmap_size : 0),
+                .bitmap_len = (unsigned)(op->opcode == OSD_OP_WRITE ? 0 : pg_bitmap_size),
                 .callback = [this, part](osd_op_t *op_part)
                 {
                     handle_op_part(part);
@@ -1127,7 +1117,7 @@ void cluster_client_t::handle_op_part(cluster_op_part_t *part)
         dirty_osds.insert(part->osd_num);
         part->flags |= PART_DONE;
         op->done_count++;
-        if (op->opcode == OSD_OP_READ || op->opcode == OSD_OP_READ_BITMAP)
+        if (op->opcode == OSD_OP_READ)
         {
             copy_part_bitmap(op, part);
             op->version = op->parts.size() == 1 ? part->op.reply.rw.version : 0;
@@ -1151,7 +1141,7 @@ void cluster_client_t::copy_part_bitmap(cluster_op_t *op, cluster_op_part_t *par
     );
     uint32_t object_offset = (part->op.req.rw.offset - op->offset) / bs_bitmap_granularity;
     uint32_t part_offset = (part->op.req.rw.offset % pg_block_size) / bs_bitmap_granularity;
-    uint32_t part_len = (op->opcode == OSD_OP_READ_BITMAP ? pg_block_size : part->op.req.rw.len) / bs_bitmap_granularity;
+    uint32_t part_len = part->op.req.rw.len / bs_bitmap_granularity;
     if (!(object_offset & 0x7) && !(part_offset & 0x7) && (part_len >= 8))
     {
         // Copy bytes
@@ -1171,8 +1161,3 @@ void cluster_client_t::copy_part_bitmap(cluster_op_t *op, cluster_op_part_t *par
         part_len--;
     }
 }
-
-uint64_t cluster_client_t::next_op_id()
-{
-    return op_id++;
-}

src/cluster_client.h

@@ -10,11 +10,6 @@
 #define MAX_BLOCK_SIZE 128*1024*1024
 #define DEFAULT_CLIENT_MAX_DIRTY_BYTES 32*1024*1024
 #define DEFAULT_CLIENT_MAX_DIRTY_OPS 1024
-#define INODE_LIST_DONE 1
-#define INODE_LIST_HAS_UNSTABLE 2
-#define OSD_OP_READ_BITMAP OSD_OP_SEC_READ_BMP
-
-#define OSD_OP_IGNORE_READONLY 0x08
 
 struct cluster_op_t;
 
@@ -32,22 +27,19 @@ struct cluster_op_part_t
 
 struct cluster_op_t
 {
-    uint64_t opcode; // OSD_OP_READ, OSD_OP_WRITE, OSD_OP_SYNC, OSD_OP_DELETE, OSD_OP_READ_BITMAP
+    uint64_t opcode; // OSD_OP_READ, OSD_OP_WRITE, OSD_OP_SYNC
     uint64_t inode;
     uint64_t offset;
     uint64_t len;
     // for reads and writes within a single object (stripe),
     // reads can return current version and writes can use "CAS" semantics
     uint64_t version = 0;
-    // now only OSD_OP_IGNORE_READONLY is supported
-    uint64_t flags = 0;
     int retval;
     osd_op_buf_list_t iov;
-    // READ and READ_BITMAP return the bitmap here
-    void *bitmap_buf = NULL;
     std::function<void(cluster_op_t*)> callback;
     ~cluster_op_t();
 protected:
+    uint64_t flags = 0;
     int state = 0;
     uint64_t cur_inode; // for snapshot reads
     void *buf = NULL;
@@ -56,7 +48,7 @@ protected:
     bool up_wait = false;
     int inflight_count = 0, done_count = 0;
     std::vector<cluster_op_part_t> parts;
-    void *part_bitmaps = NULL;
+    void *bitmap_buf = NULL, *part_bitmaps = NULL;
     unsigned bitmap_buf_size = 0;
     cluster_op_t *prev = NULL, *next = NULL;
     int prev_wait = 0;
@@ -70,9 +62,6 @@ struct cluster_buffer_t
     int state;
 };
 
-struct inode_list_t;
-struct inode_list_osd_t;
-
 // FIXME: Split into public and private interfaces
 class cluster_client_t
 {
@@ -104,7 +93,6 @@ class cluster_client_t
     bool pgs_loaded = false;
     ring_consumer_t consumer;
     std::vector<std::function<void(void)>> on_ready_hooks;
-    std::vector<inode_list_t*> lists;
     int continuing_ops = 0;
 
 public:
@@ -120,14 +108,6 @@ public:
 
     static void copy_write(cluster_op_t *op, std::map<object_id, cluster_buffer_t> & dirty_buffers);
     void continue_ops(bool up_retry = false);
-    inode_list_t *list_inode_start(inode_t inode,
-        std::function<void(inode_list_t* lst, std::set<object_id>&& objects, pg_num_t pg_num, osd_num_t primary_osd, int status)> callback);
-    int list_pg_count(inode_list_t *lst);
-    void list_inode_next(inode_list_t *lst, int next_pgs);
-    inline uint32_t get_bs_bitmap_granularity() { return bs_bitmap_granularity; }
-    inline uint64_t get_bs_block_size() { return bs_block_size; }
-    uint64_t next_op_id();
-
 protected:
     bool affects_osd(uint64_t inode, uint64_t offset, uint64_t len, osd_num_t osd);
     void flush_buffer(const object_id & oid, cluster_buffer_t *wr);
@@ -145,7 +125,4 @@ protected:
     void erase_op(cluster_op_t *op);
     void calc_wait(cluster_op_t *op);
     void inc_wait(uint64_t opcode, uint64_t flags, cluster_op_t *next, int inc);
-    void continue_lists();
-    void continue_listing(inode_list_t *lst);
-    void send_list(inode_list_osd_t *cur_list);
 };

src/cluster_client_list.cpp

@@ -1,285 +0,0 @@
-// Copyright (c) Vitaliy Filippov, 2019+
-// License: VNPL-1.1 or GNU GPL-2.0+ (see README.md for details)
-
-#include <algorithm>
-#include "pg_states.h"
-#include "cluster_client.h"
-
-struct inode_list_t;
-
-struct inode_list_pg_t;
-
-struct inode_list_osd_t
-{
-    inode_list_pg_t *pg = NULL;
-    osd_num_t osd_num = 0;
-    bool sent = false;
-};
-
-struct inode_list_pg_t
-{
-    inode_list_t *lst = NULL;
-    int pos = 0;
-    pg_num_t pg_num;
-    osd_num_t cur_primary;
-    bool has_unstable = false;
-    int sent = 0;
-    int done = 0;
-    std::vector<inode_list_osd_t> list_osds;
-    std::set<object_id> objects;
-};
-
-struct inode_list_t
-{
-    cluster_client_t *cli = NULL;
-    pool_id_t pool_id = 0;
-    inode_t inode = 0;
-    int done_pgs = 0;
-    int want = 0;
-    std::vector<inode_list_pg_t*> pgs;
-    std::function<void(inode_list_t* lst, std::set<object_id>&& objects, pg_num_t pg_num, osd_num_t primary_osd, int status)> callback;
-};
-
-inode_list_t* cluster_client_t::list_inode_start(inode_t inode,
-    std::function<void(inode_list_t* lst, std::set<object_id>&& objects, pg_num_t pg_num, osd_num_t primary_osd, int status)> callback)
-{
-    int skipped_pgs = 0;
-    pool_id_t pool_id = INODE_POOL(inode);
-    if (!pool_id || st_cli.pool_config.find(pool_id) == st_cli.pool_config.end())
-    {
-        if (log_level > 0)
-        {
-            fprintf(stderr, "Pool %u does not exist\n", pool_id);
-        }
-        return NULL;
-    }
-    inode_list_t *lst = new inode_list_t();
-    lst->cli = this;
-    lst->pool_id = pool_id;
-    lst->inode = inode;
-    lst->callback = callback;
-    auto pool_cfg = st_cli.pool_config[pool_id];
-    for (auto & pg_item: pool_cfg.pg_config)
-    {
-        auto & pg = pg_item.second;
-        if (pg.pause || !pg.cur_primary || !(pg.cur_state & PG_ACTIVE))
-        {
-            skipped_pgs++;
-            if (log_level > 0)
-            {
-                fprintf(stderr, "PG %u is inactive, skipping\n", pg_item.first);
-            }
-            continue;
-        }
-        inode_list_pg_t *r = new inode_list_pg_t();
-        r->lst = lst;
-        r->pg_num = pg_item.first;
-        r->cur_primary = pg.cur_primary;
-        if (pg.cur_state != PG_ACTIVE)
-        {
-            // Not clean
-            std::set<osd_num_t> all_peers;
-            for (osd_num_t pg_osd: pg.target_set)
-            {
-                if (pg_osd != 0)
-                {
-                    all_peers.insert(pg_osd);
-                }
-            }
-            for (osd_num_t pg_osd: pg.all_peers)
-            {
-                if (pg_osd != 0)
-                {
-                    all_peers.insert(pg_osd);
-                }
-            }
-            for (auto & hist_item: pg.target_history)
-            {
-                for (auto pg_osd: hist_item)
-                {
-                    if (pg_osd != 0)
-                    {
-                        all_peers.insert(pg_osd);
-                    }
-                }
-            }
-            for (osd_num_t peer_osd: all_peers)
-            {
-                r->list_osds.push_back((inode_list_osd_t){
-                    .pg = r,
-                    .osd_num = peer_osd,
-                    .sent = false,
-                });
-            }
-        }
-        else
-        {
-            // Clean
-            r->list_osds.push_back((inode_list_osd_t){
-                .pg = r,
-                .osd_num = pg.cur_primary,
-                .sent = false,
-            });
-        }
-        lst->pgs.push_back(r);
-    }
-    std::sort(lst->pgs.begin(), lst->pgs.end(), [](inode_list_pg_t *a, inode_list_pg_t *b)
-    {
-        return a->cur_primary < b->cur_primary ? true : false;
-    });
-    for (int i = 0; i < lst->pgs.size(); i++)
-    {
-        lst->pgs[i]->pos = i;
-    }
-    lists.push_back(lst);
-    return lst;
-}
-
-int cluster_client_t::list_pg_count(inode_list_t *lst)
-{
-    return lst->pgs.size();
-}
-
-void cluster_client_t::list_inode_next(inode_list_t *lst, int next_pgs)
-{
-    if (next_pgs >= 0)
-    {
-        lst->want += next_pgs;
-    }
-    continue_listing(lst);
-}
-
-void cluster_client_t::continue_listing(inode_list_t *lst)
-{
-    if (lst->done_pgs >= lst->pgs.size())
-    {
-        // All done
-        for (int i = 0; i < lists.size(); i++)
-        {
-            if (lists[i] == lst)
-            {
-                lists.erase(lists.begin()+i, lists.begin()+i+1);
-                break;
-            }
-        }
-        delete lst;
-        return;
-    }
-    if (lst->want <= 0)
-    {
-        return;
-    }
-    for (int i = 0; i < lst->pgs.size(); i++)
-    {
-        if (lst->pgs[i] && lst->pgs[i]->sent < lst->pgs[i]->list_osds.size())
-        {
-            for (int j = 0; j < lst->pgs[i]->list_osds.size(); j++)
-            {
-                send_list(&lst->pgs[i]->list_osds[j]);
-                if (lst->want <= 0)
-                {
-                    break;
-                }
-            }
-        }
-    }
-}
-
-void cluster_client_t::send_list(inode_list_osd_t *cur_list)
-{
-    if (cur_list->sent)
-    {
-        return;
-    }
-    if (msgr.osd_peer_fds.find(cur_list->osd_num) == msgr.osd_peer_fds.end())
-    {
-        // Initiate connection
-        msgr.connect_peer(cur_list->osd_num, st_cli.peer_states[cur_list->osd_num]);
-        return;
-    }
-    auto & pool_cfg = st_cli.pool_config[cur_list->pg->lst->pool_id];
-    osd_op_t *op = new osd_op_t();
-    op->op_type = OSD_OP_OUT;
-    op->peer_fd = msgr.osd_peer_fds[cur_list->osd_num];
-    op->req = (osd_any_op_t){
-        .sec_list = {
-            .header = {
-                .magic = SECONDARY_OSD_OP_MAGIC,
-                .id = op_id++,
-                .opcode = OSD_OP_SEC_LIST,
-            },
-            .list_pg = cur_list->pg->pg_num,
-            .pg_count = (pg_num_t)pool_cfg.real_pg_count,
-            .pg_stripe_size = pool_cfg.pg_stripe_size,
-            .min_inode = cur_list->pg->lst->inode,
-            .max_inode = cur_list->pg->lst->inode,
-        },
-    };
-    op->callback = [this, cur_list](osd_op_t *op)
-    {
-        if (op->reply.hdr.retval < 0)
-        {
-            fprintf(stderr, "Failed to get PG %u/%u object list from OSD %lu (retval=%ld), skipping\n",
-                cur_list->pg->lst->pool_id, cur_list->pg->pg_num, cur_list->osd_num, op->reply.hdr.retval);
-        }
-        else
-        {
-            if (op->reply.sec_list.stable_count < op->reply.hdr.retval)
-            {
-                // Unstable objects, if present, mean that someone still writes into the inode. Warn the user about it.
-                cur_list->pg->has_unstable = true;
-                fprintf(
-                    stderr, "[PG %u/%u] Inode still has %lu unstable object versions out of total %lu - is it still open?\n",
-                    cur_list->pg->lst->pool_id, cur_list->pg->pg_num, op->reply.hdr.retval - op->reply.sec_list.stable_count,
-                    op->reply.hdr.retval
-                );
-            }
-            if (log_level > 0)
-            {
-                fprintf(
-                    stderr, "[PG %u/%u] Got inode object list from OSD %lu: %ld object versions\n",
-                    cur_list->pg->lst->pool_id, cur_list->pg->pg_num, cur_list->osd_num, op->reply.hdr.retval
-                );
-            }
-            for (uint64_t i = 0; i < op->reply.hdr.retval; i++)
-            {
-                object_id oid = ((obj_ver_id*)op->buf)[i].oid;
-                oid.stripe = oid.stripe & ~STRIPE_MASK;
-                cur_list->pg->objects.insert(oid);
-            }
-        }
-        delete op;
-        auto lst = cur_list->pg->lst;
-        auto pg = cur_list->pg;
-        pg->done++;
-        if (pg->done >= pg->list_osds.size())
-        {
-            int status = 0;
-            lst->done_pgs++;
-            if (lst->done_pgs >= lst->pgs.size())
-            {
-                status |= INODE_LIST_DONE;
-            }
-            if (pg->has_unstable)
-            {
-                status |= INODE_LIST_HAS_UNSTABLE;
-            }
-            lst->callback(lst, std::move(pg->objects), pg->pg_num, pg->cur_primary, status);
-            lst->pgs[pg->pos] = NULL;
-            delete pg;
-        }
-        continue_listing(lst);
-    };
-    msgr.outbox_push(op);
-    cur_list->sent = true;
-    cur_list->pg->sent++;
-    cur_list->pg->lst->want--;
-}
-
-void cluster_client_t::continue_lists()
-{
-    for (auto lst: lists)
-    {
-        continue_listing(lst);
-    }
-}

src/etcd_state_client.cpp

@@ -17,11 +17,6 @@ etcd_state_client_t::~etcd_state_client_t()
     }
     watches.clear();
     etcd_watches_initialised = -1;
-    if (ws_keepalive_timer >= 0)
-    {
-        tfd->clear_timer(ws_keepalive_timer);
-        ws_keepalive_timer = -1;
-    }
 #ifndef __MOCK__
     if (etcd_watch_ws)
     {
@@ -55,13 +50,12 @@ void etcd_state_client_t::etcd_txn(json11::Json txn, int timeout, std::function<
 
 void etcd_state_client_t::etcd_call(std::string api, json11::Json payload, int timeout, std::function<void(std::string, json11::Json)> callback)
 {
-    if (!etcd_addresses.size() && !etcd_local.size())
+    if (!etcd_addresses.size())
     {
         fprintf(stderr, "etcd_address is missing in Vitastor configuration\n");
         exit(1);
     }
-    pick_next_etcd();
+    std::string etcd_address = etcd_addresses[rand() % etcd_addresses.size()];
-    std::string etcd_address = selected_etcd_address;
     std::string etcd_api_path;
     int pos = etcd_address.find('/');
     if (pos >= 0)
@@ -76,12 +70,7 @@ void etcd_state_client_t::etcd_call(std::string api, json11::Json payload, int t
         "Content-Length: "+std::to_string(req.size())+"\r\n"
         "Connection: close\r\n"
         "\r\n"+req;
-    http_request_json(tfd, etcd_address, req, timeout, [this, cur_addr = selected_etcd_address, callback](std::string err, json11::Json data)
+    http_request_json(tfd, etcd_address, req, timeout, callback);
-    {
-        if (err != "" && cur_addr == selected_etcd_address)
-            selected_etcd_address = "";
-        callback(err, data);
-    });
 }
 
 void etcd_state_client_t::add_etcd_url(std::string addr)
@@ -95,30 +84,9 @@ void etcd_state_client_t::add_etcd_url(std::string addr)
             fprintf(stderr, "HTTPS is unsupported for etcd. Either use plain HTTP or setup a local proxy for etcd interaction\n");
             exit(1);
         }
-        if (!local_ips.size())
+        if (addr.find('/') == std::string::npos)
-            local_ips = getifaddr_list();
-        std::string check_addr;
-        int pos = addr.find('/');
-        int pos2 = addr.find(':');
-        if (pos2 >= 0)
-            check_addr = addr.substr(0, pos2);
-        else if (pos >= 0)
-            check_addr = addr.substr(0, pos);
-        else
-            check_addr = addr;
-        if (pos == std::string::npos)
             addr += "/v3";
-        int i;
+        this->etcd_addresses.push_back(addr);
-        for (i = 0; i < local_ips.size(); i++)
-        {
-            if (local_ips[i] == check_addr)
-            {
-                this->etcd_local.push_back(addr);
-                break;
-            }
-        }
-        if (i >= local_ips.size())
-            this->etcd_addresses.push_back(addr);
     }
 }
 
@@ -157,38 +125,14 @@ void etcd_state_client_t::parse_config(const json11::Json & config)
     this->log_level = config["log_level"].int64_value();
 }
 
-void etcd_state_client_t::pick_next_etcd()
-{
-    if (selected_etcd_address != "")
-        return;
-    if (addresses_to_try.size() == 0)
-    {
-        // Prefer local etcd, if any
-        for (int i = 0; i < etcd_local.size(); i++)
-            addresses_to_try.push_back(etcd_local[i]);
-        std::vector<int> ns;
-        for (int i = 0; i < etcd_addresses.size(); i++)
-            ns.push_back(i);
-        while (ns.size())
-        {
-            int i = rand() % ns.size();
-            addresses_to_try.push_back(etcd_addresses[ns[i]]);
-            ns.erase(ns.begin()+i, ns.begin()+i+1);
-        }
-    }
-    selected_etcd_address = addresses_to_try[0];
-    addresses_to_try.erase(addresses_to_try.begin(), addresses_to_try.begin()+1);
-}
-
 void etcd_state_client_t::start_etcd_watcher()
 {
-    if (!etcd_addresses.size() && !etcd_local.size())
+    if (!etcd_addresses.size())
     {
         fprintf(stderr, "etcd_address is missing in Vitastor configuration\n");
         exit(1);
     }
-    pick_next_etcd();
+    std::string etcd_address = etcd_addresses[rand() % etcd_addresses.size()];
-    std::string etcd_address = selected_etcd_address;
     std::string etcd_api_path;
     int pos = etcd_address.find('/');
     if (pos >= 0)
@@ -197,18 +141,10 @@ void etcd_state_client_t::start_etcd_watcher()
         etcd_address = etcd_address.substr(0, pos);
     }
     etcd_watches_initialised = 0;
-    ws_alive = 1;
+    etcd_watch_ws = open_websocket(tfd, etcd_address, etcd_api_path+"/watch", ETCD_SLOW_TIMEOUT, [this](const http_response_t *msg)
-    if (etcd_watch_ws)
-    {
-        etcd_watch_ws->close();
-        etcd_watch_ws = NULL;
-    }
-    etcd_watch_ws = open_websocket(tfd, etcd_address, etcd_api_path+"/watch", ETCD_SLOW_TIMEOUT,
-        [this, cur_addr = selected_etcd_address](const http_response_t *msg)
     {
         if (msg->body.length())
         {
-            ws_alive = 1;
             std::string json_err;
             json11::Json data = json11::Json::parse(msg->body, json_err);
             if (json_err != "")
@@ -221,39 +157,9 @@ void etcd_state_client_t::start_etcd_watcher()
                 {
                     etcd_watches_initialised++;
                 }
-                if (data["result"]["canceled"].bool_value())
-                {
-                    // etcd watch canceled, maybe because the revision was compacted
-                    if (data["result"]["compact_revision"].uint64_value())
-                    {
-                        // we may miss events if we proceed
-                        // so we should restart from the beginning if we can
-                        if (on_reload_hook != NULL)
-                        {
-                            fprintf(stderr, "Revisions before %lu were compacted by etcd, reloading state\n",
-                                data["result"]["compact_revision"].uint64_value());
-                            etcd_watch_ws->close();
-                            etcd_watch_ws = NULL;
-                            etcd_watch_revision = 0;
-                            on_reload_hook();
-                        }
-                        else
-                        {
-                            fprintf(stderr, "Revisions before %lu were compacted by etcd, exiting\n",
-                                data["result"]["compact_revision"].uint64_value());
-                            exit(1);
-                        }
-                    }
-                    else
-                    {
-                        fprintf(stderr, "Watch canceled by etcd, reason: %s, exiting\n", data["result"]["cancel_reason"].string_value().c_str());
-                        exit(1);
-                    }
-                }
                 if (etcd_watches_initialised == 4)
                 {
-                    etcd_watch_revision = data["result"]["header"]["revision"].uint64_value()+1;
+                    etcd_watch_revision = data["result"]["header"]["revision"].uint64_value();
-                    addresses_to_try.clear();
                 }
                 // First gather all changes into a hash to remove multiple overwrites
                 std::map<std::string, etcd_kv_t> changes;
@@ -282,15 +188,11 @@ void etcd_state_client_t::start_etcd_watcher()
         }
         if (msg->eof)
         {
-            if (cur_addr == selected_etcd_address)
-            {
-                selected_etcd_address = "";
-            }
             etcd_watch_ws = NULL;
             if (etcd_watches_initialised == 0)
             {
-                // Connection not established, retry in <ETCD_QUICK_TIMEOUT>
+                // Connection not established, retry in <ETCD_SLOW_TIMEOUT>
-                tfd->set_timer(ETCD_QUICK_TIMEOUT, false, [this](int)
+                tfd->set_timer(ETCD_SLOW_TIMEOUT, false, [this](int)
                 {
                     start_etcd_watcher();
                 });
@@ -306,7 +208,7 @@ void etcd_state_client_t::start_etcd_watcher()
         { "create_request", json11::Json::object {
             { "key", base64_encode(etcd_prefix+"/config/") },
             { "range_end", base64_encode(etcd_prefix+"/config0") },
-            { "start_revision", etcd_watch_revision },
+            { "start_revision", etcd_watch_revision+1 },
             { "watch_id", ETCD_CONFIG_WATCH_ID },
             { "progress_notify", true },
         } }
@@ -315,7 +217,7 @@ void etcd_state_client_t::start_etcd_watcher()
         { "create_request", json11::Json::object {
             { "key", base64_encode(etcd_prefix+"/osd/state/") },
             { "range_end", base64_encode(etcd_prefix+"/osd/state0") },
-            { "start_revision", etcd_watch_revision },
+            { "start_revision", etcd_watch_revision+1 },
             { "watch_id", ETCD_OSD_STATE_WATCH_ID },
             { "progress_notify", true },
         } }
@@ -324,7 +226,7 @@ void etcd_state_client_t::start_etcd_watcher()
         { "create_request", json11::Json::object {
             { "key", base64_encode(etcd_prefix+"/pg/state/") },
             { "range_end", base64_encode(etcd_prefix+"/pg/state0") },
-            { "start_revision", etcd_watch_revision },
+            { "start_revision", etcd_watch_revision+1 },
             { "watch_id", ETCD_PG_STATE_WATCH_ID },
             { "progress_notify", true },
         } }
@@ -333,34 +235,11 @@ void etcd_state_client_t::start_etcd_watcher()
         { "create_request", json11::Json::object {
             { "key", base64_encode(etcd_prefix+"/pg/history/") },
             { "range_end", base64_encode(etcd_prefix+"/pg/history0") },
-            { "start_revision", etcd_watch_revision },
+            { "start_revision", etcd_watch_revision+1 },
             { "watch_id", ETCD_PG_HISTORY_WATCH_ID },
             { "progress_notify", true },
         } }
     }).dump());
-    if (ws_keepalive_timer < 0)
-    {
-        ws_keepalive_timer = tfd->set_timer(ETCD_KEEPALIVE_TIMEOUT, true, [this](int)
-        {
-            if (!etcd_watch_ws)
-            {
-                // Do nothing
-            }
-            else if (!ws_alive)
-            {
-                etcd_watch_ws->close();
-                etcd_watch_ws = NULL;
-                start_etcd_watcher();
-            }
-            else
-            {
-                ws_alive = 0;
-                etcd_watch_ws->post_message(WS_TEXT, json11::Json(json11::Json::object {
-                    { "progress_request", json11::Json::object { } }
-                }).dump());
-            }
-        });
-    }
 }
 
 void etcd_state_client_t::load_global_config()
@@ -458,7 +337,7 @@ void etcd_state_client_t::load_pgs()
         }
         if (!etcd_watch_revision)
         {
-            etcd_watch_revision = data["header"]["revision"].uint64_value()+1;
+            etcd_watch_revision = data["header"]["revision"].uint64_value();
         }
         for (auto & res: data["responses"].array_items())
         {
@@ -886,27 +765,3 @@ void etcd_state_client_t::close_watch(inode_watch_t* watch)
     }
     delete watch;
 }
-
-json11::Json::object etcd_state_client_t::serialize_inode_cfg(inode_config_t *cfg)
-{
-    json11::Json::object new_cfg = json11::Json::object {
-        { "name", cfg->name },
-        { "size", cfg->size },
-    };
-    if (cfg->parent_id)
-    {
-        if (INODE_POOL(cfg->num) != INODE_POOL(cfg->parent_id))
-            new_cfg["parent_pool"] = (uint64_t)INODE_POOL(cfg->parent_id);
-        new_cfg["parent_id"] = (uint64_t)INODE_NO_POOL(cfg->parent_id);
-    }
-    if (cfg->readonly)
-    {
-        new_cfg["readonly"] = true;
-    }
-    return new_cfg;
-}
-
-int etcd_state_client_t::address_count()
-{
-    return etcd_addresses.size() + etcd_local.size();
-}

src/etcd_state_client.h

@@ -15,7 +15,6 @@
 #define MAX_ETCD_ATTEMPTS 5
 #define ETCD_SLOW_TIMEOUT 5000
 #define ETCD_QUICK_TIMEOUT 1000
-#define ETCD_KEEPALIVE_TIMEOUT 30000
 
 #define DEFAULT_BLOCK_SIZE 128*1024
 
@@ -76,19 +75,12 @@ struct websocket_t;
 struct etcd_state_client_t
 {
 protected:
-    std::vector<std::string> local_ips;
-    std::vector<std::string> etcd_addresses;
-    std::vector<std::string> etcd_local;
-    std::string selected_etcd_address;
-    std::vector<std::string> addresses_to_try;
     std::vector<inode_watch_t*> watches;
     websocket_t *etcd_watch_ws = NULL;
-    int ws_keepalive_timer = -1;
-    int ws_alive = 0;
     uint64_t bs_block_size = DEFAULT_BLOCK_SIZE;
     void add_etcd_url(std::string);
-    void pick_next_etcd();
 public:
+    std::vector<std::string> etcd_addresses;
     std::string etcd_prefix;
     int log_level = 0;
     timerfd_manager_t *tfd = NULL;
@@ -106,9 +98,7 @@ public:
     std::function<void(bool)> on_load_pgs_hook;
     std::function<void(pool_id_t, pg_num_t)> on_change_pg_history_hook;
     std::function<void(osd_num_t)> on_change_osd_state_hook;
-    std::function<void()> on_reload_hook;
 
-    json11::Json::object serialize_inode_cfg(inode_config_t *cfg);
     etcd_kv_t parse_etcd_kv(const json11::Json & kv_json);
     void etcd_call(std::string api, json11::Json payload, int timeout, std::function<void(std::string, json11::Json)> callback);
     void etcd_txn(json11::Json txn, int timeout, std::function<void(std::string, json11::Json)> callback);
@@ -119,6 +109,5 @@ public:
     void parse_config(const json11::Json & config);
     inode_watch_t* watch_inode(std::string name);
     void close_watch(inode_watch_t* watch);
-    int address_count();
     ~etcd_state_client_t();
 };

src/http_client.cpp

@@ -451,11 +451,7 @@ bool http_co_t::handle_read()
         }
         if (want_streaming && parsed.body.size() > 0)
         {
-            if (!ended)
+            callback(&parsed);
-            {
-                // Don't deliver additional events after close()
-                callback(&parsed);
-            }
             parsed.body = "";
         }
     }
@@ -463,11 +459,7 @@ bool http_co_t::handle_read()
     {
         while (ws_parse_frame(response, parsed.ws_msg_type, parsed.body))
         {
-            if (!ended)
+            callback(&parsed);
-            {
-                // Don't deliver additional events after close()
-                callback(&parsed);
-            }
             parsed.body = "";
         }
     }
@@ -629,82 +621,8 @@ static bool ws_parse_frame(std::string & buf, int & type, std::string & res)
     return true;
 }
 
-static bool cidr_match(const in_addr &addr, const in_addr &net, uint8_t bits)
+std::vector<std::string> getifaddr_list(bool include_v6)
 {
-    if (bits == 0)
-    {
-        // C99 6.5.7 (3): u32 << 32 is undefined behaviour
-        return true;
-    }
-    return !((addr.s_addr ^ net.s_addr) & htonl(0xFFFFFFFFu << (32 - bits)));
-}
-
-static bool cidr6_match(const in6_addr &address, const in6_addr &network, uint8_t bits)
-{
-    const uint32_t *a = address.s6_addr32;
-    const uint32_t *n = network.s6_addr32;
-    int bits_whole, bits_incomplete;
-    bits_whole = bits >> 5;         // number of whole u32
-    bits_incomplete = bits & 0x1F;  // number of bits in incomplete u32
-    if (bits_whole && memcmp(a, n, bits_whole << 2))
-        return false;
-    if (bits_incomplete)
-    {
-        uint32_t mask = htonl((0xFFFFFFFFu) << (32 - bits_incomplete));
-        if ((a[bits_whole] ^ n[bits_whole]) & mask)
-            return false;
-    }
-    return true;
-}
-
-struct addr_mask_t
-{
-    sa_family_t family;
-    in_addr ipv4;
-    in6_addr ipv6;
-    uint8_t bits;
-};
-
-std::vector<std::string> getifaddr_list(json11::Json mask_cfg, bool include_v6)
-{
-    std::vector<addr_mask_t> masks;
-    if (mask_cfg.is_string())
-    {
-        mask_cfg = json11::Json::array{ mask_cfg };
-    }
-    for (auto mask_json: mask_cfg.array_items())
-    {
-        std::string mask = mask_json.string_value();
-        unsigned bits = 0;
-        int p = mask.find('/');
-        if (p != std::string::npos)
-        {
-            char null_byte = 0;
-            if (sscanf(mask.c_str()+p+1, "%u%c", &bits, &null_byte) != 1 || bits > 128)
-            {
-                throw std::runtime_error((include_v6 ? "Invalid IPv4 address mask: " : "Invalid IP address mask: ") + mask);
-            }
-            mask = mask.substr(0, p);
-        }
-        in_addr ipv4;
-        in6_addr ipv6;
-        if (inet_pton(AF_INET, mask.c_str(), &ipv4) == 1)
-        {
-            if (bits > 32)
-            {
-                throw std::runtime_error((include_v6 ? "Invalid IPv4 address mask: " : "Invalid IP address mask: ") + mask);
-            }
-            masks.push_back((addr_mask_t){ .family = AF_INET, .ipv4 = ipv4, .bits = (uint8_t)bits });
-        }
-        else if (include_v6 && inet_pton(AF_INET6, mask.c_str(), &ipv6) == 1)
-        {
-            masks.push_back((addr_mask_t){ .family = AF_INET6, .ipv6 = ipv6, .bits = (uint8_t)bits });
-        }
-        else
-        {
-            throw std::runtime_error((include_v6 ? "Invalid IPv4 address mask: " : "Invalid IP address mask: ") + mask);
-        }
-    }
     std::vector<std::string> addresses;
     ifaddrs *list, *ifa;
     if (getifaddrs(&list) == -1)
@@ -723,30 +641,9 @@ std::vector<std::string> getifaddr_list(json11::Json mask_cfg, bool include_v6)
         {
             void *addr_ptr;
             if (family == AF_INET)
-            {
                 addr_ptr = &((sockaddr_in *)ifa->ifa_addr)->sin_addr;
-            }
             else
-            {
                 addr_ptr = &((sockaddr_in6 *)ifa->ifa_addr)->sin6_addr;
-            }
-            if (masks.size() > 0)
-            {
-                int i;
-                for (i = 0; i < masks.size(); i++)
-                {
-                    if (masks[i].family == family && (family == AF_INET
-                        ? cidr_match(*(in_addr*)addr_ptr, masks[i].ipv4, masks[i].bits)
-                        : cidr6_match(*(in6_addr*)addr_ptr, masks[i].ipv6, masks[i].bits)))
-                    {
-                        break;
-                    }
-                }
-                if (i >= masks.size())
-                {
-                    continue;
-                }
-            }
             char addr[INET6_ADDRSTRLEN];
             if (!inet_ntop(family, addr_ptr, addr, INET6_ADDRSTRLEN))
             {

src/http_client.h

@@ -45,7 +45,7 @@ struct websocket_t
 
 void parse_http_headers(std::string & res, http_response_t *parsed);
 
-std::vector<std::string> getifaddr_list(json11::Json mask_cfg = json11::Json(), bool include_v6 = false);
+std::vector<std::string> getifaddr_list(bool include_v6 = false);
 
 uint64_t stoull_full(const std::string & str, int base = 10);
 

src/messenger.cpp

@@ -17,12 +17,11 @@ void osd_messenger_t::init()
     {
         rdma_context = msgr_rdma_context_t::create(
             rdma_device != "" ? rdma_device.c_str() : NULL,
-            rdma_port_num, rdma_gid_index, rdma_mtu, log_level
+            rdma_port_num, rdma_gid_index, rdma_mtu
         );
         if (!rdma_context)
         {
-            if (log_level > 0)
+            fprintf(stderr, "[OSD %lu] Couldn't initialize RDMA, proceeding with TCP only\n", osd_num);
-                fprintf(stderr, "[OSD %lu] Couldn't initialize RDMA, proceeding with TCP only\n", osd_num);
         }
         else
         {
@@ -118,7 +117,7 @@ osd_messenger_t::~osd_messenger_t()
     }
     while (clients.size() > 0)
     {
-        stop_client(clients.begin()->first, true, true);
+        stop_client(clients.begin()->first, true);
     }
 #ifdef WITH_RDMA
     if (rdma_context)
@@ -147,13 +146,13 @@ void osd_messenger_t::parse_config(const json11::Json & config)
         this->rdma_max_sge = 128;
     this->rdma_max_send = config["rdma_max_send"].uint64_value();
     if (!this->rdma_max_send)
-        this->rdma_max_send = 1;
+        this->rdma_max_send = 32;
     this->rdma_max_recv = config["rdma_max_recv"].uint64_value();
     if (!this->rdma_max_recv)
-        this->rdma_max_recv = 128;
+        this->rdma_max_recv = 8;
     this->rdma_max_msg = config["rdma_max_msg"].uint64_value();
     if (!this->rdma_max_msg || this->rdma_max_msg > 128*1024*1024)
-        this->rdma_max_msg = 129*1024;
+        this->rdma_max_msg = 1024*1024;
 #endif
     this->receive_buffer_size = (uint32_t)config["tcp_header_buffer_size"].uint64_value();
     if (!this->receive_buffer_size || this->receive_buffer_size > 1024*1024*1024)

src/messenger.h

@@ -133,7 +133,7 @@ protected:
     std::string rdma_device;
     uint64_t rdma_port_num = 1, rdma_gid_index = 0, rdma_mtu = 0;
     msgr_rdma_context_t *rdma_context = NULL;
-    uint64_t rdma_max_sge = 0, rdma_max_send = 0, rdma_max_recv = 0;
+    uint64_t rdma_max_sge = 0, rdma_max_send = 0, rdma_max_recv = 8;
     uint64_t rdma_max_msg = 0;
 #endif
 
@@ -156,7 +156,7 @@ public:
     void init();
     void parse_config(const json11::Json & config);
     void connect_peer(uint64_t osd_num, json11::Json peer_state);
-    void stop_client(int peer_fd, bool force = false, bool force_delete = false);
+    void stop_client(int peer_fd, bool force = false);
     void outbox_push(osd_op_t *cur_op);
     std::function<void(osd_op_t*)> exec_op;
     std::function<void(osd_num_t)> repeer_pgs;

src/mock/messenger.cpp

@@ -15,7 +15,7 @@ osd_messenger_t::~osd_messenger_t()
 {
     while (clients.size() > 0)
     {
-        stop_client(clients.begin()->first, true, true);
+        stop_client(clients.begin()->first, true);
     }
 }
 

src/msgr_rdma.cpp

@@ -46,19 +46,15 @@ msgr_rdma_connection_t::~msgr_rdma_connection_t()
     ctx->used_max_cqe -= max_send+max_recv;
     if (qp)
         ibv_destroy_qp(qp);
-    if (recv_buffers.size())
-        for (auto b: recv_buffers)
-            free(b);
 }
 
-msgr_rdma_context_t *msgr_rdma_context_t::create(const char *ib_devname, uint8_t ib_port, uint8_t gid_index, uint32_t mtu, int log_level)
+msgr_rdma_context_t *msgr_rdma_context_t::create(const char *ib_devname, uint8_t ib_port, uint8_t gid_index, uint32_t mtu)
 {
     int res;
     ibv_device **dev_list = NULL;
     msgr_rdma_context_t *ctx = new msgr_rdma_context_t();
     ctx->mtu = mtu;
 
-    srand48(time(NULL));
     dev_list = ibv_get_device_list(NULL);
     if (!dev_list)
     {
@@ -70,8 +66,7 @@ msgr_rdma_context_t *msgr_rdma_context_t::create(const char *ib_devname, uint8_t
         ctx->dev = *dev_list;
         if (!ctx->dev)
         {
-            if (log_level > 0)
+            fprintf(stderr, "No RDMA devices found\n");
-                fprintf(stderr, "No RDMA devices found\n");
             goto cleanup;
         }
     }
@@ -482,11 +477,7 @@ void osd_messenger_t::handle_rdma_events()
             if (!is_send)
             {
                 cl->rdma_conn->cur_recv--;
-                if (!handle_read_buffer(cl, cl->rdma_conn->recv_buffers[0], wc[i].byte_len))
+                handle_read_buffer(cl, cl->rdma_conn->recv_buffers[0], wc[i].byte_len);
-                {
-                    // handle_read_buffer may stop the client
-                    continue;
-                }
                 free(cl->rdma_conn->recv_buffers[0]);
                 cl->rdma_conn->recv_buffers.erase(cl->rdma_conn->recv_buffers.begin(), cl->rdma_conn->recv_buffers.begin()+1);
                 try_recv_rdma(cl);

src/msgr_rdma.h

@@ -35,7 +35,7 @@ struct msgr_rdma_context_t
     int max_cqe = 0;
     int used_max_cqe = 0;
 
-    static msgr_rdma_context_t *create(const char *ib_devname, uint8_t ib_port, uint8_t gid_index, uint32_t mtu, int log_level);
+    static msgr_rdma_context_t *create(const char *ib_devname, uint8_t ib_port, uint8_t gid_index, uint32_t mtu);
     ~msgr_rdma_context_t();
 };
 

src/msgr_stop.cpp

@@ -41,7 +41,7 @@ void osd_messenger_t::cancel_op(osd_op_t *op)
     }
 }
 
-void osd_messenger_t::stop_client(int peer_fd, bool force, bool force_delete)
+void osd_messenger_t::stop_client(int peer_fd, bool force)
 {
     assert(peer_fd != 0);
     auto it = clients.find(peer_fd);
@@ -136,7 +136,7 @@ void osd_messenger_t::stop_client(int peer_fd, bool force, bool force_delete)
         clients.erase(it);
     }
     cl->refs--;
-    if (cl->refs <= 0 || force_delete)
+    if (cl->refs <= 0)
     {
         delete cl;
     }

src/nbd_proxy.cpp

@@ -100,7 +100,7 @@ public:
             }
             unmap(cfg["dev_num"].uint64_value());
         }
-        else if (cfg["command"] == "ls" || cfg["command"] == "list" || cfg["command"] == "list-mapped")
+        else if (cfg["command"] == "list" || cfg["command"] == "list-mapped")
         {
             auto mapped = list_mapped();
             print_mapped(mapped, !cfg["json"].is_null());
@@ -119,7 +119,7 @@ public:
             "USAGE:\n"
             "  %s map [--etcd_address <etcd_address>] (--image <image> | --pool <pool> --inode <inode> --size <size in bytes>)\n"
             "  %s unmap /dev/nbd0\n"
-            "  %s ls [--json]\n",
+            "  %s list [--json]\n",
             exe_name, exe_name, exe_name
         );
         exit(0);
@@ -402,7 +402,7 @@ public:
                 printf("%s\n", dev.first.c_str());
                 for (auto & k: dev.second.object_items())
                 {
-                    printf("%s: %s\n", k.first.c_str(), k.second.as_string().c_str());
+                    printf("%s: %s\n", k.first.c_str(), k.second.string_value().c_str());
                 }
                 printf("\n");
             }

src/osd.cpp

@@ -7,8 +7,6 @@
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 
-#include "blockstore_impl.h"
-#include "osd_primary.h"
 #include "osd.h"
 #include "http_client.h"
 
@@ -45,12 +43,6 @@ osd_t::osd_t(const json11::Json & config, ring_loop_t *ringloop)
     // FIXME: Create Blockstore from on-disk superblock config and check it against the OSD cluster config
     auto bs_cfg = json_to_bs(this->config);
     this->bs = new blockstore_t(bs_cfg, ringloop, tfd);
-    {
-        // Autosync based on the number of unstable writes to prevent stalls due to insufficient journal space
-        uint64_t max_autosync = bs->get_journal_size() / bs->get_block_size() / 2;
-        if (autosync_writes > max_autosync)
-            autosync_writes = max_autosync;
-    }
 
     this->tfd->set_timer(print_stats_interval*1000, true, [this](int timer_id)
     {
@@ -110,7 +102,7 @@ void osd_t::parse_config(const json11::Json & config)
     log_level = config["log_level"].uint64_value();
     etcd_report_interval = config["etcd_report_interval"].uint64_value();
     if (etcd_report_interval <= 0)
-        etcd_report_interval = 5;
+        etcd_report_interval = 30;
     readonly = config["readonly"] == "true" || config["readonly"] == "1" || config["readonly"] == "yes";
     run_primary = config["run_primary"] != "false" && config["run_primary"] != "0" && config["run_primary"] != "no";
     no_rebalance = config["no_rebalance"] == "true" || config["no_rebalance"] == "1" || config["no_rebalance"] == "yes";
@@ -129,11 +121,6 @@ void osd_t::parse_config(const json11::Json & config)
         if (autosync_interval > MAX_AUTOSYNC_INTERVAL)
             autosync_interval = DEFAULT_AUTOSYNC_INTERVAL;
     }
-    if (!config["autosync_writes"].is_null())
-    {
-        // Allow to set it to 0
-        autosync_writes = config["autosync_writes"].uint64_value();
-    }
     if (!config["client_queue_depth"].is_null())
     {
         client_queue_depth = config["client_queue_depth"].uint64_value();
@@ -164,26 +151,6 @@ void osd_t::bind_socket()
     int enable = 1;
     setsockopt(listen_fd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable));
 
-    if (config["osd_network"].is_string() ||
-        config["osd_network"].is_array())
-    {
-        std::vector<std::string> mask;
-        if (config["osd_network"].is_string())
-            mask.push_back(config["osd_network"].string_value());
-        else
-            for (auto v: config["osd_network"].array_items())
-                mask.push_back(v.string_value());
-        auto matched_addrs = getifaddr_list(mask, false);
-        if (matched_addrs.size() > 1)
-        {
-            fprintf(stderr, "More than 1 address matches requested network(s): %s\n", json11::Json(matched_addrs).dump().c_str());
-            force_stop(1);
-        }
-        bind_address = matched_addrs[0];
-    }
-
-    // FIXME Support multiple listening sockets
-
     sockaddr_in addr;
     int r;
     if ((r = inet_pton(AF_INET, bind_address.c_str(), &addr.sin_addr)) != 1)
@@ -398,7 +365,6 @@ void osd_t::print_stats()
 
 void osd_t::print_slow()
 {
-    bool has_slow = false;
     char alloc[1024];
     timespec now;
     clock_gettime(CLOCK_REALTIME, &now);
@@ -460,32 +426,9 @@ void osd_t::print_slow()
                 {
                     bufprintf(" inode=%lx offset=%lx len=%x", op->req.rw.inode, op->req.rw.offset, op->req.rw.len);
                 }
-                if (op->req.hdr.opcode == OSD_OP_SEC_READ || op->req.hdr.opcode == OSD_OP_SEC_WRITE ||
-                    op->req.hdr.opcode == OSD_OP_SEC_WRITE_STABLE || op->req.hdr.opcode == OSD_OP_SEC_DELETE ||
-                    op->req.hdr.opcode == OSD_OP_SEC_SYNC || op->req.hdr.opcode == OSD_OP_SEC_LIST ||
-                    op->req.hdr.opcode == OSD_OP_SEC_STABILIZE || op->req.hdr.opcode == OSD_OP_SEC_ROLLBACK ||
-                    op->req.hdr.opcode == OSD_OP_SEC_READ_BMP)
-                {
-                    bufprintf(" state=%d", PRIV(op->bs_op)->op_state);
-                    int wait_for = PRIV(op->bs_op)->wait_for;
-                    if (wait_for)
-                    {
-                        bufprintf(" wait=%d (detail=%lu)", wait_for, PRIV(op->bs_op)->wait_detail);
-                    }
-                }
-                else if (op->req.hdr.opcode == OSD_OP_READ || op->req.hdr.opcode == OSD_OP_WRITE ||
-                    op->req.hdr.opcode == OSD_OP_SYNC || op->req.hdr.opcode == OSD_OP_DELETE)
-                {
-                    bufprintf(" state=%d", !op->op_data ? -1 : op->op_data->st);
-                }
 #undef bufprintf
                 printf("%s\n", alloc);
-                has_slow = true;
             }
         }
     }
-    if (has_slow)
-    {
-        bs->dump_diagnostics();
-    }
 }

src/osd.h

@@ -35,7 +35,6 @@
 
 #define MAX_AUTOSYNC_INTERVAL 3600
 #define DEFAULT_AUTOSYNC_INTERVAL 5
-#define DEFAULT_AUTOSYNC_WRITES 128
 #define MAX_RECOVERY_QUEUE 2048
 #define DEFAULT_RECOVERY_QUEUE 4
 #define DEFAULT_RECOVERY_BATCH 16
@@ -94,7 +93,7 @@ class osd_t
     // config
 
     json11::Json::object config;
-    int etcd_report_interval = 5;
+    int etcd_report_interval = 30;
 
     bool readonly = false;
     osd_num_t osd_num = 1; // OSD numbers start with 1
@@ -109,8 +108,7 @@ class osd_t
     int print_stats_interval = 3;
     int slow_log_interval = 10;
     int immediate_commit = IMMEDIATE_NONE;
-    int autosync_interval = DEFAULT_AUTOSYNC_INTERVAL; // "emergency" sync every 5 seconds
+    int autosync_interval = DEFAULT_AUTOSYNC_INTERVAL; // sync every 5 seconds
-    int autosync_writes = DEFAULT_AUTOSYNC_WRITES;
     int recovery_queue_depth = DEFAULT_RECOVERY_QUEUE;
     int recovery_sync_batch = DEFAULT_RECOVERY_BATCH;
     int log_level = 0;
@@ -142,7 +140,6 @@ class osd_t
     osd_op_t *autosync_op = NULL;
 
     // Unstable writes
-    uint64_t unstable_write_count = 0;
     std::map<osd_object_id_t, uint64_t> unstable_writes;
     std::deque<osd_op_t*> syncs_in_progress;
 

src/osd_cluster.cpp

@@ -15,7 +15,7 @@
 //   Peer connection is lost -> Reload connection data -> Try to reconnect
 void osd_t::init_cluster()
 {
-    if (!st_cli.address_count())
+    if (!st_cli.etcd_addresses.size())
     {
         if (run_primary)
         {
@@ -615,7 +615,7 @@ void osd_t::apply_pg_config()
                 }
                 if (currently_taken)
                 {
-                    if (pg_it->second.state & (PG_ACTIVE | PG_INCOMPLETE | PG_PEERING | PG_REPEERING | PG_PEERED))
+                    if (pg_it->second.state & (PG_ACTIVE | PG_INCOMPLETE | PG_PEERING | PG_REPEERING))
                     {
                         if (pg_it->second.target_set == pg_cfg.target_set)
                         {
@@ -703,19 +703,13 @@ void osd_t::apply_pg_config()
     this->pg_config_applied = all_applied;
 }
 
-struct reporting_pg_t
-{
-    pool_pg_num_t pool_pg_num;
-    bool history_changed;
-};
-
 void osd_t::report_pg_states()
 {
-    if (etcd_reporting_pg_state || !this->pg_state_dirty.size() || !st_cli.address_count())
+    if (etcd_reporting_pg_state || !this->pg_state_dirty.size() || !st_cli.etcd_addresses.size())
     {
         return;
     }
-    std::vector<reporting_pg_t> reporting_pgs;
+    std::vector<std::pair<pool_pg_num_t,bool>> reporting_pgs;
     json11::Json::array checks;
     json11::Json::array success;
     json11::Json::array failure;
@@ -727,7 +721,7 @@ void osd_t::report_pg_states()
             continue;
         }
         auto & pg = pg_it->second;
-        reporting_pgs.push_back((reporting_pg_t){ *it, pg.history_changed });
+        reporting_pgs.push_back({ *it, pg.history_changed });
         std::string state_key_base64 = base64_encode(st_cli.etcd_prefix+"/pg/state/"+std::to_string(pg.pool_id)+"/"+std::to_string(pg.pg_num));
         bool pg_state_exists = false;
         if (pg.state != PG_STARTING)
@@ -833,10 +827,10 @@ void osd_t::report_pg_states()
             // One of PG state updates failed, put dirty flags back
             for (auto pp: reporting_pgs)
             {
-                this->pg_state_dirty.insert(pp.pool_pg_num);
+                this->pg_state_dirty.insert(pp.first);
-                if (pp.history_changed)
+                if (pp.second)
                 {
-                    auto pg_it = this->pgs.find(pp.pool_pg_num);
+                    auto pg_it = this->pgs.find(pp.first);
                     if (pg_it != this->pgs.end())
                     {
                         pg_it->second.history_changed = true;
@@ -845,10 +839,10 @@ void osd_t::report_pg_states()
             }
             for (auto & res: data["responses"].array_items())
             {
-                if (res["response_range"]["kvs"].array_items().size())
+                if (res["kvs"].array_items().size())
                 {
-                    auto kv = st_cli.parse_etcd_kv(res["response_range"]["kvs"][0]);
+                    auto kv = st_cli.parse_etcd_kv(res["kvs"][0]);
-                    if (kv.key.substr(0, st_cli.etcd_prefix.length()+10) == st_cli.etcd_prefix+"/pg/state/")
+                    if (kv.key.substr(st_cli.etcd_prefix.length()+10) == st_cli.etcd_prefix+"/pg/state/")
                     {
                         pool_id_t pool_id = 0;
                         pg_num_t pg_num = 0;
@@ -876,27 +870,17 @@ void osd_t::report_pg_states()
             // Success. We'll get our changes back via the watcher and react to them
             for (auto pp: reporting_pgs)
             {
-                auto pg_it = this->pgs.find(pp.pool_pg_num);
+                auto pg_it = this->pgs.find(pp.first);
                 if (pg_it != this->pgs.end() &&
-                    pg_state_dirty.find(pp.pool_pg_num) == pg_state_dirty.end())
+                    pg_it->second.state == PG_OFFLINE &&
+                    pg_state_dirty.find(pp.first) == pg_state_dirty.end())
                 {
-                    if (pg_it->second.state == PG_OFFLINE)
+                    // Forget offline PGs after reporting their state
+                    if (pg_it->second.scheme == POOL_SCHEME_JERASURE)
                     {
-                        // Forget offline PGs after reporting their state
+                        use_jerasure(pg_it->second.pg_size, pg_it->second.pg_data_size, false);
-                        // (if the state wasn't changed again)
-                        if (pg_it->second.scheme == POOL_SCHEME_JERASURE)
-                        {
-                            use_jerasure(pg_it->second.pg_size, pg_it->second.pg_data_size, false);
-                        }
-                        this->pgs.erase(pg_it);
-                    }
-                    else if (pg_it->second.state & PG_PEERED)
-                    {
-                        // Activate PG after PG PEERED state is reported along with history
-                        // (if the state wasn't changed again)
-                        pg_it->second.state = pg_it->second.state & ~PG_PEERED | PG_ACTIVE;
-                        report_pg_state(pg_it->second);
                     }
+                    this->pgs.erase(pg_it);
                 }
             }
             // Push other PG state updates, if any