Release 1.9.2

New features: - Support resizing normal vitastor-disk partitions and moving journal/metadata: [vitastor-disk resize](https://vitastor.io/docs/usage/disk.html#resize) - Support simple forms of vitastor-disk {dump,write}-{meta,journal} for OSD partitions Bug fixes: - Fix block RWX volumes broken after introducing stage/unstage support - Do not allow to create non-block RWX volumes in CSI - Fix vitastor-disk prepare not seeing the newly created partition in rare cases - Fix non-array tags not showing up in ls-osd/osd-tree - Make OpenNebula oned.conf patching during installation smarter - Fix iseek option in vitastor-cli dd not working - Validate conv=, iflag=, oflag= options in vitastor-cli dd - Fix vitastor-disk write-meta not writing header checksum to the disk - Fix JSON format in vitastor-disk dump-meta - Fix read_chain_bitmap not working for snapshot in another pool - Fix a possible OSD crash during parallel read & write to an image with snapshots - Several followups to the READ_CHAIN_BITMAP fix: avoid data reads, fix possible overflow in is_zero(), fix bitmap size
Add new disk command docs
2024-10-20 01:49:13 +03:00 · 2024-10-20 01:47:46 +03:00 · 2024-10-19 11:56:56 +03:00 · 2024-10-18 01:55:38 +03:00 · 2024-10-18 01:55:19 +03:00 · 2024-10-12 18:07:53 +03:00
118 changed files with 1255 additions and 1257 deletions
@@ -828,6 +828,24 @@ jobs:
          echo ""
        done

+  test_snapshot_pool2:
+    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_snapshot_pool2.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_osd_tags:
    runs-on: ubuntu-latest
    needs: build
@@ -2,6 +2,6 @@ cmake_minimum_required(VERSION 2.8.12)

 project(vitastor)

-set(VITASTOR_VERSION "1.8.0")
+set(VITASTOR_VERSION "1.9.2")

 add_subdirectory(src)
@@ -1,4 +1,4 @@
-## Vitastor
+# Vitastor

 [Read English version](README.md)

@@ -22,7 +22,7 @@ TCP и RDMA и на хорошем железе может достигать з
 Vitastor поддерживает QEMU-драйвер, протоколы NBD и NFS, драйверы OpenStack, OpenNebula, Proxmox, Kubernetes.
 Другие драйверы могут также быть легко реализованы.

-Подробности смотрите в документации по ссылкам ниже.
+Подробности смотрите в документации по ссылкам. Можете начать отсюда: [Быстрый старт](docs/intro/quickstart.ru.md).

 ## Презентации и записи докладов

@@ -51,7 +51,7 @@ Vitastor поддерживает QEMU-драйвер, протоколы NBD и
  - Параметры
    - [Общие](docs/config/common.ru.md)
    - [Сетевые](docs/config/network.ru.md)
-    - [Клиентский код](docs/config/client.en.md)
+    - [Клиентский код](docs/config/client.ru.md)
    - [Глобальные дисковые параметры](docs/config/layout-cluster.ru.md)
    - [Дисковые параметры OSD](docs/config/layout-osd.ru.md)
    - [Прочие параметры OSD](docs/config/osd.ru.md)
@@ -22,7 +22,7 @@ or internal systems of public clouds.
 Vitastor supports QEMU, NBD, NFS protocols, OpenStack, OpenNebula, Proxmox, Kubernetes drivers.
 More drivers may be created easily.

-Read more details below in the documentation.
+Read more details in the documentation. You can start from here: [Quick Start](docs/intro/quickstart.en.md).

 ## Talks and presentations

@@ -1,4 +1,4 @@
-VITASTOR_VERSION ?= v1.8.0
+VITASTOR_VERSION ?= v1.9.2

 all: build push

@@ -49,7 +49,7 @@ spec:
            capabilities:
              add: ["SYS_ADMIN"]
            allowPrivilegeEscalation: true
-          image: vitalif/vitastor-csi:v1.8.0
+          image: vitalif/vitastor-csi:v1.9.2
          args:
            - "--node=$(NODE_ID)"
            - "--endpoint=$(CSI_ENDPOINT)"
@@ -121,7 +121,7 @@ spec:
            privileged: true
            capabilities:
              add: ["SYS_ADMIN"]
-          image: vitalif/vitastor-csi:v1.8.0
+          image: vitalif/vitastor-csi:v1.9.2
          args:
            - "--node=$(NODE_ID)"
            - "--endpoint=$(CSI_ENDPOINT)"
@@ -3,10 +3,10 @@ module vitastor.io/csi
 go 1.15

 require (
-	github.com/container-storage-interface/spec v1.4.0
+	github.com/container-storage-interface/spec v1.8.0
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	github.com/kubernetes-csi/csi-lib-utils v0.9.1
-	golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb
+	golang.org/x/net v0.7.0
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	google.golang.org/grpc v1.33.1
 	google.golang.org/protobuf v1.24.0
@@ -41,8 +41,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR
 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/container-storage-interface/spec v1.8.0 h1:D0vhF3PLIZwlwZEf2eNbpujGCNwspwTYf2idJRJx4xI=
+github.com/container-storage-interface/spec v1.8.0/go.mod h1:ROLik+GhPslwwWRNFF1KasPzroNARibH2rfz1rkg4H0=
 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=
@@ -182,6 +182,7 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 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/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 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=
@@ -195,6 +196,7 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U
 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/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 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=
@@ -213,6 +215,7 @@ golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCc
 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.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 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=
@@ -228,8 +231,10 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/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/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-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/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 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=
@@ -240,6 +245,7 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
 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-20220722155255-886fb9371eb4/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=
@@ -259,13 +265,22 @@ golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7w
 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/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/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 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/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 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/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -286,8 +301,10 @@ golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgw
 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.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 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/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -5,7 +5,7 @@ package vitastor

 const (
    vitastorCSIDriverName    = "csi.vitastor.io"
-    vitastorCSIDriverVersion = "1.8.0"
+    vitastorCSIDriverVersion = "1.9.2"
 )

 // Config struct fills the parameters of request or user input
@@ -158,6 +158,12 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
        return nil, status.Error(codes.InvalidArgument, "volume capabilities is a required field")
    }

+    err := cs.checkCaps(volumeCapabilities)
+    if (err != nil)
+    {
+        return nil, err
+    }
+
    etcdVolumePrefix := req.Parameters["etcdVolumePrefix"]
    poolId, _ := strconv.ParseUint(req.Parameters["poolId"], 10, 64)
    if (poolId == 0)
@@ -301,13 +307,44 @@ func (cs *ControllerServer) ValidateVolumeCapabilities(ctx context.Context, req
        return nil, status.Error(codes.InvalidArgument, "volumeCapabilities is nil")
    }

+    err := cs.checkCaps(volumeCapabilities)
+    if (err != nil)
+    {
+        return nil, err
+    }
+
+    return &csi.ValidateVolumeCapabilitiesResponse{
+        Confirmed: &csi.ValidateVolumeCapabilitiesResponse_Confirmed{
+            VolumeCapabilities: req.VolumeCapabilities,
+        },
+    }, nil
+}
+
+func (cs *ControllerServer) checkCaps(volumeCapabilities []*csi.VolumeCapability) error
+{
    var volumeCapabilityAccessModes []*csi.VolumeCapability_AccessMode
    for _, mode := range []csi.VolumeCapability_AccessMode_Mode{
        csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
-        csi.VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER,
+        csi.VolumeCapability_AccessMode_SINGLE_NODE_READER_ONLY,
+        csi.VolumeCapability_AccessMode_MULTI_NODE_READER_ONLY,
+        csi.VolumeCapability_AccessMode_SINGLE_NODE_SINGLE_WRITER,
+        csi.VolumeCapability_AccessMode_SINGLE_NODE_MULTI_WRITER,
    } {
        volumeCapabilityAccessModes = append(volumeCapabilityAccessModes, &csi.VolumeCapability_AccessMode{Mode: mode})
    }
+    for _, capability := range volumeCapabilities
+    {
+        if (capability.GetBlock() != nil)
+        {
+            for _, mode := range []csi.VolumeCapability_AccessMode_Mode{
+                csi.VolumeCapability_AccessMode_MULTI_NODE_SINGLE_WRITER,
+                csi.VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER,
+            } {
+                volumeCapabilityAccessModes = append(volumeCapabilityAccessModes, &csi.VolumeCapability_AccessMode{Mode: mode})
+            }
+            break
+        }
+    }

    capabilitySupport := false
    for _, capability := range volumeCapabilities
@@ -323,14 +360,10 @@ func (cs *ControllerServer) ValidateVolumeCapabilities(ctx context.Context, req

    if (!capabilitySupport)
    {
-        return nil, status.Errorf(codes.NotFound, "%v not supported", req.GetVolumeCapabilities())
+        return status.Errorf(codes.NotFound, "%v not supported", volumeCapabilities)
    }

-    return &csi.ValidateVolumeCapabilitiesResponse{
-        Confirmed: &csi.ValidateVolumeCapabilitiesResponse_Confirmed{
-            VolumeCapabilities: req.VolumeCapabilities,
-        },
-    }, nil
+    return nil
 }

 // ListVolumes returns a list of volumes
@@ -228,6 +228,26 @@ func (ns *NodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVol

    // Check that it's not already mounted
    _, err = mount.IsNotMountPoint(ns.mounter, targetPath)
+    if (err == nil)
+    {
+        var finfo os.FileInfo
+        finfo, err = os.Stat(targetPath)
+        if (err != nil)
+        {
+            klog.Errorf("failed to stat %s: %v", targetPath, err)
+            return nil, err
+        }
+        if (finfo.IsDir() != (!isBlock))
+        {
+            err = os.Remove(targetPath)
+            if (err != nil)
+            {
+                klog.Errorf("failed to remove %s (to recreate it with correct type): %v", targetPath, err)
+                return nil, err
+            }
+            err = os.ErrNotExist
+        }
+    }
    if (err != nil)
    {
        if (os.IsNotExist(err))
@@ -385,7 +405,7 @@ func (ns *NodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstag
    defer ns.unlockVolume(ctxVars["configPath"]+":"+volName)

    targetPath := req.GetStagingTargetPath()
-    devicePath, refCount, err := mount.GetDeviceNameFromMount(ns.mounter, targetPath)
+    devicePath, _, err := mount.GetDeviceNameFromMount(ns.mounter, targetPath)
    if (err != nil)
    {
        if (os.IsNotExist(err))
@@ -402,6 +422,16 @@ func (ns *NodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstag
        return &csi.NodeUnstageVolumeResponse{}, nil
    }

+    refList, err := ns.mounter.GetMountRefs(targetPath)
+    if (err != nil)
+    {
+        return nil, err
+    }
+    if (len(refList) > 0)
+    {
+        klog.Warningf("%s is still referenced: %v", targetPath, refList)
+    }
+
    // unmount
    err = mount.CleanupMountPoint(targetPath, ns.mounter, false)
    if (err != nil)
@@ -410,7 +440,7 @@ func (ns *NodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstag
    }

    // unmap device
-    if (refCount == 1)
+    if (len(refList) == 0)
    {
        if (!ns.useVduse)
        {
@@ -1,4 +1,4 @@
-vitastor (1.8.0-1) unstable; urgency=medium
+vitastor (1.9.2-1) unstable; urgency=medium

  * Bugfixes

@@ -106,8 +106,8 @@ SSD cache or "media-cache" - for example, a lot of Seagate EXOS drives have
 it (they have internal SSD cache even though it's not stated in datasheets).

 Setting this parameter to "all" or "small" in OSD parameters requires enabling
-[disable_journal_fsync](layout-osd.en.yml#disable_journal_fsync) and
-[disable_meta_fsync](layout-osd.en.yml#disable_meta_fsync), setting it to
-"all" also requires enabling [disable_data_fsync](layout-osd.en.yml#disable_data_fsync).
+[disable_journal_fsync](layout-osd.en.md#disable_journal_fsync) and
+[disable_meta_fsync](layout-osd.en.md#disable_meta_fsync), setting it to
+"all" also requires enabling [disable_data_fsync](layout-osd.en.md#disable_data_fsync).
 vitastor-disk tried to do that by default, first checking/disabling drive cache.
 If it can't disable drive cache, OSD get initialized with "none".
@@ -112,6 +112,6 @@ HDD-дисках с внутренним SSD или "медиа" кэшем - н
 указано в спецификациях).

 Указание "all" или "small" в настройках / командной строке OSD требует
-включения [disable_journal_fsync](layout-osd.ru.yml#disable_journal_fsync) и
-[disable_meta_fsync](layout-osd.ru.yml#disable_meta_fsync), значение "all"
-также требует включения [disable_data_fsync](layout-osd.ru.yml#disable_data_fsync).
+включения [disable_journal_fsync](layout-osd.ru.md#disable_journal_fsync) и
+[disable_meta_fsync](layout-osd.ru.md#disable_meta_fsync), значение "all"
+также требует включения [disable_data_fsync](layout-osd.ru.md#disable_data_fsync).
@@ -55,7 +55,7 @@ Examples:
 OSD placement tree is set in a separate etcd key `/vitastor/config/node_placement`
 in the following JSON format:

-`
+```
 {
  "<node name or OSD number>": {
    "level": "<level>",
@@ -63,7 +63,7 @@ in the following JSON format:
  },
  ...
 }
-`
+```

 Here, if a node name is a number then it is assumed to refer to an OSD.
 Level of the OSD is always "osd" and cannot be overriden. You may only
@@ -54,7 +54,7 @@
 Дерево размещения OSD задаётся в отдельном ключе etcd `/vitastor/config/node_placement`
 в следующем JSON-формате:

-`
+```
 {
  "<имя узла или номер OSD>": {
    "level": "<уровень>",
@@ -62,7 +62,7 @@
  },
  ...
 }
-`
+```

 Здесь, если название узла - число, считается, что это OSD. Уровень OSD
 всегда равен "osd" и не может быть переопределён. Для OSD вы можете только
@@ -97,9 +97,9 @@
    it (they have internal SSD cache even though it's not stated in datasheets).

    Setting this parameter to "all" or "small" in OSD parameters requires enabling
-    [disable_journal_fsync](layout-osd.en.yml#disable_journal_fsync) and
-    [disable_meta_fsync](layout-osd.en.yml#disable_meta_fsync), setting it to
-    "all" also requires enabling [disable_data_fsync](layout-osd.en.yml#disable_data_fsync).
+    [disable_journal_fsync](layout-osd.en.md#disable_journal_fsync) and
+    [disable_meta_fsync](layout-osd.en.md#disable_meta_fsync), setting it to
+    "all" also requires enabling [disable_data_fsync](layout-osd.en.md#disable_data_fsync).
    vitastor-disk tried to do that by default, first checking/disabling drive cache.
    If it can't disable drive cache, OSD get initialized with "none".
  info_ru: |
@@ -156,6 +156,6 @@
    указано в спецификациях).

    Указание "all" или "small" в настройках / командной строке OSD требует
-    включения [disable_journal_fsync](layout-osd.ru.yml#disable_journal_fsync) и
-    [disable_meta_fsync](layout-osd.ru.yml#disable_meta_fsync), значение "all"
-    также требует включения [disable_data_fsync](layout-osd.ru.yml#disable_data_fsync).
+    включения [disable_journal_fsync](layout-osd.ru.md#disable_journal_fsync) и
+    [disable_meta_fsync](layout-osd.ru.md#disable_meta_fsync), значение "all"
+    также требует включения [disable_data_fsync](layout-osd.ru.md#disable_data_fsync).
@@ -1,55 +0,0 @@
-#!/usr/bin/nodejs
-
-const fs = require('fs');
-const yaml = require('yaml');
-
-const L = {
-    en: {},
-    ru: {
-        Type: 'Тип',
-        Default: 'Значение по умолчанию',
-        Minimum: 'Минимальное значение',
-    },
-};
-const types = {
-    en: {
-        string: 'string',
-        bool: 'boolean',
-        int: 'integer',
-        sec: 'seconds',
-        ms: 'milliseconds',
-        us: 'microseconds',
-    },
-    ru: {
-        string: 'строка',
-        bool: 'булево (да/нет)',
-        int: 'целое число',
-        sec: 'секунды',
-        ms: 'миллисекунды',
-        us: 'микросекунды',
-    },
-};
-const params_files = fs.readdirSync(__dirname+'/params')
-    .filter(f => f.substr(-4) == '.yml')
-    .map(f => f.substr(0, f.length-4));
-
-for (const file of params_files)
-{
-    const cfg = yaml.parse(fs.readFileSync(__dirname+'/params/'+file+'.yml', { encoding: 'utf-8' }));
-    for (const lang in types)
-    {
-        let out = '\n\n{{< toc >}}';
-        for (const c of cfg)
-        {
-            out += `\n\n## ${c.name}\n\n`;
-            out += `- ${L[lang]['Type'] || 'Type'}: ${c["type_"+lang] || types[lang][c.type] || c.type}\n`;
-            if (c.default !== undefined)
-                out += `- ${L[lang]['Default'] || 'Default'}: ${c.default}\n`;
-            if (c.min !== undefined)
-                out += `- ${L[lang]['Minimum'] || 'Minimum'}: ${c.min}\n`;
-            out += `\n`+(c["info_"+lang] || c["info"]).replace(/\s+$/, '');
-        }
-        const head = fs.readFileSync(__dirname+'/params/head/'+file+'.'+lang+'.md', { encoding: 'utf-8' });
-        fs.writeFileSync(__dirname+'/hugo/content/config/'+file+'.'+lang+'.md', head.replace(/\s+$/, '')+out+"\n");
-    }
-}
@@ -4,6 +4,8 @@

 [Читать на русском](opennebula.ru.md)

+# OpenNebula
+
 ## Automatic Installation

 OpenNebula plugin is packaged as `vitastor-opennebula` Debian and RPM package since Vitastor 1.9.0. So:
@@ -4,6 +4,8 @@

 [Read in English](opennebula.en.md)

+# OpenNebula
+
 ## Автоматическая установка

 Плагин OpenNebula Vitastor распространяется как Debian и RPM пакет `vitastor-opennebula`, начиная с версии Vitastor 1.9.0. Так что:
@@ -22,7 +22,7 @@
  использовать и десктопные SSD, включив режим отложенного fsync, но производительность будет хуже.
  О конденсаторах читайте [здесь](../config/layout-cluster.ru.md#immediate_commit).
 - Если хотите использовать HDD, берите современные модели с Media или SSD кэшем - HGST Ultrastar,
-  Toshiba MG08, Seagate EXOS или что-то похожее. Если такого кэша у ваших дисков нет,
+  Toshiba MG, Seagate EXOS или что-то похожее. Если такого кэша у ваших дисков нет,
  обязательно возьмите SSD под метаданные и журнал (маленькие, буквально 2 ГБ на 1 ТБ HDD-места).
 - Возьмите быструю сеть, минимум 10 гбит/с. Идеал - что-то вроде Mellanox ConnectX-4 с RoCEv2.
 - Для лучшей производительности отключите энергосбережение CPU: `cpupower idle-set -D 0 && cpupower frequency-set -g performance`.
@@ -33,7 +33,7 @@
 - SATA SSD: Micron 5100/5200/5300/5400, Samsung PM863/PM883/PM893, Intel D3-S4510/4520/4610/4620, Kingston DC500M
 - NVMe: Micron 9100/9200/9300/9400, Micron 7300/7450, Samsung PM983/PM9A3, Samsung PM1723/1735/1743,
  Intel DC-P3700/P4500/P4600, Intel D7-P5500/P5600, Intel Optane, Kingston DC1000B/DC1500M
- HDD: HGST Ultrastar, Toshiba MG06/MG07/MG08, Seagate EXOS
+- HDD: HGST Ultrastar, Toshiba MG, Seagate EXOS

 ## Настройте мониторы

@@ -1,6 +0,0 @@
---
-title: Common Parameters
-weight: 1
---
-
-These are the most common parameters which apply to all components of Vitastor.
@@ -1,6 +0,0 @@
---
-title: Общие параметры
-weight: 1
---
-
-Это наиболее общие параметры, используемые всеми компонентами Vitastor.
@@ -1,7 +0,0 @@
---
-title: Cluster-Wide Disk Layout Parameters
-weight: 2
---
-
-These parameters apply to clients and OSDs, are fixed at the moment of OSD drive
-initialization and can't be changed after it without losing data.
@@ -1,7 +0,0 @@
---
-title: Дисковые параметры уровня кластера
-weight: 2
---
-
-Данные параметры используются клиентами и OSD, задаются в момент инициализации
-диска OSD и не могут быть изменены после этого без потери данных.
@@ -1,7 +0,0 @@
---
-title: OSD Disk Layout Parameters
-weight: 3
---
-
-These parameters apply to OSDs, are fixed at the moment of OSD drive
-initialization and can't be changed after it without losing data.
@@ -1,8 +0,0 @@
---
-title: Дисковые параметры OSD
-weight: 3
---
-
-Данные параметры используются только OSD и, также как и общекластерные
-дисковые параметры, задаются в момент инициализации дисков OSD и не могут быть
-изменены после этого без потери данных.
@@ -1,6 +0,0 @@
---
-title: Monitor Parameters
-weight: 6
---
-
-These parameters only apply to Monitors.
@@ -1,6 +0,0 @@
---
-title: Параметры мониторов
-weight: 6
---
-
-Данные параметры используются только мониторами Vitastor.
@@ -1,7 +0,0 @@
---
-title: Network Protocol Parameters
-weight: 4
---
-
-These parameters apply to clients and OSDs and affect network connection logic
-between clients, OSDs and etcd.
@@ -1,7 +0,0 @@
---
-title: Параметры сетевого протокола
-weight: 4
---
-
-Данные параметры используются клиентами и OSD и влияют на логику сетевого
-взаимодействия между клиентами, OSD, а также etcd.
@@ -1,7 +0,0 @@
---
-title: Runtime OSD Parameters
-weight: 5
---
-
-These parameters only apply to OSDs, are not fixed at the moment of OSD drive
-initialization and can be changed with an OSD restart.
@@ -1,8 +0,0 @@
---
-title: Изменяемые параметры OSD
-weight: 5
---
-
-Данные параметры используются только OSD, но, в отличие от дисковых параметров,
-не фиксируются в момент инициализации дисков OSD и могут быть изменены в любой
-момент с перезапуском OSD.
@@ -169,6 +169,18 @@ Upgrading is performed without stopping clients (VMs/containers), you just need
 upgrade and restart servers one by one. However, ideally you should restart VMs too
 to make them use the new version of the client library.

+### 1.7.x to 1.8.0
+
+After upgrading version <= 1.7.x to version >= 1.8.0, BUT <= 1.9.0: restart all clients
+(VMs and so on), otherwise they will hang when monitor clears old PG configuration key,
+which happens 24 hours after upgrade.
+
+This is fixed in 1.9.1. So, after upgrading version <= 1.7.x directly to version >= 1.9.1,
+you DO NOT have to restart all old clients immediately - they will work like before until
+you decide to upgrade them too. The downside is that you'll have to remove the old PG
+configuration key (`/vitastor/config/pgs`) from etcd by hand when you make sure that all
+your clients are restarted.
+
 ### 1.1.x to 1.2.0

 Upgrading version <= 1.1.x to version >= 1.2.0, if you use EC n+k with k>=2, is recommended
@@ -166,6 +166,18 @@ done
 достаточно обновлять серверы по одному. Однако, конечно, чтобы запущенные виртуальные машины
 начали использовать новую версию клиентской библиотеки, их тоже нужно перезапустить.

+### 1.7.x -> 1.8.0
+
+После обновления с версий <= 1.7.x до версий >= 1.8.0, НО <= 1.9.0: перезапустите всех
+клиентов (процессы виртуальных машин можно перезапустить путём миграции на другой сервер),
+иначе они зависнут, когда монитор удалит старый ключ конфигурации PG, что происходит через
+24 часа после обновления.
+
+Однако, это исправлено в 1.9.1. Так что, если вы обновляетесь с <= 1.7.x сразу до >= 1.9.1,
+вам НЕ нужно сразу перезапускать всех клиентов - они будут работать, как раньше. Минус,
+правда, в том, что старый ключ конфигурации PG (`/vitastor/config/pgs`) будет нужно удалить
+вам из etcd вручную - после того, как вы убедитесь, что все клиенты перезапущены.
+
 ### 1.1.x -> 1.2.0

 Обновляться с версий <= 1.1.x до версий >= 1.2.0, если вы используете EC n+k и k>=2,
@@ -13,6 +13,7 @@ It supports the following commands:
 - [prepare](#prepare)
 - [upgrade-simple](#upgrade-simple)
 - [resize](#resize)
+- [raw-resize](#raw-resize)
 - [start/stop/restart/enable/disable](#start/stop/restart/enable/disable)
 - [purge](#purge)
 - [read-sb](#read-sb)
@@ -127,25 +128,49 @@ Requires the `sfdisk` utility.

 ## resize

-`vitastor-disk resize <ALL_OSD_PARAMETERS> <NEW_LAYOUT> [--iodepth 32]`
+`vitastor-disk resize <osd_num>|<osd_device> [OPTIONS]`

-Resize data area and/or rewrite/move journal and metadata.
+Resize data area and/or move journal and metadata:
+
+| <!-- -->                  | <!-- -->                               |
+|---------------------------|----------------------------------------|
+| `--move-journal TARGET`   | move journal to `TARGET`               |
+| `--move-meta TARGET`      | move metadata to `TARGET`              |
+| `--journal-size NEW_SIZE` | resize journal to `NEW_SIZE`           |
+| `--data-size NEW_SIZE`    | resize data device to `NEW_SIZE`       |
+| `--dry-run`               | only show new layout, do not apply it  |
+
+`NEW_SIZE` may include k/m/g/t suffixes.
+
+`TARGET` may be one of:
+
+| <!-- -->       | <!-- -->                                                                 |
+|----------------|--------------------------------------------------------------------------|
+| `<partition>`  | move journal/metadata to an existing GPT partition                       |
+| `<raw_device>` | create a GPT partition on `<raw_device>` and move journal/metadata to it |
+| `""`           | (empty string) move journal/metadata back to the data device             |
+
+## raw-resize
+
+`vitastor-disk raw-resize <ALL_OSD_PARAMETERS> <NEW_LAYOUT> [--iodepth 32]`
+
+Resize data area and/or rewrite/move journal and metadata (manual format).

 `ALL_OSD_PARAMETERS` must include all (at least all disk-related)
 parameters from OSD command line (i.e. from systemd unit or superblock).

 `NEW_LAYOUT` may include new disk layout parameters:

-```
--new_data_offset SIZE     resize data area so it starts at SIZE
--new_data_len SIZE        resize data area to SIZE bytes
--new_meta_device PATH     use PATH for new metadata
--new_meta_offset SIZE     make new metadata area start at SIZE
--new_meta_len SIZE        make new metadata area SIZE bytes long
--new_journal_device PATH  use PATH for new journal
--new_journal_offset SIZE  make new journal area start at SIZE
--new_journal_len SIZE     make new journal area SIZE bytes long
-```
+| <!-- -->                    | <!-- -->                                  |
+|-----------------------------|-------------------------------------------|
+| `--new_data_offset SIZE`    | resize data area so it starts at `SIZE`   |
+| `--new_data_len SIZE`       | resize data area to `SIZE` bytes          |
+| `--new_meta_device PATH`    | use `PATH` for new metadata               |
+| `--new_meta_offset SIZE`    | make new metadata area start at `SIZE`    |
+| `--new_meta_len SIZE`       | make new metadata area `SIZE` bytes long  |
+| `--new_journal_device PATH` | use `PATH` for new journal                |
+| `--new_journal_offset SIZE` | make new journal area start at `SIZE`     |
+| `--new_journal_len SIZE`    | make new journal area `SIZE` bytes long   |

 SIZE may include k/m/g/t suffixes. If any of the new layout parameter
 options are not specified, old values will be used.
@@ -217,10 +242,14 @@ Intended for use from startup scripts (i.e. from systemd units).

 ## dump-journal

+`vitastor-disk dump-journal [OPTIONS] <osd_device>`
+
 `vitastor-disk dump-journal [OPTIONS] <journal_file> <journal_block_size> <offset> <size>`

 Dump journal in human-readable or JSON (if `--json` is specified) format.

+You can specify any OSD device (data, metadata or journal), or the layout manually.
+
 Options:

 ```
@@ -233,23 +262,35 @@ Options:

 ## write-journal

+`vitastor-disk write-journal <osd_device>`
+
 `vitastor-disk write-journal <journal_file> <journal_block_size> <bitmap_size> <offset> <size>`

 Write journal from JSON taken from standard input in the same format as produced by
 `dump-journal --json --format data`.

+You can specify any OSD device (data, metadata or journal), or the layout manually.
+
 ## dump-meta

+`vitastor-disk dump-meta <osd_device>`
+
 `vitastor-disk dump-meta <meta_file> <meta_block_size> <offset> <size>`

 Dump metadata in JSON format.

+You can specify any OSD device (data, metadata or journal), or the layout manually.
+
 ## write-meta

+`vitastor-disk write-meta <osd_device>`
+
 `vitastor-disk write-meta <meta_file> <offset> <size>`

 Write metadata from JSON taken from standard input in the same format as produced by `dump-meta`.

+You can specify any OSD device (data, metadata or journal), or the layout manually.
+
 ## simple-offsets

 `vitastor-disk simple-offsets <device>`
@@ -13,6 +13,7 @@ vitastor-disk - инструмент командной строки для уп
 - [prepare](#prepare)
 - [upgrade-simple](#upgrade-simple)
 - [resize](#resize)
+- [raw-resize](#raw-resize)
 - [start/stop/restart/enable/disable](#start/stop/restart/enable/disable)
 - [purge](#purge)
 - [read-sb](#read-sb)
@@ -129,27 +130,51 @@ throttle_target_mbs, throttle_target_parallelism, throttle_threshold_us.

 ## resize

-`vitastor-disk resize <ALL_OSD_PARAMETERS> <NEW_LAYOUT> [--iodepth 32]`
+`vitastor-disk resize <osd_num>|<osd_device> [OPTIONS]`

-Изменить размер области данных и/или переместить журнал и метаданные.
+Изменить размер области данных и/или переместить журнал и метаданные:

-В `ALL_OSD_PARAMETERS` нужно указать все относящиеся к диску параметры OSD
+| <!-- -->                      | <!-- -->                                       |
+|-------------------------------|------------------------------------------------|
+| `--move-journal ЦЕЛЬ`         | переместить журнал на `ЦЕЛЬ`                   |
+| `--move-meta ЦЕЛЬ`            | переместить метаданные на `ЦЕЛЬ`               |
+| `--journal-size НОВЫЙ_РАЗМЕР` | изменить размер журнала на `НОВЫЙ_РАЗМЕР`      |
+| `--data-size НОВЫЙ_РАЗМЕР`    | изменить размер диска данных на `НОВЫЙ_РАЗМЕР` |
+| `--dry-run`                   | показать новые параметры, но не применять их   |
+
+`НОВЫЙ_РАЗМЕР` может быть указан с суффиксами k/m/g/t (кило/мега/гига/терабайт).
+
+`ЦЕЛЬ` может быть одним из:
+
+| <!-- -->        | <!-- -->                                                                            |
+|-----------------|-------------------------------------------------------------------------------------|
+| `<раздел>`      | переместить журнал/метаданные на существующий GPT-раздел                            |
+| `<полный_диск>` | создать GPT-раздел на диске `<полный_диск>` и переместить журнал/метаданные на него |
+| `""`            | (пустая строка) переместить журнал/метаданные обратно на диск данных                |
+
+## raw-resize
+
+`vitastor-disk raw-resize <ВСЕ_ПАРАМЕТРЫ_OSD> <НОВЫЕ_РАЗМЕРЫ> [--iodepth 32]`
+
+Изменить размер области данных и/или переместить журнал и метаданные (ручной формат).
+
+В `ВСЕ_ПАРАМЕТРЫ_OSD` нужно указать все относящиеся к диску параметры OSD
 из суперблока OSD или из файла сервиса systemd (в старых версиях).

-В `NEW_LAYOUT` нужно указать новые параметры расположения данных:
+В `НОВЫЕ_РАЗМЕРЫ` нужно указать новые параметры расположения данных:

-```
--new_data_offset РАЗМЕР     сдвинуть начало области данных на РАЗМЕР байт
--new_data_len РАЗМЕР        изменить размер области данных до РАЗМЕР байт
--new_meta_device ПУТЬ       использовать ПУТЬ как новое устройство метаданных
--new_meta_offset РАЗМЕР     разместить новые метаданные по смещению РАЗМЕР байт
--new_meta_len РАЗМЕР        сделать новые метаданные размером РАЗМЕР байт
--new_journal_device ПУТЬ    использовать ПУТЬ как новое устройство журнала
--new_journal_offset РАЗМЕР  разместить новый журнал по смещению РАЗМЕР байт
--new_journal_len РАЗМЕР     сделать новый журнал размером РАЗМЕР байт
-```
+| <!-- -->                      | <!-- -->                                              |
+|-------------------------------|-------------------------------------------------------|
+| `--new_data_offset РАЗМЕР`    | сдвинуть начало области данных на `РАЗМЕР` байт       |
+| `--new_data_len РАЗМЕР`       | изменить размер области данных до `РАЗМЕР` байт       |
+| `--new_meta_device ПУТЬ`      | использовать `ПУТЬ` как новое устройство метаданных   |
+| `--new_meta_offset РАЗМЕР`    | разместить новые метаданные по смещению `РАЗМЕР` байт |
+| `--new_meta_len РАЗМЕР`       | сделать новые метаданные размером `РАЗМЕР` байт       |
+| `--new_journal_device ПУТЬ`   | использовать `ПУТЬ` как новое устройство журнала      |
+| `--new_journal_offset РАЗМЕР` | разместить новый журнал по смещению `РАЗМЕР` байт     |
+| `--new_journal_len РАЗМЕР`    | сделать новый журнал размером `РАЗМЕР` байт           |

-РАЗМЕР может быть указан с суффиксами k/m/g/t. Если любой из новых параметров
+`РАЗМЕР` может быть указан с суффиксами k/m/g/t. Если любой из новых параметров
 расположения не указан, он принимается равным старому значению.

 ## start/stop/restart/enable/disable
@@ -224,10 +249,15 @@ OSD отключены fsync-и.

 ## dump-journal

+`vitastor-disk dump-journal <osd_device>`
+
 `vitastor-disk dump-journal [OPTIONS] <journal_file> <journal_block_size> <offset> <size>`

 Вывести журнал в человекочитаемом или в JSON (с опцией `--json`) виде.

+Вы можете указать любой раздел OSD - данных, журнала или метаданных - либо указать все
+параметры расположения вручную.
+
 Опции:

 ```
@@ -240,22 +270,37 @@ OSD отключены fsync-и.

 ## write-journal

+`vitastor-disk write-journal <osd_device>`
+
 `vitastor-disk write-journal <journal_file> <journal_block_size> <bitmap_size> <offset> <size>`

 Записать журнал из JSON со стандартного ввода в формате, аналогичном `dump-journal --json --format data`.

+Вы можете указать любой раздел OSD - данных, журнала или метаданных - либо указать все
+параметры расположения вручную.
+
 ## dump-meta

+`vitastor-disk dump-meta <osd_device>`
+
 `vitastor-disk dump-meta <meta_file> <meta_block_size> <offset> <size>`

 Вывести метаданные в формате JSON.

+Вы можете указать любой раздел OSD - данных, журнала или метаданных - либо указать все
+параметры расположения вручную.
+
 ## write-meta

+`vitastor-disk write-meta <osd_device>`
+
 `vitastor-disk write-meta <meta_file> <offset> <size>`

 Записать метаданные из JSON со стандартного ввода в формате, аналогичном `dump-meta`.

+Вы можете указать любой раздел OSD - данных, журнала или метаданных - либо указать все
+параметры расположения вручную.
+
 ## simple-offsets

 `vitastor-disk simple-offsets <device>`
@@ -156,17 +156,17 @@ behind. Defragmentation removes garbage and moves data still in use to new volum

 Options:

-| <!-- -->                 | <!-- -->                                                                |
-|--------------------------|------------------------------------------------------------------------ |
-| --volume_untouched 86400 | Defragment volumes last appended to at least this number of seconds ago |
-| --defrag_percent 50      | Defragment volumes with at least this % of removed data                 |
-| --defrag_block_count 16  | Read this number of pool blocks at once during defrag                   |
-| --defrag_iodepth 16      | Move up to this number of files in parallel during defrag               |
-| --trace                  | Print verbose defragmentation status                                    |
-| --dry-run                | Skip modifications, only print status                                   |
-| --recalc-stats           | Recalculate all volume statistics                                       |
-| --include-empty          | Include old and empty volumes; make sure to restart NFS servers before using it |
-| --no-rm                  | Move, but do not delete data                                            |
+| <!-- -->                   | <!-- -->                                                                |
+|----------------------------|------------------------------------------------------------------------ |
+| `--volume_untouched 86400` | Defragment volumes last appended to at least this number of seconds ago |
+| `--defrag_percent 50`      | Defragment volumes with at least this % of removed data                 |
+| `--defrag_block_count 16`  | Read this number of pool blocks at once during defrag                   |
+| `--defrag_iodepth 16`      | Move up to this number of files in parallel during defrag               |
+| `--trace`                  | Print verbose defragmentation status                                    |
+| `--dry-run`                | Skip modifications, only print status                                   |
+| `--recalc-stats`           | Recalculate all volume statistics                                       |
+| `--include-empty`          | Include old and empty volumes; make sure to restart NFS servers before using it |
+| `--no-rm`                  | Move, but do not delete data                                            |

 ## Common options

@@ -164,17 +164,17 @@ JSON-формате :-). Для инспекции содержимого БД

 Опции:

-| <!-- -->                 | <!-- -->                                                                |
-|--------------------------|------------------------------------------------------------------------ |
-| --volume_untouched 86400 | Дефрагментировать только тома, в которые уже не писали это число секунд |
-| --defrag_percent 50      | Дефрагментировать только тома, в которых этот % данных удалён           |
-| --defrag_block_count 16  | Читать это количество блоков пула за один раз                           |
-| --defrag_iodepth 16      | Перемещать одновременно до этого числа файлов                           |
-| --trace                  | Печатать детальную статистику дефрагментации                            |
-| --dry-run                | Не производить никаких изменений, только описать выполняемые действия   |
-| --recalc-stats           | Пересчитать и сохранить статистику всех томов                           |
-| --include-empty          | Дефрагментировать старые и пустые тома; обязательно перезапустите NFS-сервера после использования этой опции |
-| --no-rm                  | Перемещать, но не удалять данные                                        |
+| <!-- -->                   | <!-- -->                                                                |
+|----------------------------|------------------------------------------------------------------------ |
+| `--volume_untouched 86400` | Дефрагментировать только тома, в которые уже не писали это число секунд |
+| `--defrag_percent 50`      | Дефрагментировать только тома, в которых этот % данных удалён           |
+| `--defrag_block_count 16`  | Читать это количество блоков пула за один раз                           |
+| `--defrag_iodepth 16`      | Перемещать одновременно до этого числа файлов                           |
+| `--trace`                  | Печатать детальную статистику дефрагментации                            |
+| `--dry-run`                | Не производить никаких изменений, только описать выполняемые действия   |
+| `--recalc-stats`           | Пересчитать и сохранить статистику всех томов                           |
+| `--include-empty`          | Дефрагментировать старые и пустые тома; обязательно перезапустите NFS-сервера после использования этой опции |
+| `--no-rm`                  | Перемещать, но не удалять данные                                        |

 ## Общие опции

@@ -151,9 +151,9 @@ Example performance comparison:
 To try VDUSE you need at least Linux 5.15, built with VDUSE support
 (CONFIG_VDPA=m, CONFIG_VDPA_USER=m, CONFIG_VIRTIO_VDPA=m).

-Debian Linux kernels have these options disabled by now, so if you want to try it on Debian,
-use a kernel from Ubuntu [kernel-ppa/mainline](https://kernel.ubuntu.com/~kernel-ppa/mainline/), Proxmox,
-or build modules for Debian kernel manually:
+Debian Linux kernels had these options disabled until 6.6, so make sure you install a newer kernel
+(from bookworm-backports, trixie or newer Debian version) if you want to try VDUSE. You can also
+build modules for an existing kernel manually:

 ```
 mkdir build
@@ -154,9 +154,9 @@ VDUSE - на данный момент лучший интерфейс для п
 Чтобы попробовать VDUSE, вам нужно ядро Linux как минимум версии 5.15, собранное с поддержкой
 VDUSE (CONFIG_VDPA=m, CONFIG_VDPA_USER=m, CONFIG_VIRTIO_VDPA=m).

-В ядрах в Debian Linux поддержка пока отключена по умолчанию, так что чтобы попробовать VDUSE
-на Debian, поставьте ядро из Ubuntu [kernel-ppa/mainline](https://kernel.ubuntu.com/~kernel-ppa/mainline/),
-из Proxmox или соберите модули для ядра Debian вручную:
+В ядрах в Debian Linux эти опции включены, только начиная с 6.6, так что установите свежее ядро
+из bookworm-backports, trixie или из более новой версии Debian, если хотите попробовать VDUSE.
+Либо же вы можете самостоятельно собрать модули для установленного ядра:

 ```
 mkdir build
@@ -1,6 +0,0 @@
---
-title: "{{ replace .Name "-" " " | title }}"
-date: {{ .Date }}
-draft: true
---
-
@@ -1,35 +0,0 @@
-baseURL: http://localhost
-title: Vitastor
-theme: hugo-geekdoc
-#languageCode: en-us
-
-pluralizeListTitles: false
-
-# Geekdoc required configuration
-pygmentsUseClasses: true
-pygmentsCodeFences: true
-disablePathToLower: true
-
-# Required if you want to render robots.txt template
-enableRobotsTXT: true
-
-defaultContentLanguage: en
-languages:
-  en:
-    weight: 1
-    languageName: English
-  ru:
-    weight: 1
-    languageName: Русский
-
-markup:
-  goldmark:
-    renderer:
-      # Needed for mermaid shortcode
-      unsafe: true
-  tableOfContents:
-    startLevel: 1
-    endLevel: 9
-
-taxonomies:
-  tag: tags
@@ -1,6 +0,0 @@
-## The Idea
-
-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).
@@ -1,5 +0,0 @@
---
-title: Parameter Reference
-weight: 1
---
-
@@ -1,5 +0,0 @@
---
-title: Перечень настроек
-weight: 1
---
-
@@ -1,5 +0,0 @@
---
-title: Pool configuration
-weight: 100
---
-
@@ -1,5 +0,0 @@
---
-title: Packages
-weight: 2
---
-
@@ -1,5 +0,0 @@
---
-title: Quick Start
-weight: 1
---
-
@@ -1,5 +0,0 @@
---
-title: Building from Source
-weight: 3
---
-
@@ -1,4 +0,0 @@
---
-title: Introduction
-weight: -1
---
@@ -1,5 +0,0 @@
---
-title: Architecture
-weight: 3
---
-
@@ -1,5 +0,0 @@
---
-title: Author and License
-weight: 3
---
-
@@ -1,5 +0,0 @@
---
-title: Features
-weight: 1
---
-
@@ -1,5 +0,0 @@
---
-title: Example Comparison with Ceph
-weight: 4
---
-
@@ -1,5 +0,0 @@
---
-title: Vitastor's Theoretical Maximum Performance
-weight: 3
---
-
@@ -1,5 +0,0 @@
---
-title: Tuning
-weight: 2
---
-
@@ -1,5 +0,0 @@
---
-title: Understanding Storage Performance
-weight: 1
---
-
@@ -1,7 +0,0 @@
---
-title: Vitastor CLI
-weight: 1
---
-
-{{< toc >}}
-
@@ -1,5 +0,0 @@
---
-title: NBD
-weight: 6
---
-
@@ -1,5 +0,0 @@
---
-title: QEMU and qemu-img
-weight: 2
---
-
@@ -1,37 +0,0 @@
---
-nav_navigation: Навигация
-nav_tags: Теги
-nav_more: Подробнее
-nav_top: К началу
-
-form_placeholder_search: Поиск
-
-error_page_title: Открыта несуществующая страница
-error_message_title: Потерялись?
-error_message_code: Ошибка 404
-error_message_text: >
-  Похоже, страница, которую вы открыли, не существует. Попробуйте найти
-  нужную информацию с <a class="gdoc-error__link" href="{{ . }}">главной страницы</a>.
-
-button_toggle_dark: Переключить тёмный/светлый/авто режим
-button_nav_open: Показать навигацию
-button_nav_close: Скрыть навигацию
-button_menu_open: Открыть меню
-button_menu_close: Закрыть меню
-button_homepage: На главную
-
-title_anchor_prefix: "Ссылка на:"
-
-posts_read_more: Читать подробнее
-posts_read_time:
-  one: "Одна минута на чтение"
-  other: "{{ . }} минут(ы) на чтение"
-posts_update_prefix: Обновлено
-
-footer_build_with: >
-  Сделано на <a href="https://gohugo.io/" class="gdoc-footer__link">Hugo</a> с
-  <svg class="icon gdoc_heart"><use xlink:href="#gdoc_heart"></use></svg>
-footer_legal_notice: Правовая информация
-footer_privacy_policy: Приватность
-
-language_switch_no_tranlation_prefix: "Страница не переведена:"
@@ -1,34 +0,0 @@
-<footer class="gdoc-footer">
-    <div class="container flex">
-        <div class="flex flex-wrap" style="flex: 1">
-            <span class="gdoc-footer__item gdoc-footer__item--row">
-                &copy; Vitaliy Filippov, 2021+
-            </span>
-        </div>
-        <div class="flex flex-wrap">
-            {{ with .Site.Params.GeekdocLegalNotice }}
-            <span class="gdoc-footer__item gdoc-footer__item--row">
-                <a href="{{ . | relURL }}" class="gdoc-footer__link">{{ i18n "footer_legal_notice" }}</a>
-            </span>
-            {{ end }}
-            {{ with .Site.Params.GeekdocPrivacyPolicy }}
-            <span class="gdoc-footer__item gdoc-footer__item--row">
-                <a href="{{ . | relURL }}" class="gdoc-footer__link">{{ i18n "footer_privacy_policy" }}</a>
-            </span>
-            {{ end }}
-        </div>
-        {{ if (default true .Site.Params.GeekdocBackToTop) }}
-        <div class="flex flex-25 justify-end">
-            <span class="gdoc-footer__item gdoc-footer__item--row" style="margin-right: 50px">
-                {{ i18n "footer_build_with" | safeHTML }}
-            </span>
-            <span class="gdoc-footer__item">
-                <a class="gdoc-footer__link fake-link" href="#" aria-label="{{ i18n "nav_top" }}">
-                    <svg class="icon gdoc_keyboard_arrow_up"><use xlink:href="#gdoc_keyboard_arrow_up"></use></svg>
-                    <span class="hidden-mobile">{{ i18n "nav_top" }}</span>
-                </a>
-            </span>
-        </div>
-        {{ end }}
-    </div>
-</footer>
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="logo_only2.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
-   id="svg1340"
-   version="1.1"
-   viewBox="0 0 100 86.80192"
-   height="86.801918mm"
-   width="100mm"
-   inkscape:export-filename="/var/home/vitali/SVN/vitastor/presentation/logos/logo_only.png"
-   inkscape:export-xdpi="92.889999"
-   inkscape:export-ydpi="92.889999">
-  <defs
-     id="defs1334">
-    <linearGradient
-       osb:paint="gradient"
-       id="linearGradient866">
-      <stop
-         id="stop862"
-         offset="0"
-         style="stop-color:#c0c0c0;stop-opacity:1" />
-      <stop
-         id="stop864"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient846"
-       osb:paint="gradient">
-      <stop
-         style="stop-color:#ffd42a;stop-opacity:1"
-         offset="0"
-         id="stop842" />
-      <stop
-         style="stop-color:#ffa200;stop-opacity:1"
-         offset="1"
-         id="stop844" />
-    </linearGradient>
-    <radialGradient
-       r="50"
-       fy="159.11139"
-       fx="202.36813"
-       cy="159.11139"
-       cx="202.36813"
-       gradientTransform="matrix(1.2462942,-1.2279529,0.77712408,0.78873143,-190.96813,230.1331)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1530"
-       xlink:href="#linearGradient1352"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1352">
-      <stop
-         style="stop-color:#00c9e6;stop-opacity:1"
-         offset="0"
-         id="stop1348" />
-      <stop
-         style="stop-color:#5240d3;stop-opacity:1"
-         offset="1"
-         id="stop1350" />
-    </linearGradient>
-    <linearGradient
-       y2="62.555599"
-       x2="51.484566"
-       y1="62.555599"
-       x1="38.105473"
-       gradientTransform="rotate(-16.930773,271.11609,-412.42594)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1508"
-       xlink:href="#linearGradient1323"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1323">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.47178105"
-         offset="0"
-         id="stop1319" />
-      <stop
-         style="stop-color:#eeaaff;stop-opacity:0;"
-         offset="1"
-         id="stop1321" />
-    </linearGradient>
-    <radialGradient
-       r="21.541935"
-       fy="24.614815"
-       fx="45.312912"
-       cy="24.614815"
-       cx="45.312912"
-       gradientTransform="matrix(1.0933447,0.13113705,-0.12664108,1.0558599,-1.082187,93.974708)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1504"
-       xlink:href="#linearGradient846"
-       inkscape:collect="always" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter1497"
-       width="2"
-       height="2"
-       x="-0.5"
-       y="-0.5">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood1487" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite1489" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="6"
-         result="blur"
-         id="feGaussianBlur1491" />
-      <feOffset
-         dx="0"
-         dy="6"
-         result="offset"
-         id="feOffset1493" />
-      <feComposite
-         in="offset"
-         in2="offset"
-         operator="atop"
-         result="composite2"
-         id="feComposite1495" />
-    </filter>
-    <radialGradient
-       r="21.541935"
-       fy="24.614815"
-       fx="45.312912"
-       cy="24.614815"
-       cx="45.312912"
-       gradientTransform="matrix(1.0933447,0.13113705,-0.12664108,1.0558599,-1.082187,93.974708)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1506"
-       xlink:href="#linearGradient846"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
-     inkscape:window-height="992"
-     inkscape:window-width="1920"
-     fit-margin-bottom="0"
-     fit-margin-right="0"
-     fit-margin-left="0"
-     fit-margin-top="-30"
-     showgrid="false"
-     inkscape:document-rotation="0"
-     inkscape:current-layer="layer1"
-     inkscape:document-units="mm"
-     inkscape:cy="47.914558"
-     inkscape:cx="-103.69646"
-     inkscape:zoom="0.7"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="1"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#000000"
-     id="base" />
-  <metadata
-     id="metadata1337">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-133.26969,-52.101187)"
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Слой 1">
-    <path
-       style="fill:url(#radialGradient1530);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 133.26969,59.089473 50,75.000087 50,-75.000087 z"
-       id="path1528"
-       sodipodi:nodetypes="cccc" />
-    <path
-       d="m 194.29572,89.403603 -8.41706,2.562119 -2.50682,7.49308 7.17785,23.579008 9.60097,-14.40173 z"
-       style="fill:url(#linearGradient1508);fill-opacity:1;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.501961"
-       id="path1459" />
-    <g
-       transform="translate(135.70225,-49.385894)"
-       id="g1465">
-      <path
-         id="path1461"
-         style="fill:url(#radialGradient1504);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter1497)"
-         d="m 28.817436,101.36529 c 3.112699,10.74423 6.225077,21.48892 9.333984,32.23438 2.519532,0 5.039063,0 7.558594,0 -0.985406,8.09729 -2.085815,16.18202 -2.951172,24.29297 -0.06053,0.88723 1.098131,1.61652 1.76,0.9155 1.007514,-1.05482 1.676008,-2.3829 2.528566,-3.56053 7.51538,-11.37722 14.987447,-22.78299 22.482919,-34.17333 -3.239584,0 -6.479167,0 -9.71875,0 2.887267,-6.79562 5.775365,-13.59088 8.662109,-20.38672 -13.284505,0 -26.56901,0 -39.853516,0 0.06576,0.22591 0.131511,0.45182 0.197266,0.67773 z" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         id="path1463"
-         d="m 30.735882,102.2764 h 35.342242 l -8.662729,20.3854 h 9.173783 l -22.106472,33.62346 3.027029,-24.27377 H 39.34604 Z"
-         style="fill:url(#radialGradient1506);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>
@@ -1,138 +0,0 @@
-/* Global customization */
-
-:root {
-  --code-max-height: 60rem;
-}
-
-/* Light mode theming */
-:root,
-:root[color-mode="light"] {
-  --header-background: #404050;
-  --header-font-color: #ffffff;
-
-  --body-background: #ffffff;
-  --body-font-color: #343a40;
-
-  --button-background: #62cb97;
-  --button-border-color: #4ec58a;
-
-  --link-color: #c54e8a;
-  --link-color-visited: #c54e8a;
-
-  --code-background: #f5f6f8;
-  --code-accent-color: #e3e7eb;
-  --code-accent-color-lite: #eff1f3;
-
-  --accent-color: #e9ecef;
-  --accent-color-lite: #f8f9fa;
-
-  --control-icons: #b2bac1;
-
-  --footer-background: #606070;
-  --footer-font-color: #ffffff;
-  --footer-link-color: #ffcc5c;
-  --footer-link-color-visited: #ffcc5c;
-}
-@media (prefers-color-scheme: light) {
-  :root {
-    --header-background: #404050;
-    --header-font-color: #ffffff;
-
-    --body-background: #ffffff;
-    --body-font-color: #343a40;
-
-    --button-background: #62cb97;
-    --button-border-color: #4ec58a;
-
-    --link-color: #c54e8a;
-    --link-color-visited: #c54e8a;
-
-    --code-background: #f5f6f8;
-    --code-accent-color: #e3e7eb;
-    --code-accent-color-lite: #eff1f3;
-
-    --accent-color: #e9ecef;
-    --accent-color-lite: #f8f9fa;
-
-    --control-icons: #b2bac1;
-
-    --footer-background: #606070;
-    --footer-font-color: #ffffff;
-    --footer-link-color: #ffcc5c;
-    --footer-link-color-visited: #ffcc5c;
-  }
-}
-
-/* Dark mode theming */
-:root[color-mode="dark"] {
-  --header-background: #202830;
-  --header-font-color: #ffffff;
-
-  --body-background: #343a44;
-  --body-font-color: #ced3d8;
-
-  --button-background: #62cb97;
-  --button-border-color: #4ec58a;
-
-  --link-color: #7ac29e;
-  --link-color-visited: #7ac29e;
-
-  --code-background: #2f353a;
-  --code-accent-color: #262b2f;
-  --code-accent-color-lite: #2b3035;
-
-  --accent-color: #2b3035;
-  --accent-color-lite: #2f353a;
-
-  --control-icons: #b2bac1;
-
-  --footer-background: #2f333e;
-  --footer-font-color: #cccccc;
-  --footer-link-color: #7ac29e;
-  --footer-link-color-visited: #7ac29e;
-}
-@media (prefers-color-scheme: dark) {
-  :root {
-    --header-background: #404070;
-    --header-font-color: #ffffff;
-
-    --body-background: #343a40;
-    --body-font-color: #ced3d8;
-
-    --button-background: #62cb97;
-    --button-border-color: #4ec58a;
-
-    --link-color: #7ac29e;
-    --link-color-visited: #7ac29e;
-
-    --code-background: #2f353a;
-    --code-accent-color: #262b2f;
-    --code-accent-color-lite: #2b3035;
-
-    --accent-color: #2b3035;
-    --accent-color-lite: #2f353a;
-
-    --control-icons: #b2bac1;
-
-    --footer-background: #2f333e;
-    --footer-font-color: #cccccc;
-    --footer-link-color: #7ac29e;
-    --footer-link-color-visited: #7ac29e;
-  }
-}
-
-.gdoc-brand__img {
-  width: 48px;
-  height: auto;
-  margin-top: -4px;
-  margin-bottom: -4px;
-}
-
-.gdoc-menu-header > span {
-  display: flex;
-  flex-direction: row-reverse;
-}
-
-span.gdoc-language {
-  margin-right: 20px;
-}
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="favicon.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
-   id="svg1340"
-   version="1.1"
-   viewBox="0 0 100 100"
-   height="100mm"
-   width="100mm"
-   inkscape:export-filename="/var/home/vitali/SVN/vitastor/docs/static/favicon/favicon-64x64.png"
-   inkscape:export-xdpi="16.26"
-   inkscape:export-ydpi="16.26">
-  <defs
-     id="defs1334">
-    <linearGradient
-       osb:paint="gradient"
-       id="linearGradient866">
-      <stop
-         id="stop862"
-         offset="0"
-         style="stop-color:#c0c0c0;stop-opacity:1" />
-      <stop
-         id="stop864"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient846"
-       osb:paint="gradient">
-      <stop
-         style="stop-color:#ffd42a;stop-opacity:1"
-         offset="0"
-         id="stop842" />
-      <stop
-         style="stop-color:#ffa200;stop-opacity:1"
-         offset="1"
-         id="stop844" />
-    </linearGradient>
-    <radialGradient
-       r="50"
-       fy="159.11139"
-       fx="202.36813"
-       cy="159.11139"
-       cx="202.36813"
-       gradientTransform="matrix(1.2462942,-1.2279529,0.77712408,0.78873143,-190.96813,230.1331)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1530"
-       xlink:href="#linearGradient1352"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1352">
-      <stop
-         style="stop-color:#00c9e6;stop-opacity:1"
-         offset="0"
-         id="stop1348" />
-      <stop
-         style="stop-color:#5240d3;stop-opacity:1"
-         offset="1"
-         id="stop1350" />
-    </linearGradient>
-    <linearGradient
-       y2="62.555599"
-       x2="51.484566"
-       y1="62.555599"
-       x1="38.105473"
-       gradientTransform="rotate(-16.930773,271.11609,-412.42594)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1508"
-       xlink:href="#linearGradient1323"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1323">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.47178105"
-         offset="0"
-         id="stop1319" />
-      <stop
-         style="stop-color:#eeaaff;stop-opacity:0;"
-         offset="1"
-         id="stop1321" />
-    </linearGradient>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter1497"
-       width="2"
-       height="2"
-       x="-0.5"
-       y="-0.5">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood1487" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite1489" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="6"
-         result="blur"
-         id="feGaussianBlur1491" />
-      <feOffset
-         dx="0"
-         dy="6"
-         result="offset"
-         id="feOffset1493" />
-      <feComposite
-         in="offset"
-         in2="offset"
-         operator="atop"
-         result="composite2"
-         id="feComposite1495" />
-    </filter>
-    <radialGradient
-       r="21.541935"
-       fy="24.614815"
-       fx="45.312912"
-       cy="24.614815"
-       cx="45.312912"
-       gradientTransform="matrix(1.6678615,0.20004527,-0.19318681,1.6106796,108.48083,22.966962)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1506"
-       xlink:href="#linearGradient846"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
-     inkscape:window-height="992"
-     inkscape:window-width="1920"
-     fit-margin-bottom="0"
-     fit-margin-right="0"
-     fit-margin-left="0"
-     fit-margin-top="0"
-     showgrid="false"
-     inkscape:document-rotation="0"
-     inkscape:current-layer="layer1"
-     inkscape:document-units="mm"
-     inkscape:cy="83.752268"
-     inkscape:cx="-103.69645"
-     inkscape:zoom="0.7"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#000000"
-     id="base" />
-  <metadata
-     id="metadata1337">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-133.26969,-35.630924)"
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Слой 1">
-    <path
-       style="fill:url(#radialGradient1530);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 133.26969,59.089473 50,75.000087 50,-75.000087 z"
-       id="path1528"
-       sodipodi:nodetypes="cccc" />
-    <path
-       d="m 194.29572,89.403603 -8.41706,2.562119 -2.50682,7.49308 7.17785,23.579008 9.60097,-14.40173 z"
-       style="fill:url(#linearGradient1508);fill-opacity:1;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.501961"
-       id="path1459" />
-    <path
-       sodipodi:nodetypes="cccccccc"
-       id="path1463"
-       d="m 157.01826,35.630924 h 53.91343 l -13.21471,31.09726 h 13.99432 l -33.7227,51.291496 4.61762,-37.02885 h -12.45344 z"
-       style="fill:url(#radialGradient1506);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
-</svg>
@@ -218,6 +218,10 @@ class Mon
            }
            else if (key != '/stats' && key.substr(0, 13) != '/inode/stats/')
            {
+                if (key == '/config/pgs' && !kv.value)
+                {
+                    this.old_pg_config = false;
+                }
                changed = true;
            }
            if (this.config.verbose)
@@ -422,30 +426,6 @@ class Mon
                    throw new Error('Failed to duplicate old PG config to new PG config');
            }
            this.old_pg_config = true;
-            this.old_pg_config_timer = setInterval(() => this.check_clear_old_config().catch(console.error),
-                this.config.old_pg_config_clear_interval||3600000);
-        }
-    }
-
-    async check_clear_old_config()
-    {
-        if (this.old_pg_config && this.old_pg_stats_seen)
-        {
-            this.old_pg_stats_seen = false;
-            return;
-        }
-        if (this.old_pg_config)
-        {
-            await this.etcd.etcd_call('/kv/txn', { success: [
-                { requestDeleteRange: { key: b64(this.config.etcd_prefix+'/config/pgs') } },
-                { requestDeleteRange: { key: b64(this.config.etcd_prefix+'/pg/stats/'), range_end: b64(this.config.etcd_prefix+'/pg/stats0') } },
-            ] }, this.config.etcd_mon_timeout, this.config.etcd_mon_retries);
-            this.old_pg_config = false;
-        }
-        if (this.old_pg_config_timer)
-        {
-            clearInterval(this.old_pg_config_timer);
-            this.old_pg_config_timer = null;
        }
    }

@@ -1,6 +1,6 @@
 {
  "name": "vitastor-mon",
-  "version": "1.8.0",
+  "version": "1.9.2",
  "description": "Vitastor SDS monitor service",
  "main": "mon-main.js",
  "scripts": {
@@ -3,7 +3,9 @@
 set -e

 reapply_patch() {
-	if ! patch -f --dry-run -F 0 -R $1 < $2 >/dev/null; then
+	if ! [[ -e $1 ]]; then
+		echo "$1 does not exist, OpenNebula is not installed"
+	elif ! patch -f --dry-run -F 0 -R $1 < $2 >/dev/null; then
 		already_applied=0
 		if ! patch --no-backup-if-mismatch -r - -F 0 -f $1 < $2; then
 			applied_ok=0
@@ -15,8 +17,13 @@ echo "Reapplying Vitastor patches to OpenNebula's oned.conf, vmm_execrc and down
 already_applied=1
 applied_ok=1
 reapply_patch /var/lib/one/remotes/datastore/downloader.sh /var/lib/one/remotes/datastore/vitastor/downloader-vitastor.sh.diff
-reapply_patch /etc/one/oned.conf /var/lib/one/remotes/datastore/vitastor/oned.conf.diff
 reapply_patch /etc/one/vmm_exec/vmm_execrc /var/lib/one/remotes/datastore/vitastor/vmm_execrc.diff
+if [[ -e /etc/one/oned.conf ]]; then
+	if ! /var/lib/one/remotes/datastore/vitastor/patch-oned-conf.py /etc/one/oned.conf; then
+		applied_ok=0
+		already_applied=0
+	fi
+fi
 if [[ "$already_applied" = 1 ]]; then
 	echo "OK: Vitastor OpenNebula patches are already applied"
 elif [[ "$applied_ok" = 1 ]]; then
@@ -54,20 +54,20 @@ index be02d646a8..27f876ec36 100644
 TM_MAD_CONF = [
     NAME = "iscsi_libvirt", LN_TARGET = "NONE", CLONE_TARGET = "SELF", SHARED = "YES",
     DS_MIGRATE = "NO", DRIVER = "raw"
-@@ -1219,9 +1230,16 @@ DS_MAD_CONF = [
+@@ -1263,9 +1274,16 @@ DS_MAD_CONF = [
     NAME = "ceph",
     REQUIRED_ATTRS = "DISK_TYPE,BRIDGE_LIST",
     PERSISTENT_ONLY = "NO",
     MARKETPLACE_ACTIONS = "export"
- ]
- 
+]
+
 +DS_MAD_CONF = [
 +    NAME = "vitastor",
 +    REQUIRED_ATTRS = "DISK_TYPE,BRIDGE_LIST",
 +    PERSISTENT_ONLY = "NO",
 +    MARKETPLACE_ACTIONS = "export"
-+]
-+
+ ]
+ 
 DS_MAD_CONF = [
     NAME = "dev", REQUIRED_ATTRS = "DISK_TYPE", PERSISTENT_ONLY = "YES"
 ]
@@ -0,0 +1,115 @@
+#!/usr/bin/env python3
+# Patch /etc/one/oned.conf for Vitastor support
+# -s = also enable save.vitastor/restore.vitastor overrides
+
+import re
+import os
+import sys
+
+class Fixer:
+    save_restore = 0
+
+    def require_sub_cb(self, m, cb):
+        self.found = 1
+        return cb(m)
+
+    def require_sub(self, regexp, cb, text, error):
+        self.found = 0
+        new_text = re.sub(regexp, lambda m: self.require_sub_cb(m, cb), text)
+        if not self.found and error:
+            self.errors.append(error)
+        return new_text
+
+    def fix(self, oned_conf):
+        self.errors = []
+        self.kvm_found = 0
+        oned_conf = self.require_sub(r'((?:^|\n)[ \t]*VM_MAD\s*=\s*\[)([^\]]+)\]', lambda m: m.group(1)+self.fix_vm_mad(m.group(2))+']', oned_conf, 'VM_MAD not found')
+        if not self.kvm_found:
+            self.errors.append("VM_MAD[NAME=kvm].ARGUMENTS not found")
+        oned_conf = self.require_sub(r'((?:^|\n)[ \t]*TM_MAD\s*=\s*\[)([^\]]+)\]', lambda m: m.group(1)+self.fix_tm_mad(m.group(2))+']', oned_conf, 'TM_MAD not found')
+        oned_conf = self.require_sub(r'((?:^|\n)[ \t]*DATASTORE_MAD\s*=\s*\[)([^\]]+)\]', lambda m: m.group(1)+self.fix_datastore_mad(m.group(2))+']', oned_conf, 'DATASTORE_MAD not found')
+        if oned_conf[-1:] != '\n':
+            oned_conf += '\n'
+        if not re.compile(r'(^|\n)[ \t]*INHERIT_DATASTORE_ATTR\s*=\s*"VITASTOR_CONF"').search(oned_conf):
+            oned_conf += '\nINHERIT_DATASTORE_ATTR="VITASTOR_CONF"\n'
+        if not re.compile(r'(^|\n)[ \t]*INHERIT_DATASTORE_ATTR\s*=\s*"IMAGE_PREFIX"').search(oned_conf):
+            oned_conf += '\nINHERIT_DATASTORE_ATTR="IMAGE_PREFIX"\n'
+        if not re.compile(r'(^|\n)[ \t]*TM_MAD_CONF\s*=\s*\[[^\]]*NAME\s*=\s*"vitastor"').search(oned_conf):
+            oned_conf += ('\nTM_MAD_CONF = [\n'+
+                '    NAME = "vitastor", LN_TARGET = "NONE", CLONE_TARGET = "SELF", SHARED = "YES",\n'+
+                '    DS_MIGRATE = "NO", DRIVER = "raw", ALLOW_ORPHANS="format",\n'+
+                '    TM_MAD_SYSTEM = "ssh,shared", LN_TARGET_SSH = "SYSTEM", CLONE_TARGET_SSH = "SYSTEM",\n'+
+                '    DISK_TYPE_SSH = "FILE", LN_TARGET_SHARED = "NONE",\n'+
+                '    CLONE_TARGET_SHARED = "SELF", DISK_TYPE_SHARED = "FILE"\n'+
+                ']\n')
+        if not re.compile(r'(^|\n)[ \t]*DS_MAD_CONF\s*=\s*\[[^\]]*NAME\s*=\s*"vitastor"').search(oned_conf):
+            oned_conf += ('\nDS_MAD_CONF = [\n'+
+                '    NAME = "vitastor",\n'+
+                '    REQUIRED_ATTRS = "DISK_TYPE,BRIDGE_LIST",\n'+
+                '    PERSISTENT_ONLY = "NO",\n'+
+                '    MARKETPLACE_ACTIONS = "export"\n'+
+                ']\n')
+        return oned_conf
+
+    def fix_vm_mad(self, vm_mad_params):
+        if re.compile(r'\bNAME\s*=\s*"kvm"').search(vm_mad_params):
+            vm_mad_params = re.sub(r'\b(ARGUMENTS\s*=\s*")([^"]+)"', lambda m: m.group(1)+self.fix_vm_mad_args(m.group(2))+'"', vm_mad_params)
+            self.kvm_found = 1
+        return vm_mad_params
+
+    def fix_vm_mad_args(self, args):
+        args = self.fix_vm_mad_override(args, 'deploy')
+        if self.save_restore:
+            args = self.fix_vm_mad_override(args, 'save')
+            args = self.fix_vm_mad_override(args, 'restore')
+        return args
+
+    def fix_vm_mad_override(self, args, override):
+        m = re.compile(r'-l (\S+)').search(args)
+        if m and re.compile(override+'='+override+'.vitastor').search(m.group(1)):
+            return args
+        elif m and re.compile(override+'=').search(m.group(1)):
+            self.errors.append(override+"= is already overridden in -l option in VM_MAD[NAME=kvm].ARGUMENTS")
+            return args
+        elif m:
+            return self.require_sub(r'-l (\S+)', lambda m: '-l '+m.group(1)+','+override+'='+override+'.vitastor', args, '-l option not found in VM_MAD[NAME=kvm].ARGUMENTS')
+        else:
+            return args+' -l '+override+'='+override+'.vitastor'
+
+    def fix_tm_mad(self, params):
+        return self.require_sub(r'\b(ARGUMENTS\s*=\s*")([^"]+)"', lambda m: m.group(1)+self.fix_tm_mad_args('d', m.group(2), "TM_MAD")+'"', params, "TM_MAD.ARGUMENTS not found")
+
+    def fix_tm_mad_args(self, opt, args, v):
+        return self.require_sub('(-'+opt+r') (\S+)', lambda m: self.fix_tm_mad_arg(m), args, "-"+opt+" option not found in "+v+".ARGUMENTS")
+
+    def fix_tm_mad_arg(self, m):
+        a = m.group(2).split(',')
+        if 'vitastor' not in a:
+            a += [ 'vitastor' ]
+        return m.group(1)+' '+(','.join(a))
+
+    def fix_datastore_mad(self, params):
+        params = self.require_sub(r'\b(ARGUMENTS\s*=\s*")([^"]+)"', lambda m: m.group(1)+self.fix_tm_mad_args('d', m.group(2), "DATASTORE_MAD")+'"', params, "DATASTORE_MAD.ARGUMENTS not found")
+        return self.require_sub(r'\b(ARGUMENTS\s*=\s*")([^"]+)"', lambda m: m.group(1)+self.fix_tm_mad_args('s', m.group(2), "DATASTORE_MAD")+'"', params, "")
+
+fixer = Fixer()
+oned_conf_file = ''
+for arg in sys.argv[1:]:
+    if arg == '-s':
+        fixer.save_restore = 1
+    else:
+        oned_conf_file = arg
+        break
+if not oned_conf_file:
+    sys.stderr.write("USAGE: ./patch-oned-conf.py [-s] /etc/one/oned.conf\n-s means also enable save.vitastor/restore.vitastor overrides\n")
+    sys.exit(1)
+with open(oned_conf_file, 'r') as fd:
+    oned_conf = fd.read()
+new_conf = fixer.fix(oned_conf)
+if new_conf != oned_conf:
+    os.rename(oned_conf_file, oned_conf_file+'.bak')
+    with open(oned_conf_file, 'w') as fd:
+        fd.write(new_conf)
+if len(fixer.errors) > 0:
+    sys.stderr.write("ERROR: Failed to patch "+oned_conf_file+", patch it manually. Errors:\n- "+('\n- '.join(fixer.errors))+'\n')
+    sys.exit(1)
@@ -4,12 +4,15 @@
 # Copyright (c) Vitaliy Filippov, 2024+
 # License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0

+set -e
+
 DRIVER_PATH=$(dirname $0)
 DEP_FILE=$1
 DEP_FILE_LOCATION=$(dirname $DEP_FILE)
+HOST=$2

 cat > $DEP_FILE

 python3 $DRIVER_PATH/deploy_vitastor.py $DEP_FILE $DEP_FILE_LOCATION/vm.xml

-cat $DEP_FILE | $DRIVER_PATH/deploy $@
+cat "$DEP_FILE" | ssh "$HOST" "'${SCRIPTS_REMOTE_DIR:-/var/tmp/one}/vmm/kvm/deploy' '$DEP_FILE'"
@@ -54,5 +54,4 @@ for disk in dep.findall('./devices/disk[@type="file"]'):
    except Exception as e:
        print("Error: {}".format(e), file=stderr)

-if changed:
-    ET.ElementTree(dep).write(dep_file)
+ET.ElementTree(dep).write(dep_file)
@@ -10,7 +10,7 @@ source $DRIVER_PATH/../../etc/vmm/kvm/kvmrc
 source $DRIVER_PATH/../../scripts_common.sh

 FILE=$1
-HOST=$2
+DST_HOST=$2
 DEPLOY_ID=$3
 VM_ID=$4
 DS_ID=$5
@@ -33,7 +33,8 @@ fi

 SRC_IMAGE="${IMAGE_PREFIX}-sys-${VM_ID}-checkpoint"

-exec_and_log "$CLI dd iimg=$SRC_IMAGE of=$FILE" "Error exporting checkpoint into from $SRC_IMAGE to $FILE"
-exec_and_log "$CLI rm $SRC_IMAGE" "Error removing checkpoint $SRC_IMAGE"
+ssh_exec_and_log "$DST_HOST" "$CLI dd iimg=$SRC_IMAGE of=$FILE" "Error exporting checkpoint into from $SRC_IMAGE to $FILE"
+ssh_exec_and_log "$DST_HOST" "$CLI rm $SRC_IMAGE" "Error removing checkpoint $SRC_IMAGE"

-"$DRIVER_PATH"/restore $@
+set -e
+ssh "$DST_HOST" "'${SCRIPTS_REMOTE_DIR:-/var/tmp/one}/vmm/kvm/restore' $@"
@@ -11,11 +11,14 @@ source $DRIVER_PATH/../../scripts_common.sh

 DEPLOY_ID=$1
 FILE=$2
+SRC_HOST=$3
 VM_ID=$4
 DS_ID=$5

-rm -f "$FILE"
-"$DRIVER_PATH"/save $@
+set -e
+ssh "$SRC_HOST" 'rm -f "$FILE"'
+ssh "$SRC_HOST" "'${SCRIPTS_REMOTE_DIR:-/var/tmp/one}/vmm/kvm/save' $@"
+set +e

 XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"

@@ -42,7 +45,7 @@ fi

 DST_IMAGE="${IMAGE_PREFIX}-sys-${VM_ID}-checkpoint"

-exec_and_log "$CLI dd if=$FILE oimg=$DST_IMAGE conv=trunc" "Error importing checkpoint into $DST_IMAGE"
-exec_and_log "$RM -f $FILE" "Error removing checkpoint ($FILE)"
+ssh_exec_and_log "$SRC_HOST" "$CLI dd if=$FILE oimg=$DST_IMAGE conv=trunc" "Error importing checkpoint into $DST_IMAGE"
+ssh_exec_and_log "$SRC_HOST" "$RM -f $FILE" "Error removing checkpoint ($FILE)"

 exit 0
@@ -50,7 +50,7 @@ from cinder.volume import configuration
 from cinder.volume import driver
 from cinder.volume import volume_utils

-VITASTOR_VERSION = '1.8.0'
+VITASTOR_VERSION = '1.9.2'

 LOG = logging.getLogger(__name__)

@@ -1,11 +1,11 @@
 Name:           vitastor
-Version:        1.8.0
+Version:        1.9.2
 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.8.0.el7.tar.gz
+Source0:        vitastor-1.9.2.el7.tar.gz

 BuildRequires:  liburing-devel >= 0.6
 BuildRequires:  gperftools-devel
@@ -202,4 +202,8 @@ chown vitastor:vitastor /var/lib/vitastor
 /var/lib/one/remotes/datastore/vitastor/install.sh


+# Turn off the brp-python-bytecompile script
+%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
+
+
 %changelog
@@ -1,11 +1,11 @@
 Name:           vitastor
-Version:        1.8.0
+Version:        1.9.2
 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.8.0.el8.tar.gz
+Source0:        vitastor-1.9.2.el8.tar.gz

 BuildRequires:  liburing-devel >= 0.6
 BuildRequires:  gperftools-devel
@@ -199,4 +199,8 @@ chown vitastor:vitastor /var/lib/vitastor
 /var/lib/one/remotes/datastore/vitastor/install.sh


+# Turn off the brp-python-bytecompile script
+%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
+
+
 %changelog
@@ -1,11 +1,11 @@
 Name:           vitastor
-Version:        1.8.0
+Version:        1.9.2
 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.8.0.el9.tar.gz
+Source0:        vitastor-1.9.2.el9.tar.gz

 BuildRequires:  liburing-devel >= 0.6
 BuildRequires:  gperftools-devel
@@ -192,4 +192,8 @@ chown vitastor:vitastor /var/lib/vitastor
 /var/lib/one/remotes/datastore/vitastor/install.sh


+# Turn off the brp-python-bytecompile script
+%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
+
+
 %changelog
@@ -19,7 +19,7 @@ if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/local/?$")
 	set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
 endif()

-add_definitions(-DVITASTOR_VERSION="1.8.0")
+add_definitions(-DVITASTOR_VERSION="1.9.2")
 add_definitions(-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wno-sign-compare -Wno-comment -Wno-parentheses -Wno-pointer-arith -fdiagnostics-color=always -fno-omit-frame-pointer -I ${CMAKE_SOURCE_DIR}/src)
 add_link_options(-fno-omit-frame-pointer)
 if (${WITH_ASAN})
@@ -993,7 +993,8 @@ int blockstore_impl_t::read_bitmap(object_id oid, uint64_t target_version, void
    {
        while (dirty_it->first.oid == oid)
        {
-            if (target_version >= dirty_it->first.version)
+            // Condition has to be the same as in dequeue_read()
+            if (!IS_IN_FLIGHT(dirty_it->second.state) && target_version >= dirty_it->first.version)
            {
                if (result_version)
                    *result_version = dirty_it->first.version;
@@ -10,7 +10,7 @@ endif (IBVERBS_LIBRARIES)
 add_library(vitastor_common STATIC
 	../util/epoll_manager.cpp etcd_state_client.cpp messenger.cpp ../util/addr_util.cpp
 	msgr_stop.cpp msgr_op.cpp msgr_send.cpp msgr_receive.cpp ../util/ringloop.cpp ../../json11/json11.cpp
-	http_client.cpp osd_ops.cpp pg_states.cpp ../util/timerfd_manager.cpp ../util/str_util.cpp ${MSGR_RDMA}
+	http_client.cpp osd_ops.cpp pg_states.cpp ../util/timerfd_manager.cpp ../util/str_util.cpp ../util/json_util.cpp ${MSGR_RDMA}
 )
 target_link_libraries(vitastor_common pthread)
 target_compile_options(vitastor_common PUBLIC -fPIC)
@@ -88,7 +88,7 @@ add_executable(test_cluster_client
 	EXCLUDE_FROM_ALL
 	../test/test_cluster_client.cpp
 	pg_states.cpp osd_ops.cpp cluster_client.cpp cluster_client_list.cpp cluster_client_wb.cpp msgr_op.cpp ../test/mock/messenger.cpp msgr_stop.cpp
-	etcd_state_client.cpp ../util/timerfd_manager.cpp ../util/str_util.cpp ../../json11/json11.cpp
+	etcd_state_client.cpp ../util/timerfd_manager.cpp ../util/str_util.cpp ../util/json_util.cpp ../../json11/json11.cpp
 )
 target_compile_definitions(test_cluster_client PUBLIC -D__MOCK__)
 target_include_directories(test_cluster_client BEFORE PUBLIC ${CMAKE_SOURCE_DIR}/src/test/mock)
@@ -4,7 +4,7 @@
 #include <stdexcept>
 #include <assert.h>
 #include "cluster_client_impl.h"
-#include "http_client.h" // json_is_true
+#include "json_util.h"

 cluster_client_t::cluster_client_t(ring_loop_t *ringloop, timerfd_manager_t *tfd, json11::Json config)
 {
@@ -955,7 +955,7 @@ void cluster_client_t::slice_rw(cluster_op_t *op)
            ? (stripe + pg_block_size) : (op->offset + op->len);
        op->parts[i].iov.reset();
        op->parts[i].flags = 0;
-        if (op->cur_inode != op->inode || op->opcode == OSD_OP_READ && dirty_copied)
+        if (op->opcode != OSD_OP_READ_CHAIN_BITMAP && op->cur_inode != op->inode || op->opcode == OSD_OP_READ && dirty_copied)
        {
            // Read remaining parts from upper layers
            uint64_t prev = begin, cur = begin;
@@ -15,6 +15,7 @@

 #include "addr_util.h"
 #include "str_util.h"
+#include "json_util.h"
 #include "json11/json11.hpp"
 #include "http_client.h"
 #include "timerfd_manager.h"
@@ -724,22 +725,3 @@ static bool ws_parse_frame(std::string & buf, int & type, std::string & res)
    buf = buf.substr(hdr+len);
    return true;
 }
-
-// FIXME: move to utils
-bool json_is_true(const json11::Json & val)
-{
-    if (val.is_string())
-        return val == "true" || val == "yes" || val == "1";
-    return val.bool_value();
-}
-
-bool json_is_false(const json11::Json & val)
-{
-    if (val.is_string())
-        return val.string_value() == "false" || val.string_value() == "no" || val.string_value() == "0";
-    if (val.is_number())
-        return val.number_value() == 0;
-    if (val.is_bool())
-        return !val.bool_value();
-    return false;
-}
@@ -48,9 +48,3 @@ void http_request(http_co_t *handler, const std::string & host, const std::strin
    const http_options_t & options, std::function<void(const http_response_t *response)> response_callback);
 void http_post_message(http_co_t *handler, int type, const std::string & msg);
 void http_close(http_co_t *co);
-
-// Utils
-std::string strtolower(const std::string & in);
-// FIXME: move to json11
-bool json_is_true(const json11::Json & val);
-bool json_is_false(const json11::Json & val);
@@ -6,7 +6,7 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@

 Name: Vitastor
 Description: Vitastor client library
-Version: 1.8.0
+Version: 1.9.2
 Libs: -L${libdir} -lvitastor_client
 Cflags: -I${includedir}

@@ -369,6 +369,7 @@ struct cli_dd_t
 {
    cli_tool_t *parent;

+    std::vector<std::string> conv, iflag, oflag;
    dd_in_info_t iinfo;
    dd_out_info_t oinfo;

@@ -766,6 +767,49 @@ struct cli_dd_t
            goto resume_3;
        else if (state == 4)
            goto resume_4;
+        for (int i = 0; i < conv.size(); i++)
+        {
+            if (conv[i] == "nofsync")
+                oinfo.end_fsync = false;
+            else if (conv[i] == "trunc")
+                oinfo.out_trunc = true;
+            else if (conv[i] == "nocreat")
+                oinfo.out_create = false;
+            else if (conv[i] == "noerror")
+                ignore_errors = true;
+            else if (conv[i] == "nosparse")
+                write_zero = true;
+            else
+            {
+                result = (cli_result_t){ .err = EINVAL, .text = "Unknown option conv="+conv[i] };
+                state = 100;
+                return;
+            }
+        }
+        for (int i = 0; i < iflag.size(); i++)
+        {
+            if (iflag[i] == "direct")
+                iinfo.in_direct = true;
+            else
+            {
+                result = (cli_result_t){ .err = EINVAL, .text = "Unknown option iflag="+iflag[i] };
+                state = 100;
+                return;
+            }
+        }
+        for (int i = 0; i < oflag.size(); i++)
+        {
+            if (oflag[i] == "direct")
+                oinfo.out_direct = true;
+            else if (oflag[i] == "append")
+                oinfo.out_append = true;
+            else
+            {
+                result = (cli_result_t){ .err = EINVAL, .text = "Unknown option oflag="+oflag[i] };
+                state = 100;
+                return;
+            }
+        }
        if ((oinfo.oimg != "" && oinfo.ofile != "") || (iinfo.iimg != "" && iinfo.ifile != ""))
        {
            result = (cli_result_t){ .err = EINVAL, .text = "Image and file can't be specified at the same time" };
@@ -908,6 +952,18 @@ static uint64_t parse_blocks(json11::Json v, uint64_t bs, uint64_t def)
    return res;
 }

+static std::vector<std::string> explode_json(const std::string & sep, json11::Json opt)
+{
+    if (opt.is_array())
+    {
+        std::vector<std::string> arr;
+        for (auto & item: opt.array_items())
+            arr.push_back(item.as_string());
+        return arr;
+    }
+    return explode(sep, opt.as_string(), true);
+}
+
 std::function<bool(cli_result_t &)> cli_tool_t::start_dd(json11::Json cfg)
 {
    auto dd = new cli_dd_t();
@@ -923,7 +979,7 @@ std::function<bool(cli_result_t &)> cli_tool_t::start_dd(json11::Json cfg)
    dd->oseek = parse_blocks(cfg["oseek"], dd->blocksize, 0);
    if (!dd->oseek)
        dd->oseek = parse_blocks(cfg["seek"], dd->blocksize, 0);
-    dd->iseek = parse_blocks(cfg["oseek"], dd->blocksize, 0);
+    dd->iseek = parse_blocks(cfg["iseek"], dd->blocksize, 0);
    if (!dd->iseek)
        dd->iseek = parse_blocks(cfg["skip"], dd->blocksize, 0);
    dd->iodepth = cfg["iodepth"].uint64_value();
@@ -935,25 +991,9 @@ std::function<bool(cli_result_t &)> cli_tool_t::start_dd(json11::Json cfg)
        progress = true;
    dd->iinfo.detect_size = cfg["size"].is_null();
    dd->oinfo.out_size = parse_size(cfg["size"].as_string());
-    std::vector<std::string> conv = explode(",", cfg["conv"].string_value(), true);
-    if (std::find(conv.begin(), conv.end(), "nofsync") != conv.end())
-        dd->oinfo.end_fsync = false;
-    if (std::find(conv.begin(), conv.end(), "trunc") != conv.end())
-        dd->oinfo.out_trunc = true;
-    if (std::find(conv.begin(), conv.end(), "nocreat") != conv.end())
-        dd->oinfo.out_create = false;
-    if (std::find(conv.begin(), conv.end(), "noerror") != conv.end())
-        dd->ignore_errors = true;
-    if (std::find(conv.begin(), conv.end(), "nosparse") != conv.end())
-        dd->write_zero = true;
-    conv = explode(",", cfg["iflag"].string_value(), true);
-    if (std::find(conv.begin(), conv.end(), "direct") != conv.end())
-        dd->iinfo.in_direct = true;
-    conv = explode(",", cfg["oflag"].string_value(), true);
-    if (std::find(conv.begin(), conv.end(), "direct") != conv.end())
-        dd->oinfo.out_direct = true;
-    if (std::find(conv.begin(), conv.end(), "append") != conv.end())
-        dd->oinfo.out_append = true;
+    dd->conv = explode_json(",", cfg["conv"]);
+    dd->iflag = explode_json(",", cfg["iflag"]);
+    dd->oflag = explode_json(",", cfg["oflag"]);
    return [dd](cli_result_t & result)
    {
        dd->loop();
@@ -5,6 +5,7 @@
 #include "cluster_client.h"
 #include "pg_states.h"
 #include "str_util.h"
+#include "json_util.h"

 struct cli_fix_t
 {
@@ -21,6 +21,3 @@ template<class T> void remove_duplicates(std::vector<T> & ret)
    }
    ret.resize(j+1);
 }
-
-// from http_client.cpp...
-bool json_is_false(const json11::Json & val);
@@ -4,6 +4,7 @@
 #include "cli.h"
 #include "cluster_client.h"
 #include "str_util.h"
+#include "json_util.h"
 #include "http_client.h"

 // Reweight OSD, change tags or set noout flag
@@ -156,6 +156,8 @@ resume_1:
                    for (auto & jtag: osd_cfg["tags"].array_items())
                        osd.tags.push_back(jtag.string_value());
                }
+                else if (osd_cfg["tags"].is_string())
+                    osd.tags.push_back(osd_cfg["tags"].string_value());
                osd.noout = osd_cfg["noout"].bool_value();
            }
            auto np_it = node_placement.find(std::to_string(osd.num));
@@ -4,6 +4,7 @@
 #include "cli.h"
 #include "cluster_client.h"
 #include "str_util.h"
+#include "json_util.h"
 #include "pg_states.h"
 #include "http_client.h"

@@ -5,8 +5,9 @@ project(vitastor)
 # vitastor-disk
 add_executable(vitastor-disk
 	disk_tool.cpp disk_simple_offsets.cpp
-	disk_tool_journal.cpp disk_tool_meta.cpp disk_tool_prepare.cpp disk_tool_resize.cpp disk_tool_udev.cpp disk_tool_utils.cpp disk_tool_upgrade.cpp
-	../util/crc32c.c ../util/str_util.cpp ../../json11/json11.cpp ../util/rw_blocking.cpp ../util/allocator.cpp ../util/ringloop.cpp ../blockstore/blockstore_disk.cpp
+	disk_tool_journal.cpp disk_tool_meta.cpp disk_tool_prepare.cpp disk_tool_resize.cpp
+	disk_tool_resize_auto.cpp disk_tool_udev.cpp disk_tool_utils.cpp disk_tool_upgrade.cpp
+	../util/crc32c.c ../util/str_util.cpp ../util/json_util.cpp ../../json11/json11.cpp ../util/rw_blocking.cpp ../util/allocator.cpp ../util/ringloop.cpp ../blockstore/blockstore_disk.cpp
 )
 target_link_libraries(vitastor-disk
 	tcmalloc_minimal
@@ -92,8 +92,22 @@ static const char *help_text =
    "  \n"
    "  Requires the `sfdisk` utility.\n"
    "\n"
-    "vitastor-disk resize <ALL_OSD_PARAMETERS> <NEW_LAYOUT> [--iodepth 32]\n"
-    "  Resize data area and/or rewrite/move journal and metadata\n"
+    "vitastor-disk resize <osd_num>|<osd_device> [OPTIONS]\n"
+    "  Resize data area and/or move journal and metadata:\n"
+    "    --move-journal TARGET    move journal to TARGET\n"
+    "    --move-meta TARGET       move metadata to TARGET\n"
+    "    --journal-size NEW_SIZE  resize journal to NEW_SIZE\n"
+    "    --data-size NEW_SIZE     resize data device to NEW_SIZE\n"
+    "    --dry-run                only show new layout, do not apply it\n"
+    "  \n"
+    "  NEW_SIZE may include k/m/g/t suffixes.\n"
+    "  TARGET may be one of:\n"
+    "    <partition>    move journal/metadata to an existing GPT partition\n"
+    "    <raw_device>   create a GPT partition on <raw_device> and move journal/metadata to it\n"
+    "    \"\"           (empty string) move journal/metadata back to the data device\n"
+    "\n"
+    "vitastor-disk raw-resize <ALL_OSD_PARAMETERS> <NEW_LAYOUT> [--iodepth 32]\n"
+    "  Resize data area and/or rewrite/move journal and metadata (manual format).\n"
    "  ALL_OSD_PARAMETERS must include all (at least all disk-related)\n"
    "  parameters from OSD command line (i.e. from systemd unit or superblock).\n"
    "  NEW_LAYOUT may include new disk layout parameters:\n"
@@ -143,8 +157,10 @@ static const char *help_text =
    "  For now, this only checks that device cache is in write-through mode if fsync is disabled.\n"
    "  Intended for use from startup scripts (i.e. from systemd units).\n"
    "\n"
+    "vitastor-disk dump-journal [OPTIONS] <osd_device>\n"
    "vitastor-disk dump-journal [OPTIONS] <journal_file> <journal_block_size> <offset> <size>\n"
-    "  Dump journal in human-readable or JSON (if --json is specified) format.\n"
+    "  Dump journal in text or JSON (if --json is specified) format.\n"
+    "  You can specify any OSD device (data, metadata or journal), or the layout manually.\n"
    "  Options:\n"
    "  --all             Scan the whole journal area for entries and dump them, even outdated ones\n"
    "  --json            Dump journal in JSON format\n"
@@ -152,16 +168,21 @@ static const char *help_text =
    "  --format data     Same as \"entries\", but also include small write data\n"
    "  --format blocks   Dump as an array of journal blocks each containing array of entries\n"
    "\n"
+    "vitastor-disk write-journal <osd_device>\n"
    "vitastor-disk write-journal <journal_file> <journal_block_size> <bitmap_size> <offset> <size>\n"
    "  Write journal from JSON taken from standard input in the same format as produced by\n"
    "  `dump-journal --json --format data`.\n"
+    "  You can specify any OSD device (data, metadata or journal), or the layout manually.\n"
    "\n"
+    "vitastor-disk dump-meta <osd_device>\n"
    "vitastor-disk dump-meta <meta_file> <meta_block_size> <offset> <size>\n"
    "  Dump metadata in JSON format.\n"
+    "  You can specify any OSD device (data, metadata or journal), or the layout manually.\n"
    "\n"
+    "vitastor-disk write-meta <osd_device>\n"
    "vitastor-disk write-meta <meta_file> <offset> <size>\n"
-    "  Write metadata from JSON taken from standard input in the same format as produced by\n"
-    "  `dump-meta`. Intended for debugging.\n"
+    "  Write metadata from JSON taken from standard input in the same format as produced by `dump-meta`.\n"
+    "  You can specify any OSD device (data, metadata or journal), or the layout manually.\n"
    "\n"
    "vitastor-disk simple-offsets <device>\n"
    "  Calculate offsets for old simple&stupid (no superblock) OSD deployment. Options:\n"
@@ -229,6 +250,10 @@ int main(int argc, char *argv[])
        {
            self.options["force"] = "1";
        }
+        else if (!strcmp(argv[i], "--dry-run") || !strcmp(argv[i], "--dry_run"))
+        {
+            self.options["dry_run"] = "1";
+        }
        else if (!strcmp(argv[i], "--allow-data-loss"))
        {
            self.options["allow_data_loss"] = "1";
@@ -236,7 +261,7 @@ int main(int argc, char *argv[])
        else if (argv[i][0] == '-' && argv[i][1] == '-' && i < argc-1)
        {
            char *key = argv[i]+2;
-            self.options[key] = argv[++i];
+            self.options[str_replace(key, "-", "_")] = argv[++i];
        }
        else
        {
@@ -249,29 +274,49 @@ int main(int argc, char *argv[])
    }
    if (!strcmp(cmd[0], "dump-journal"))
    {
-        if (cmd.size() < 5)
+        if (cmd.size() != 2 && cmd.size() < 5)
        {
            print_help(help_text, aliased ? "vitastor-dump-journal" : "vitastor-disk", cmd[0], false);
            return 1;
        }
        self.dsk.journal_device = cmd[1];
-        self.dsk.journal_block_size = strtoul(cmd[2], NULL, 10);
-        self.dsk.journal_offset = strtoull(cmd[3], NULL, 10);
-        self.dsk.journal_len = strtoull(cmd[4], NULL, 10);
+        if (cmd.size() > 2)
+        {
+            self.dsk.journal_block_size = strtoul(cmd[2], NULL, 10);
+            self.dsk.journal_offset = strtoull(cmd[3], NULL, 10);
+            self.dsk.journal_len = strtoull(cmd[4], NULL, 10);
+        }
+        else
+        {
+            // First argument is an OSD device - take metadata layout parameters from it
+            if (self.dump_load_check_superblock(self.dsk.journal_device))
+                return 1;
+        }
        return self.dump_journal();
    }
    else if (!strcmp(cmd[0], "write-journal"))
    {
-        if (cmd.size() < 6)
+        if (cmd.size() != 2 && cmd.size() < 6)
        {
            print_help(help_text, "vitastor-disk", cmd[0], false);
            return 1;
        }
        self.new_journal_device = cmd[1];
-        self.dsk.journal_block_size = strtoul(cmd[2], NULL, 10);
-        self.dsk.clean_entry_bitmap_size = strtoul(cmd[3], NULL, 10);
-        self.new_journal_offset = strtoull(cmd[4], NULL, 10);
-        self.new_journal_len = strtoull(cmd[5], NULL, 10);
+        if (cmd.size() > 2)
+        {
+            self.dsk.journal_block_size = strtoul(cmd[2], NULL, 10);
+            self.dsk.clean_entry_bitmap_size = strtoul(cmd[3], NULL, 10);
+            self.new_journal_offset = strtoull(cmd[4], NULL, 10);
+            self.new_journal_len = strtoull(cmd[5], NULL, 10);
+        }
+        else
+        {
+            // First argument is an OSD device - take metadata layout parameters from it
+            if (self.dump_load_check_superblock(self.new_journal_device))
+                return 1;
+            self.new_journal_offset = self.dsk.journal_offset;
+            self.new_journal_len = self.dsk.journal_len;
+        }
        std::string json_err;
        json11::Json entries = json11::Json::parse(read_all_fd(0), json_err);
        if (json_err != "")
@@ -296,27 +341,47 @@ int main(int argc, char *argv[])
    }
    else if (!strcmp(cmd[0], "dump-meta"))
    {
-        if (cmd.size() < 5)
+        if (cmd.size() != 2 && cmd.size() < 5)
        {
            print_help(help_text, "vitastor-disk", cmd[0], false);
            return 1;
        }
        self.dsk.meta_device = cmd[1];
-        self.dsk.meta_block_size = strtoul(cmd[2], NULL, 10);
-        self.dsk.meta_offset = strtoull(cmd[3], NULL, 10);
-        self.dsk.meta_len = strtoull(cmd[4], NULL, 10);
+        if (cmd.size() > 2)
+        {
+            self.dsk.meta_block_size = strtoul(cmd[2], NULL, 10);
+            self.dsk.meta_offset = strtoull(cmd[3], NULL, 10);
+            self.dsk.meta_len = strtoull(cmd[4], NULL, 10);
+        }
+        else
+        {
+            // First argument is an OSD device - take metadata layout parameters from it
+            if (self.dump_load_check_superblock(self.dsk.meta_device))
+                return 1;
+        }
        return self.dump_meta();
    }
    else if (!strcmp(cmd[0], "write-meta"))
    {
-        if (cmd.size() < 4)
+        if (cmd.size() != 2 && cmd.size() < 4)
        {
            print_help(help_text, "vitastor-disk", cmd[0], false);
            return 1;
        }
        self.new_meta_device = cmd[1];
-        self.new_meta_offset = strtoull(cmd[2], NULL, 10);
-        self.new_meta_len = strtoull(cmd[3], NULL, 10);
+        if (cmd.size() > 2)
+        {
+            self.new_meta_offset = strtoull(cmd[2], NULL, 10);
+            self.new_meta_len = strtoull(cmd[3], NULL, 10);
+        }
+        else
+        {
+            // First argument is an OSD device - take metadata layout parameters from it
+            if (self.dump_load_check_superblock(self.new_meta_device))
+                return 1;
+            self.new_meta_offset = self.dsk.meta_offset;
+            self.new_meta_len = self.dsk.meta_len;
+        }
        std::string json_err;
        json11::Json meta = json11::Json::parse(read_all_fd(0), json_err);
        if (json_err != "")
@@ -328,7 +393,16 @@ int main(int argc, char *argv[])
    }
    else if (!strcmp(cmd[0], "resize"))
    {
-        return self.resize_data();
+        if (cmd.size() != 2)
+        {
+            fprintf(stderr, "Exactly 1 OSD number or OSD device path argument is required\n");
+            return 1;
+        }
+        return self.resize_data(cmd[1]);
+    }
+    else if (!strcmp(cmd[0], "raw-resize"))
+    {
+        return self.raw_resize();
    }
    else if (!strcmp(cmd[0], "simple-offsets"))
    {
@@ -93,10 +93,16 @@ struct disk_tool_t
    void dump_meta_header(blockstore_meta_header_v2_t *hdr);
    void dump_meta_entry(uint64_t block_num, clean_disk_entry *entry, uint8_t *bitmap);

+    int dump_load_check_superblock(const std::string & device);
+
    int write_json_journal(json11::Json entries);
    int write_json_meta(json11::Json meta);

-    int resize_data();
+    int resize_data(std::string device);
+    int resize_parse_move_journal(std::map<std::string, std::string> & move_options, bool dry_run);
+    int resize_parse_move_meta(std::map<std::string, std::string> & move_options, bool dry_run);
+
+    int raw_resize();
    int resize_parse_params();
    void resize_init(blockstore_meta_header_v2_t *hdr);
    int resize_remap_blocks();
@@ -114,11 +120,13 @@ struct disk_tool_t
    int systemd_start_stop_osds(const std::vector<std::string> & cmd, const std::vector<std::string> & devices);
    int pre_exec_osd(std::string device);
    int purge_devices(const std::vector<std::string> & devices);
+    int clear_osd_superblock(const std::string & dev);

    json11::Json read_osd_superblock(std::string device, bool expect_exist = true, bool ignore_nonref = false);
    uint32_t write_osd_superblock(std::string device, json11::Json params);

    int prepare_one(std::map<std::string, std::string> options, int is_hdd = -1);
+    int check_existing_partition(const std::string & dev);
    int prepare(std::vector<std::string> devices);
    std::vector<vitastor_dev_info_t> collect_devices(const std::vector<std::string> & devices);
    json11::Json add_partitions(vitastor_dev_info_t & devinfo, std::vector<std::string> sizes);
@@ -133,8 +141,8 @@ void disk_tool_simple_offsets(json11::Json cfg, bool json_output);
 uint64_t sscanf_json(const char *fmt, const json11::Json & str);
 void fromhexstr(const std::string & from, int bytes, uint8_t *to);
 int disable_cache(std::string dev);
+uint64_t get_device_size(const std::string & dev, bool should_exist = false);
 std::string get_parent_device(std::string dev);
-bool json_is_true(const json11::Json & val);
 int shell_exec(const std::vector<std::string> & cmd, const std::string & in, std::string *out, std::string *err);
 int write_zero(int fd, uint64_t offset, uint64_t size);
 json11::Json read_parttable(std::string dev);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Vitaliy Filippov	79719e44ac	Release 1.9.2 New features: - Support resizing normal vitastor-disk partitions and moving journal/metadata: [vitastor-disk resize](https://vitastor.io/docs/usage/disk.html#resize) - Support simple forms of vitastor-disk {dump,write}-{meta,journal} for OSD partitions Bug fixes: - Fix block RWX volumes broken after introducing stage/unstage support - Do not allow to create non-block RWX volumes in CSI - Fix vitastor-disk prepare not seeing the newly created partition in rare cases - Fix non-array tags not showing up in ls-osd/osd-tree - Make OpenNebula oned.conf patching during installation smarter - Fix iseek option in vitastor-cli dd not working - Validate conv=, iflag=, oflag= options in vitastor-cli dd - Fix vitastor-disk write-meta not writing header checksum to the disk - Fix JSON format in vitastor-disk dump-meta - Fix read_chain_bitmap not working for snapshot in another pool - Fix a possible OSD crash during parallel read & write to an image with snapshots - Several followups to the READ_CHAIN_BITMAP fix: avoid data reads, fix possible overflow in is_zero(), fix bitmap size	2024-10-20 01:49:13 +03:00
Vitaliy Filippov	f5626655df	Add new disk command docs	2024-10-20 01:47:46 +03:00
Vitaliy Filippov	7e2dde2702	Fix block RWX volumes broken after introducing stage/unstage support	2024-10-19 11:56:56 +03:00
Vitaliy Filippov	3b0ab317cf	Validate non-block RWX in CSI	2024-10-18 01:55:38 +03:00
Vitaliy Filippov	18eb99c494	Implement resizing partitions created with vitastor-disk	2024-10-18 01:55:19 +03:00
Vitaliy Filippov	4e8a1a8895	Run partprobe in add_partition() if /dev/disk/by-partuuid symlink is not present	2024-10-12 18:07:53 +03:00
Vitaliy Filippov	d27a8bdabc	Make get_parent_device return full path	2024-10-12 13:44:52 +03:00
Vitaliy Filippov	ebd616e42f	Extract clear_osd_superblock()	2024-10-12 13:44:52 +03:00
Vitaliy Filippov	b18d296e01	Extract check_existing_partition(), get_device_size()	2024-10-12 13:44:52 +03:00
Vitaliy Filippov	a03508320e	Move json_is_true/json_is_false to json_util.cpp	2024-10-12 00:40:39 +03:00
Vitaliy Filippov	c9ccc790ec	Fix non-array tags not showing up in ls-osd/osd-tree	2024-10-11 18:33:35 +03:00
Vitaliy Filippov	db2d9c5b3d	Fix tables in NFS doc	2024-10-08 00:20:10 +03:00
Vitaliy Filippov	09f15f44c9	Fix Toshiba MG and VDUSE Debian kernel note in docs	2024-10-08 00:17:14 +03:00
Vitaliy Filippov	c5a58c2e81	Support reading parameters automatically from the superblock in vitastor-disk {dump,write}-{meta,journal}	2024-10-07 02:21:58 +03:00
Vitaliy Filippov	30e7c2ad1e	Add custom OpenNebula oned.conf patcher (it uses a SHITTY configuration file format)	2024-10-06 13:46:05 +03:00
Vitaliy Filippov	2e76ceabbe	Fix iseek option in vitastor-cli dd	2024-10-05 18:25:38 +03:00
Vitaliy Filippov	3df088c207	Validate conv=, iflag=, oflag= options in vitastor-cli dd	2024-10-05 18:02:36 +03:00
Vitaliy Filippov	d882a19eab	Fix vitastor-disk write-meta not writing header checksum to the disk...	2024-10-05 17:32:55 +03:00
Vitaliy Filippov	702be3da7a	Fix JSON format in vitastor-disk dump-meta	2024-10-05 16:08:34 +03:00
Vitaliy Filippov	99533e1c2f	Fix .yml links	2024-10-02 00:38:07 +03:00
Vitaliy Filippov	a6cceb43bf	Fix read_chain_bitmap not working for snapshot in another pool	2024-10-02 00:24:48 +03:00
Vitaliy Filippov	745d89459a	Fix link, add title	2024-09-29 22:05:56 +03:00
Vitaliy Filippov	48f023292d	Fix extra data reads on read_chain	2024-09-21 17:05:42 +03:00
Vitaliy Filippov	b58bf3ada5	Fix possible OSD crash during parallel read & write to an image with snapshots OSDs could crash with the following "assertion failed" message (crash didn't affect data and was caused by OSD thinking upper blocks are full while they weren't). Reproduction without introducing artificial delays is hard because you have to force OSD to read an object with enqueued but not handled write which fills previously non-full bitmap. O_o. ``` vitastor-osd: ./src/osd/osd_primary_chain.cpp:613: void osd_t::send_chained_read_results(pg_t&, osd_op_t*): Assertion `stripes[role].read_buf' failed. ```	2024-09-21 13:44:36 +03:00
Vitaliy Filippov	f18a749324	READ_CHAIN fix was incomplete :-)	2024-09-21 13:40:31 +03:00
Vitaliy Filippov	6e9307c522	Fix possible overflow in is_zero()	2024-09-21 13:40:10 +03:00
Vitaliy Filippov	99adbb9483	Release 1.9.1 Hotfixes for OpenNebula and upgrade hotfix for 1.7 - Fix deploy.vitastor, save.vitastor, restore.vitastor scripts not working for nodes other than master oned - Fix deploy.vitastor not working for VMs without Vitastor disks - Disable clearing old PG configuration when upgrading from 1.7 or older versions (it was breaking old clients)	2024-09-14 19:17:30 +03:00
Vitaliy Filippov	b489a611a9	Add 1.8 upgrade note	2024-09-14 19:17:30 +03:00
Vitaliy Filippov	c6c0b8957a	Stop updating old PG configuration when the user manually deletes it	2024-09-14 19:15:40 +03:00
Vitaliy Filippov	5d40d2a459	Fix oned.conf patch	2024-09-14 19:08:44 +03:00
Vitaliy Filippov	f449c28c3b	Always write decoded base64 deployment file (otherwise it breaks VMs without Vitastor disks)	2024-09-14 15:25:02 +03:00
Vitaliy Filippov	a6274f58cc	Same fix for save/restore: they also need to ssh to target node	2024-09-14 02:46:48 +03:00
Vitaliy Filippov	ac29ffea6a	Add ssh to target node to deploy.vitastor - without it it always tried to deploy VMs on oned host	2024-09-14 02:15:24 +03:00
Vitaliy Filippov	bc06acc153	Disable clearing old PG configuration - we can not be sure that old clients do not need it	2024-09-13 19:00:12 +03:00
Vitaliy Filippov	fe8e611e23	Release 1.9.0 - OpenNebula support! [Installation instructions](https://git.yourcmc.ru/vitalif/vitastor/src/branch/master/docs/installation/opennebula.en.md) - Added [vitastor-cli rm --exact\|--matching](https://git.yourcmc.ru/vitalif/vitastor/src/branch/master/docs/usage/cli.en.md#rm) command - Added [vitastor-cli dd](https://git.yourcmc.ru/vitalif/vitastor/src/branch/master/docs/usage/cli.en.md#dd) command - copy files between Vitastor images, files and pipes - Add a startup timeout to vitastor-cli to not wait for etcd infinitely - Fix non-working OSD_OP_READ_CHAIN_BITMAP O_o - Autodetect block_size/bitmap_granularity/immediate_commit when creating pools - Do not allow to create multiple pools with the same name from vitastor-cli - Fix skip_cache_check option not applied due to type issue (see github issue #70)	2024-09-06 01:46:16 +03:00
Vitaliy Filippov	7636f9c726	Turn off brp-python-bytecompile in RPM specs	2024-09-06 01:44:44 +03:00