Release 1.4.1

- Fix a monitor crash on primary OSD switching introduced in 1.4.0
- Fix "partly outside array bounds" warnings for GCC 12 in cpp-btree
- Fix a realloc memory leak in theory possible with too large listings (OSD_OP_LIST)

.gitea/workflows/test.yml

@@ -532,6 +532,24 @@ jobs:
           echo ""
         done
 
+  test_switch_primary:
+    runs-on: ubuntu-latest
+    needs: build
+    container: ${{env.TEST_IMAGE}}:${{github.sha}}
+    steps:
+    - name: Run test
+      id: test
+      timeout-minutes: 3
+      run: /root/vitastor/tests/test_switch_primary.sh
+    - name: Print logs
+      if: always() && steps.test.outcome == 'failure'
+      run: |
+        for i in /root/vitastor/testdata/*.log /root/vitastor/testdata/*.txt; do
+          echo "-------- $i --------"
+          cat $i
+          echo ""
+        done
+
   test_write:
     runs-on: ubuntu-latest
     needs: build

CLA-en.md

@@ -38,7 +38,7 @@ in the offer.
         on behalf of third parties, including on behalf of his employer.
 
 2. Subject of the Agreement. \
-   2.1. Subject of the Agreement shall be the Contributions sent to the Author by Contributors.
+   2.1. Subject of the Agreement shall be the Contributions sent to the Author by Contributors. \
    2.2. The Contributor grants to the Author the right to use Contributions at his own
         discretion and without any necessity to get a prior approval from Contributor or
         any other third party in any way, under a simple (non-exclusive), royalty-free,
@@ -86,7 +86,7 @@ in the offer.
         of their provision to the Author. \
    5.2. The Contributor represents and warrants that he legally owns exclusive
         intellectual property rights to the Contributions. \
-   5.3. The Contributor represents and warrants that any further use of \
+   5.3. The Contributor represents and warrants that any further use of
         Contributions by the Author as provided by Contributor under the terms
         of the Agreement does not infringe on intellectual and other rights and
         legitimate interests of third parties. \

CMakeLists.txt

@@ -2,6 +2,6 @@ cmake_minimum_required(VERSION 2.8.12)
 
 project(vitastor)
 
-set(VERSION "1.3.1")
+set(VERSION "1.4.1")
 
 add_subdirectory(src)

csi/Makefile

@@ -1,4 +1,4 @@
-VERSION ?= v1.3.1
+VERSION ?= v1.4.1
 
 all: build push
 

csi/deploy/004-csi-nodeplugin.yaml

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

csi/deploy/007-csi-provisioner.yaml

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

csi/src/config.go

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

csi/src/nodeserver.go

@@ -188,7 +188,6 @@ func (ns *NodeServer) unmapNbd(devicePath string)
 
 func findByPidFile(pidFile string) (*os.Process, error)
 {
-    klog.Infof("killing process with PID from file %s", pidFile)
     pidBuf, err := os.ReadFile(pidFile)
     if (err != nil)
     {
@@ -209,6 +208,7 @@ func findByPidFile(pidFile string) (*os.Process, error)
 
 func killByPidFile(pidFile string) error
 {
+    klog.Infof("killing process with PID from file %s", pidFile)
     proc, err := findByPidFile(pidFile)
     if (err != nil)
     {

debian/changelog

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

debian/vitastor.Dockerfile

@@ -35,8 +35,8 @@ RUN set -e -x; \
     mkdir -p /root/packages/vitastor-$REL; \
     rm -rf /root/packages/vitastor-$REL/*; \
     cd /root/packages/vitastor-$REL; \
-    cp -r /root/vitastor vitastor-1.3.1; \
-    cd vitastor-1.3.1; \
+    cp -r /root/vitastor vitastor-1.4.1; \
+    cd vitastor-1.4.1; \
     ln -s /root/fio-build/fio-*/ ./fio; \
     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; \
@@ -49,8 +49,8 @@ RUN set -e -x; \
     rm -rf a b; \
     echo "dep:fio=$FIO" > debian/fio_version; \
     cd /root/packages/vitastor-$REL; \
-    tar --sort=name --mtime='2020-01-01' --owner=0 --group=0 --exclude=debian -cJf vitastor_1.3.1.orig.tar.xz vitastor-1.3.1; \
-    cd vitastor-1.3.1; \
+    tar --sort=name --mtime='2020-01-01' --owner=0 --group=0 --exclude=debian -cJf vitastor_1.4.1.orig.tar.xz vitastor-1.4.1; \
+    cd vitastor-1.4.1; \
     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; \

docs/installation/kubernetes.en.md

@@ -37,6 +37,7 @@ Vitastor CSI supports:
 - Volume snapshots. Example: [snapshot class](../../csi/deploy/example-snapshot-class.yaml), [snapshot](../../csi/deploy/example-snapshot.yaml), [clone](../../csi/deploy/example-snapshot-clone.yaml)
 - [VDUSE](../usage/qemu.en.md#vduse) (preferred) and [NBD](../usage/nbd.en.md) device mapping methods
 - Upgrades with VDUSE - new handler processes are restarted when CSI pods are restarted themselves
+- VDUSE daemon auto-restart - handler processes are automatically restarted if they crash due to a bug in Vitastor client code
 - Multiple clusters by using multiple configuration files in ConfigMap.
 
 Remember that to use snapshots with CSI you also have to install [Snapshot Controller and CRDs](https://kubernetes-csi.github.io/docs/snapshot-controller.html#deployment).

docs/installation/kubernetes.ru.md

@@ -37,6 +37,7 @@ CSI-плагин Vitastor поддерживает:
 - Снимки томов. Пример: [класс снимков](../../csi/deploy/example-snapshot-class.yaml), [снимок](../../csi/deploy/example-snapshot.yaml), [клон снимка](../../csi/deploy/example-snapshot-clone.yaml)
 - Способы подключения устройств [VDUSE](../usage/qemu.ru.md#vduse) (предпочитаемый) и [NBD](../usage/nbd.ru.md)
 - Обновление при использовании VDUSE - новые процессы-обработчики устройств успешно перезапускаются вместе с самими подами CSI
+- Автоперезауск демонов VDUSE - процесс-обработчик автоматически перезапустится, если он внезапно упадёт из-за бага в коде клиента Vitastor
 - Несколько кластеров через задание нескольких файлов конфигурации в ConfigMap.
 
 Не забывайте, что для использования снимков нужно сначала установить [контроллер снимков и CRD](https://kubernetes-csi.github.io/docs/snapshot-controller.html#deployment).

docs/performance/theoretical.en.md

@@ -11,19 +11,26 @@ Replicated setups:
 - Single-threaded write+fsync latency:
   - With immediate commit: 2 network roundtrips + 1 disk write.
   - With lazy commit: 4 network roundtrips + 1 disk write + 1 disk flush.
-- Saturated parallel read iops: min(network bandwidth, sum(disk read iops)).
-- Saturated parallel write iops: min(network bandwidth, sum(disk write iops / number of replicas / write amplification)).
+- Linear read: `min(total network bandwidth, sum(disk read MB/s))`.
+- Linear write: `min(total network bandwidth, sum(disk write MB/s / number of replicas))`.
+- Saturated parallel read iops: `min(total network bandwidth, sum(disk read iops))`.
+- Saturated parallel write iops: `min(total network bandwidth / number of replicas, sum(disk write iops / number of replicas / (write amplification = 4)))`.
 
-EC/XOR setups:
+EC/XOR setups (EC N+K):
 - Single-threaded (T1Q1) read latency: 1.5 network roundtrips + 1 disk read.
 - Single-threaded write+fsync latency:
   - With immediate commit: 3.5 network roundtrips + 1 disk read + 2 disk writes.
   - With lazy commit: 5.5 network roundtrips + 1 disk read + 2 disk writes + 2 disk fsyncs.
-  - 0.5 in actually (k-1)/k which means that an additional roundtrip doesn't happen when
+  - 0.5 in actually `(N-1)/N` which means that an additional roundtrip doesn't happen when
     the read sub-operation can be served locally.
-- Saturated parallel read iops: min(network bandwidth, sum(disk read iops)).
-- Saturated parallel write iops: min(network bandwidth, sum(disk write iops * number of data drives / (number of data + parity drives) / write amplification)).
-  In fact, you should put disk write iops under the condition of ~10% reads / ~90% writes in this formula.
+- Linear read: `min(total network bandwidth, sum(disk read MB/s))`.
+- Linear write: `min(total network bandwidth, sum(disk write MB/s * N/(N+K)))`.
+- Saturated parallel read iops: `min(total network bandwidth, sum(disk read iops))`.
+- Saturated parallel write iops: roughly `total iops / (N+K) / WA`. More exactly,
+  `min(total network bandwidth * N/(N+K), sum(disk randrw iops / (N*4 + K*5 + 1)))` with
+  random read/write mix corresponding to `(N-1)/(N*4 + K*5 + 1)*100 % reads`.
+  - For example, with EC 2+1 it is: `(7% randrw iops) / 14`.
+  - With EC 6+3 it is: `(12.5% randrw iops) / 40`.
 
 Write amplification for 4 KB blocks is usually 3-5 in Vitastor:
 1. Journal block write

docs/performance/theoretical.ru.md

@@ -11,20 +11,27 @@
 - Запись+fsync в 1 поток:
   - С мгновенным сбросом: 2 RTT + 1 запись.
   - С отложенным ("ленивым") сбросом: 4 RTT + 1 запись + 1 fsync.
-- Параллельное чтение: сумма IOPS всех дисков либо производительность сети, если в сеть упрётся раньше.
-- Параллельная запись: сумма IOPS всех дисков / число реплик / WA либо производительность сети, если в сеть упрётся раньше.
+- Линейное чтение: сумма МБ/с чтения всех дисков, либо общая производительность сети (сумма пропускной способности сети всех нод), если в сеть упрётся раньше.
+- Линейная запись: сумма МБ/с записи всех дисков / число реплик, либо производительность сети / число реплик, если в сеть упрётся раньше.
+- Параллельное случайное мелкое чтение: сумма IOPS чтения всех дисков, либо производительность сети, если в сеть упрётся раньше.
+- Параллельная случайная мелкая запись: сумма IOPS записи всех дисков / число реплик / WA, либо производительность сети / число реплик, если в сеть упрётся раньше.
 
-При использовании кодов коррекции ошибок (EC):
+При использовании кодов коррекции ошибок (EC N+K):
 - Задержка чтения в 1 поток (T1Q1): 1.5 RTT + 1 чтение.
 - Запись+fsync в 1 поток:
   - С мгновенным сбросом: 3.5 RTT + 1 чтение + 2 записи.
   - С отложенным ("ленивым") сбросом: 5.5 RTT + 1 чтение + 2 записи + 2 fsync.
-- Под 0.5 на самом деле подразумевается (k-1)/k, где k - число дисков данных,
+- Под 0.5 на самом деле подразумевается (N-1)/N, где N - число дисков данных,
   что означает, что дополнительное обращение по сети не нужно, когда операция
   чтения обслуживается локально.
-- Параллельное чтение: сумма IOPS всех дисков либо производительность сети, если в сеть упрётся раньше.
-- Параллельная запись: сумма IOPS всех дисков / общее число дисков данных и чётности / WA либо производительность сети, если в сеть упрётся раньше.
-  Примечание: IOPS дисков в данном случае надо брать в смешанном режиме чтения/записи в пропорции, аналогичной формулам выше.
+- Линейное чтение: сумма МБ/с чтения всех дисков, либо общая производительность сети, если в сеть упрётся раньше.
+- Линейная запись: сумма МБ/с записи всех дисков * N/(N+K), либо производительность сети * N / (N+K), если в сеть упрётся раньше.
+- Параллельное случайное мелкое чтение: сумма IOPS чтения всех дисков либо производительность сети, если в сеть упрётся раньше.
+- Параллельная случайная мелкая запись: грубо `(сумма IOPS / (N+K) / WA)`. Если точнее, то:
+  сумма смешанного IOPS всех дисков при `(N-1)/(N*4 + K*5 + 1)*100 %` чтения, делённая на `(N*4 + K*5 + 1)`.
+  Либо, производительность сети * N/(N+K), если в сеть упрётся раньше.
+  - Например, при EC 2+1 это: `(сумма IOPS при 7% чтения) / 14`.
+  - При EC 6+3 это: `(сумма IOPS при 12.5% чтения) / 40`.
 
 WA (мультипликатор записи) для 4 КБ блоков в Vitastor обычно составляет 3-5:
 1. Запись метаданных в журнал

mon/mon.js

@@ -390,7 +390,8 @@ class Mon
 {
     constructor(config)
     {
-        this.die = (e) => this._die(e);
+        this.failconnect = (e) => this._die(e, 2);
+        this.die = (e) => this._die(e, 1);
         if (fs.existsSync(config.config_path||'/etc/vitastor/vitastor.conf'))
         {
             config = {
@@ -604,7 +605,7 @@ class Mon
         }
         if (!this.ws)
         {
-            this.die('Failed to open etcd watch websocket');
+            this.failconnect('Failed to open etcd watch websocket');
         }
         const cur_addr = this.selected_etcd_url;
         this.ws_alive = true;
@@ -791,7 +792,7 @@ class Mon
             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)
             {
-                this.die('Lease expired');
+                this.failconnect('Lease expired');
             }
         }, this.config.etcd_mon_timeout);
         if (!this.signals_set)
@@ -1414,7 +1415,14 @@ class Mon
             }
             if (changed)
             {
-                await this.save_pg_config(new_config_pgs);
+                const ok = await this.save_pg_config(new_config_pgs);
+                if (ok)
+                    console.log('PG configuration successfully changed');
+                else
+                {
+                    console.log('Someone changed PG configuration while we also tried to change it. Retrying in '+this.config.mon_change_timeout+' ms');
+                    this.schedule_recheck();
+                }
             }
         }
         this.recheck_pgs_active = false;
@@ -1495,6 +1503,11 @@ class Mon
             this.save_new_pgs_txn(new_config_pgs, etcd_request, pool_id, up_osds, osd_tree, real_prev_pgs, pool_res.pgs, pg_history);
         }
         new_config_pgs.hash = tree_hash;
+        return await this.save_pg_config(new_config_pgs, etcd_request);
+    }
+
+    async save_pg_config(new_config_pgs, etcd_request = { compare: [], success: [] })
+    {
         etcd_request.compare.push(
             { key: b64(this.etcd_prefix+'/mon/master'), target: 'LEASE', lease: ''+this.etcd_lease_id },
             { key: b64(this.etcd_prefix+'/config/pgs'), target: 'MOD', mod_revision: ''+this.etcd_watch_revision, result: 'LESS' },
@@ -1985,14 +1998,14 @@ class Mon
                 return res.json;
             }
         }
-        this.die();
+        this.failconnect();
     }
 
-    _die(err)
+    _die(err, code)
     {
         // In fact we can just try to rejoin
         console.error(new Error(err || 'Cluster connection failed'));
-        process.exit(1);
+        process.exit(code || 2);
     }
 
     local_ips(all)

mon/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitastor-mon",
-  "version": "1.3.1",
+  "version": "1.4.1",
   "description": "Vitastor SDS monitor service",
   "main": "mon-main.js",
   "scripts": {

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 = '1.3.1'
+VERSION = '1.4.1'
 
 LOG = logging.getLogger(__name__)
 

pull_request_template.yml

@@ -0,0 +1,28 @@
+name: Pull Request
+about: Submit a pull request
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Describe your pull request
+      placeholder: ""
+      value: ""
+    validations:
+      required: true
+  - type: input
+    id: author
+    attributes:
+      label: Contributor Name
+      description: Contributor Name or Company Details if the Contributor is a company
+      placeholder: ""
+    validations:
+      required: false
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: CLA
+      description: By submitting this pull request, I accept [Vitastor CLA](https://git.yourcmc.ru/vitalif/vitastor/src/branch/master/CLA-en.md)
+      options:
+        - label: "I accept Vitastor CLA agreement: https://git.yourcmc.ru/vitalif/vitastor/src/branch/master/CLA-en.md"
+          required: true

rpm/build-tarball.sh

@@ -24,4 +24,4 @@ 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"; }'`
 perl -i -pe 's/(Requires:\s*fio)([^\n]+)?/$1 = '$FIO'/' $VITASTOR/rpm/vitastor-el$EL.spec
-tar --transform 's#^#vitastor-1.3.1/#' --exclude 'rpm/*.rpm' -czf $VITASTOR/../vitastor-1.3.1$(rpm --eval '%dist').tar.gz *
+tar --transform 's#^#vitastor-1.4.1/#' --exclude 'rpm/*.rpm' -czf $VITASTOR/../vitastor-1.4.1$(rpm --eval '%dist').tar.gz *

rpm/vitastor-el7.Dockerfile

@@ -36,7 +36,7 @@ ADD . /root/vitastor
 RUN set -e; \
     cd /root/vitastor/rpm; \
     sh build-tarball.sh; \
-    cp /root/vitastor-1.3.1.el7.tar.gz ~/rpmbuild/SOURCES; \
+    cp /root/vitastor-1.4.1.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:        1.3.1
+Version:        1.4.1
 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-1.3.1.el7.tar.gz
+Source0:        vitastor-1.4.1.el7.tar.gz
 
 BuildRequires:  liburing-devel >= 0.6
 BuildRequires:  gperftools-devel

rpm/vitastor-el8.Dockerfile

@@ -35,7 +35,7 @@ ADD . /root/vitastor
 RUN set -e; \
     cd /root/vitastor/rpm; \
     sh build-tarball.sh; \
-    cp /root/vitastor-1.3.1.el8.tar.gz ~/rpmbuild/SOURCES; \
+    cp /root/vitastor-1.4.1.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:        1.3.1
+Version:        1.4.1
 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-1.3.1.el8.tar.gz
+Source0:        vitastor-1.4.1.el8.tar.gz
 
 BuildRequires:  liburing-devel >= 0.6
 BuildRequires:  gperftools-devel

rpm/vitastor-el9.Dockerfile

@@ -18,7 +18,7 @@ ADD . /root/vitastor
 RUN set -e; \
     cd /root/vitastor/rpm; \
     sh build-tarball.sh; \
-    cp /root/vitastor-1.3.1.el9.tar.gz ~/rpmbuild/SOURCES; \
+    cp /root/vitastor-1.4.1.el9.tar.gz ~/rpmbuild/SOURCES; \
     cp vitastor-el9.spec ~/rpmbuild/SPECS/vitastor.spec; \
     cd ~/rpmbuild/SPECS/; \
     rpmbuild -ba vitastor.spec; \

rpm/vitastor-el9.spec

@@ -1,11 +1,11 @@
 Name:           vitastor
-Version:        1.3.1
+Version:        1.4.1
 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-1.3.1.el9.tar.gz
+Source0:        vitastor-1.4.1.el9.tar.gz
 
 BuildRequires:  liburing-devel >= 0.6
 BuildRequires:  gperftools-devel

src/CMakeLists.txt

@@ -16,7 +16,7 @@ if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/local/?$")
 	set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
 endif()
 
-add_definitions(-DVERSION="1.3.1")
+add_definitions(-DVERSION="1.4.1")
 add_definitions(-Wall -Wno-sign-compare -Wno-comment -Wno-parentheses -Wno-pointer-arith -fdiagnostics-color=always -fno-omit-frame-pointer -I ${CMAKE_SOURCE_DIR}/src)
 add_link_options(-fno-omit-frame-pointer)
 if (${WITH_ASAN})
@@ -181,25 +181,6 @@ target_link_libraries(vitastor-nbd
 	vitastor_client
 )
 
-# vitastor-kv
-add_executable(vitastor-kv
-	kv_cli.cpp
-	kv_db.cpp
-	kv_db.h
-)
-target_link_libraries(vitastor-kv
-	vitastor_client
-)
-
-add_executable(vitastor-kv-stress
-	kv_stress.cpp
-	kv_db.cpp
-	kv_db.h
-)
-target_link_libraries(vitastor-kv-stress
-	vitastor_client
-)
-
 # vitastor-nfs
 add_executable(vitastor-nfs
 	nfs_proxy.cpp

src/blockstore_impl.cpp

@@ -558,13 +558,14 @@ void blockstore_impl_t::process_list(blockstore_op_t *op)
             if (stable_count >= stable_alloc)
             {
                 stable_alloc *= 2;
-                stable = (obj_ver_id*)realloc(stable, sizeof(obj_ver_id) * stable_alloc);
-                if (!stable)
+                obj_ver_id* nst = (obj_ver_id*)realloc(stable, sizeof(obj_ver_id) * stable_alloc);
+                if (!nst)
                 {
                     op->retval = -ENOMEM;
                     FINISH_OP(op);
                     return;
                 }
+                stable = nst;
             }
             stable[stable_count++] = {
                 .oid = clean_it->first,
@@ -642,8 +643,8 @@ void blockstore_impl_t::process_list(blockstore_op_t *op)
                             if (stable_count >= stable_alloc)
                             {
                                 stable_alloc += 32768;
-                                stable = (obj_ver_id*)realloc(stable, sizeof(obj_ver_id) * stable_alloc);
-                                if (!stable)
+                                obj_ver_id *nst = (obj_ver_id*)realloc(stable, sizeof(obj_ver_id) * stable_alloc);
+                                if (!nst)
                                 {
                                     if (unstable)
                                         free(unstable);
@@ -651,6 +652,7 @@ void blockstore_impl_t::process_list(blockstore_op_t *op)
                                     FINISH_OP(op);
                                     return;
                                 }
+                                stable = nst;
                             }
                             stable[stable_count++] = dirty_it->first;
                         }
@@ -666,8 +668,8 @@ void blockstore_impl_t::process_list(blockstore_op_t *op)
                     if (unstable_count >= unstable_alloc)
                     {
                         unstable_alloc += 32768;
-                        unstable = (obj_ver_id*)realloc(unstable, sizeof(obj_ver_id) * unstable_alloc);
-                        if (!unstable)
+                        obj_ver_id *nst = (obj_ver_id*)realloc(unstable, sizeof(obj_ver_id) * unstable_alloc);
+                        if (!nst)
                         {
                             if (stable)
                                 free(stable);
@@ -675,6 +677,7 @@ void blockstore_impl_t::process_list(blockstore_op_t *op)
                             FINISH_OP(op);
                             return;
                         }
+                        unstable = nst;
                     }
                     unstable[unstable_count++] = dirty_it->first;
                 }
@@ -694,8 +697,8 @@ void blockstore_impl_t::process_list(blockstore_op_t *op)
     if (stable_count+unstable_count > stable_alloc)
     {
         stable_alloc = stable_count+unstable_count;
-        stable = (obj_ver_id*)realloc(stable, sizeof(obj_ver_id) * stable_alloc);
-        if (!stable)
+        obj_ver_id *nst = (obj_ver_id*)realloc(stable, sizeof(obj_ver_id) * stable_alloc);
+        if (!nst)
         {
             if (unstable)
                 free(unstable);
@@ -703,6 +706,7 @@ void blockstore_impl_t::process_list(blockstore_op_t *op)
             FINISH_OP(op);
             return;
         }
+        stable = nst;
     }
     // Copy unstable entries
     for (int i = 0; i < unstable_count; i++)

src/cluster_client.cpp

@@ -6,7 +6,7 @@
 #include "cluster_client_impl.h"
 #include "http_client.h" // json_is_true
 
-cluster_client_t::cluster_client_t(ring_loop_t *ringloop, timerfd_manager_t *tfd, json11::Json config)
+cluster_client_t::cluster_client_t(ring_loop_t *ringloop, timerfd_manager_t *tfd, json11::Json & config)
 {
     wb = new writeback_cache_t();
 
@@ -534,7 +534,7 @@ void cluster_client_t::execute_internal(cluster_op_t *op)
         return;
     }
     if (op->opcode == OSD_OP_WRITE && enable_writeback && !(op->flags & OP_FLUSH_BUFFER) &&
-        !op->version /* no CAS writeback */)
+        !op->version /* FIXME no CAS writeback */)
     {
         if (wb->writebacks_active >= client_max_writeback_iodepth)
         {
@@ -555,7 +555,7 @@ void cluster_client_t::execute_internal(cluster_op_t *op)
     }
     if (op->opcode == OSD_OP_WRITE && !(op->flags & OP_IMMEDIATE_COMMIT))
     {
-        if (!(op->flags & OP_FLUSH_BUFFER) && !op->version /* no CAS write-repeat */)
+        if (!(op->flags & OP_FLUSH_BUFFER))
         {
             wb->copy_write(op, CACHE_WRITTEN);
         }
@@ -1161,7 +1161,7 @@ void cluster_client_t::handle_op_part(cluster_op_part_t *part)
                 );
             }
         }
-        else if (log_level > 0)
+        else
         {
             fprintf(
                 stderr, "%s operation failed on OSD %lu: retval=%ld (expected %d)\n",

src/cluster_client.h

@@ -121,7 +121,7 @@ public:
     json11::Json::object cli_config, file_config, etcd_global_config;
     json11::Json::object config;
 
-    cluster_client_t(ring_loop_t *ringloop, timerfd_manager_t *tfd, json11::Json config);
+    cluster_client_t(ring_loop_t *ringloop, timerfd_manager_t *tfd, json11::Json & config);
     ~cluster_client_t();
     void execute(cluster_op_t *op);
     void execute_raw(osd_num_t osd_num, osd_op_t *op);

src/etcd_state_client.h

@@ -28,7 +28,7 @@ struct etcd_kv_t
 {
     std::string key;
     json11::Json value;
-    uint64_t mod_revision;
+    uint64_t mod_revision = 0;
 };
 
 struct pg_config_t

src/kv_cli.cpp

@@ -1,401 +0,0 @@
-// Copyright (c) Vitaliy Filippov, 2019+
-// License: VNPL-1.1 (see README.md for details)
-//
-// Vitastor shared key/value database test CLI
-
-#define _XOPEN_SOURCE
-#include <limits.h>
-
-#include <netinet/tcp.h>
-#include <sys/epoll.h>
-#include <unistd.h>
-#include <fcntl.h>
-//#include <signal.h>
-
-#include "epoll_manager.h"
-#include "str_util.h"
-#include "kv_db.h"
-
-const char *exe_name = NULL;
-
-class kv_cli_t
-{
-public:
-    kv_dbw_t *db = NULL;
-    ring_loop_t *ringloop = NULL;
-    epoll_manager_t *epmgr = NULL;
-    cluster_client_t *cli = NULL;
-    bool interactive = false;
-    int in_progress = 0;
-    char *cur_cmd = NULL;
-    int cur_cmd_size = 0, cur_cmd_alloc = 0;
-    bool finished = false, eof = false;
-    json11::Json::object cfg;
-
-    ~kv_cli_t();
-
-    static json11::Json::object parse_args(int narg, const char *args[]);
-    void run(const json11::Json::object & cfg);
-    void read_cmd();
-    void next_cmd();
-    void handle_cmd(const std::string & cmd, std::function<void()> cb);
-};
-
-kv_cli_t::~kv_cli_t()
-{
-    if (cur_cmd)
-    {
-        free(cur_cmd);
-        cur_cmd = NULL;
-    }
-    cur_cmd_alloc = 0;
-    if (db)
-        delete db;
-    if (cli)
-    {
-        cli->flush();
-        delete cli;
-    }
-    if (epmgr)
-        delete epmgr;
-    if (ringloop)
-        delete ringloop;
-}
-
-json11::Json::object kv_cli_t::parse_args(int narg, const char *args[])
-{
-    json11::Json::object cfg;
-    for (int i = 1; i < narg; i++)
-    {
-        if (!strcmp(args[i], "-h") || !strcmp(args[i], "--help"))
-        {
-            printf(
-                "Vitastor Key/Value CLI\n"
-                "(c) Vitaliy Filippov, 2023+ (VNPL-1.1)\n"
-                "\n"
-                "USAGE: %s [--etcd_address ADDR] [OTHER OPTIONS]\n",
-                exe_name
-            );
-            exit(0);
-        }
-        else if (args[i][0] == '-' && args[i][1] == '-')
-        {
-            const char *opt = args[i]+2;
-            cfg[opt] = !strcmp(opt, "json") || i == narg-1 ? "1" : args[++i];
-        }
-    }
-    return cfg;
-}
-
-void kv_cli_t::run(const json11::Json::object & cfg)
-{
-    // Create client
-    ringloop = new ring_loop_t(512);
-    epmgr = new epoll_manager_t(ringloop);
-    cli = new cluster_client_t(ringloop, epmgr->tfd, cfg);
-    db = new kv_dbw_t(cli);
-    // Load image metadata
-    while (!cli->is_ready())
-    {
-        ringloop->loop();
-        if (cli->is_ready())
-            break;
-        ringloop->wait();
-    }
-    // Run
-    fcntl(0, F_SETFL, fcntl(0, F_GETFL, 0) | O_NONBLOCK);
-    try
-    {
-        epmgr->tfd->set_fd_handler(0, false, [this](int fd, int events)
-        {
-            if (events & EPOLLIN)
-            {
-                read_cmd();
-            }
-            if (events & EPOLLRDHUP)
-            {
-                epmgr->tfd->set_fd_handler(0, false, NULL);
-                finished = true;
-            }
-        });
-        interactive = true;
-        printf("> ");
-    }
-    catch (std::exception & e)
-    {
-        // Can't add to epoll, STDIN is probably a file
-        read_cmd();
-    }
-    while (!finished)
-    {
-        ringloop->loop();
-        if (!finished)
-            ringloop->wait();
-    }
-    // Destroy the client
-    delete db;
-    db = NULL;
-    cli->flush();
-    delete cli;
-    delete epmgr;
-    delete ringloop;
-    cli = NULL;
-    epmgr = NULL;
-    ringloop = NULL;
-}
-
-void kv_cli_t::read_cmd()
-{
-    if (!cur_cmd_alloc)
-    {
-        cur_cmd_alloc = 65536;
-        cur_cmd = (char*)malloc_or_die(cur_cmd_alloc);
-    }
-    while (cur_cmd_size < cur_cmd_alloc)
-    {
-        int r = read(0, cur_cmd+cur_cmd_size, cur_cmd_alloc-cur_cmd_size);
-        if (r < 0 && errno != EAGAIN)
-            fprintf(stderr, "Error reading from stdin: %s\n", strerror(errno));
-        if (r > 0)
-            cur_cmd_size += r;
-        if (r == 0)
-            eof = true;
-        if (r <= 0)
-            break;
-    }
-    next_cmd();
-}
-
-void kv_cli_t::next_cmd()
-{
-    if (in_progress > 0)
-    {
-        return;
-    }
-    int pos = 0;
-    for (; pos < cur_cmd_size; pos++)
-    {
-        if (cur_cmd[pos] == '\n' || cur_cmd[pos] == '\r')
-        {
-            auto cmd = trim(std::string(cur_cmd, pos));
-            pos++;
-            memmove(cur_cmd, cur_cmd+pos, cur_cmd_size-pos);
-            cur_cmd_size -= pos;
-            in_progress++;
-            handle_cmd(cmd, [this]()
-            {
-                in_progress--;
-                if (interactive)
-                    printf("> ");
-                next_cmd();
-                if (!in_progress)
-                    read_cmd();
-            });
-            break;
-        }
-    }
-    if (eof && !in_progress)
-    {
-        finished = true;
-    }
-}
-
-void kv_cli_t::handle_cmd(const std::string & cmd, std::function<void()> cb)
-{
-    if (cmd == "")
-    {
-        cb();
-        return;
-    }
-    auto pos = cmd.find_first_of(" \t");
-    if (pos != std::string::npos)
-    {
-        while (pos < cmd.size()-1 && (cmd[pos+1] == ' ' || cmd[pos+1] == '\t'))
-            pos++;
-    }
-    auto opname = strtolower(pos == std::string::npos ? cmd : cmd.substr(0, pos));
-    if (opname == "open")
-    {
-        uint64_t pool_id = 0;
-        inode_t inode_id = 0;
-        uint32_t kv_block_size = 0;
-        int scanned = sscanf(cmd.c_str() + pos+1, "%lu %lu %u", &pool_id, &inode_id, &kv_block_size);
-        if (scanned == 2)
-        {
-            kv_block_size = 4096;
-        }
-        if (scanned < 2 || !pool_id || !inode_id || !kv_block_size || (kv_block_size & (kv_block_size-1)) != 0)
-        {
-            fprintf(stderr, "Usage: open <pool_id> <inode_id> [block_size]. Block size must be a power of 2. Default is 4096.\n");
-            cb();
-            return;
-        }
-        cfg["kv_block_size"] = (uint64_t)kv_block_size;
-        db->open(INODE_WITH_POOL(pool_id, inode_id), cfg, [=](int res)
-        {
-            if (res < 0)
-                fprintf(stderr, "Error opening index: %s (code %d)\n", strerror(-res), res);
-            else
-                printf("Index opened. Current size: %lu bytes\n", db->get_size());
-            cb();
-        });
-    }
-    else if (opname == "config")
-    {
-        auto pos2 = cmd.find_first_of(" \t", pos+1);
-        if (pos2 == std::string::npos)
-        {
-            fprintf(stderr, "Usage: config <property> <value>\n");
-            cb();
-            return;
-        }
-        auto key = trim(cmd.substr(pos+1, pos2-pos-1));
-        auto value = parse_size(trim(cmd.substr(pos2+1)));
-        if (key != "kv_memory_limit" &&
-            key != "kv_allocate_blocks" &&
-            key != "kv_evict_max_misses" &&
-            key != "kv_evict_attempts_per_level" &&
-            key != "kv_evict_unused_age" &&
-            key != "kv_log_level")
-        {
-            fprintf(
-                stderr, "Allowed properties: kv_memory_limit, kv_allocate_blocks,"
-                " kv_evict_max_misses, kv_evict_attempts_per_level, kv_evict_unused_age, kv_log_level\n"
-            );
-        }
-        else
-        {
-            cfg[key] = value;
-            db->set_config(cfg);
-        }
-        cb();
-    }
-    else if (opname == "get" || opname == "set" || opname == "del")
-    {
-        if (opname == "get" || opname == "del")
-        {
-            if (pos == std::string::npos)
-            {
-                fprintf(stderr, "Usage: %s <key>\n", opname.c_str());
-                cb();
-                return;
-            }
-            auto key = trim(cmd.substr(pos+1));
-            if (opname == "get")
-            {
-                db->get(key, [this, cb](int res, const std::string & value)
-                {
-                    if (res < 0)
-                        fprintf(stderr, "Error: %s (code %d)\n", strerror(-res), res);
-                    else
-                    {
-                        write(1, value.c_str(), value.size());
-                        write(1, "\n", 1);
-                    }
-                    cb();
-                });
-            }
-            else
-            {
-                db->del(key, [this, cb](int res)
-                {
-                    if (res < 0)
-                        fprintf(stderr, "Error: %s (code %d)\n", strerror(-res), res);
-                    else
-                        printf("OK\n");
-                    cb();
-                });
-            }
-        }
-        else
-        {
-            auto pos2 = cmd.find_first_of(" \t", pos+1);
-            if (pos2 == std::string::npos)
-            {
-                fprintf(stderr, "Usage: set <key> <value>\n");
-                cb();
-                return;
-            }
-            auto key = trim(cmd.substr(pos+1, pos2-pos-1));
-            auto value = trim(cmd.substr(pos2+1));
-            db->set(key, value, [this, cb](int res)
-            {
-                if (res < 0)
-                    fprintf(stderr, "Error: %s (code %d)\n", strerror(-res), res);
-                else
-                    printf("OK\n");
-                cb();
-            });
-        }
-    }
-    else if (opname == "list")
-    {
-        std::string start, end;
-        if (pos != std::string::npos)
-        {
-            auto pos2 = cmd.find_first_of(" \t", pos+1);
-            if (pos2 != std::string::npos)
-            {
-                start = trim(cmd.substr(pos+1, pos2-pos-1));
-                end = trim(cmd.substr(pos2+1));
-            }
-            else
-            {
-                start = trim(cmd.substr(pos+1));
-            }
-        }
-        void *handle = db->list_start(start);
-        db->list_next(handle, [=](int res, const std::string & key, const std::string & value)
-        {
-            if (res < 0)
-            {
-                if (res != -ENOENT)
-                {
-                    fprintf(stderr, "Error: %s (code %d)\n", strerror(-res), res);
-                }
-                db->list_close(handle);
-                cb();
-            }
-            else
-            {
-                printf("%s = %s\n", key.c_str(), value.c_str());
-                db->list_next(handle, NULL);
-            }
-        });
-    }
-    else if (opname == "close")
-    {
-        db->close([=]()
-        {
-            printf("Index closed\n");
-            cb();
-        });
-    }
-    else if (opname == "quit" || opname == "q")
-    {
-        ::close(0);
-        finished = true;
-    }
-    else
-    {
-        fprintf(
-            stderr, "Unknown operation: %s. Supported operations:\n"
-            "open <pool_id> <inode_id> [block_size]\n"
-            "config <property> <value>\n"
-            "get <key>\nset <key> <value>\ndel <key>\nlist [<start> [end]]\n"
-            "close\nquit\n", opname.c_str()
-        );
-        cb();
-    }
-}
-
-int main(int narg, const char *args[])
-{
-    setvbuf(stdout, NULL, _IONBF, 0);
-    setvbuf(stderr, NULL, _IONBF, 0);
-    exe_name = args[0];
-    kv_cli_t *p = new kv_cli_t();
-    p->run(kv_cli_t::parse_args(narg, args));
-    delete p;
-    return 0;
-}

src/kv_db.h

@@ -1,39 +0,0 @@
-// Copyright (c) Vitaliy Filippov, 2019+
-// License: VNPL-1.1 (see README.md for details)
-//
-// Vitastor shared key/value database
-// Parallel optimistic B-Tree O:-)
-
-#pragma once
-
-#include "cluster_client.h"
-
-struct kv_db_t;
-
-struct kv_dbw_t
-{
-    kv_dbw_t(cluster_client_t *cli);
-    ~kv_dbw_t();
-
-    void open(inode_t inode_id, json11::Json cfg, std::function<void(int)> cb);
-    void set_config(json11::Json cfg);
-    void close(std::function<void()> cb);
-
-    uint64_t get_size();
-
-    void get(const std::string & key, std::function<void(int res, const std::string & value)> cb,
-        bool allow_old_cached = false);
-    void set(const std::string & key, const std::string & value, std::function<void(int res)> cb,
-        std::function<bool(int res, const std::string & value)> cas_compare = NULL);
-    void del(const std::string & key, std::function<void(int res)> cb,
-        std::function<bool(int res, const std::string & value)> cas_compare = NULL);
-    void update(const std::string & key,
-        std::function<int(int res, const std::string & old_value, std::string & new_value)> cas_compare,
-        std::function<bool(int res)> cb);
-
-    void* list_start(const std::string & start);
-    void list_next(void *handle, std::function<void(int res, const std::string & key, const std::string & value)> cb);
-    void list_close(void *handle);
-
-    kv_db_t *db;
-};

src/kv_stress.cpp

@@ -1,697 +0,0 @@
-// Copyright (c) Vitaliy Filippov, 2019+
-// License: VNPL-1.1 (see README.md for details)
-//
-// Vitastor shared key/value database stress tester / benchmark
-
-#define _XOPEN_SOURCE
-#include <limits.h>
-
-#include <netinet/tcp.h>
-#include <sys/epoll.h>
-#include <unistd.h>
-#include <fcntl.h>
-//#include <signal.h>
-
-#include "epoll_manager.h"
-#include "str_util.h"
-#include "kv_db.h"
-
-const char *exe_name = NULL;
-
-struct kv_test_listing_t
-{
-    uint64_t count = 0, done = 0;
-    void *handle = NULL;
-    std::string next_after;
-    std::set<std::string> inflights;
-    timespec tv_begin;
-    bool error = false;
-};
-
-struct kv_test_lat_t
-{
-    const char *name = NULL;
-    uint64_t usec = 0, count = 0;
-};
-
-struct kv_test_stat_t
-{
-    kv_test_lat_t get, add, update, del, list;
-    uint64_t list_keys = 0;
-};
-
-class kv_test_t
-{
-public:
-    // Config
-    json11::Json::object kv_cfg;
-    std::string key_prefix, key_suffix;
-    uint64_t inode_id = 0;
-    uint64_t op_count = 1000000;
-    uint64_t runtime_sec = 0;
-    uint64_t parallelism = 4;
-    uint64_t reopen_prob = 1;
-    uint64_t get_prob = 30000;
-    uint64_t add_prob = 20000;
-    uint64_t update_prob = 20000;
-    uint64_t del_prob = 5000;
-    uint64_t list_prob = 300;
-    uint64_t min_key_len = 10;
-    uint64_t max_key_len = 70;
-    uint64_t min_value_len = 50;
-    uint64_t max_value_len = 300;
-    uint64_t min_list_count = 10;
-    uint64_t max_list_count = 1000;
-    uint64_t print_stats_interval = 1;
-    bool json_output = false;
-    uint64_t log_level = 1;
-    bool trace = false;
-    bool stop_on_error = false;
-    // FIXME: Multiple clients
-    kv_test_stat_t stat, prev_stat;
-    timespec prev_stat_time, start_stat_time;
-
-    // State
-    kv_dbw_t *db = NULL;
-    ring_loop_t *ringloop = NULL;
-    epoll_manager_t *epmgr = NULL;
-    cluster_client_t *cli = NULL;
-    ring_consumer_t consumer;
-    bool finished = false;
-    uint64_t total_prob = 0;
-    uint64_t ops_sent = 0, ops_done = 0;
-    int stat_timer_id = -1;
-    int in_progress = 0;
-    bool reopening = false;
-    std::set<kv_test_listing_t*> listings;
-    std::set<std::string> changing_keys;
-    std::map<std::string, std::string> values;
-
-    ~kv_test_t();
-
-    static json11::Json::object parse_args(int narg, const char *args[]);
-    void parse_config(json11::Json cfg);
-    void run(json11::Json cfg);
-    void loop();
-    void print_stats(kv_test_stat_t & prev_stat, timespec & prev_stat_time);
-    void print_total_stats();
-    void start_change(const std::string & key);
-    void stop_change(const std::string & key);
-    void add_stat(kv_test_lat_t & stat, timespec tv_begin);
-};
-
-kv_test_t::~kv_test_t()
-{
-    if (db)
-        delete db;
-    if (cli)
-    {
-        cli->flush();
-        delete cli;
-    }
-    if (epmgr)
-        delete epmgr;
-    if (ringloop)
-        delete ringloop;
-}
-
-json11::Json::object kv_test_t::parse_args(int narg, const char *args[])
-{
-    json11::Json::object cfg;
-    for (int i = 1; i < narg; i++)
-    {
-        if (!strcmp(args[i], "-h") || !strcmp(args[i], "--help"))
-        {
-            printf(
-                "Vitastor Key/Value DB stress tester / benchmark\n"
-                "(c) Vitaliy Filippov, 2023+ (VNPL-1.1)\n"
-                "\n"
-                "USAGE: %s --pool_id POOL_ID --inode_id INODE_ID [OPTIONS]\n"
-                "  --op_count 1000000\n"
-                "    Total operations to run during test. 0 means unlimited\n"
-                "  --key_prefix \"\"\n"
-                "    Prefix for all keys read or written (to avoid collisions)\n"
-                "  --key_suffix \"\"\n"
-                "    Suffix for all keys read or written (to avoid collisions, but scan all DB)\n"
-                "  --runtime 0\n"
-                "    Run for this number of seconds. 0 means unlimited\n"
-                "  --parallelism 4\n"
-                "    Run this number of operations in parallel\n"
-                "  --get_prob 30000\n"
-                "    Fraction of key retrieve operations\n"
-                "  --add_prob 20000\n"
-                "    Fraction of key addition operations\n"
-                "  --update_prob 20000\n"
-                "    Fraction of key update operations\n"
-                "  --del_prob 30000\n"
-                "    Fraction of key delete operations\n"
-                "  --list_prob 300\n"
-                "    Fraction of listing operations\n"
-                "  --min_key_len 10\n"
-                "    Minimum key size in bytes\n"
-                "  --max_key_len 70\n"
-                "    Maximum key size in bytes\n"
-                "  --min_value_len 50\n"
-                "    Minimum value size in bytes\n"
-                "  --max_value_len 300\n"
-                "    Maximum value size in bytes\n"
-                "  --min_list_count 10\n"
-                "    Minimum number of keys read in listing (0 = all keys)\n"
-                "  --max_list_count 1000\n"
-                "    Maximum number of keys read in listing\n"
-                "  --print_stats 1\n"
-                "    Print operation statistics every this number of seconds\n"
-                "  --json\n"
-                "    JSON output\n"
-                "  --stop_on_error 0\n"
-                "    Stop on first execution error, mismatch, lost key or extra key during listing\n"
-                "  --kv_memory_limit 128M\n"
-                "    Maximum memory to use for vitastor-kv index cache\n"
-                "  --kv_allocate_blocks 4\n"
-                "    Number of PG blocks used for new tree block allocation in parallel\n"
-                "  --kv_evict_max_misses 10\n"
-                "    Eviction algorithm parameter: retry eviction from another random spot\n"
-                "    if this number of keys is used currently or was used recently\n"
-                "  --kv_evict_attempts_per_level 3\n"
-                "    Retry eviction at most this number of times per tree level, starting\n"
-                "    with bottom-most levels\n"
-                "  --kv_evict_unused_age 1000\n"
-                "    Evict only keys unused during this number of last operations\n"
-                "  --kv_log_level 1\n"
-                "    Log level. 0 = errors, 1 = warnings, 10 = trace operations\n",
-                exe_name
-            );
-            exit(0);
-        }
-        else if (args[i][0] == '-' && args[i][1] == '-')
-        {
-            const char *opt = args[i]+2;
-            cfg[opt] = !strcmp(opt, "json") || i == narg-1 ? "1" : args[++i];
-        }
-    }
-    return cfg;
-}
-
-void kv_test_t::parse_config(json11::Json cfg)
-{
-    inode_id = INODE_WITH_POOL(cfg["pool_id"].uint64_value(), cfg["inode_id"].uint64_value());
-    if (cfg["op_count"].uint64_value() > 0)
-        op_count = cfg["op_count"].uint64_value();
-    key_prefix = cfg["key_prefix"].string_value();
-    key_suffix = cfg["key_suffix"].string_value();
-    if (cfg["runtime"].uint64_value() > 0)
-        runtime_sec = cfg["runtime"].uint64_value();
-    if (cfg["parallelism"].uint64_value() > 0)
-        parallelism = cfg["parallelism"].uint64_value();
-    if (!cfg["reopen_prob"].is_null())
-        reopen_prob = cfg["reopen_prob"].uint64_value();
-    if (!cfg["get_prob"].is_null())
-        get_prob = cfg["get_prob"].uint64_value();
-    if (!cfg["add_prob"].is_null())
-        add_prob = cfg["add_prob"].uint64_value();
-    if (!cfg["update_prob"].is_null())
-        update_prob = cfg["update_prob"].uint64_value();
-    if (!cfg["del_prob"].is_null())
-        del_prob = cfg["del_prob"].uint64_value();
-    if (!cfg["list_prob"].is_null())
-        list_prob = cfg["list_prob"].uint64_value();
-    if (!cfg["min_key_len"].is_null())
-        min_key_len = cfg["min_key_len"].uint64_value();
-    if (cfg["max_key_len"].uint64_value() > 0)
-        max_key_len = cfg["max_key_len"].uint64_value();
-    if (!cfg["min_value_len"].is_null())
-        min_value_len = cfg["min_value_len"].uint64_value();
-    if (cfg["max_value_len"].uint64_value() > 0)
-        max_value_len = cfg["max_value_len"].uint64_value();
-    if (!cfg["min_list_count"].is_null())
-        min_list_count = cfg["min_list_count"].uint64_value();
-    if (!cfg["max_list_count"].is_null())
-        max_list_count = cfg["max_list_count"].uint64_value();
-    if (!cfg["print_stats"].is_null())
-        print_stats_interval = cfg["print_stats"].uint64_value();
-    if (!cfg["json"].is_null())
-        json_output = true;
-    if (!cfg["stop_on_error"].is_null())
-        stop_on_error = cfg["stop_on_error"].bool_value();
-    if (!cfg["kv_memory_limit"].is_null())
-        kv_cfg["kv_memory_limit"] = cfg["kv_memory_limit"];
-    if (!cfg["kv_allocate_blocks"].is_null())
-        kv_cfg["kv_allocate_blocks"] = cfg["kv_allocate_blocks"];
-    if (!cfg["kv_evict_max_misses"].is_null())
-        kv_cfg["kv_evict_max_misses"] = cfg["kv_evict_max_misses"];
-    if (!cfg["kv_evict_attempts_per_level"].is_null())
-        kv_cfg["kv_evict_attempts_per_level"] = cfg["kv_evict_attempts_per_level"];
-    if (!cfg["kv_evict_unused_age"].is_null())
-        kv_cfg["kv_evict_unused_age"] = cfg["kv_evict_unused_age"];
-    if (!cfg["kv_log_level"].is_null())
-    {
-        log_level = cfg["kv_log_level"].uint64_value();
-        trace = log_level >= 10;
-        kv_cfg["kv_log_level"] = cfg["kv_log_level"];
-    }
-    total_prob = reopen_prob+get_prob+add_prob+update_prob+del_prob+list_prob;
-    stat.get.name = "get";
-    stat.add.name = "add";
-    stat.update.name = "update";
-    stat.del.name = "del";
-    stat.list.name = "list";
-}
-
-void kv_test_t::run(json11::Json cfg)
-{
-    srand48(time(NULL));
-    parse_config(cfg);
-    // Create client
-    ringloop = new ring_loop_t(512);
-    epmgr = new epoll_manager_t(ringloop);
-    cli = new cluster_client_t(ringloop, epmgr->tfd, cfg);
-    db = new kv_dbw_t(cli);
-    // Load image metadata
-    while (!cli->is_ready())
-    {
-        ringloop->loop();
-        if (cli->is_ready())
-            break;
-        ringloop->wait();
-    }
-    // Run
-    reopening = true;
-    db->open(inode_id, kv_cfg, [this](int res)
-    {
-        reopening = false;
-        if (res < 0)
-        {
-            fprintf(stderr, "ERROR: Open index: %d (%s)\n", res, strerror(-res));
-            exit(1);
-        }
-        if (trace)
-            printf("Index opened\n");
-        ringloop->wakeup();
-    });
-    consumer.loop = [this]() { loop(); };
-    ringloop->register_consumer(&consumer);
-    if (print_stats_interval)
-        stat_timer_id = epmgr->tfd->set_timer(print_stats_interval*1000, true, [this](int) { print_stats(prev_stat, prev_stat_time); });
-    clock_gettime(CLOCK_REALTIME, &start_stat_time);
-    prev_stat_time = start_stat_time;
-    while (!finished)
-    {
-        ringloop->loop();
-        if (!finished)
-            ringloop->wait();
-    }
-    if (stat_timer_id >= 0)
-        epmgr->tfd->clear_timer(stat_timer_id);
-    ringloop->unregister_consumer(&consumer);
-    // Print total stats
-    print_total_stats();
-    // Destroy the client
-    delete db;
-    db = NULL;
-    cli->flush();
-    delete cli;
-    delete epmgr;
-    delete ringloop;
-    cli = NULL;
-    epmgr = NULL;
-    ringloop = NULL;
-}
-
-static const char *base64_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789@+/";
-
-std::string random_str(int len)
-{
-    std::string str;
-    str.resize(len);
-    for (int i = 0; i < len; i++)
-    {
-        str[i] = base64_chars[lrand48() % 64];
-    }
-    return str;
-}
-
-void kv_test_t::loop()
-{
-    if (reopening)
-    {
-        return;
-    }
-    if (ops_done >= op_count)
-    {
-        finished = true;
-    }
-    while (!finished && ops_sent < op_count && in_progress < parallelism)
-    {
-        uint64_t dice = (lrand48() % total_prob);
-        if (dice < reopen_prob)
-        {
-            reopening = true;
-            db->close([this]()
-            {
-                if (trace)
-                    printf("Index closed\n");
-                db->open(inode_id, kv_cfg, [this](int res)
-                {
-                    reopening = false;
-                    if (res < 0)
-                    {
-                        fprintf(stderr, "ERROR: Reopen index: %d (%s)\n", res, strerror(-res));
-                        finished = true;
-                        return;
-                    }
-                    if (trace)
-                        printf("Index reopened\n");
-                    ringloop->wakeup();
-                });
-            });
-            return;
-        }
-        else if (dice < reopen_prob+get_prob)
-        {
-            // get existing
-            auto key = random_str(max_key_len);
-            auto k_it = values.lower_bound(key);
-            if (k_it == values.end())
-                continue;
-            key = k_it->first;
-            if (changing_keys.find(key) != changing_keys.end())
-                continue;
-            in_progress++;
-            ops_sent++;
-            if (trace)
-                printf("get %s\n", key.c_str());
-            timespec tv_begin;
-            clock_gettime(CLOCK_REALTIME, &tv_begin);
-            db->get(key, [this, key, tv_begin](int res, const std::string & value)
-            {
-                add_stat(stat.get, tv_begin);
-                ops_done++;
-                in_progress--;
-                auto it = values.find(key);
-                if (res != (it == values.end() ? -ENOENT : 0))
-                {
-                    fprintf(stderr, "ERROR: get %s: %d (%s)\n", key.c_str(), res, strerror(-res));
-                    if (stop_on_error)
-                        exit(1);
-                }
-                else if (it != values.end() && value != it->second)
-                {
-                    fprintf(stderr, "ERROR: get %s: mismatch: %s vs %s\n", key.c_str(), value.c_str(), it->second.c_str());
-                    if (stop_on_error)
-                        exit(1);
-                }
-                ringloop->wakeup();
-            });
-        }
-        else if (dice < reopen_prob+get_prob+add_prob+update_prob)
-        {
-            bool is_add = false;
-            std::string key;
-            if (dice < reopen_prob+get_prob+add_prob)
-            {
-                // add
-                is_add = true;
-                uint64_t key_len = min_key_len + (max_key_len > min_key_len ? lrand48() % (max_key_len-min_key_len) : 0);
-                key = key_prefix + random_str(key_len) + key_suffix;
-            }
-            else
-            {
-                // update
-                key = random_str(max_key_len);
-                auto k_it = values.lower_bound(key);
-                if (k_it == values.end())
-                    continue;
-                key = k_it->first;
-            }
-            if (changing_keys.find(key) != changing_keys.end())
-                continue;
-            uint64_t value_len = min_value_len + (max_value_len > min_value_len ? lrand48() % (max_value_len-min_value_len) : 0);
-            auto value = random_str(value_len);
-            start_change(key);
-            ops_sent++;
-            in_progress++;
-            if (trace)
-                printf("set %s = %s\n", key.c_str(), value.c_str());
-            timespec tv_begin;
-            clock_gettime(CLOCK_REALTIME, &tv_begin);
-            db->set(key, value, [this, key, value, tv_begin, is_add](int res)
-            {
-                add_stat(is_add ? stat.add : stat.update, tv_begin);
-                stop_change(key);
-                ops_done++;
-                in_progress--;
-                if (res != 0)
-                {
-                    fprintf(stderr, "ERROR: set %s = %s: %d (%s)\n", key.c_str(), value.c_str(), res, strerror(-res));
-                    if (stop_on_error)
-                        exit(1);
-                }
-                else
-                {
-                    values[key] = value;
-                }
-                ringloop->wakeup();
-            }, NULL);
-        }
-        else if (dice < reopen_prob+get_prob+add_prob+update_prob+del_prob)
-        {
-            // delete
-            auto key = random_str(max_key_len);
-            auto k_it = values.lower_bound(key);
-            if (k_it == values.end())
-                continue;
-            key = k_it->first;
-            if (changing_keys.find(key) != changing_keys.end())
-                continue;
-            start_change(key);
-            ops_sent++;
-            in_progress++;
-            if (trace)
-                printf("del %s\n", key.c_str());
-            timespec tv_begin;
-            clock_gettime(CLOCK_REALTIME, &tv_begin);
-            db->del(key, [this, key, tv_begin](int res)
-            {
-                add_stat(stat.del, tv_begin);
-                stop_change(key);
-                ops_done++;
-                in_progress--;
-                if (res != 0)
-                {
-                    fprintf(stderr, "ERROR: del %s: %d (%s)\n", key.c_str(), res, strerror(-res));
-                    if (stop_on_error)
-                        exit(1);
-                }
-                else
-                {
-                    values.erase(key);
-                }
-                ringloop->wakeup();
-            }, NULL);
-        }
-        else if (dice < reopen_prob+get_prob+add_prob+update_prob+del_prob+list_prob)
-        {
-            // list
-            ops_sent++;
-            in_progress++;
-            auto key = random_str(max_key_len);
-            auto lst = new kv_test_listing_t;
-            auto k_it = values.lower_bound(key);
-            lst->count = min_list_count + (max_list_count > min_list_count ? lrand48() % (max_list_count-min_list_count) : 0);
-            lst->handle = db->list_start(k_it == values.begin() ? key_prefix : key);
-            lst->next_after = k_it == values.begin() ? key_prefix : key;
-            lst->inflights = changing_keys;
-            listings.insert(lst);
-            if (trace)
-                printf("list from %s\n", key.c_str());
-            clock_gettime(CLOCK_REALTIME, &lst->tv_begin);
-            db->list_next(lst->handle, [this, lst](int res, const std::string & key, const std::string & value)
-            {
-                if (log_level >= 11)
-                    printf("list: %s = %s\n", key.c_str(), value.c_str());
-                if (res >= 0 && key_prefix.size() && (key.size() < key_prefix.size() ||
-                    key.substr(0, key_prefix.size()) != key_prefix))
-                {
-                    // stop at this key
-                    res = -ENOENT;
-                }
-                if (res < 0 || (lst->count > 0 && lst->done >= lst->count))
-                {
-                    add_stat(stat.list, lst->tv_begin);
-                    if (res == 0)
-                    {
-                        // ok (done >= count)
-                    }
-                    else if (res != -ENOENT)
-                    {
-                        fprintf(stderr, "ERROR: list: %d (%s)\n", res, strerror(-res));
-                        lst->error = true;
-                    }
-                    else
-                    {
-                        auto k_it = lst->next_after == "" ? values.begin() : values.upper_bound(lst->next_after);
-                        while (k_it != values.end())
-                        {
-                            while (k_it != values.end() && lst->inflights.find(k_it->first) != lst->inflights.end())
-                                k_it++;
-                            if (k_it != values.end())
-                            {
-                                fprintf(stderr, "ERROR: list: missing key %s\n", (k_it++)->first.c_str());
-                                lst->error = true;
-                            }
-                        }
-                    }
-                    if (lst->error && stop_on_error)
-                        exit(1);
-                    ops_done++;
-                    in_progress--;
-                    db->list_close(lst->handle);
-                    delete lst;
-                    listings.erase(lst);
-                    ringloop->wakeup();
-                }
-                else
-                {
-                    stat.list_keys++;
-                    // Do not check modified keys in listing
-                    // Listing may return their old or new state
-                    if ((!key_suffix.size() || key.size() >= key_suffix.size() &&
-                        key.substr(key.size()-key_suffix.size()) == key_suffix) &&
-                        lst->inflights.find(key) == lst->inflights.end())
-                    {
-                        lst->done++;
-                        auto k_it = lst->next_after == "" ? values.begin() : values.upper_bound(lst->next_after);
-                        while (true)
-                        {
-                            while (k_it != values.end() && lst->inflights.find(k_it->first) != lst->inflights.end())
-                            {
-                                k_it++;
-                            }
-                            if (k_it == values.end() || k_it->first > key)
-                            {
-                                fprintf(stderr, "ERROR: list: extra key %s\n", key.c_str());
-                                lst->error = true;
-                                break;
-                            }
-                            else if (k_it->first < key)
-                            {
-                                fprintf(stderr, "ERROR: list: missing key %s\n", k_it->first.c_str());
-                                lst->error = true;
-                                lst->next_after = k_it->first;
-                                k_it++;
-                            }
-                            else
-                            {
-                                if (k_it->second != value)
-                                {
-                                    fprintf(stderr, "ERROR: list: mismatch: %s = %s but should be %s\n",
-                                        key.c_str(), value.c_str(), k_it->second.c_str());
-                                    lst->error = true;
-                                }
-                                lst->next_after = k_it->first;
-                                break;
-                            }
-                        }
-                    }
-                    db->list_next(lst->handle, NULL);
-                }
-            });
-        }
-    }
-}
-
-void kv_test_t::add_stat(kv_test_lat_t & stat, timespec tv_begin)
-{
-    timespec tv_end;
-    clock_gettime(CLOCK_REALTIME, &tv_end);
-    int64_t usec = (tv_end.tv_sec - tv_begin.tv_sec)*1000000 +
-        (tv_end.tv_nsec - tv_begin.tv_nsec)/1000;
-    if (usec > 0)
-    {
-        stat.usec += usec;
-        stat.count++;
-    }
-}
-
-void kv_test_t::print_stats(kv_test_stat_t & prev_stat, timespec & prev_stat_time)
-{
-    timespec cur_stat_time;
-    clock_gettime(CLOCK_REALTIME, &cur_stat_time);
-    int64_t usec = (cur_stat_time.tv_sec - prev_stat_time.tv_sec)*1000000 +
-        (cur_stat_time.tv_nsec - prev_stat_time.tv_nsec)/1000;
-    if (usec > 0)
-    {
-        kv_test_lat_t *lats[] = { &stat.get, &stat.add, &stat.update, &stat.del, &stat.list };
-        kv_test_lat_t *prev[] = { &prev_stat.get, &prev_stat.add, &prev_stat.update, &prev_stat.del, &prev_stat.list };
-        if (!json_output)
-        {
-            char buf[128] = { 0 };
-            for (int i = 0; i < sizeof(lats)/sizeof(lats[0]); i++)
-            {
-                snprintf(buf, sizeof(buf)-1, "%.1f %s/s (%lu us)", (lats[i]->count-prev[i]->count)*1000000.0/usec,
-                    lats[i]->name, (lats[i]->usec-prev[i]->usec)/(lats[i]->count-prev[i]->count > 0 ? lats[i]->count-prev[i]->count : 1));
-                int k;
-                for (k = strlen(buf); k < strlen(lats[i]->name)+21; k++)
-                    buf[k] = ' ';
-                buf[k] = 0;
-                printf("%s", buf);
-            }
-            printf("\n");
-        }
-        else
-        {
-            int64_t runtime = (cur_stat_time.tv_sec - start_stat_time.tv_sec)*1000000 +
-                (cur_stat_time.tv_nsec - start_stat_time.tv_nsec)/1000;
-            printf("{\"runtime\":%.1f", (double)runtime/1000000.0);
-            for (int i = 0; i < sizeof(lats)/sizeof(lats[0]); i++)
-            {
-                if (lats[i]->count > prev[i]->count)
-                {
-                    printf(
-                        ",\"%s\":{\"avg\":{\"iops\":%.1f,\"usec\":%lu},\"total\":{\"count\":%lu,\"usec\":%lu}}",
-                        lats[i]->name, (lats[i]->count-prev[i]->count)*1000000.0/usec,
-                        (lats[i]->usec-prev[i]->usec)/(lats[i]->count-prev[i]->count),
-                        lats[i]->count, lats[i]->usec
-                    );
-                }
-            }
-            printf("}\n");
-        }
-    }
-    prev_stat = stat;
-    prev_stat_time = cur_stat_time;
-}
-
-void kv_test_t::print_total_stats()
-{
-    if (!json_output)
-        printf("Total:\n");
-    kv_test_stat_t start_stats;
-    timespec start_stat_time = this->start_stat_time;
-    print_stats(start_stats, start_stat_time);
-}
-
-void kv_test_t::start_change(const std::string & key)
-{
-    changing_keys.insert(key);
-    for (auto lst: listings)
-    {
-        lst->inflights.insert(key);
-    }
-}
-
-void kv_test_t::stop_change(const std::string & key)
-{
-    changing_keys.erase(key);
-}
-
-int main(int narg, const char *args[])
-{
-    setvbuf(stdout, NULL, _IONBF, 0);
-    setvbuf(stderr, NULL, _IONBF, 0);
-    exe_name = args[0];
-    kv_test_t *p = new kv_test_t();
-    p->run(kv_test_t::parse_args(narg, args));
-    delete p;
-    return 0;
-}

src/vitastor.pc.in

@@ -6,7 +6,7 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
 
 Name: Vitastor
 Description: Vitastor client library
-Version: 1.3.1
+Version: 1.4.1
 Libs: -L${libdir} -lvitastor_client
 Cflags: -I${includedir}
 

tests/run_3osds.sh

@@ -10,6 +10,7 @@ SCHEME=${SCHEME:-replicated}
 # OFFSET_ARGS
 # PG_SIZE
 # PG_MINSIZE
+# GLOBAL_CONFIG
 
 if [ "$SCHEME" = "ec" ]; then
     OSD_COUNT=${OSD_COUNT:-5}
@@ -19,10 +20,10 @@ fi
 
 if [ "$IMMEDIATE_COMMIT" != "" ]; then
     NO_SAME="--journal_no_same_sector_overwrites true --journal_sector_buffer_count 1024 --disable_data_fsync 1 --immediate_commit all --log_level 10 --etcd_stats_interval 5"
-    $ETCDCTL put /vitastor/config/global '{"recovery_queue_depth":1,"recovery_tune_util_low":1,"osd_out_time":1,"immediate_commit":"all","client_enable_writeback":true}'
+    $ETCDCTL put /vitastor/config/global '{"recovery_queue_depth":1,"recovery_tune_util_low":1,"immediate_commit":"all","client_enable_writeback":true,"client_max_writeback_iodepth":32'$GLOBAL_CONFIG'}'
 else
     NO_SAME="--journal_sector_buffer_count 1024 --log_level 10 --etcd_stats_interval 5"
-    $ETCDCTL put /vitastor/config/global '{"recovery_queue_depth":1,"recovery_tune_util_low":1,"osd_out_time":1,"client_enable_writeback":true}'
+    $ETCDCTL put /vitastor/config/global '{"recovery_queue_depth":1,"recovery_tune_util_low":1,"client_enable_writeback":true,"client_max_writeback_iodepth":32'$GLOBAL_CONFIG'}'
 fi
 
 start_osd_on()
@@ -53,7 +54,7 @@ for i in $(seq 1 $OSD_COUNT); do
     start_osd $i
 done
 
-(while true; do node mon/mon-main.js --etcd_address $ETCD_URL --etcd_prefix "/vitastor" --verbose 1 || true; done) >>./testdata/mon.log 2>&1 &
+(while true; do set +e; node mon/mon-main.js --etcd_address $ETCD_URL --etcd_prefix "/vitastor" --verbose 1; if [[ $? -ne 2 ]]; then break; fi; done) >>./testdata/mon.log 2>&1 &
 MON_PID=$!
 
 if [ "$SCHEME" = "ec" ]; then

tests/run_tests.sh

@@ -45,6 +45,8 @@ IMMEDIATE_COMMIT=1 ./test_rebalance_verify.sh
 SCHEME=ec ./test_rebalance_verify.sh
 SCHEME=ec IMMEDIATE_COMMIT=1 ./test_rebalance_verify.sh
 
+./test_switch_primary.sh
+
 ./test_write.sh
 SCHEME=xor ./test_write.sh
 

tests/test_add_osd.sh

@@ -1,7 +1,7 @@
 #!/bin/bash -ex
 
 PG_COUNT=2048
-
+GLOBAL_CONFIG=',"osd_out_time":1'
 . `dirname $0`/run_3osds.sh
 
 LD_PRELOAD="build/src/libfio_vitastor.so" \

tests/test_heal.sh

@@ -9,6 +9,7 @@ if [[ "$SCHEME" = "ec" ]]; then
 fi
 OSD_COUNT=${OSD_COUNT:-7}
 PG_COUNT=32
+GLOBAL_CONFIG=',"osd_out_time":1'
 . `dirname $0`/run_3osds.sh
 check_qemu
 

tests/test_minsize_1.sh

@@ -2,6 +2,7 @@
 
 PG_MINSIZE=1
 SCHEME=replicated
+GLOBAL_CONFIG=',"osd_out_time":1'
 
 . `dirname $0`/run_3osds.sh
 

tests/test_splitbrain.sh

@@ -4,6 +4,7 @@ OSD_COUNT=2
 PG_SIZE=2
 PG_MINSIZE=1
 SCHEME=replicated
+GLOBAL_CONFIG=',"osd_out_time":1'
 
 . `dirname $0`/run_3osds.sh
 

tests/test_switch_primary.sh

@@ -0,0 +1,18 @@
+#!/bin/bash -ex
+
+. `dirname $0`/run_3osds.sh
+
+primary=$($ETCDCTL get --print-value-only /vitastor/config/pgs | jq -r '.items["1"]["1"].primary')
+primary_pid=OSD${primary}_PID
+kill -9 ${!primary_pid}
+
+sleep 15
+wait_condition 10 "$ETCDCTL get --print-value-only /vitastor/config/pgs | jq -s -e '.[0].items[\"1\"][\"1\"].primary != \"$primary\"'"
+
+newprim=$($ETCDCTL get --print-value-only /vitastor/config/pgs | jq -r '.items["1"]["1"].primary')
+
+if [ "$newprim" = "$primary" ]; then
+    format_error Primary not switched
+fi
+
+format_green OK