Compare commits
48 Commits
check-writ
...
master
Author | SHA1 | Date |
---|---|---|
Vitaliy Filippov | 99adbb9483 | |
Vitaliy Filippov | b489a611a9 | |
Vitaliy Filippov | c6c0b8957a | |
Vitaliy Filippov | 5d40d2a459 | |
Vitaliy Filippov | f449c28c3b | |
Vitaliy Filippov | a6274f58cc | |
Vitaliy Filippov | ac29ffea6a | |
Vitaliy Filippov | bc06acc153 | |
Vitaliy Filippov | fe8e611e23 | |
Vitaliy Filippov | 7636f9c726 | |
Vitaliy Filippov | d5f7005ddd | |
Vitaliy Filippov | 70d6fcd32a | |
Vitaliy Filippov | 17caaa59af | |
Vitaliy Filippov | 2dac6ee38b | |
Vitaliy Filippov | 8be67a2d5b | |
Vitaliy Filippov | 9c2132882c | |
Vitaliy Filippov | 9f25bb059b | |
Vitaliy Filippov | ee3094c5e5 | |
Vitaliy Filippov | ba9f263b75 | |
Vitaliy Filippov | 30eaa1a8e6 | |
Vitaliy Filippov | 6a8daedbe2 | |
Vitaliy Filippov | 2b96ac0b44 | |
Vitaliy Filippov | 986cd11705 | |
Vitaliy Filippov | b804051eaf | |
Vitaliy Filippov | 3cc326500e | |
Vitaliy Filippov | f848c450a4 | |
Vitaliy Filippov | 4121c66281 | |
Vitaliy Filippov | b3716fbe23 | |
Vitaliy Filippov | 97f49d7d94 | |
Vitaliy Filippov | 131de4b790 | |
Vitaliy Filippov | ce359c5a69 | |
Vitaliy Filippov | 521e867b10 | |
Vitaliy Filippov | 333c54ebbf | |
Vitaliy Filippov | 58d3da95c8 | |
Vitaliy Filippov | 4e90e752eb | |
Vitaliy Filippov | 09342d7189 | |
Vitaliy Filippov | eb3e8b8c19 | |
Vitaliy Filippov | e2ca3ad99e | |
Vitaliy Filippov | dd4b0aed2b | |
Vitaliy Filippov | 42851a061c | |
Vitaliy Filippov | 8e0f242d30 | |
Vitaliy Filippov | 0daa8ea39b | |
Vitaliy Filippov | b263d311ef | |
Vitaliy Filippov | 8720185780 | |
Vitaliy Filippov | 20584414d8 | |
Vitaliy Filippov | 306a3db7f3 | |
Vitaliy Filippov | 5b0aebada4 | |
Vitaliy Filippov | d6f0b480c8 |
|
@ -16,6 +16,7 @@ env:
|
||||||
BUILDENV_IMAGE: git.yourcmc.ru/vitalif/vitastor/buildenv
|
BUILDENV_IMAGE: git.yourcmc.ru/vitalif/vitastor/buildenv
|
||||||
TEST_IMAGE: git.yourcmc.ru/vitalif/vitastor/test
|
TEST_IMAGE: git.yourcmc.ru/vitalif/vitastor/test
|
||||||
OSD_ARGS: '--etcd_quick_timeout 2000'
|
OSD_ARGS: '--etcd_quick_timeout 2000'
|
||||||
|
USE_RAMDISK: 1
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
group: ci-${{ github.ref }}
|
group: ci-${{ github.ref }}
|
||||||
|
@ -557,6 +558,24 @@ jobs:
|
||||||
echo ""
|
echo ""
|
||||||
done
|
done
|
||||||
|
|
||||||
|
test_dd:
|
||||||
|
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_dd.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_root_node:
|
test_root_node:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: build
|
needs: build
|
||||||
|
|
|
@ -2,6 +2,6 @@ cmake_minimum_required(VERSION 2.8.12)
|
||||||
|
|
||||||
project(vitastor)
|
project(vitastor)
|
||||||
|
|
||||||
set(VERSION "1.7.1")
|
set(VITASTOR_VERSION "1.9.1")
|
||||||
|
|
||||||
add_subdirectory(src)
|
add_subdirectory(src)
|
||||||
|
|
|
@ -19,7 +19,7 @@ Vitastor нацелен в первую очередь на SSD и SSD+HDD кл
|
||||||
TCP и RDMA и на хорошем железе может достигать задержки 4 КБ чтения и записи на уровне ~0.1 мс,
|
TCP и RDMA и на хорошем железе может достигать задержки 4 КБ чтения и записи на уровне ~0.1 мс,
|
||||||
что примерно в 10 раз быстрее, чем Ceph и другие популярные программные СХД.
|
что примерно в 10 раз быстрее, чем Ceph и другие популярные программные СХД.
|
||||||
|
|
||||||
Vitastor поддерживает QEMU-драйвер, протоколы NBD и NFS, драйверы OpenStack, Proxmox, Kubernetes.
|
Vitastor поддерживает QEMU-драйвер, протоколы NBD и NFS, драйверы OpenStack, OpenNebula, Proxmox, Kubernetes.
|
||||||
Другие драйверы могут также быть легко реализованы.
|
Другие драйверы могут также быть легко реализованы.
|
||||||
|
|
||||||
Подробности смотрите в документации по ссылкам ниже.
|
Подробности смотрите в документации по ссылкам ниже.
|
||||||
|
@ -42,6 +42,7 @@ Vitastor поддерживает QEMU-драйвер, протоколы NBD и
|
||||||
- Установка
|
- Установка
|
||||||
- [Пакеты](docs/installation/packages.ru.md)
|
- [Пакеты](docs/installation/packages.ru.md)
|
||||||
- [Proxmox](docs/installation/proxmox.ru.md)
|
- [Proxmox](docs/installation/proxmox.ru.md)
|
||||||
|
- [OpenNebula](docs/installation/opennebula.ru.md)
|
||||||
- [OpenStack](docs/installation/openstack.ru.md)
|
- [OpenStack](docs/installation/openstack.ru.md)
|
||||||
- [Kubernetes CSI](docs/installation/kubernetes.ru.md)
|
- [Kubernetes CSI](docs/installation/kubernetes.ru.md)
|
||||||
- [Сборка из исходных кодов](docs/installation/source.ru.md)
|
- [Сборка из исходных кодов](docs/installation/source.ru.md)
|
||||||
|
|
|
@ -19,7 +19,7 @@ supports TCP and RDMA and may achieve 4 KB read and write latency as low as ~0.1
|
||||||
with proper hardware which is ~10 times faster than other popular SDS's like Ceph
|
with proper hardware which is ~10 times faster than other popular SDS's like Ceph
|
||||||
or internal systems of public clouds.
|
or internal systems of public clouds.
|
||||||
|
|
||||||
Vitastor supports QEMU, NBD, NFS protocols, OpenStack, Proxmox, Kubernetes drivers.
|
Vitastor supports QEMU, NBD, NFS protocols, OpenStack, OpenNebula, Proxmox, Kubernetes drivers.
|
||||||
More drivers may be created easily.
|
More drivers may be created easily.
|
||||||
|
|
||||||
Read more details below in the documentation.
|
Read more details below in the documentation.
|
||||||
|
@ -42,6 +42,7 @@ Read more details below in the documentation.
|
||||||
- Installation
|
- Installation
|
||||||
- [Packages](docs/installation/packages.en.md)
|
- [Packages](docs/installation/packages.en.md)
|
||||||
- [Proxmox](docs/installation/proxmox.en.md)
|
- [Proxmox](docs/installation/proxmox.en.md)
|
||||||
|
- [OpenNebula](docs/installation/opennebula.en.md)
|
||||||
- [OpenStack](docs/installation/openstack.en.md)
|
- [OpenStack](docs/installation/openstack.en.md)
|
||||||
- [Kubernetes CSI](docs/installation/kubernetes.en.md)
|
- [Kubernetes CSI](docs/installation/kubernetes.en.md)
|
||||||
- [Building from Source](docs/installation/source.en.md)
|
- [Building from Source](docs/installation/source.en.md)
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
VERSION ?= v1.7.1
|
VITASTOR_VERSION ?= v1.9.1
|
||||||
|
|
||||||
all: build push
|
all: build push
|
||||||
|
|
||||||
build:
|
build:
|
||||||
@docker build --rm -t vitalif/vitastor-csi:$(VERSION) .
|
@docker build --rm -t vitalif/vitastor-csi:$(VITASTOR_VERSION) .
|
||||||
|
|
||||||
push:
|
push:
|
||||||
@docker push vitalif/vitastor-csi:$(VERSION)
|
@docker push vitalif/vitastor-csi:$(VITASTOR_VERSION)
|
||||||
|
|
|
@ -49,7 +49,7 @@ spec:
|
||||||
capabilities:
|
capabilities:
|
||||||
add: ["SYS_ADMIN"]
|
add: ["SYS_ADMIN"]
|
||||||
allowPrivilegeEscalation: true
|
allowPrivilegeEscalation: true
|
||||||
image: vitalif/vitastor-csi:v1.7.1
|
image: vitalif/vitastor-csi:v1.9.1
|
||||||
args:
|
args:
|
||||||
- "--node=$(NODE_ID)"
|
- "--node=$(NODE_ID)"
|
||||||
- "--endpoint=$(CSI_ENDPOINT)"
|
- "--endpoint=$(CSI_ENDPOINT)"
|
||||||
|
|
|
@ -121,7 +121,7 @@ spec:
|
||||||
privileged: true
|
privileged: true
|
||||||
capabilities:
|
capabilities:
|
||||||
add: ["SYS_ADMIN"]
|
add: ["SYS_ADMIN"]
|
||||||
image: vitalif/vitastor-csi:v1.7.1
|
image: vitalif/vitastor-csi:v1.9.1
|
||||||
args:
|
args:
|
||||||
- "--node=$(NODE_ID)"
|
- "--node=$(NODE_ID)"
|
||||||
- "--endpoint=$(CSI_ENDPOINT)"
|
- "--endpoint=$(CSI_ENDPOINT)"
|
||||||
|
|
|
@ -5,7 +5,7 @@ package vitastor
|
||||||
|
|
||||||
const (
|
const (
|
||||||
vitastorCSIDriverName = "csi.vitastor.io"
|
vitastorCSIDriverName = "csi.vitastor.io"
|
||||||
vitastorCSIDriverVersion = "1.7.1"
|
vitastorCSIDriverVersion = "1.9.1"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Config struct fills the parameters of request or user input
|
// Config struct fills the parameters of request or user input
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
vitastor (1.7.1-1) unstable; urgency=medium
|
vitastor (1.9.1-1) unstable; urgency=medium
|
||||||
|
|
||||||
* Bugfixes
|
* Bugfixes
|
||||||
|
|
||||||
|
|
|
@ -53,3 +53,9 @@ Architecture: amd64
|
||||||
Depends: ${shlibs:Depends}, ${misc:Depends}, vitastor-client (= ${binary:Version})
|
Depends: ${shlibs:Depends}, ${misc:Depends}, vitastor-client (= ${binary:Version})
|
||||||
Description: Vitastor Proxmox Virtual Environment storage plugin
|
Description: Vitastor Proxmox Virtual Environment storage plugin
|
||||||
Vitastor storage plugin for Proxmox Virtual Environment.
|
Vitastor storage plugin for Proxmox Virtual Environment.
|
||||||
|
|
||||||
|
Package: vitastor-opennebula
|
||||||
|
Architecture: amd64
|
||||||
|
Depends: ${shlibs:Depends}, ${misc:Depends}, vitastor-client, patch, python3, jq
|
||||||
|
Description: Vitastor OpenNebula storage plugin
|
||||||
|
Vitastor storage plugin for OpenNebula.
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
opennebula/remotes var/lib/one/
|
||||||
|
opennebula/sudoers.d etc/
|
||||||
|
opennebula/install.sh var/lib/one/remotes/datastore/vitastor/
|
|
@ -0,0 +1,7 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
if [ "$1" = "configure" ]; then
|
||||||
|
/var/lib/one/remotes/datastore/vitastor/install.sh
|
||||||
|
fi
|
|
@ -0,0 +1,4 @@
|
||||||
|
interest /var/lib/one/remotes/datastore/downloader.sh
|
||||||
|
interest /etc/one/oned.conf
|
||||||
|
interest /etc/one/vmm_exec/vmm_execrc
|
||||||
|
interest /etc/apparmor.d/local/abstractions/libvirt-qemu
|
|
@ -0,0 +1,184 @@
|
||||||
|
[Documentation](../../README.md#documentation) → Installation → OpenNebula
|
||||||
|
|
||||||
|
-----
|
||||||
|
|
||||||
|
[Читать на русском](opennebula.ru.md)
|
||||||
|
|
||||||
|
## Automatic Installation
|
||||||
|
|
||||||
|
OpenNebula plugin is packaged as `vitastor-opennebula` Debian and RPM package since Vitastor 1.9.0. So:
|
||||||
|
|
||||||
|
- Run `apt-get install vitastor-opennebula` or `yum install vitastor-opennebula` after installing OpenNebula on all nodes
|
||||||
|
- Check that it prints "OK, Vitastor OpenNebula patches successfully applied" or "OK, Vitastor OpenNebula patches are already applied"
|
||||||
|
- If it does not, refer to [Manual Installation](#manual-installation) and apply configuration file changes manually
|
||||||
|
- Make sure that Vitastor patched versions of QEMU and libvirt are installed
|
||||||
|
(`dpkg -l qemu-system-x86`, `dpkg -l | grep libvirt`, `rpm -qa | grep qemu`, `rpm -qa | grep qemu`, `rpm -qa | grep libvirt-libs` should show "vitastor" in version names)
|
||||||
|
- [Block VM access to Vitastor cluster](#block-vm-access-to-vitastor-cluster)
|
||||||
|
|
||||||
|
## Manual Installation
|
||||||
|
|
||||||
|
Install OpenNebula. Then, on each node:
|
||||||
|
|
||||||
|
- Copy [opennebula/remotes](../../opennebula/remotes) into `/var/lib/one` recursively: `cp -r opennebula/remotes /var/lib/one/`
|
||||||
|
- Copy [opennebula/sudoers.d](../../opennebula/sudoers.d) to `/etc`: `cp -r opennebula/sudoers.d /etc/`
|
||||||
|
- Apply [downloader-vitastor.sh.diff](../../opennebula/remotes/datastore/vitastor/downloader-vitastor.sh.diff) to `/var/lib/one/remotes/datastore/downloader.sh`:
|
||||||
|
`patch /var/lib/one/remotes/datastore/downloader.sh < opennebula/remotes/datastore/vitastor/downloader-vitastor.sh.diff` - or read the patch and apply the same change manually
|
||||||
|
- Add `kvm-vitastor` to `LIVE_DISK_SNAPSHOTS` in `/etc/one/vmm_exec/vmm_execrc`
|
||||||
|
- If on Debian or Ubuntu (and AppArmor is used), add Vitastor config file path(s) to `/etc/apparmor.d/local/abstractions/libvirt-qemu`: for example,
|
||||||
|
`echo ' "/etc/vitastor/vitastor.conf" r,' >> /etc/apparmor.d/local/abstractions/libvirt-qemu`
|
||||||
|
- Apply changes to `/etc/one/oned.conf`
|
||||||
|
|
||||||
|
### oned.conf changes
|
||||||
|
|
||||||
|
1. Add deploy script override in kvm VM_MAD: add `-l deploy.vitastor` to ARGUMENTS.
|
||||||
|
|
||||||
|
```diff
|
||||||
|
VM_MAD = [
|
||||||
|
NAME = "kvm",
|
||||||
|
SUNSTONE_NAME = "KVM",
|
||||||
|
EXECUTABLE = "one_vmm_exec",
|
||||||
|
- ARGUMENTS = "-t 15 -r 0 kvm -p",
|
||||||
|
+ ARGUMENTS = "-t 15 -r 0 kvm -p -l deploy=deploy.vitastor",
|
||||||
|
DEFAULT = "vmm_exec/vmm_exec_kvm.conf",
|
||||||
|
TYPE = "kvm",
|
||||||
|
KEEP_SNAPSHOTS = "yes",
|
||||||
|
LIVE_RESIZE = "yes",
|
||||||
|
SUPPORT_SHAREABLE = "yes",
|
||||||
|
IMPORTED_VMS_ACTIONS = "terminate, terminate-hard, hold, release, suspend,
|
||||||
|
resume, delete, reboot, reboot-hard, resched, unresched, disk-attach,
|
||||||
|
disk-detach, nic-attach, nic-detach, snapshot-create, snapshot-delete,
|
||||||
|
resize, updateconf, update"
|
||||||
|
]
|
||||||
|
```
|
||||||
|
|
||||||
|
Optional: if you also want to save VM RAM checkpoints to Vitastor, use
|
||||||
|
`-l deploy=deploy.vitastor,save=save.vitastor,restore=restore.vitastor`
|
||||||
|
instead of just `-l deploy=deploy.vitastor`.
|
||||||
|
|
||||||
|
2. Add `vitastor` to TM_MAD.ARGUMENTS and DATASTORE_MAD.ARGUMENTS:
|
||||||
|
|
||||||
|
```diff
|
||||||
|
TM_MAD = [
|
||||||
|
EXECUTABLE = "one_tm",
|
||||||
|
- ARGUMENTS = "-t 15 -d dummy,lvm,shared,fs_lvm,fs_lvm_ssh,qcow2,ssh,ceph,dev,vcenter,iscsi_libvirt"
|
||||||
|
+ ARGUMENTS = "-t 15 -d dummy,lvm,shared,fs_lvm,fs_lvm_ssh,qcow2,ssh,ceph,vitastor,dev,vcenter,iscsi_libvirt"
|
||||||
|
]
|
||||||
|
|
||||||
|
DATASTORE_MAD = [
|
||||||
|
EXECUTABLE = "one_datastore",
|
||||||
|
- ARGUMENTS = "-t 15 -d dummy,fs,lvm,ceph,dev,iscsi_libvirt,vcenter,restic,rsync -s shared,ssh,ceph,fs_lvm,fs_lvm_ssh,qcow2,vcenter"
|
||||||
|
+ ARGUMENTS = "-t 15 -d dummy,fs,lvm,ceph,vitastor,dev,iscsi_libvirt,vcenter,restic,rsync -s shared,ssh,ceph,vitastor,fs_lvm,fs_lvm_ssh,qcow2,vcenter"
|
||||||
|
]
|
||||||
|
```
|
||||||
|
|
||||||
|
3. Add INHERIT_DATASTORE_ATTR for two Vitastor attributes:
|
||||||
|
|
||||||
|
```
|
||||||
|
INHERIT_DATASTORE_ATTR = "VITASTOR_CONF"
|
||||||
|
INHERIT_DATASTORE_ATTR = "IMAGE_PREFIX"
|
||||||
|
```
|
||||||
|
|
||||||
|
4. Add TM_MAD_CONF and DS_MAD_CONF for Vitastor:
|
||||||
|
|
||||||
|
```
|
||||||
|
TM_MAD_CONF = [
|
||||||
|
NAME = "vitastor", LN_TARGET = "NONE", CLONE_TARGET = "SELF", SHARED = "YES",
|
||||||
|
DS_MIGRATE = "NO", DRIVER = "raw", ALLOW_ORPHANS="format",
|
||||||
|
TM_MAD_SYSTEM = "ssh,shared", LN_TARGET_SSH = "SYSTEM", CLONE_TARGET_SSH = "SYSTEM",
|
||||||
|
DISK_TYPE_SSH = "FILE", LN_TARGET_SHARED = "NONE",
|
||||||
|
CLONE_TARGET_SHARED = "SELF", DISK_TYPE_SHARED = "FILE"
|
||||||
|
]
|
||||||
|
|
||||||
|
DS_MAD_CONF = [
|
||||||
|
NAME = "vitastor",
|
||||||
|
REQUIRED_ATTRS = "DISK_TYPE,BRIDGE_LIST",
|
||||||
|
PERSISTENT_ONLY = "NO",
|
||||||
|
MARKETPLACE_ACTIONS = "export"
|
||||||
|
]
|
||||||
|
```
|
||||||
|
|
||||||
|
## Create Datastores
|
||||||
|
|
||||||
|
Example Image and System Datastore definitions:
|
||||||
|
[opennebula/vitastor-imageds.conf](../../opennebula/vitastor-imageds.conf) and
|
||||||
|
[opennebula/vitastor-systemds.conf](../../opennebula/vitastor-systemds.conf).
|
||||||
|
|
||||||
|
Change parameters to your will:
|
||||||
|
|
||||||
|
- POOL_NAME is Vitastor pool name to store images.
|
||||||
|
- IMAGE_PREFIX is a string prepended to all Vitastor image names.
|
||||||
|
- BRIDGE_LIST is a list of hosts with access to Vitastor cluster, mostly used for image (not system) datastore operations.
|
||||||
|
- VITASTOR_CONF is the path to cluster configuration. Note that it should be also added to `/etc/apparmor.d/local/abstractions/libvirt-qemu` if you use AppArmor.
|
||||||
|
- STAGING_DIR is a temporary directory used when importing external images. Should have free space sufficient for downloading external images.
|
||||||
|
|
||||||
|
Then create datastores using `onedatastore create vitastor-imageds.conf` and `onedatastore create vitastor-systemds.conf` (or use UI).
|
||||||
|
|
||||||
|
## Block VM access to Vitastor cluster
|
||||||
|
|
||||||
|
Vitastor doesn't support any authentication yet, so you MUST block VM guest access to the Vitastor cluster at the network level.
|
||||||
|
|
||||||
|
If you use VLAN networking for VMs - make sure you use different VLANs for VMs and hypervisor/storage network and
|
||||||
|
block access between them using your firewall/switch configuration.
|
||||||
|
|
||||||
|
If you use something more stupid like bridged networking, you probably have to use manual firewall/iptables setup
|
||||||
|
to only allow access to Vitastor from hypervisor IPs.
|
||||||
|
|
||||||
|
Also you need to switch network to "Bridged & Security Groups" and enable IP spoofing filters in OpenNebula.
|
||||||
|
Problem is that OpenNebula's IP spoofing filter doesn't affect local interfaces of the hypervisor i.e. when
|
||||||
|
it's enabled a VM can't talk to other VMs or to the outer world using a spoofed IP, but it CAN talk to the
|
||||||
|
hypervisor if it takes an IP from its subnet. To fix that you also need some more iptables.
|
||||||
|
|
||||||
|
So the complete "stupid" bridged network filter setup could look like the following
|
||||||
|
(here `10.0.3.0/24` is the VM subnet and `10.0.2.0/24` is the hypervisor subnet):
|
||||||
|
|
||||||
|
```
|
||||||
|
# Allow incoming traffic from physical device
|
||||||
|
iptables -A INPUT -m physdev --physdev-in eth0 -j ACCEPT
|
||||||
|
# Do not allow incoming traffic from VMs, but not from VM subnet
|
||||||
|
iptables -A INPUT ! -s 10.0.3.0/24 -i onebr0 -j DROP
|
||||||
|
# Drop traffic from VMs to hypervisor/storage subnet
|
||||||
|
iptables -I FORWARD 1 -s 10.0.3.0/24 -d 10.0.2.0/24 -j DROP
|
||||||
|
```
|
||||||
|
|
||||||
|
## Testing
|
||||||
|
|
||||||
|
The OpenNebula plugin includes quite a bit of bash scripts, so here's their description to get an idea about what they actually do.
|
||||||
|
|
||||||
|
| Script | Action | How to Test |
|
||||||
|
| ----------------------- | ----------------------------------------- | ------------------------------------------------------------------------------------ |
|
||||||
|
| vmm/kvm/deploy.vitastor | Start a VM | Create and start a VM with Vitastor disk(s): persistent / non-persistent / volatile. |
|
||||||
|
| vmm/kvm/save.vitastor | Save VM memory checkpoint | Stop a VM using "Stop" command. |
|
||||||
|
| vmm/kvm/restore.vitastor| Restore VM memory checkpoint | Start a VM back after stopping it. |
|
||||||
|
| datastore/clone | Copy an image as persistent | Create a VM template and instantiate it as persistent. |
|
||||||
|
| datastore/cp | Import an external image | Import a VM template with images from Marketplace. |
|
||||||
|
| datastore/export | Export an image as URL | Probably: export a VM template with images to Marketplace. |
|
||||||
|
| datastore/mkfs | Create an image with FS | Storage → Images → Create → Type: Datablock, Location: Empty disk image, Filesystem: Not empty. |
|
||||||
|
| datastore/monitor | Monitor used space in image datastore | Check reported used/free space in image datastore list. |
|
||||||
|
| datastore/rm | Remove a persistent image | Storage → Images → Select an image → Delete. |
|
||||||
|
| datastore/snap_delete | Delete a snapshot of a persistent image | Storage → Images → Select an image → Select a snapshot → Delete; <br> To create an image with snapshot: attach a persistent image to a VM; create a snapshot; detach the image. |
|
||||||
|
| datastore/snap_flatten | Revert an image to snapshot and delete other snapshots | Storage → Images → Select an image → Select a snapshot → Flatten. |
|
||||||
|
| datastore/snap_revert | Revert an image to snapshot | Storage → Images → Select an image → Select a snapshot → Revert. |
|
||||||
|
| datastore/stat | Get virtual size of an image in MB | No idea. Seems to be unused both in Vitastor and Ceph datastores. |
|
||||||
|
| tm/clone | Clone a non-persistent image to a VM disk | Attach a non-persistent image to a VM. |
|
||||||
|
| tm/context | Generate a contextualisation VM disk | Create a VM with enabled contextualisation (default). Common host FS-based version is used in Vitastor and Ceph datastores. |
|
||||||
|
| tm/cpds | Copy a VM disk / its snapshot to an image | Select a VM → Select a disk → Optionally select a snapshot → Save as. |
|
||||||
|
| tm/delete | Delete a cloned or volatile VM disk | Detach a volatile disk or a non-persistent image from a VM. |
|
||||||
|
| tm/failmigrate | Handle live migration failure | No action. Script is empty in Vitastor and Ceph. In other datastores, should roll back actions done by tm/premigrate. |
|
||||||
|
| tm/ln | Attach a persistent image to a VM | No action. Script is empty in Vitastor and Ceph. |
|
||||||
|
| tm/mkimage | Create a volatile disk, maybe with FS | Attach a volatile disk to a VM, with or without file system. |
|
||||||
|
| tm/mkswap | Create a volatile swap disk | Attach a volatile disk to a VM, formatted as swap. |
|
||||||
|
| tm/monitor | Monitor used space in system datastore | Check reported used/free space in system datastore list. |
|
||||||
|
| tm/mv | Move a migrated VM disk between hosts | Migrate a VM between hosts. In Vitastor and Ceph datastores, doesn't do any storage action. |
|
||||||
|
| tm/mvds | Detach a persistent image from a VM | No action. The opposite of tm/ln. Script is empty in Vitastor and Ceph. In other datastores, script may copy the image from VM host back to the datastore. |
|
||||||
|
| tm/postbackup | Executed after backup | Seems that the script just removes temporary files after backup. Perform a VM backup and check that temporary files are cleaned up. |
|
||||||
|
| tm/postbackup_live | Executed after backup of a running VM | Same as tm/postbackup, but for a running VM. |
|
||||||
|
| tm/postmigrate | Executed after VM live migration | No action. Only executed for system datastore, so the script tries to call other TMs for other disks. Except that, the script does nothing in Vitastor and Ceph datastores. |
|
||||||
|
| tm/prebackup | Actual backup script: backup VM disks | Set up "rsync" backup datastore → Backup a VM to it. |
|
||||||
|
| tm/prebackup_live | Backup VM disks of a running VM | Same as tm/prebackup, but also does fsfreeze/thaw. So perform a live backup, restore it and check that disks are consistent. |
|
||||||
|
| tm/premigrate | Executed before live migration | No action. Only executed for system datastore, so the script tries to call other TMs for other disks. Except that, the script does nothing in Vitastor and Ceph datastores. |
|
||||||
|
| tm/resize | Resize a VM disk | Select a VM → Select a non-persistent disk → Resize. |
|
||||||
|
| tm/restore | Restore VM disks from backup | Set up "rsync" backup datastore → Backup a VM to it → Restore it back. |
|
||||||
|
| tm/snap_create | Create a VM disk snapshot | Select a VM → Select a disk → Create snapshot. |
|
||||||
|
| tm/snap_create_live | Create a VM disk snapshot for a live VM | Select a running VM → Select a disk → Create snapshot. |
|
||||||
|
| tm/snap_delete | Delete a VM disk snapshot | Select a VM → Select a disk → Select a snapshot → Delete. |
|
||||||
|
| tm/snap_revert | Revert a VM disk to a snapshot | Select a VM → Select a disk → Select a snapshot → Revert. |
|
|
@ -0,0 +1,187 @@
|
||||||
|
[Документация](../../README-ru.md#документация) → Установка → OpenNebula
|
||||||
|
|
||||||
|
-----
|
||||||
|
|
||||||
|
[Read in English](opennebula.en.md)
|
||||||
|
|
||||||
|
## Автоматическая установка
|
||||||
|
|
||||||
|
Плагин OpenNebula Vitastor распространяется как Debian и RPM пакет `vitastor-opennebula`, начиная с версии Vitastor 1.9.0. Так что:
|
||||||
|
|
||||||
|
- Запустите `apt-get install vitastor-opennebula` или `yum install vitastor-opennebula` после установки OpenNebula на всех серверах
|
||||||
|
- Проверьте, что он выводит "OK, Vitastor OpenNebula patches successfully applied" или "OK, Vitastor OpenNebula patches are already applied" в процессе установки
|
||||||
|
- Если сообщение не выведено, пройдите по шагам инструкцию [Ручная установка](#ручная-установка) и примените правки файлов конфигурации вручную
|
||||||
|
- Удостоверьтесь, что установлены версии QEMU и libvirt с изменениями Vitastor
|
||||||
|
(`dpkg -l qemu-system-x86`, `dpkg -l | grep libvirt`, `rpm -qa | grep qemu`, `rpm -qa | grep qemu`, `rpm -qa | grep libvirt-libs` должны показывать "vitastor" в номере версии)
|
||||||
|
- [Заблокируйте доступ виртуальных машин в Vitastor](#блокировка-доступа-вм-в-vitastor)
|
||||||
|
|
||||||
|
## Ручная установка
|
||||||
|
|
||||||
|
Сначала установите саму OpenNebula. После этого, на каждом сервере:
|
||||||
|
|
||||||
|
- Скопируйте директорию [opennebula/remotes](../../opennebula/remotes) в `/var/lib/one`: `cp -r opennebula/remotes /var/lib/one/`
|
||||||
|
- Скопируйте директорию [opennebula/sudoers.d](../../opennebula/sudoers.d) в `/etc`: `cp -r opennebula/sudoers.d /etc/`
|
||||||
|
- Примените патч [downloader-vitastor.sh.diff](../../opennebula/remotes/datastore/vitastor/downloader-vitastor.sh.diff) к `/var/lib/one/remotes/datastore/downloader.sh`:
|
||||||
|
`patch /var/lib/one/remotes/datastore/downloader.sh < opennebula/remotes/datastore/vitastor/downloader-vitastor.sh.diff` - либо прочитайте патч и примените изменение вручную
|
||||||
|
- Добавьте `kvm-vitastor` в список `LIVE_DISK_SNAPSHOTS` в файле `/etc/one/vmm_exec/vmm_execrc`
|
||||||
|
- Если вы используете Debian или Ubuntu (и AppArmor), добавьте пути к файлу(ам) конфигурации Vitastor в файл `/etc/apparmor.d/local/abstractions/libvirt-qemu`: например,
|
||||||
|
`echo ' "/etc/vitastor/vitastor.conf" r,' >> /etc/apparmor.d/local/abstractions/libvirt-qemu`
|
||||||
|
- Примените изменения `/etc/one/oned.conf`
|
||||||
|
|
||||||
|
### Изменения oned.conf
|
||||||
|
|
||||||
|
1. Добавьте переопределение скрипта deploy в VM_MAD kvm, добавив `-l deploy.vitastor` в `ARGUMENTS`:
|
||||||
|
|
||||||
|
```diff
|
||||||
|
VM_MAD = [
|
||||||
|
NAME = "kvm",
|
||||||
|
SUNSTONE_NAME = "KVM",
|
||||||
|
EXECUTABLE = "one_vmm_exec",
|
||||||
|
- ARGUMENTS = "-t 15 -r 0 kvm -p",
|
||||||
|
+ ARGUMENTS = "-t 15 -r 0 kvm -p -l deploy=deploy.vitastor",
|
||||||
|
DEFAULT = "vmm_exec/vmm_exec_kvm.conf",
|
||||||
|
TYPE = "kvm",
|
||||||
|
KEEP_SNAPSHOTS = "yes",
|
||||||
|
LIVE_RESIZE = "yes",
|
||||||
|
SUPPORT_SHAREABLE = "yes",
|
||||||
|
IMPORTED_VMS_ACTIONS = "terminate, terminate-hard, hold, release, suspend,
|
||||||
|
resume, delete, reboot, reboot-hard, resched, unresched, disk-attach,
|
||||||
|
disk-detach, nic-attach, nic-detach, snapshot-create, snapshot-delete,
|
||||||
|
resize, updateconf, update"
|
||||||
|
]
|
||||||
|
```
|
||||||
|
|
||||||
|
Опционально: если вы хотите также сохранять снимки памяти ВМ в Vitastor, добавьте
|
||||||
|
`-l deploy=deploy.vitastor,save=save.vitastor,restore=restore.vitastor`
|
||||||
|
вместо просто `-l deploy=deploy.vitastor`.
|
||||||
|
|
||||||
|
2. Добавьте `vitastor` в значения TM_MAD.ARGUMENTS и DATASTORE_MAD.ARGUMENTS:
|
||||||
|
|
||||||
|
```diff
|
||||||
|
TM_MAD = [
|
||||||
|
EXECUTABLE = "one_tm",
|
||||||
|
- ARGUMENTS = "-t 15 -d dummy,lvm,shared,fs_lvm,fs_lvm_ssh,qcow2,ssh,ceph,dev,vcenter,iscsi_libvirt"
|
||||||
|
+ ARGUMENTS = "-t 15 -d dummy,lvm,shared,fs_lvm,fs_lvm_ssh,qcow2,ssh,ceph,vitastor,dev,vcenter,iscsi_libvirt"
|
||||||
|
]
|
||||||
|
|
||||||
|
DATASTORE_MAD = [
|
||||||
|
EXECUTABLE = "one_datastore",
|
||||||
|
- ARGUMENTS = "-t 15 -d dummy,fs,lvm,ceph,dev,iscsi_libvirt,vcenter,restic,rsync -s shared,ssh,ceph,fs_lvm,fs_lvm_ssh,qcow2,vcenter"
|
||||||
|
+ ARGUMENTS = "-t 15 -d dummy,fs,lvm,ceph,vitastor,dev,iscsi_libvirt,vcenter,restic,rsync -s shared,ssh,ceph,vitastor,fs_lvm,fs_lvm_ssh,qcow2,vcenter"
|
||||||
|
]
|
||||||
|
```
|
||||||
|
|
||||||
|
3. Добавьте строчки с INHERIT_DATASTORE_ATTR для двух атрибутов Vitastor-хранилищ:
|
||||||
|
|
||||||
|
```
|
||||||
|
INHERIT_DATASTORE_ATTR = "VITASTOR_CONF"
|
||||||
|
INHERIT_DATASTORE_ATTR = "IMAGE_PREFIX"
|
||||||
|
```
|
||||||
|
|
||||||
|
4. Добавьте TM_MAD_CONF и DS_MAD_CONF для Vitastor:
|
||||||
|
|
||||||
|
```
|
||||||
|
TM_MAD_CONF = [
|
||||||
|
NAME = "vitastor", LN_TARGET = "NONE", CLONE_TARGET = "SELF", SHARED = "YES",
|
||||||
|
DS_MIGRATE = "NO", DRIVER = "raw", ALLOW_ORPHANS="format",
|
||||||
|
TM_MAD_SYSTEM = "ssh,shared", LN_TARGET_SSH = "SYSTEM", CLONE_TARGET_SSH = "SYSTEM",
|
||||||
|
DISK_TYPE_SSH = "FILE", LN_TARGET_SHARED = "NONE",
|
||||||
|
CLONE_TARGET_SHARED = "SELF", DISK_TYPE_SHARED = "FILE"
|
||||||
|
]
|
||||||
|
|
||||||
|
DS_MAD_CONF = [
|
||||||
|
NAME = "vitastor",
|
||||||
|
REQUIRED_ATTRS = "DISK_TYPE,BRIDGE_LIST",
|
||||||
|
PERSISTENT_ONLY = "NO",
|
||||||
|
MARKETPLACE_ACTIONS = "export"
|
||||||
|
]
|
||||||
|
```
|
||||||
|
|
||||||
|
## Создайте хранилища
|
||||||
|
|
||||||
|
Примеры настроек хранилищ образов (image) и дисков ВМ (system):
|
||||||
|
[opennebula/vitastor-imageds.conf](../../opennebula/vitastor-imageds.conf) и
|
||||||
|
[opennebula/vitastor-systemds.conf](../../opennebula/vitastor-systemds.conf).
|
||||||
|
|
||||||
|
Скопируйте настройки и поменяйте следующие параметры так, как вам необходимо:
|
||||||
|
|
||||||
|
- POOL_NAME - имя пула Vitastor для сохранения образов дисков.
|
||||||
|
- IMAGE_PREFIX - строка, добавляемая в начало имён образов дисков.
|
||||||
|
- BRIDGE_LIST - список серверов с доступом к кластеру Vitastor, используемых для операций с хранилищем образов (image, не system).
|
||||||
|
- VITASTOR_CONF - путь к конфигурации Vitastor. Имейте в виду, что этот путь также надо добавить в `/etc/apparmor.d/local/abstractions/libvirt-qemu`, если вы используете AppArmor.
|
||||||
|
- STAGING_DIR - путь к временному каталогу, используемому при импорте внешних образов. Должен иметь достаточно свободного места, чтобы вмещать скачанные образы.
|
||||||
|
|
||||||
|
После этого создайте хранилища с помощью команд `onedatastore create vitastor-imageds.conf` и `onedatastore create vitastor-systemds.conf` (либо через UI).
|
||||||
|
|
||||||
|
## Блокировка доступа ВМ в Vitastor
|
||||||
|
|
||||||
|
Vitastor пока не поддерживает никакую аутентификацию, так что вы ДОЛЖНЫ заблокировать доступ гостевых ВМ
|
||||||
|
в кластер Vitastor на сетевом уровне.
|
||||||
|
|
||||||
|
Если вы используете VLAN-сети для ВМ - удостоверьтесь, что ВМ и гипервизор/сеть хранения помещены в разные
|
||||||
|
изолированные друг от друга VLAN-ы.
|
||||||
|
|
||||||
|
Если вы используете что-то более примитивное, например, мосты (bridge), вам, скорее всего, придётся вручную
|
||||||
|
настроить iptables / межсетевой экран, чтобы разрешить доступ к Vitastor только с IP гипервизоров.
|
||||||
|
|
||||||
|
Также в этом случае нужно будет переключить обычные мосты на "Bridged & Security Groups" и включить фильтр
|
||||||
|
спуфинга IP в OpenNebula. Правда, реализация этого фильтра пока не полная, и она не блокирует доступ к
|
||||||
|
локальным интерфейсам гипервизора. То есть, включённый фильтр спуфинга IP запрещает ВМ отправлять трафик
|
||||||
|
с чужими IP к другим ВМ или во внешний мир, но не запрещает отправлять его напрямую гипервизору. Чтобы
|
||||||
|
исправить это, тоже нужны дополнительные правила iptables.
|
||||||
|
|
||||||
|
Таким образом, более-менее полная блокировка при использовании простой сети на сетевых мостах может
|
||||||
|
выглядеть так (здесь `10.0.3.0/24` - подсеть ВМ, `10.0.2.0/24` - подсеть гипервизора):
|
||||||
|
|
||||||
|
```
|
||||||
|
# Разрешаем входящий трафик с физического устройства
|
||||||
|
iptables -A INPUT -m physdev --physdev-in eth0 -j ACCEPT
|
||||||
|
# Запрещаем трафик со всех ВМ, но с IP не из подсети ВМ
|
||||||
|
iptables -A INPUT ! -s 10.0.3.0/24 -i onebr0 -j DROP
|
||||||
|
# Запрещаем трафик от ВМ к сети гипервизора
|
||||||
|
iptables -I FORWARD 1 -s 10.0.3.0/24 -d 10.0.2.0/24 -j DROP
|
||||||
|
```
|
||||||
|
|
||||||
|
## Тестирование
|
||||||
|
|
||||||
|
Плагин OpenNebula по большей части состоит из bash-скриптов, и чтобы было понятнее, что они
|
||||||
|
вообще делают - ниже приведены описания процедур, которыми можно протестировать каждый из них.
|
||||||
|
|
||||||
|
| Скрипт | Описание | Как протестировать |
|
||||||
|
| ----------------------- | --------------------------------------------- | ------------------------------------------------------------------------------------ |
|
||||||
|
| vmm/kvm/deploy.vitastor | Запустить виртуальную машину | Создайте и запустите виртуальную машину с дисками Vitastor: постоянным / непостоянным / волатильным (временным). |
|
||||||
|
| vmm/kvm/save.vitastor | Сохранить снимок памяти ВМ | Остановите виртуальную машину командой "Остановить". |
|
||||||
|
| vmm/kvm/restore.vitastor| Восстановить снимок памяти ВМ | Запустите ВМ после остановки обратно. |
|
||||||
|
| datastore/clone | Скопировать образ как "постоянный" | Создайте шаблон ВМ и создайте из него постоянную ВМ. |
|
||||||
|
| datastore/cp | Импортировать внешний образ | Импортируйте шаблон ВМ с образами дисков из Магазина OpenNebula. |
|
||||||
|
| datastore/export | Экспортировать образ как URL | Вероятно: экспортируйте шаблон ВМ с образами в Магазин. |
|
||||||
|
| datastore/mkfs | Создать образ с файловой системой | Хранилище → Образы → Создать → Тип: базовый блок данных, Расположение: пустой образ диска, Файловая система: любая непустая. |
|
||||||
|
| datastore/monitor | Вывод статистики места в хранилище образов | Проверьте статистику свободного/занятого места в списке хранилищ образов. |
|
||||||
|
| datastore/rm | Удалить "постоянный" образ | Хранилище → Образы → Выберите образ → Удалить. |
|
||||||
|
| datastore/snap_delete | Удалить снимок "постоянного" образа | Хранилище → Образы → Выберите образ → Выберите снимок → Удалить; <br> Чтобы создать образ со снимком: подключите постоянный образ к ВМ, создайте снимок, отключите образ. |
|
||||||
|
| datastore/snap_flatten | Откатить образ к снимку, удалив другие снимки | Хранилище → Образы → Выберите образ → Выберите снимок → "Выровнять" (flatten). |
|
||||||
|
| datastore/snap_revert | Откатить образ к снимку | Хранилище → Образы → Выберите образ → Выберите снимок → Откатить. |
|
||||||
|
| datastore/stat | Показать виртуальный размер образа в МБ | Неизвестно. По-видимому, в плагинах Vitastor и Ceph не используется. |
|
||||||
|
| tm/clone | Клонировать "непостоянный" образ в диск ВМ | Подключите "непостоянный" образ к ВМ. |
|
||||||
|
| tm/context | Создать диск контекстуализации ВМ | Создайте ВМ с контекстуализацией, как обычно. Но тестировать особенно нечего: в плагинах Vitastor и Ceph образ контекста хранится в локальной ФС гипервизора. |
|
||||||
|
| tm/cpds | Копировать диск ВМ/его снимок в новый образ | Выберите ВМ → Выберите диск → Опционально выберите снимок → "Сохранить как". |
|
||||||
|
| tm/delete | Удалить диск-клон или волатильный диск ВМ | Отключите волатильный или не-постоянный диск от ВМ. |
|
||||||
|
| tm/failmigrate | Обработать неудачную миграцию | Тестировать нечего. Скрипт пуст в плагинах Vitastor и Ceph. В других плагинах скрипт должен откатывать действия tm/premigrate. |
|
||||||
|
| tm/ln | Подключить "постоянный" образ к ВМ | Тестировать нечего. Скрипт пуст в плагинах Vitastor и Ceph. |
|
||||||
|
| tm/mkimage | Создать волатильный диск, без или с ФС | Подключите волатильный диск к ВМ, с или без файловой системы. |
|
||||||
|
| tm/mkswap | Создать волатильный диск подкачки | Подключите волатильный диск к ВМ, форматированный как диск подкачки (swap). |
|
||||||
|
| tm/monitor | Вывод статистики места в хранилище дисков ВМ | Проверьте статистику свободного/занятого места в списке хранилищ дисков ВМ. |
|
||||||
|
| tm/mv | Мигрировать диск ВМ между хостами | Мигрируйте ВМ между серверами. Правда, с точки зрения хранилища в плагинах Vitastor и Ceph этот скрипт ничего не делает. |
|
||||||
|
| tm/mvds | Отключить "постоянный" образ от ВМ | Тестировать нечего. Скрипт пуст в плагинах Vitastor и Ceph. В целом же скрипт обратный к tm/ln и в других хранилищах он может, например, копировать образ ВМ с диска гипервизора обратно в хранилище. |
|
||||||
|
| tm/postbackup | Выполняется после бэкапа | По-видимому, скрипт просто удаляет временные файлы после резервного копирования. Так что можно провести его и проверить, что на серверах не осталось временных файлов. |
|
||||||
|
| tm/postbackup_live | Выполняется после бэкапа запущенной ВМ | То же, что tm/postbackup, но для запущенной ВМ. |
|
||||||
|
| tm/postmigrate | Выполняется после миграции ВМ | Тестировать нечего. Однако, OpenNebula запускает скрипт только для системного хранилища, поэтому он вызывает аналогичные скрипты для хранилищ других дисков той же ВМ. Помимо этого в плагинах Vitastor и Ceph скрипт ничего не делает. |
|
||||||
|
| tm/prebackup | Выполнить резервное копирование дисков ВМ | Создайте хранилище резервных копий типа "rsync" → Забэкапьте в него ВМ. |
|
||||||
|
| tm/prebackup_live | То же самое для запущенной ВМ | То же, что tm/prebackup, но запускает fsfreeze/thaw (остановку доступа к дискам). Так что смысл теста - проведите резервное копирование и проверьте, что данные скопировались консистентно. |
|
||||||
|
| tm/premigrate | Выполняется перед миграцией ВМ | Тестировать нечего. Аналогично tm/postmigrate запускается только для системного хранилища. |
|
||||||
|
| tm/resize | Изменить размер диска ВМ | Выберите ВМ → Выберите непостоянный диск → Измените его размер. |
|
||||||
|
| tm/restore | Восстановить диски ВМ из бэкапа | Создайте хранилище резервных копий → Забэкапьте в него ВМ → Восстановите её обратно. |
|
||||||
|
| tm/snap_create | Создать снимок диска ВМ | Выберите ВМ → Выберите диск → Создайте снимок. |
|
||||||
|
| tm/snap_create_live | Создать снимок диска запущенной ВМ | Выберите запущенную ВМ → Выберите диск → Создайте снимок. |
|
||||||
|
| tm/snap_delete | Удалить снимок диска ВМ | Выберите ВМ → Выберите диск → Выберите снимок → Удалить. |
|
||||||
|
| tm/snap_revert | Откатить диск ВМ к снимку | Выберите ВМ → Выберите диск → Выберите снимок → Откатить. |
|
|
@ -17,10 +17,10 @@ To enable Vitastor support in Proxmox Virtual Environment (6.4-8.1 are supported
|
||||||
- Restart pvedaemon: `systemctl restart pvedaemon`
|
- Restart pvedaemon: `systemctl restart pvedaemon`
|
||||||
|
|
||||||
`/etc/pve/storage.cfg` example (the only required option is vitastor_pool, all others
|
`/etc/pve/storage.cfg` example (the only required option is vitastor_pool, all others
|
||||||
are listed below with their default values):
|
are listed below with their default values; `vitastor_ssd` is Proxmox storage pool id):
|
||||||
|
|
||||||
```
|
```
|
||||||
vitastor: vitastor
|
vitastor: vitastor_ssd
|
||||||
# pool to put new images into
|
# pool to put new images into
|
||||||
vitastor_pool testpool
|
vitastor_pool testpool
|
||||||
# path to the configuration file
|
# path to the configuration file
|
||||||
|
|
|
@ -16,10 +16,10 @@
|
||||||
- Перезапустите демон Proxmox: `systemctl restart pvedaemon`
|
- Перезапустите демон Proxmox: `systemctl restart pvedaemon`
|
||||||
|
|
||||||
Пример `/etc/pve/storage.cfg` (единственная обязательная опция - vitastor_pool, все остальные
|
Пример `/etc/pve/storage.cfg` (единственная обязательная опция - vitastor_pool, все остальные
|
||||||
перечислены внизу для понимания значений по умолчанию):
|
перечислены внизу для понимания значений по умолчанию; `vitastor_ssd` - имя хранилища в Proxmox):
|
||||||
|
|
||||||
```
|
```
|
||||||
vitastor: vitastor
|
vitastor: vitastor_ssd
|
||||||
# Пул, в который будут помещаться образы дисков
|
# Пул, в который будут помещаться образы дисков
|
||||||
vitastor_pool testpool
|
vitastor_pool testpool
|
||||||
# Путь к файлу конфигурации
|
# Путь к файлу конфигурации
|
||||||
|
|
|
@ -39,6 +39,10 @@
|
||||||
|
|
||||||
## Plugins and tools
|
## Plugins and tools
|
||||||
|
|
||||||
|
- [Proxmox storage plugin and packages](../installation/proxmox.en.md)
|
||||||
|
- [OpenNebula storage plugin](../installation/opennebula.en.md)
|
||||||
|
- [CSI plugin for Kubernetes](../installation/kubernetes.en.md)
|
||||||
|
- [OpenStack support: Cinder driver, Nova and libvirt patches](../installation/openstack.en.md)
|
||||||
- [Debian and CentOS packages](../installation/packages.en.md)
|
- [Debian and CentOS packages](../installation/packages.en.md)
|
||||||
- [Image management CLI (vitastor-cli)](../usage/cli.en.md)
|
- [Image management CLI (vitastor-cli)](../usage/cli.en.md)
|
||||||
- [Disk management CLI (vitastor-disk)](../usage/disk.en.md)
|
- [Disk management CLI (vitastor-disk)](../usage/disk.en.md)
|
||||||
|
@ -46,9 +50,6 @@
|
||||||
- [Native QEMU driver](../usage/qemu.en.md)
|
- [Native QEMU driver](../usage/qemu.en.md)
|
||||||
- [Loadable fio engine for benchmarks](../usage/fio.en.md)
|
- [Loadable fio engine for benchmarks](../usage/fio.en.md)
|
||||||
- [NBD proxy for kernel mounts](../usage/nbd.en.md)
|
- [NBD proxy for kernel mounts](../usage/nbd.en.md)
|
||||||
- [CSI plugin for Kubernetes](../installation/kubernetes.en.md)
|
|
||||||
- [OpenStack support: Cinder driver, Nova and libvirt patches](../installation/openstack.en.md)
|
|
||||||
- [Proxmox storage plugin and packages](../installation/proxmox.en.md)
|
|
||||||
- [Simplified NFS proxy for file-based image access emulation (suitable for VMWare)](../usage/nfs.en.md#pseudo-fs)
|
- [Simplified NFS proxy for file-based image access emulation (suitable for VMWare)](../usage/nfs.en.md#pseudo-fs)
|
||||||
|
|
||||||
## Roadmap
|
## Roadmap
|
||||||
|
@ -58,7 +59,6 @@ The following features are planned for the future:
|
||||||
- Control plane optimisation
|
- Control plane optimisation
|
||||||
- Other administrative tools
|
- Other administrative tools
|
||||||
- Web GUI
|
- Web GUI
|
||||||
- OpenNebula plugin
|
|
||||||
- iSCSI and NVMeoF gateways
|
- iSCSI and NVMeoF gateways
|
||||||
- Multi-threaded client
|
- Multi-threaded client
|
||||||
- Faster failover
|
- Faster failover
|
||||||
|
|
|
@ -41,6 +41,10 @@
|
||||||
|
|
||||||
## Драйверы и инструменты
|
## Драйверы и инструменты
|
||||||
|
|
||||||
|
- [Плагин для Proxmox](../installation/proxmox.ru.md)
|
||||||
|
- [Плагин для OpenNebula](../installation/opennebula.ru.md)
|
||||||
|
- [CSI-плагин для Kubernetes](../installation/kubernetes.ru.md)
|
||||||
|
- [Базовая поддержка OpenStack: драйвер Cinder, патчи для Nova и libvirt](../installation/openstack.ru.md)
|
||||||
- [Пакеты для Debian и CentOS](../installation/packages.ru.md)
|
- [Пакеты для Debian и CentOS](../installation/packages.ru.md)
|
||||||
- [Консольный интерфейс управления образами (vitastor-cli)](../usage/cli.ru.md)
|
- [Консольный интерфейс управления образами (vitastor-cli)](../usage/cli.ru.md)
|
||||||
- [Инструмент управления дисками (vitastor-disk)](../usage/disk.ru.md)
|
- [Инструмент управления дисками (vitastor-disk)](../usage/disk.ru.md)
|
||||||
|
@ -48,9 +52,6 @@
|
||||||
- [Драйвер диска для QEMU](../usage/qemu.ru.md)
|
- [Драйвер диска для QEMU](../usage/qemu.ru.md)
|
||||||
- [Драйвер диска для утилиты тестирования производительности fio](../usage/fio.ru.md)
|
- [Драйвер диска для утилиты тестирования производительности fio](../usage/fio.ru.md)
|
||||||
- [NBD-прокси для монтирования образов ядром](../usage/nbd.ru.md) ("блочное устройство в режиме пользователя")
|
- [NBD-прокси для монтирования образов ядром](../usage/nbd.ru.md) ("блочное устройство в режиме пользователя")
|
||||||
- [CSI-плагин для Kubernetes](../installation/kubernetes.ru.md)
|
|
||||||
- [Базовая поддержка OpenStack: драйвер Cinder, патчи для Nova и libvirt](../installation/openstack.ru.md)
|
|
||||||
- [Плагин для Proxmox](../installation/proxmox.ru.md)
|
|
||||||
- [Упрощённая NFS-прокси для эмуляции файлового доступа к образам (подходит для VMWare)](../usage/nfs.ru.md#псевдо-фс)
|
- [Упрощённая NFS-прокси для эмуляции файлового доступа к образам (подходит для VMWare)](../usage/nfs.ru.md#псевдо-фс)
|
||||||
|
|
||||||
## Планы развития
|
## Планы развития
|
||||||
|
@ -58,7 +59,6 @@
|
||||||
- Оптимизация слоя управления
|
- Оптимизация слоя управления
|
||||||
- Другие инструменты администрирования
|
- Другие инструменты администрирования
|
||||||
- Web-интерфейс
|
- Web-интерфейс
|
||||||
- Плагин для OpenNebula
|
|
||||||
- iSCSI и NVMeoF прокси
|
- iSCSI и NVMeoF прокси
|
||||||
- Многопоточный клиент
|
- Многопоточный клиент
|
||||||
- Более быстрое переключение при отказах
|
- Более быстрое переключение при отказах
|
||||||
|
|
|
@ -42,7 +42,7 @@ PG state always includes exactly 1 of the following base states:
|
||||||
- **offline** — PG isn't activated by any OSD at all. Either primary OSD isn't set for
|
- **offline** — PG isn't activated by any OSD at all. Either primary OSD isn't set for
|
||||||
this PG at all (if the pool is just created), or an unavailable OSD is set as primary,
|
this PG at all (if the pool is just created), or an unavailable OSD is set as primary,
|
||||||
or the primary OSD refuses to start this PG (for example, because of wrong block_size),
|
or the primary OSD refuses to start this PG (for example, because of wrong block_size),
|
||||||
or the PG is stopped by the monitor using `pause: true` flag in `/vitastor/config/pgs` in etcd.
|
or the PG is stopped by the monitor using `pause: true` flag in `/vitastor/pg/config` in etcd.
|
||||||
- **starting** — primary OSD has acquired PG lock in etcd, PG is starting.
|
- **starting** — primary OSD has acquired PG lock in etcd, PG is starting.
|
||||||
- **peering** — primary OSD requests PG object listings from secondary OSDs and calculates
|
- **peering** — primary OSD requests PG object listings from secondary OSDs and calculates
|
||||||
the PG state.
|
the PG state.
|
||||||
|
@ -150,7 +150,7 @@ POOL_ID=1
|
||||||
ALL_OSDS=$(etcdctl --endpoints=your_etcd_address:2379 get --keys-only --prefix /vitastor/osd/stats/ | \
|
ALL_OSDS=$(etcdctl --endpoints=your_etcd_address:2379 get --keys-only --prefix /vitastor/osd/stats/ | \
|
||||||
perl -e '$/ = undef; $a = <>; $a =~ s/\s*$//; $a =~ s!/vitastor/osd/stats/!!g; $a =~ s/\s+/,/g; print $a')
|
perl -e '$/ = undef; $a = <>; $a =~ s/\s*$//; $a =~ s!/vitastor/osd/stats/!!g; $a =~ s/\s+/,/g; print $a')
|
||||||
for i in $(seq 1 $PG_COUNT); do
|
for i in $(seq 1 $PG_COUNT); do
|
||||||
etcdctl --endpoints=your_etcd_address:2379 put /vitastor/pg/history/$POOL_ID/$i '{"all_peers":['$ALL_OSDS']}'; done
|
etcdctl --endpoints=your_etcd_address:2379 put /vitastor/pg/history/$POOL_ID/$i '{"all_peers":['$ALL_OSDS']}'
|
||||||
done
|
done
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -169,21 +169,63 @@ 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
|
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.
|
to make them use the new version of the client library.
|
||||||
|
|
||||||
Exceptions (specific upgrade instructions):
|
### 1.7.x to 1.8.0
|
||||||
- Upgrading <= 1.1.x to 1.2.0 or later, if you use EC n+k with k>=2, is recommended
|
|
||||||
to be performed with full downtime: first you should stop all clients, then all OSDs,
|
|
||||||
then upgrade and start everything back — because versions before 1.2.0 have several
|
|
||||||
bugs leading to invalid data being read in EC n+k, k>=2 configurations in degraded pools.
|
|
||||||
- Versions <= 0.8.7 are incompatible with versions >= 0.9.0, so you should first
|
|
||||||
upgrade from <= 0.8.7 to 0.8.8 or 0.8.9, and only then to >= 0.9.x. If you upgrade
|
|
||||||
without this intermediate step, client I/O will hang until the end of upgrade process.
|
|
||||||
- Upgrading from <= 0.5.x to >= 0.6.x is not supported.
|
|
||||||
|
|
||||||
Rollback:
|
After upgrading version <= 1.7.x to version >= 1.8.0, BUT <= 1.9.0: restart all clients
|
||||||
- Version 1.0.0 has a new disk format, so OSDs initiaziled on 1.0.0 can't be rolled
|
(VMs and so on), otherwise they will hang when monitor clears old PG configuration key,
|
||||||
back to 0.9.x or previous versions.
|
which happens 24 hours after upgrade.
|
||||||
- Versions before 0.8.0 don't have vitastor-disk, so OSDs, initialized by it, won't
|
|
||||||
start with 0.7.x or 0.6.x. :-)
|
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
|
||||||
|
to be performed with full downtime: first you should stop all clients, then all OSDs,
|
||||||
|
then upgrade and start everything back — because versions before 1.2.0 have several
|
||||||
|
bugs leading to invalid data being read in EC n+k, k>=2 configurations in degraded pools.
|
||||||
|
|
||||||
|
### 0.8.7 to 0.9.0
|
||||||
|
|
||||||
|
Versions <= 0.8.7 are incompatible with versions >= 0.9.0, so you should first
|
||||||
|
upgrade from <= 0.8.7 to 0.8.8 or 0.8.9, and only then to >= 0.9.x. If you upgrade
|
||||||
|
without this intermediate step, client I/O will hang until the end of upgrade process.
|
||||||
|
|
||||||
|
### 0.5.x to 0.6.x
|
||||||
|
|
||||||
|
Upgrading from <= 0.5.x to >= 0.6.x is not supported.
|
||||||
|
|
||||||
|
## Downgrade
|
||||||
|
|
||||||
|
Downgrade are also allowed freely, except the following specific instructions:
|
||||||
|
|
||||||
|
### 1.8.0 to 1.7.1
|
||||||
|
|
||||||
|
Before downgrading from version >= 1.8.0 to version <= 1.7.1
|
||||||
|
you have to copy /vitastor/pg/config etcd key to /vitastor/config/pgs:
|
||||||
|
|
||||||
|
```
|
||||||
|
etcdctl --endpoints=http://... get --print-value-only /vitastor/pg/config | \
|
||||||
|
etcdctl --endpoints=http://... put /vitastor/config/pgs
|
||||||
|
```
|
||||||
|
|
||||||
|
Then you can just install older packages and restart all services.
|
||||||
|
|
||||||
|
If you performed downgrade without first copying that key, run "add all OSDs into the
|
||||||
|
history records of all PGs" from [Restoring from lost pool configuration](#restoring-from-lost-pool-configuration).
|
||||||
|
|
||||||
|
### 1.0.0 to 0.9.x
|
||||||
|
|
||||||
|
Version 1.0.0 has a new disk format, so OSDs initialized on 1.0.0 or later can't
|
||||||
|
be rolled back to 0.9.x or previous versions.
|
||||||
|
|
||||||
|
### 0.8.0 to 0.7.x
|
||||||
|
|
||||||
|
Versions before 0.8.0 don't have vitastor-disk, so OSDs, initialized by it, won't
|
||||||
|
start with older versions (0.4.x - 0.7.x). :-)
|
||||||
|
|
||||||
## OSD memory usage
|
## OSD memory usage
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
- **offline** — PG вообще не активирована ни одним OSD. Либо первичный OSD не назначен вообще
|
- **offline** — PG вообще не активирована ни одним OSD. Либо первичный OSD не назначен вообще
|
||||||
(если пул только создан), либо в качестве первичного назначен недоступный OSD, либо
|
(если пул только создан), либо в качестве первичного назначен недоступный OSD, либо
|
||||||
назначенный OSD отказывается запускать эту PG (например, из-за несовпадения block_size),
|
назначенный OSD отказывается запускать эту PG (например, из-за несовпадения block_size),
|
||||||
либо PG остановлена монитором через флаг `pause: true` в `/vitastor/config/pgs` в etcd.
|
либо PG остановлена монитором через флаг `pause: true` в `/vitastor/pg/config` в etcd.
|
||||||
- **starting** — первичный OSD захватил блокировку PG в etcd, PG запускается.
|
- **starting** — первичный OSD захватил блокировку PG в etcd, PG запускается.
|
||||||
- **peering** — первичный OSD опрашивает вторичные OSD на предмет списков объектов данной PG и рассчитывает её состояние.
|
- **peering** — первичный OSD опрашивает вторичные OSD на предмет списков объектов данной PG и рассчитывает её состояние.
|
||||||
- **repeering** — PG ожидает завершения текущих операций ввода-вывода, после чего перейдёт в состояние **peering**.
|
- **repeering** — PG ожидает завершения текущих операций ввода-вывода, после чего перейдёт в состояние **peering**.
|
||||||
|
@ -147,7 +147,7 @@ POOL_ID=1
|
||||||
ALL_OSDS=$(etcdctl --endpoints=your_etcd_address:2379 get --keys-only --prefix /vitastor/osd/stats/ | \
|
ALL_OSDS=$(etcdctl --endpoints=your_etcd_address:2379 get --keys-only --prefix /vitastor/osd/stats/ | \
|
||||||
perl -e '$/ = undef; $a = <>; $a =~ s/\s*$//; $a =~ s!/vitastor/osd/stats/!!g; $a =~ s/\s+/,/g; print $a')
|
perl -e '$/ = undef; $a = <>; $a =~ s/\s*$//; $a =~ s!/vitastor/osd/stats/!!g; $a =~ s/\s+/,/g; print $a')
|
||||||
for i in $(seq 1 $PG_COUNT); do
|
for i in $(seq 1 $PG_COUNT); do
|
||||||
etcdctl --endpoints=your_etcd_address:2379 put /vitastor/pg/history/$POOL_ID/$i '{"all_peers":['$ALL_OSDS']}'; done
|
etcdctl --endpoints=your_etcd_address:2379 put /vitastor/pg/history/$POOL_ID/$i '{"all_peers":['$ALL_OSDS']}'
|
||||||
done
|
done
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -166,21 +166,63 @@ done
|
||||||
достаточно обновлять серверы по одному. Однако, конечно, чтобы запущенные виртуальные машины
|
достаточно обновлять серверы по одному. Однако, конечно, чтобы запущенные виртуальные машины
|
||||||
начали использовать новую версию клиентской библиотеки, их тоже нужно перезапустить.
|
начали использовать новую версию клиентской библиотеки, их тоже нужно перезапустить.
|
||||||
|
|
||||||
Исключения (особые указания при обновлении):
|
### 1.7.x -> 1.8.0
|
||||||
- Обновляться с версий <= 1.1.x до версий >= 1.2.0, если вы используете EC n+k и k>=2,
|
|
||||||
рекомендуется с временной остановкой кластера — сначала нужно остановить всех клиентов,
|
|
||||||
потом все OSD, потом обновить и запустить всё обратно — из-за нескольких багов, которые
|
|
||||||
могли приводить к некорректному чтению данных в деградированных EC-пулах.
|
|
||||||
- Версии <= 0.8.7 несовместимы с версиями >= 0.9.0, поэтому при обновлении с <= 0.8.7
|
|
||||||
нужно сначала обновиться до 0.8.8 или 0.8.9, а уже потом до любых версий >= 0.9.x.
|
|
||||||
Иначе клиентский ввод-вывод зависнет до завершения обновления.
|
|
||||||
- Обновление с версий 0.5.x и более ранних до 0.6.x и более поздних не поддерживается.
|
|
||||||
|
|
||||||
Откат:
|
После обновления с версий <= 1.7.x до версий >= 1.8.0, НО <= 1.9.0: перезапустите всех
|
||||||
- В версии 1.0.0 поменялся дисковый формат, поэтому OSD, созданные на версии >= 1.0.0,
|
клиентов (процессы виртуальных машин можно перезапустить путём миграции на другой сервер),
|
||||||
нельзя откатить до версии 0.9.x и более ранних.
|
иначе они зависнут, когда монитор удалит старый ключ конфигурации PG, что происходит через
|
||||||
- В версиях ранее 0.8.0 нет vitastor-disk, значит, созданные им OSD нельзя откатить
|
24 часа после обновления.
|
||||||
до 0.7.x или 0.6.x. :-)
|
|
||||||
|
Однако, это исправлено в 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,
|
||||||
|
рекомендуется с временной остановкой кластера — сначала нужно остановить всех клиентов,
|
||||||
|
потом все OSD, потом обновить и запустить всё обратно — из-за нескольких багов, которые
|
||||||
|
могли приводить к некорректному чтению данных в деградированных EC-пулах.
|
||||||
|
|
||||||
|
### 0.8.7 -> 0.9.0
|
||||||
|
|
||||||
|
Версии <= 0.8.7 несовместимы с версиями >= 0.9.0, поэтому при обновлении с <= 0.8.7
|
||||||
|
нужно сначала обновиться до 0.8.8 или 0.8.9, а уже потом до любых версий >= 0.9.x.
|
||||||
|
Иначе клиентский ввод-вывод зависнет до завершения обновления.
|
||||||
|
|
||||||
|
### 0.5.x -> 0.6.x
|
||||||
|
|
||||||
|
Обновление с версий 0.5.x и более ранних до 0.6.x и более поздних не поддерживается.
|
||||||
|
|
||||||
|
## Откат версии
|
||||||
|
|
||||||
|
Откат (понижение версии) тоже свободно разрешён, кроме указанных ниже случаев:
|
||||||
|
|
||||||
|
### 1.8.0 -> 1.7.1
|
||||||
|
|
||||||
|
Перед понижением версии с >= 1.8.0 до <= 1.7.1 вы должны скопировать ключ
|
||||||
|
etcd `/vitastor/pg/config` в `/vitastor/config/pgs`:
|
||||||
|
|
||||||
|
```
|
||||||
|
etcdctl --endpoints=http://... get --print-value-only /vitastor/pg/config | \
|
||||||
|
etcdctl --endpoints=http://... put /vitastor/config/pgs
|
||||||
|
```
|
||||||
|
|
||||||
|
После этого можно просто установить более старые пакеты и перезапустить все сервисы.
|
||||||
|
|
||||||
|
Если вы откатили версию, не скопировав предварительно этот ключ - выполните "добавление всех
|
||||||
|
OSD в исторические записи всех PG" из раздела [Восстановление потерянной конфигурации пулов](#восстановление-потерянной-конфигурации-пулов).
|
||||||
|
|
||||||
|
### 1.0.0 -> 0.9.x
|
||||||
|
|
||||||
|
В версии 1.0.0 поменялся дисковый формат, поэтому OSD, созданные на версии >= 1.0.0,
|
||||||
|
нельзя откатить до версии 0.9.x и более ранних.
|
||||||
|
|
||||||
|
### 0.8.0 -> 0.7.x
|
||||||
|
|
||||||
|
В версиях ранее 0.8.0 нет vitastor-disk, значит, созданные им OSD не запустятся на
|
||||||
|
более ранних версиях (0.4.x - 0.7.x). :-)
|
||||||
|
|
||||||
## Потребление памяти OSD
|
## Потребление памяти OSD
|
||||||
|
|
||||||
|
|
|
@ -16,6 +16,7 @@ It supports the following commands:
|
||||||
- [create](#create)
|
- [create](#create)
|
||||||
- [snap-create](#create)
|
- [snap-create](#create)
|
||||||
- [modify](#modify)
|
- [modify](#modify)
|
||||||
|
- [dd](#dd)
|
||||||
- [rm](#rm)
|
- [rm](#rm)
|
||||||
- [flatten](#flatten)
|
- [flatten](#flatten)
|
||||||
- [rm-data](#rm-data)
|
- [rm-data](#rm-data)
|
||||||
|
@ -148,19 +149,60 @@ You should resize file system in the image, if present, before shrinking it.
|
||||||
* `-f|--force` - Proceed with shrinking or setting readwrite flag even if the image has children.
|
* `-f|--force` - Proceed with shrinking or setting readwrite flag even if the image has children.
|
||||||
* `--down-ok` - Proceed with shrinking even if some data will be left on unavailable OSDs.
|
* `--down-ok` - Proceed with shrinking even if some data will be left on unavailable OSDs.
|
||||||
|
|
||||||
|
## dd
|
||||||
|
|
||||||
|
```
|
||||||
|
vitastor-cli dd [iimg=<image> | if=<file>] [oimg=<image> | of=<file>] [bs=1M] \
|
||||||
|
[count=N] [seek/oseek=N] [skip/iseek=M] [iodepth=N] [status=progress] \
|
||||||
|
[conv=nocreat,noerror,nofsync,trunc,nosparse] [iflag=direct] [oflag=direct,append]
|
||||||
|
```
|
||||||
|
|
||||||
|
Copy data between Vitastor images, files and pipes.
|
||||||
|
|
||||||
|
Options can be specified in classic dd style (`key=value`) or like usual (`--key value`).
|
||||||
|
|
||||||
|
| <!-- --> | <!-- --> |
|
||||||
|
|-----------------|-------------------------------------------------------------------------|
|
||||||
|
| `iimg=<image>` | Copy from Vitastor image `<image>` |
|
||||||
|
| `if=<file>` | Copy from file `<file>` |
|
||||||
|
| `oimg=<image>` | Copy to Vitastor image `<image>` |
|
||||||
|
| `of=<file>` | Copy to file `<file>` |
|
||||||
|
| `bs=1M` | Set copy block size |
|
||||||
|
| `count=N` | Copy only N input blocks. If N ends in B it counts bytes, not blocks |
|
||||||
|
| `seek/oseek=N` | Skip N output blocks. If N ends in B it counts bytes, not blocks |
|
||||||
|
| `skip/iseek=N` | Skip N input blocks. If N ends in B it counts bytes, not blocks |
|
||||||
|
| `iodepth=N` | Send N reads or writes in parallel (default 4) |
|
||||||
|
| `status=LEVEL` | The LEVEL of information to print to stderr: none/noxfer/progress |
|
||||||
|
| `size=N` | Specify size for the created output file/image (defaults to input size) |
|
||||||
|
| `iflag=direct` | For input files only: use direct I/O |
|
||||||
|
| `oflag=direct` | For output files only: use direct I/O |
|
||||||
|
| `oflag=append` | For files only: append to output file |
|
||||||
|
| `conv=nocreat` | Do not create output file/image |
|
||||||
|
| `conv=trunc` | Truncate output file/image |
|
||||||
|
| `conv=noerror` | Continue copying after errors |
|
||||||
|
| `conv=nofsync` | Do not call fsync before finishing (default behaviour is fsync) |
|
||||||
|
| `conv=nosparse` | Write all output blocks including all-zero blocks |
|
||||||
|
|
||||||
## rm
|
## rm
|
||||||
|
|
||||||
`vitastor-cli rm <from> [<to>] [--writers-stopped] [--down-ok]`
|
`vitastor-cli rm <from> [<to>] [--writers-stopped] [--down-ok]`
|
||||||
|
|
||||||
Remove `<from>` or all layers between `<from>` and `<to>` (`<to>` must be a child of `<from>`),
|
`vitastor-cli rm (--exact|--matching) <glob> ...`
|
||||||
rebasing all their children accordingly. --writers-stopped allows merging to be a bit
|
|
||||||
more effective in case of a single 'slim' read-write child and 'fat' removed parent:
|
|
||||||
the child is merged into parent and parent is renamed to child in that case.
|
|
||||||
In other cases parent layers are always merged into children.
|
|
||||||
|
|
||||||
Other options:
|
Remove layer(s) and rebase all their children accordingly.
|
||||||
|
|
||||||
* `--down-ok` - Continue deletion/merging even if some data will be left on unavailable OSDs.
|
In the first form, remove `<from>` or layers between `<from>` and its child `<to>`.
|
||||||
|
|
||||||
|
In the second form, remove all images with exact or pattern-matched names.
|
||||||
|
|
||||||
|
Options:
|
||||||
|
|
||||||
|
* `--writers-stopped` allows optimised removal in case of a single 'slim' read-write
|
||||||
|
child and 'fat' removed parent: the child is merged into parent and parent is renamed
|
||||||
|
to child in that case. In other cases parent layers are always merged into children.
|
||||||
|
* `--exact` - remove multiple images with names matching given glob patterns.
|
||||||
|
* `--matching` - remove multiple images with given names
|
||||||
|
* `--down-ok` - continue deletion/merging even if some data will be left on unavailable OSDs.
|
||||||
|
|
||||||
## flatten
|
## flatten
|
||||||
|
|
||||||
|
@ -307,7 +349,7 @@ OSD PARENT UP SIZE USED% TAGS WEIGHT BLOCK BITMAP
|
||||||
|
|
||||||
`vitastor-cli modify-osd [--tags tag1,tag2,...] [--reweight <number>] [--noout true/false] <osd_number>`
|
`vitastor-cli modify-osd [--tags tag1,tag2,...] [--reweight <number>] [--noout true/false] <osd_number>`
|
||||||
|
|
||||||
Set OSD reweight, tags or noout flag. See detail description in [OSD config documentation](../config.pool.en.md#osd-settings).
|
Set OSD reweight, tags or noout flag. See detail description in [OSD config documentation](../config/pool.en.md#osd-settings).
|
||||||
|
|
||||||
## pg-list
|
## pg-list
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,7 @@ vitastor-cli - интерфейс командной строки для адм
|
||||||
- [create](#create)
|
- [create](#create)
|
||||||
- [snap-create](#create)
|
- [snap-create](#create)
|
||||||
- [modify](#modify)
|
- [modify](#modify)
|
||||||
|
- [dd](#dd)
|
||||||
- [rm](#rm)
|
- [rm](#rm)
|
||||||
- [flatten](#flatten)
|
- [flatten](#flatten)
|
||||||
- [rm-data](#rm-data)
|
- [rm-data](#rm-data)
|
||||||
|
@ -151,23 +152,61 @@ vitastor-cli snap-create [-p|--pool <id|name>] <image>@<snapshot>
|
||||||
* `-f|--force` - Разрешить уменьшение или перевод в чтение-запись образа, у которого есть клоны.
|
* `-f|--force` - Разрешить уменьшение или перевод в чтение-запись образа, у которого есть клоны.
|
||||||
* `--down-ok` - Разрешить уменьшение, даже если часть данных останется неудалённой на недоступных OSD.
|
* `--down-ok` - Разрешить уменьшение, даже если часть данных останется неудалённой на недоступных OSD.
|
||||||
|
|
||||||
|
## dd
|
||||||
|
|
||||||
|
```
|
||||||
|
vitastor-cli dd [iimg=<image> | if=<file>] [oimg=<image> | of=<file>] [bs=1M] \
|
||||||
|
[count=N] [seek/oseek=N] [skip/iseek=M] [iodepth=N] [status=progress] \
|
||||||
|
[conv=nocreat,noerror,nofsync,trunc,nosparse] [iflag=direct] [oflag=direct,append]
|
||||||
|
```
|
||||||
|
|
||||||
|
Копировать данные между образами Vitastor, файлами и каналами.
|
||||||
|
|
||||||
|
Опции можно передавать в классическом стиле dd (`key=value`) или как обычно (`--key value`).
|
||||||
|
|
||||||
|
| <!-- --> | <!-- --> |
|
||||||
|
|-----------------|-------------------------------------------------------------------------|
|
||||||
|
| `iimg=<image>` | Копировать из образа Vitastor `<image>` |
|
||||||
|
| `if=<file>` | Копировать из файла `<file>` |
|
||||||
|
| `oimg=<image>` | Копировать в образ Vitastor `<image>` |
|
||||||
|
| `of=<file>` | Копировать в файл `<file>` |
|
||||||
|
| `bs=1M` | Задать размер блока копирования |
|
||||||
|
| `count=N` | Копировать не более N блоков. Если N заканчивается на B - то N байт. |
|
||||||
|
| `seek/oseek=N` | Пропустить N выходных блоков. Если N заканчивается на B - то N байт. |
|
||||||
|
| `skip/iseek=N` | Пропустить N входных блоков. Если N заканчивается на B - то N байт. |
|
||||||
|
| `iodepth=N` | Отправлять N чтений/записей параллельно (по умолчанию 4). |
|
||||||
|
| `status=LEVEL` | Уровень вывода в консоль: none/noxfer/progress |
|
||||||
|
| `size=N` | Задать размер выходного файла/образа (по умолчанию равен размеру входа).|
|
||||||
|
| `iflag=direct` | Только для входного файла: использовать прямой ввод-вывод |
|
||||||
|
| `oflag=direct` | Только для выходного файла: использовать прямой ввод-вывод |
|
||||||
|
| `oflag=append` | Только для файлов: дописывать в конец выходного файла |
|
||||||
|
| `conv=nocreat` | Не создавать выходной файл/образ |
|
||||||
|
| `conv=trunc` | Обрезать выходной файл/образ до размера входа |
|
||||||
|
| `conv=noerror` | Продолжать копирование после ошибок |
|
||||||
|
| `conv=nofsync` | Не вызывать fsync перед завершением |
|
||||||
|
| `conv=nosparse` | Записывать все выходные блоки, включая пустые |
|
||||||
|
|
||||||
## rm
|
## rm
|
||||||
|
|
||||||
`vitastor-cli rm <from> [<to>] [--writers-stopped] [--down-ok]`
|
`vitastor-cli rm <from> [<to>] [--writers-stopped] [--down-ok]`
|
||||||
|
|
||||||
Удалить образ `<from>` или все слои от `<from>` до `<to>` (`<to>` должен быть дочерним
|
`vitastor-cli rm (--exact|--matching) <glob> ...`
|
||||||
образом `<from>`), одновременно меняя родительские образы их клонов (если таковые есть).
|
|
||||||
|
|
||||||
`--writers-stopped` позволяет чуть более эффективно удалять образы в частом случае, когда
|
Удалить образ(ы), корректно перебазируя их дочерние образы.
|
||||||
у удаляемой цепочки есть только один дочерний образ, содержащий небольшой объём данных.
|
|
||||||
В этом случае дочерний образ вливается в родительский и удаляется, а родительский
|
|
||||||
переименовывается в дочерний.
|
|
||||||
|
|
||||||
В других случаях родительские слои вливаются в дочерние.
|
В первой форме удаляет один образ `<from>` или все слои между `<from>` и его дочерним `<to>`.
|
||||||
|
|
||||||
Другие опции:
|
Во второй форме, удаляет все образы с точными именами или именами, подходящими под шаблон(ы).
|
||||||
|
|
||||||
* `--down-ok` - Продолжать удаление/слияние, даже если часть данных останется неудалённой на недоступных OSD.
|
Опции:
|
||||||
|
|
||||||
|
* `--writers-stopped` позволяет чуть более эффективно удалять образы в частом случае, когда
|
||||||
|
у удаляемой цепочки есть только один дочерний образ, содержащий небольшой объём данных.
|
||||||
|
В этом случае дочерний образ вливается в родительский и удаляется, а родительский
|
||||||
|
переименовывается в дочерний.
|
||||||
|
* `--exact` - удалить все образы с именами, подходящими под переданные glob-шаблоны.
|
||||||
|
* `--matching` - удалить все образы с точно заданными именами.
|
||||||
|
* `--down-ok` - продолжать удаление/слияние, даже если часть данных останется неудалённой на недоступных OSD.
|
||||||
|
|
||||||
## flatten
|
## flatten
|
||||||
|
|
||||||
|
@ -324,7 +363,7 @@ OSD PARENT UP SIZE USED% TAGS WEIGHT BLOCK BITMAP
|
||||||
|
|
||||||
`vitastor-cli modify-osd [--tags tag1,tag2,...] [--reweight <number>] [--noout true/false] <osd_number>`
|
`vitastor-cli modify-osd [--tags tag1,tag2,...] [--reweight <number>] [--noout true/false] <osd_number>`
|
||||||
|
|
||||||
Установить вес OSD, теги или флаг noout. Смотрите подробное описание в [документации настроек OSD](../config.pool.ru.md#настройки-osd).
|
Установить вес OSD, теги или флаг noout. Смотрите подробное описание в [документации настроек OSD](../config/pool.ru.md#настройки-osd).
|
||||||
|
|
||||||
## pg-list
|
## pg-list
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ const etcd_nonempty_keys = {
|
||||||
'config/global': 1,
|
'config/global': 1,
|
||||||
'config/node_placement': 1,
|
'config/node_placement': 1,
|
||||||
'config/pools': 1,
|
'config/pools': 1,
|
||||||
'config/pgs': 1,
|
'pg/config': 1,
|
||||||
'history/last_clean_pgs': 1,
|
'history/last_clean_pgs': 1,
|
||||||
'stats': 1,
|
'stats': 1,
|
||||||
};
|
};
|
||||||
|
@ -15,7 +15,8 @@ const etcd_allow = new RegExp('^'+[
|
||||||
'config/node_placement',
|
'config/node_placement',
|
||||||
'config/pools',
|
'config/pools',
|
||||||
'config/osd/[1-9]\\d*',
|
'config/osd/[1-9]\\d*',
|
||||||
'config/pgs',
|
'config/pgs', // old name
|
||||||
|
'pg/config',
|
||||||
'config/inode/[1-9]\\d*/[1-9]\\d*',
|
'config/inode/[1-9]\\d*/[1-9]\\d*',
|
||||||
'osd/state/[1-9]\\d*',
|
'osd/state/[1-9]\\d*',
|
||||||
'osd/stats/[1-9]\\d*',
|
'osd/stats/[1-9]\\d*',
|
||||||
|
@ -24,7 +25,8 @@ const etcd_allow = new RegExp('^'+[
|
||||||
'mon/master',
|
'mon/master',
|
||||||
'mon/member/[a-f0-9]+',
|
'mon/member/[a-f0-9]+',
|
||||||
'pg/state/[1-9]\\d*/[1-9]\\d*',
|
'pg/state/[1-9]\\d*/[1-9]\\d*',
|
||||||
'pg/stats/[1-9]\\d*/[1-9]\\d*',
|
'pg/stats/[1-9]\\d*/[1-9]\\d*', // old name
|
||||||
|
'pgstats/[1-9]\\d*/[1-9]\\d*',
|
||||||
'pg/history/[1-9]\\d*/[1-9]\\d*',
|
'pg/history/[1-9]\\d*/[1-9]\\d*',
|
||||||
'history/last_clean_pgs',
|
'history/last_clean_pgs',
|
||||||
'inode/stats/[1-9]\\d*/\\d+',
|
'inode/stats/[1-9]\\d*/\\d+',
|
||||||
|
@ -205,19 +207,6 @@ const etcd_tree = {
|
||||||
osd: {
|
osd: {
|
||||||
/* <id>: { reweight?: 1, tags?: [ 'nvme', ... ], noout?: true }, ... */
|
/* <id>: { reweight?: 1, tags?: [ 'nvme', ... ], noout?: true }, ... */
|
||||||
},
|
},
|
||||||
/* pgs: {
|
|
||||||
hash: string,
|
|
||||||
items: {
|
|
||||||
<pool_id>: {
|
|
||||||
<pg_id>: {
|
|
||||||
osd_set: [ 1, 2, 3 ],
|
|
||||||
primary: 1,
|
|
||||||
pause: false,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, */
|
|
||||||
pgs: {},
|
|
||||||
/* inode: {
|
/* inode: {
|
||||||
<pool_id>: {
|
<pool_id>: {
|
||||||
<inode_t>: {
|
<inode_t>: {
|
||||||
|
@ -290,6 +279,19 @@ const etcd_tree = {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
pg: {
|
pg: {
|
||||||
|
/* config: {
|
||||||
|
hash: string,
|
||||||
|
items: {
|
||||||
|
<pool_id>: {
|
||||||
|
<pg_id>: {
|
||||||
|
osd_set: [ 1, 2, 3 ],
|
||||||
|
primary: 1,
|
||||||
|
pause: false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, */
|
||||||
|
config: {},
|
||||||
state: {
|
state: {
|
||||||
/* <pool_id>: {
|
/* <pool_id>: {
|
||||||
<pg_id>: {
|
<pg_id>: {
|
||||||
|
@ -300,18 +302,6 @@ const etcd_tree = {
|
||||||
}
|
}
|
||||||
}, */
|
}, */
|
||||||
},
|
},
|
||||||
stats: {
|
|
||||||
/* <pool_id>: {
|
|
||||||
<pg_id>: {
|
|
||||||
object_count: uint64_t,
|
|
||||||
clean_count: uint64_t,
|
|
||||||
misplaced_count: uint64_t,
|
|
||||||
degraded_count: uint64_t,
|
|
||||||
incomplete_count: uint64_t,
|
|
||||||
write_osd_set: osd_num_t[],
|
|
||||||
},
|
|
||||||
}, */
|
|
||||||
},
|
|
||||||
history: {
|
history: {
|
||||||
/* <pool_id>: {
|
/* <pool_id>: {
|
||||||
<pg_id>: {
|
<pg_id>: {
|
||||||
|
@ -323,6 +313,18 @@ const etcd_tree = {
|
||||||
}, */
|
}, */
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
pgstats: {
|
||||||
|
/* <pool_id>: {
|
||||||
|
<pg_id>: {
|
||||||
|
object_count: uint64_t,
|
||||||
|
clean_count: uint64_t,
|
||||||
|
misplaced_count: uint64_t,
|
||||||
|
degraded_count: uint64_t,
|
||||||
|
incomplete_count: uint64_t,
|
||||||
|
write_osd_set: osd_num_t[],
|
||||||
|
},
|
||||||
|
}, */
|
||||||
|
},
|
||||||
inode: {
|
inode: {
|
||||||
stats: {
|
stats: {
|
||||||
/* <pool_id>: {
|
/* <pool_id>: {
|
||||||
|
|
115
mon/mon.js
115
mon/mon.js
|
@ -75,6 +75,8 @@ class Mon
|
||||||
this.prev_stats = { osd_stats: {}, osd_diff: {} };
|
this.prev_stats = { osd_stats: {}, osd_diff: {} };
|
||||||
this.recheck_pgs_active = false;
|
this.recheck_pgs_active = false;
|
||||||
this.watcher_active = false;
|
this.watcher_active = false;
|
||||||
|
this.old_pg_config = false;
|
||||||
|
this.old_pg_stats_seen = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
async start()
|
async start()
|
||||||
|
@ -122,7 +124,7 @@ class Mon
|
||||||
!Number(this.state.pool.stats[pool_id].pg_real_size))
|
!Number(this.state.pool.stats[pool_id].pg_real_size))
|
||||||
{
|
{
|
||||||
// Generate missing data in etcd
|
// Generate missing data in etcd
|
||||||
this.state.config.pgs.hash = null;
|
this.state.pg.config.hash = null;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -201,16 +203,25 @@ class Mon
|
||||||
stats_changed = true;
|
stats_changed = true;
|
||||||
changed = true;
|
changed = true;
|
||||||
}
|
}
|
||||||
else if (key.substr(0, 11) == '/osd/stats/' || key.substr(0, 10) == '/pg/stats/' || key.substr(0, 16) == '/osd/inodestats/')
|
else if (key.substr(0, 11) == '/osd/stats/' || key.substr(0, 9) == '/pgstats/' || key.substr(0, 16) == '/osd/inodestats/')
|
||||||
{
|
{
|
||||||
stats_changed = true;
|
stats_changed = true;
|
||||||
}
|
}
|
||||||
|
else if (key.substr(0, 10) == '/pg/stats/')
|
||||||
|
{
|
||||||
|
this.old_pg_stats_seen = true;
|
||||||
|
stats_changed = true;
|
||||||
|
}
|
||||||
else if (key.substr(0, 10) == '/pg/state/')
|
else if (key.substr(0, 10) == '/pg/state/')
|
||||||
{
|
{
|
||||||
pg_states_changed = true;
|
pg_states_changed = true;
|
||||||
}
|
}
|
||||||
else if (key != '/stats' && key.substr(0, 13) != '/inode/stats/')
|
else if (key != '/stats' && key.substr(0, 13) != '/inode/stats/')
|
||||||
{
|
{
|
||||||
|
if (key == '/config/pgs' && !kv.value)
|
||||||
|
{
|
||||||
|
this.old_pg_config = false;
|
||||||
|
}
|
||||||
changed = true;
|
changed = true;
|
||||||
}
|
}
|
||||||
if (this.config.verbose)
|
if (this.config.verbose)
|
||||||
|
@ -285,7 +296,7 @@ class Mon
|
||||||
continue next_pool;
|
continue next_pool;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
new_clean_pgs.items[pool_id] = this.state.config.pgs.items[pool_id];
|
new_clean_pgs.items[pool_id] = this.state.pg.config.items[pool_id];
|
||||||
}
|
}
|
||||||
this.state.history.last_clean_pgs = new_clean_pgs;
|
this.state.history.last_clean_pgs = new_clean_pgs;
|
||||||
await this.etcd.etcd_call('/kv/txn', {
|
await this.etcd.etcd_call('/kv/txn', {
|
||||||
|
@ -396,6 +407,26 @@ class Mon
|
||||||
this.parse_kv(kv);
|
this.parse_kv(kv);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (Object.keys((this.state.config.pgs||{}).items||{}).length)
|
||||||
|
{
|
||||||
|
// Support seamless upgrade to new OSDs
|
||||||
|
if (!Object.keys((this.state.pg.config||{}).items||{}).length)
|
||||||
|
{
|
||||||
|
const pgs = JSON.stringify(this.state.config.pgs);
|
||||||
|
this.state.pg.config = JSON.parse(pgs);
|
||||||
|
const res = await this.etcd.etcd_call('/kv/txn', {
|
||||||
|
success: [
|
||||||
|
{ requestPut: { key: b64(this.config.etcd_prefix+'/pg/config'), value: b64(pgs) } },
|
||||||
|
],
|
||||||
|
compare: [
|
||||||
|
{ key: b64(this.config.etcd_prefix+'/pg/config'), target: 'MOD', mod_revision: ''+this.etcd_watch_revision, result: 'LESS' },
|
||||||
|
],
|
||||||
|
}, this.config.etcd_mon_timeout, this.config.etcd_mon_retries);
|
||||||
|
if (!res.succeeded)
|
||||||
|
throw new Error('Failed to duplicate old PG config to new PG config');
|
||||||
|
}
|
||||||
|
this.old_pg_config = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
all_osds()
|
all_osds()
|
||||||
|
@ -406,7 +437,7 @@ class Mon
|
||||||
async stop_all_pgs(pool_id)
|
async stop_all_pgs(pool_id)
|
||||||
{
|
{
|
||||||
let has_online = false, paused = true;
|
let has_online = false, paused = true;
|
||||||
for (const pg in this.state.config.pgs.items[pool_id]||{})
|
for (const pg in this.state.pg.config.items[pool_id]||{})
|
||||||
{
|
{
|
||||||
// FIXME: Change all (||{}) to ?. (optional chaining) at some point
|
// FIXME: Change all (||{}) to ?. (optional chaining) at some point
|
||||||
const cur_state = (((this.state.pg.state[pool_id]||{})[pg]||{}).state||[]).join(',');
|
const cur_state = (((this.state.pg.state[pool_id]||{})[pg]||{}).state||[]).join(',');
|
||||||
|
@ -414,7 +445,7 @@ class Mon
|
||||||
{
|
{
|
||||||
has_online = true;
|
has_online = true;
|
||||||
}
|
}
|
||||||
if (!this.state.config.pgs.items[pool_id][pg].pause)
|
if (!this.state.pg.config.items[pool_id][pg].pause)
|
||||||
{
|
{
|
||||||
paused = false;
|
paused = false;
|
||||||
}
|
}
|
||||||
|
@ -422,7 +453,7 @@ class Mon
|
||||||
if (!paused)
|
if (!paused)
|
||||||
{
|
{
|
||||||
console.log('Stopping all PGs for pool '+pool_id+' before changing PG count');
|
console.log('Stopping all PGs for pool '+pool_id+' before changing PG count');
|
||||||
const new_cfg = JSON.parse(JSON.stringify(this.state.config.pgs));
|
const new_cfg = JSON.parse(JSON.stringify(this.state.pg.config));
|
||||||
for (const pg in new_cfg.items[pool_id])
|
for (const pg in new_cfg.items[pool_id])
|
||||||
{
|
{
|
||||||
new_cfg.items[pool_id][pg].pause = true;
|
new_cfg.items[pool_id][pg].pause = true;
|
||||||
|
@ -430,22 +461,26 @@ class Mon
|
||||||
// Check that no OSDs change their state before we pause PGs
|
// Check that no OSDs change their state before we pause PGs
|
||||||
// Doing this we make sure that OSDs don't wake up in the middle of our "transaction"
|
// Doing this we make sure that OSDs don't wake up in the middle of our "transaction"
|
||||||
// and can't see the old PG configuration
|
// and can't see the old PG configuration
|
||||||
const checks = [];
|
const checks = [
|
||||||
|
{ key: b64(this.config.etcd_prefix+'/mon/master'), target: 'LEASE', lease: ''+this.etcd_lease_id },
|
||||||
|
{ key: b64(this.config.etcd_prefix+'/pg/config'), target: 'MOD', mod_revision: ''+this.etcd_watch_revision, result: 'LESS' },
|
||||||
|
];
|
||||||
for (const osd_num of this.all_osds())
|
for (const osd_num of this.all_osds())
|
||||||
{
|
{
|
||||||
const key = b64(this.config.etcd_prefix+'/osd/state/'+osd_num);
|
const key = b64(this.config.etcd_prefix+'/osd/state/'+osd_num);
|
||||||
checks.push({ key, target: 'MOD', result: 'LESS', mod_revision: ''+this.etcd_watch_revision });
|
checks.push({ key, target: 'MOD', result: 'LESS', mod_revision: ''+this.etcd_watch_revision });
|
||||||
}
|
}
|
||||||
await this.etcd.etcd_call('/kv/txn', {
|
const txn = {
|
||||||
compare: [
|
compare: checks,
|
||||||
{ key: b64(this.config.etcd_prefix+'/mon/master'), target: 'LEASE', lease: ''+this.etcd_lease_id },
|
|
||||||
{ key: b64(this.config.etcd_prefix+'/config/pgs'), target: 'MOD', mod_revision: ''+this.etcd_watch_revision, result: 'LESS' },
|
|
||||||
...checks,
|
|
||||||
],
|
|
||||||
success: [
|
success: [
|
||||||
{ requestPut: { key: b64(this.config.etcd_prefix+'/config/pgs'), value: b64(JSON.stringify(new_cfg)) } },
|
{ requestPut: { key: b64(this.config.etcd_prefix+'/pg/config'), value: b64(JSON.stringify(new_cfg)) } },
|
||||||
],
|
],
|
||||||
}, this.config.etcd_mon_timeout, 0);
|
};
|
||||||
|
if (this.old_pg_config)
|
||||||
|
{
|
||||||
|
txn.success.push({ requestPut: { key: b64(this.config.etcd_prefix+'/config/pgs'), value: b64(JSON.stringify(new_cfg)) } });
|
||||||
|
}
|
||||||
|
await this.etcd.etcd_call('/kv/txn', txn, this.config.etcd_mon_timeout, 0);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return !has_online;
|
return !has_online;
|
||||||
|
@ -473,7 +508,7 @@ class Mon
|
||||||
pools: this.state.config.pools,
|
pools: this.state.config.pools,
|
||||||
};
|
};
|
||||||
const tree_hash = sha1hex(stableStringify(tree_cfg));
|
const tree_hash = sha1hex(stableStringify(tree_cfg));
|
||||||
if (this.state.config.pgs.hash != tree_hash)
|
if (this.state.pg.config.hash != tree_hash)
|
||||||
{
|
{
|
||||||
// Something has changed
|
// Something has changed
|
||||||
console.log('Pool configuration or OSD tree changed, re-optimizing');
|
console.log('Pool configuration or OSD tree changed, re-optimizing');
|
||||||
|
@ -514,10 +549,10 @@ class Mon
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Nothing changed, but we still want to recheck the distribution of primaries
|
// Nothing changed, but we still want to recheck the distribution of primaries
|
||||||
let new_config_pgs = recheck_primary(this.state, this.config, up_osds, osd_tree);
|
let new_pg_config = recheck_primary(this.state, this.config, up_osds, osd_tree);
|
||||||
if (new_config_pgs)
|
if (new_pg_config)
|
||||||
{
|
{
|
||||||
const ok = await this.save_pg_config(new_config_pgs);
|
const ok = await this.save_pg_config(new_pg_config);
|
||||||
if (ok)
|
if (ok)
|
||||||
console.log('PG configuration successfully changed');
|
console.log('PG configuration successfully changed');
|
||||||
else
|
else
|
||||||
|
@ -532,12 +567,12 @@ class Mon
|
||||||
|
|
||||||
async apply_pool_pgs(results, up_osds, osd_tree, tree_hash)
|
async apply_pool_pgs(results, up_osds, osd_tree, tree_hash)
|
||||||
{
|
{
|
||||||
for (const pool_id in (this.state.config.pgs||{}).items||{})
|
for (const pool_id in (this.state.pg.config||{}).items||{})
|
||||||
{
|
{
|
||||||
// We should stop all PGs when deleting a pool or changing its PG count
|
// We should stop all PGs when deleting a pool or changing its PG count
|
||||||
if (!this.state.config.pools[pool_id] ||
|
if (!this.state.config.pools[pool_id] ||
|
||||||
this.state.config.pgs.items[pool_id] && this.state.config.pools[pool_id].pg_count !=
|
this.state.pg.config.items[pool_id] && this.state.config.pools[pool_id].pg_count !=
|
||||||
Object.keys(this.state.config.pgs.items[pool_id]).reduce((a, c) => (a < (0|c) ? (0|c) : a), 0))
|
Object.keys(this.state.pg.config.items[pool_id]).reduce((a, c) => (a < (0|c) ? (0|c) : a), 0))
|
||||||
{
|
{
|
||||||
if (!await this.stop_all_pgs(pool_id))
|
if (!await this.stop_all_pgs(pool_id))
|
||||||
{
|
{
|
||||||
|
@ -545,22 +580,22 @@ class Mon
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const new_config_pgs = JSON.parse(JSON.stringify(this.state.config.pgs));
|
const new_pg_config = JSON.parse(JSON.stringify(this.state.pg.config));
|
||||||
const etcd_request = { compare: [], success: [] };
|
const etcd_request = { compare: [], success: [] };
|
||||||
for (const pool_id in (new_config_pgs||{}).items||{})
|
for (const pool_id in (new_pg_config||{}).items||{})
|
||||||
{
|
{
|
||||||
if (!this.state.config.pools[pool_id])
|
if (!this.state.config.pools[pool_id])
|
||||||
{
|
{
|
||||||
const prev_pgs = [];
|
const prev_pgs = [];
|
||||||
for (const pg in new_config_pgs.items[pool_id]||{})
|
for (const pg in new_pg_config.items[pool_id]||{})
|
||||||
{
|
{
|
||||||
prev_pgs[pg-1] = new_config_pgs.items[pool_id][pg].osd_set;
|
prev_pgs[pg-1] = new_pg_config.items[pool_id][pg].osd_set;
|
||||||
}
|
}
|
||||||
// Also delete pool statistics
|
// Also delete pool statistics
|
||||||
etcd_request.success.push({ requestDeleteRange: {
|
etcd_request.success.push({ requestDeleteRange: {
|
||||||
key: b64(this.config.etcd_prefix+'/pool/stats/'+pool_id),
|
key: b64(this.config.etcd_prefix+'/pool/stats/'+pool_id),
|
||||||
} });
|
} });
|
||||||
save_new_pgs_txn(new_config_pgs, etcd_request, this.state, this.config.etcd_prefix,
|
save_new_pgs_txn(new_pg_config, etcd_request, this.state, this.config.etcd_prefix,
|
||||||
this.etcd_watch_revision, pool_id, up_osds, osd_tree, prev_pgs, [], []);
|
this.etcd_watch_revision, pool_id, up_osds, osd_tree, prev_pgs, [], []);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -569,7 +604,7 @@ class Mon
|
||||||
const pool_id = pool_res.pool_id;
|
const pool_id = pool_res.pool_id;
|
||||||
const pool_cfg = this.state.config.pools[pool_id];
|
const pool_cfg = this.state.config.pools[pool_id];
|
||||||
let pg_history = [];
|
let pg_history = [];
|
||||||
for (const pg in ((this.state.config.pgs.items||{})[pool_id]||{}))
|
for (const pg in ((this.state.pg.config.items||{})[pool_id]||{}))
|
||||||
{
|
{
|
||||||
if (this.state.pg.history[pool_id] &&
|
if (this.state.pg.history[pool_id] &&
|
||||||
this.state.pg.history[pool_id][pg])
|
this.state.pg.history[pool_id][pg])
|
||||||
|
@ -578,9 +613,9 @@ class Mon
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const real_prev_pgs = [];
|
const real_prev_pgs = [];
|
||||||
for (const pg in ((this.state.config.pgs.items||{})[pool_id]||{}))
|
for (const pg in ((this.state.pg.config.items||{})[pool_id]||{}))
|
||||||
{
|
{
|
||||||
real_prev_pgs[pg-1] = [ ...this.state.config.pgs.items[pool_id][pg].osd_set ];
|
real_prev_pgs[pg-1] = [ ...this.state.pg.config.items[pool_id][pg].osd_set ];
|
||||||
}
|
}
|
||||||
if (real_prev_pgs.length > 0 && real_prev_pgs.length != pool_res.pgs.length)
|
if (real_prev_pgs.length > 0 && real_prev_pgs.length != pool_res.pgs.length)
|
||||||
{
|
{
|
||||||
|
@ -591,8 +626,8 @@ class Mon
|
||||||
pg_history = scale_pg_history(pg_history, real_prev_pgs, pool_res.pgs);
|
pg_history = scale_pg_history(pg_history, real_prev_pgs, pool_res.pgs);
|
||||||
// Drop stats
|
// Drop stats
|
||||||
etcd_request.success.push({ requestDeleteRange: {
|
etcd_request.success.push({ requestDeleteRange: {
|
||||||
key: b64(this.config.etcd_prefix+'/pg/stats/'+pool_id+'/'),
|
key: b64(this.config.etcd_prefix+'/pgstats/'+pool_id+'/'),
|
||||||
range_end: b64(this.config.etcd_prefix+'/pg/stats/'+pool_id+'0'),
|
range_end: b64(this.config.etcd_prefix+'/pgstats/'+pool_id+'0'),
|
||||||
} });
|
} });
|
||||||
}
|
}
|
||||||
const stats = {
|
const stats = {
|
||||||
|
@ -603,22 +638,26 @@ class Mon
|
||||||
key: b64(this.config.etcd_prefix+'/pool/stats/'+pool_id),
|
key: b64(this.config.etcd_prefix+'/pool/stats/'+pool_id),
|
||||||
value: b64(JSON.stringify(stats)),
|
value: b64(JSON.stringify(stats)),
|
||||||
} });
|
} });
|
||||||
save_new_pgs_txn(new_config_pgs, etcd_request, this.state, this.config.etcd_prefix,
|
save_new_pgs_txn(new_pg_config, etcd_request, this.state, this.config.etcd_prefix,
|
||||||
this.etcd_watch_revision, pool_id, up_osds, osd_tree, real_prev_pgs, pool_res.pgs, pg_history);
|
this.etcd_watch_revision, pool_id, up_osds, osd_tree, real_prev_pgs, pool_res.pgs, pg_history);
|
||||||
}
|
}
|
||||||
new_config_pgs.hash = tree_hash;
|
new_pg_config.hash = tree_hash;
|
||||||
return await this.save_pg_config(new_config_pgs, etcd_request);
|
return await this.save_pg_config(new_pg_config, etcd_request);
|
||||||
}
|
}
|
||||||
|
|
||||||
async save_pg_config(new_config_pgs, etcd_request = { compare: [], success: [] })
|
async save_pg_config(new_pg_config, etcd_request = { compare: [], success: [] })
|
||||||
{
|
{
|
||||||
etcd_request.compare.push(
|
etcd_request.compare.push(
|
||||||
{ key: b64(this.config.etcd_prefix+'/mon/master'), target: 'LEASE', lease: ''+this.etcd_lease_id },
|
{ key: b64(this.config.etcd_prefix+'/mon/master'), target: 'LEASE', lease: ''+this.etcd_lease_id },
|
||||||
{ key: b64(this.config.etcd_prefix+'/config/pgs'), target: 'MOD', mod_revision: ''+this.etcd_watch_revision, result: 'LESS' },
|
{ key: b64(this.config.etcd_prefix+'/pg/config'), target: 'MOD', mod_revision: ''+this.etcd_watch_revision, result: 'LESS' },
|
||||||
);
|
);
|
||||||
etcd_request.success.push(
|
etcd_request.success.push(
|
||||||
{ requestPut: { key: b64(this.config.etcd_prefix+'/config/pgs'), value: b64(JSON.stringify(new_config_pgs)) } },
|
{ requestPut: { key: b64(this.config.etcd_prefix+'/pg/config'), value: b64(JSON.stringify(new_pg_config)) } },
|
||||||
);
|
);
|
||||||
|
if (this.old_pg_config)
|
||||||
|
{
|
||||||
|
etcd_request.success.push({ requestPut: { key: b64(this.config.etcd_prefix+'/config/pgs'), value: b64(JSON.stringify(new_pg_config)) } });
|
||||||
|
}
|
||||||
const txn_res = await this.etcd.etcd_call('/kv/txn', etcd_request, this.config.etcd_mon_timeout, 0);
|
const txn_res = await this.etcd.etcd_call('/kv/txn', etcd_request, this.config.etcd_mon_timeout, 0);
|
||||||
return txn_res.succeeded;
|
return txn_res.succeeded;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "vitastor-mon",
|
"name": "vitastor-mon",
|
||||||
"version": "1.7.1",
|
"version": "1.9.1",
|
||||||
"description": "Vitastor SDS monitor service",
|
"description": "Vitastor SDS monitor service",
|
||||||
"main": "mon-main.js",
|
"main": "mon-main.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
|
@ -57,7 +57,7 @@ function pick_primary(pool_config, osd_set, up_osds, aff_osds)
|
||||||
|
|
||||||
function recheck_primary(state, global_config, up_osds, osd_tree)
|
function recheck_primary(state, global_config, up_osds, osd_tree)
|
||||||
{
|
{
|
||||||
let new_config_pgs;
|
let new_pg_config;
|
||||||
for (const pool_id in state.config.pools)
|
for (const pool_id in state.config.pools)
|
||||||
{
|
{
|
||||||
const pool_cfg = state.config.pools[pool_id];
|
const pool_cfg = state.config.pools[pool_id];
|
||||||
|
@ -69,30 +69,30 @@ function recheck_primary(state, global_config, up_osds, osd_tree)
|
||||||
reset_rng();
|
reset_rng();
|
||||||
for (let pg_num = 1; pg_num <= pool_cfg.pg_count; pg_num++)
|
for (let pg_num = 1; pg_num <= pool_cfg.pg_count; pg_num++)
|
||||||
{
|
{
|
||||||
if (!state.config.pgs.items[pool_id])
|
if (!state.pg.config.items[pool_id])
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
const pg_cfg = state.config.pgs.items[pool_id][pg_num];
|
const pg_cfg = state.pg.config.items[pool_id][pg_num];
|
||||||
if (pg_cfg)
|
if (pg_cfg)
|
||||||
{
|
{
|
||||||
const new_primary = pick_primary(state.config.pools[pool_id], pg_cfg.osd_set, up_osds, aff_osds);
|
const new_primary = pick_primary(state.config.pools[pool_id], pg_cfg.osd_set, up_osds, aff_osds);
|
||||||
if (pg_cfg.primary != new_primary)
|
if (pg_cfg.primary != new_primary)
|
||||||
{
|
{
|
||||||
if (!new_config_pgs)
|
if (!new_pg_config)
|
||||||
{
|
{
|
||||||
new_config_pgs = JSON.parse(JSON.stringify(state.config.pgs));
|
new_pg_config = JSON.parse(JSON.stringify(state.pg.config));
|
||||||
}
|
}
|
||||||
console.log(
|
console.log(
|
||||||
`Moving pool ${pool_id} (${pool_cfg.name || 'unnamed'}) PG ${pg_num}`+
|
`Moving pool ${pool_id} (${pool_cfg.name || 'unnamed'}) PG ${pg_num}`+
|
||||||
` primary OSD from ${pg_cfg.primary} to ${new_primary}`
|
` primary OSD from ${pg_cfg.primary} to ${new_primary}`
|
||||||
);
|
);
|
||||||
new_config_pgs.items[pool_id][pg_num].primary = new_primary;
|
new_pg_config.items[pool_id][pg_num].primary = new_primary;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return new_config_pgs;
|
return new_pg_config;
|
||||||
}
|
}
|
||||||
|
|
||||||
function save_new_pgs_txn(save_to, request, state, etcd_prefix, etcd_watch_revision, pool_id, up_osds, osd_tree, prev_pgs, new_pgs, pg_history)
|
function save_new_pgs_txn(save_to, request, state, etcd_prefix, etcd_watch_revision, pool_id, up_osds, osd_tree, prev_pgs, new_pgs, pg_history)
|
||||||
|
@ -185,10 +185,10 @@ async function generate_pool_pgs(state, global_config, pool_id, osd_tree, levels
|
||||||
}
|
}
|
||||||
if (!prev_pgs.length)
|
if (!prev_pgs.length)
|
||||||
{
|
{
|
||||||
// Fall back to config/pgs if it's empty
|
// Fall back to pg/config if it's empty
|
||||||
for (const pg in ((state.config.pgs.items||{})[pool_id]||{}))
|
for (const pg in ((state.pg.config.items||{})[pool_id]||{}))
|
||||||
{
|
{
|
||||||
prev_pgs[pg-1] = [ ...state.config.pgs.items[pool_id][pg].osd_set ];
|
prev_pgs[pg-1] = [ ...state.pg.config.items[pool_id][pg].osd_set ];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const old_pg_count = prev_pgs.length;
|
const old_pg_count = prev_pgs.length;
|
||||||
|
@ -205,8 +205,8 @@ async function generate_pool_pgs(state, global_config, pool_id, osd_tree, levels
|
||||||
ordered: pool_cfg.scheme != 'replicated',
|
ordered: pool_cfg.scheme != 'replicated',
|
||||||
};
|
};
|
||||||
let optimize_result;
|
let optimize_result;
|
||||||
// Re-shuffle PGs if config/pgs.hash is empty
|
// Re-shuffle PGs if pg/config.hash is empty
|
||||||
if (old_pg_count > 0 && state.config.pgs.hash)
|
if (old_pg_count > 0 && state.pg.config.hash)
|
||||||
{
|
{
|
||||||
if (prev_pgs.length != pool_cfg.pg_count)
|
if (prev_pgs.length != pool_cfg.pg_count)
|
||||||
{
|
{
|
||||||
|
|
|
@ -166,7 +166,7 @@ function export_prometheus_metrics(st)
|
||||||
res += `vitastor_pool_used_raw_tb{${pool_label}} ${pool_stat.used_raw_tb||0}\n`;
|
res += `vitastor_pool_used_raw_tb{${pool_label}} ${pool_stat.used_raw_tb||0}\n`;
|
||||||
|
|
||||||
// PG states and pool up/down status
|
// PG states and pool up/down status
|
||||||
const real_pg_count = (Object.keys(((st.config.pgs||{}).items||{})[pool_id]||{}).length) || (0|pool_cfg.pg_count);
|
const real_pg_count = (Object.keys(((st.pg.config||{}).items||{})[pool_id]||{}).length) || (0|pool_cfg.pg_count);
|
||||||
const per_state = {
|
const per_state = {
|
||||||
active: 0,
|
active: 0,
|
||||||
starting: 0,
|
starting: 0,
|
||||||
|
|
17
mon/stats.js
17
mon/stats.js
|
@ -100,10 +100,19 @@ function sum_object_counts(state, global_config)
|
||||||
{
|
{
|
||||||
const object_counts = { object: 0n, clean: 0n, misplaced: 0n, degraded: 0n, incomplete: 0n };
|
const object_counts = { object: 0n, clean: 0n, misplaced: 0n, degraded: 0n, incomplete: 0n };
|
||||||
const object_bytes = { object: 0n, clean: 0n, misplaced: 0n, degraded: 0n, incomplete: 0n };
|
const object_bytes = { object: 0n, clean: 0n, misplaced: 0n, degraded: 0n, incomplete: 0n };
|
||||||
for (const pool_id in state.pg.stats)
|
let pgstats = state.pgstats;
|
||||||
|
if (state.pg.stats)
|
||||||
|
{
|
||||||
|
// Merge with old stats for seamless transition to new stats
|
||||||
|
for (const pool_id in state.pg.stats)
|
||||||
|
{
|
||||||
|
pgstats[pool_id] = { ...(state.pg.stats[pool_id] || {}), ...(pgstats[pool_id] || {}) };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (const pool_id in pgstats)
|
||||||
{
|
{
|
||||||
let object_size = 0;
|
let object_size = 0;
|
||||||
for (const osd_num of state.pg.stats[pool_id].write_osd_set||[])
|
for (const osd_num of pgstats[pool_id].write_osd_set||[])
|
||||||
{
|
{
|
||||||
if (osd_num && state.osd.stats[osd_num] && state.osd.stats[osd_num].block_size)
|
if (osd_num && state.osd.stats[osd_num] && state.osd.stats[osd_num].block_size)
|
||||||
{
|
{
|
||||||
|
@ -121,9 +130,9 @@ function sum_object_counts(state, global_config)
|
||||||
object_size *= ((pool_cfg.pg_size||0) - (pool_cfg.parity_chunks||0));
|
object_size *= ((pool_cfg.pg_size||0) - (pool_cfg.parity_chunks||0));
|
||||||
}
|
}
|
||||||
object_size = BigInt(object_size);
|
object_size = BigInt(object_size);
|
||||||
for (const pg_num in state.pg.stats[pool_id])
|
for (const pg_num in pgstats[pool_id])
|
||||||
{
|
{
|
||||||
const st = state.pg.stats[pool_id][pg_num];
|
const st = pgstats[pool_id][pg_num];
|
||||||
if (st)
|
if (st)
|
||||||
{
|
{
|
||||||
for (const k in object_counts)
|
for (const k in object_counts)
|
||||||
|
|
|
@ -35,7 +35,8 @@ function vitastor_persist_filter(cfg)
|
||||||
}
|
}
|
||||||
else if (key.substr(0, prefix.length+'/osd/'.length) == prefix+'/osd/' ||
|
else if (key.substr(0, prefix.length+'/osd/'.length) == prefix+'/osd/' ||
|
||||||
key.substr(0, prefix.length+'/inode/stats/'.length) == prefix+'/inode/stats/' ||
|
key.substr(0, prefix.length+'/inode/stats/'.length) == prefix+'/inode/stats/' ||
|
||||||
key.substr(0, prefix.length+'/pg/stats/'.length) == prefix+'/pg/stats/' ||
|
key.substr(0, prefix.length+'/pg/stats/'.length) == prefix+'/pg/stats/' || // old name
|
||||||
|
key.substr(0, prefix.length+'/pgstats/'.length) == prefix+'/pgstats/' ||
|
||||||
key.substr(0, prefix.length+'/pool/stats/'.length) == prefix+'/pool/stats/' ||
|
key.substr(0, prefix.length+'/pool/stats/'.length) == prefix+'/pool/stats/' ||
|
||||||
key == prefix+'/stats')
|
key == prefix+'/stats')
|
||||||
{
|
{
|
||||||
|
|
|
@ -24,7 +24,7 @@ NAN_MODULE_INIT(InitAddon)
|
||||||
|
|
||||||
tpl = Nan::New<v8::FunctionTemplate>(NodeVitastorImage::Create);
|
tpl = Nan::New<v8::FunctionTemplate>(NodeVitastorImage::Create);
|
||||||
tpl->SetClassName(Nan::New("Image").ToLocalChecked());
|
tpl->SetClassName(Nan::New("Image").ToLocalChecked());
|
||||||
tpl->InstanceTemplate()->SetInternalFieldCount(2);
|
tpl->InstanceTemplate()->SetInternalFieldCount(1);
|
||||||
|
|
||||||
Nan::SetPrototypeMethod(tpl, "read", NodeVitastorImage::Read);
|
Nan::SetPrototypeMethod(tpl, "read", NodeVitastorImage::Read);
|
||||||
Nan::SetPrototypeMethod(tpl, "write", NodeVitastorImage::Write);
|
Nan::SetPrototypeMethod(tpl, "write", NodeVitastorImage::Write);
|
||||||
|
@ -67,7 +67,7 @@ NAN_MODULE_INIT(InitAddon)
|
||||||
|
|
||||||
tpl = Nan::New<v8::FunctionTemplate>(NodeVitastorKVListing::Create);
|
tpl = Nan::New<v8::FunctionTemplate>(NodeVitastorKVListing::Create);
|
||||||
tpl->SetClassName(Nan::New("KVListing").ToLocalChecked());
|
tpl->SetClassName(Nan::New("KVListing").ToLocalChecked());
|
||||||
tpl->InstanceTemplate()->SetInternalFieldCount(2);
|
tpl->InstanceTemplate()->SetInternalFieldCount(1);
|
||||||
|
|
||||||
Nan::SetPrototypeMethod(tpl, "next", NodeVitastorKVListing::Next);
|
Nan::SetPrototypeMethod(tpl, "next", NodeVitastorKVListing::Next);
|
||||||
Nan::SetPrototypeMethod(tpl, "close", NodeVitastorKVListing::Close);
|
Nan::SetPrototypeMethod(tpl, "close", NodeVitastorKVListing::Close);
|
||||||
|
|
|
@ -11,10 +11,10 @@
|
||||||
|
|
||||||
#define ERRORF(format, ...) fprintf(stderr, format "\n", __VA_ARGS__);
|
#define ERRORF(format, ...) fprintf(stderr, format "\n", __VA_ARGS__);
|
||||||
|
|
||||||
#define TRACEF(format, ...) fprintf(stderr, format "\n", __VA_ARGS__);
|
//#define TRACEF(format, ...) fprintf(stderr, format "\n", __VA_ARGS__);
|
||||||
#define TRACE(msg) fprintf(stderr, "%s\n", msg);
|
//#define TRACE(msg) fprintf(stderr, "%s\n", msg);
|
||||||
|
|
||||||
//#define TRACEF(format, arg) ;
|
#define TRACEF(format, ...) ;
|
||||||
//#define TRACE(msg) ;
|
#define TRACE(msg) ;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -13,7 +13,8 @@
|
||||||
'<!(pkg-config --cflags vitastor)'
|
'<!(pkg-config --cflags vitastor)'
|
||||||
],
|
],
|
||||||
'libraries': [
|
'libraries': [
|
||||||
'<!(pkg-config --libs vitastor)'
|
'<!(pkg-config --libs vitastor)',
|
||||||
|
'-lvitastor_kv'
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -18,12 +18,15 @@
|
||||||
class NodeVitastorRequest: public Nan::AsyncResource
|
class NodeVitastorRequest: public Nan::AsyncResource
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
NodeVitastorRequest(v8::Local<v8::Function> cb): Nan::AsyncResource("NodeVitastorRequest")
|
NodeVitastorRequest(NodeVitastor *cli, v8::Local<v8::Function> cb): Nan::AsyncResource("NodeVitastorRequest")
|
||||||
{
|
{
|
||||||
|
this->cli = cli;
|
||||||
callback.Reset(cb);
|
callback.Reset(cb);
|
||||||
}
|
}
|
||||||
|
|
||||||
iovec iov;
|
iovec iov;
|
||||||
|
std::vector<iovec> iov_list;
|
||||||
|
NodeVitastor *cli = NULL;
|
||||||
NodeVitastorImage *img = NULL;
|
NodeVitastorImage *img = NULL;
|
||||||
int op = 0;
|
int op = 0;
|
||||||
uint64_t offset = 0, len = 0, version = 0;
|
uint64_t offset = 0, len = 0, version = 0;
|
||||||
|
@ -31,6 +34,13 @@ public:
|
||||||
Nan::Persistent<v8::Function> callback;
|
Nan::Persistent<v8::Function> callback;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static uint64_t get_ui64(const v8::Local<v8::Value> & val)
|
||||||
|
{
|
||||||
|
if (val->IsBigInt())
|
||||||
|
return val->ToBigInt(Nan::GetCurrentContext()).ToLocalChecked()->Uint64Value();
|
||||||
|
return Nan::To<int64_t>(val).FromJust();
|
||||||
|
}
|
||||||
|
|
||||||
//////////////////////////////////////////////////
|
//////////////////////////////////////////////////
|
||||||
// NodeVitastor
|
// NodeVitastor
|
||||||
//////////////////////////////////////////////////
|
//////////////////////////////////////////////////
|
||||||
|
@ -43,6 +53,7 @@ NodeVitastor::NodeVitastor(): Nan::ObjectWrap()
|
||||||
|
|
||||||
NodeVitastor::~NodeVitastor()
|
NodeVitastor::~NodeVitastor()
|
||||||
{
|
{
|
||||||
|
TRACE("NodeVitastor: destructor");
|
||||||
uv_poll_stop(&poll_watcher);
|
uv_poll_stop(&poll_watcher);
|
||||||
vitastor_c_destroy(c);
|
vitastor_c_destroy(c);
|
||||||
c = NULL;
|
c = NULL;
|
||||||
|
@ -74,9 +85,10 @@ NAN_METHOD(NodeVitastor::Create)
|
||||||
if (res >= 0)
|
if (res >= 0)
|
||||||
{
|
{
|
||||||
cli->eventfd = res;
|
cli->eventfd = res;
|
||||||
res = uv_poll_init_socket(uv_default_loop(), &cli->poll_watcher, cli->eventfd);
|
res = uv_poll_init(uv_default_loop(), &cli->poll_watcher, cli->eventfd);
|
||||||
if (res >= 0)
|
if (res >= 0)
|
||||||
res = uv_poll_start(&cli->poll_watcher, UV_READABLE, on_io_readable);
|
res = uv_poll_start(&cli->poll_watcher, UV_READABLE, on_io_readable);
|
||||||
|
on_io_readable(&cli->poll_watcher, 0, UV_READABLE);
|
||||||
}
|
}
|
||||||
if (res < 0)
|
if (res < 0)
|
||||||
{
|
{
|
||||||
|
@ -97,15 +109,14 @@ void NodeVitastor::on_io_readable(uv_poll_t* handle, int status, int revents)
|
||||||
if (revents & UV_READABLE)
|
if (revents & UV_READABLE)
|
||||||
{
|
{
|
||||||
NodeVitastor* self = (NodeVitastor*)handle->data;
|
NodeVitastor* self = (NodeVitastor*)handle->data;
|
||||||
std::unique_lock<std::mutex> lock(self->mu);
|
|
||||||
vitastor_c_uring_handle_events(self->c);
|
vitastor_c_uring_handle_events(self->c);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static NodeVitastorRequest* getReadRequest(const Nan::FunctionCallbackInfo<v8::Value> & info, int argpos)
|
NodeVitastorRequest* NodeVitastor::get_read_request(const Nan::FunctionCallbackInfo<v8::Value> & info, int argpos)
|
||||||
{
|
{
|
||||||
uint64_t offset = Nan::To<int64_t>(info[argpos+0]).FromJust();
|
uint64_t offset = get_ui64(info[argpos+0]);
|
||||||
uint64_t len = Nan::To<int64_t>(info[argpos+1]).FromJust();
|
uint64_t len = get_ui64(info[argpos+1]);
|
||||||
uint8_t *buf = (uint8_t*)malloc(len);
|
uint8_t *buf = (uint8_t*)malloc(len);
|
||||||
if (!buf)
|
if (!buf)
|
||||||
{
|
{
|
||||||
|
@ -113,7 +124,7 @@ static NodeVitastorRequest* getReadRequest(const Nan::FunctionCallbackInfo<v8::V
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
v8::Local<v8::Function> callback = info[argpos+2].As<v8::Function>();
|
v8::Local<v8::Function> callback = info[argpos+2].As<v8::Function>();
|
||||||
auto req = new NodeVitastorRequest(callback);
|
auto req = new NodeVitastorRequest(this, callback);
|
||||||
|
|
||||||
req->offset = offset;
|
req->offset = offset;
|
||||||
req->len = len;
|
req->len = len;
|
||||||
|
@ -126,73 +137,101 @@ static NodeVitastorRequest* getReadRequest(const Nan::FunctionCallbackInfo<v8::V
|
||||||
NAN_METHOD(NodeVitastor::Read)
|
NAN_METHOD(NodeVitastor::Read)
|
||||||
{
|
{
|
||||||
TRACE("NodeVitastor::Read");
|
TRACE("NodeVitastor::Read");
|
||||||
|
if (info.Length() < 5)
|
||||||
|
Nan::ThrowError("Not enough arguments to read(pool, inode, offset, len, callback(err, buffer, version))");
|
||||||
|
|
||||||
NodeVitastor* self = Nan::ObjectWrap::Unwrap<NodeVitastor>(info.This());
|
NodeVitastor* self = Nan::ObjectWrap::Unwrap<NodeVitastor>(info.This());
|
||||||
|
|
||||||
uint64_t pool = Nan::To<int64_t>(info[0]).FromJust();
|
uint64_t pool = get_ui64(info[0]);
|
||||||
uint64_t inode = Nan::To<int64_t>(info[1]).FromJust();
|
uint64_t inode = get_ui64(info[1]);
|
||||||
|
|
||||||
auto req = getReadRequest(info, 2);
|
auto req = self->get_read_request(info, 2);
|
||||||
|
|
||||||
std::unique_lock<std::mutex> lock(self->mu);
|
self->Ref();
|
||||||
vitastor_c_read(self->c, ((pool << (64-POOL_ID_BITS)) | inode), req->offset, req->len, &req->iov, 1, on_read_finish, req);
|
vitastor_c_read(self->c, ((pool << (64-POOL_ID_BITS)) | inode), req->offset, req->len, &req->iov, 1, on_read_finish, req);
|
||||||
}
|
}
|
||||||
|
|
||||||
static NodeVitastorRequest* getWriteRequest(const Nan::FunctionCallbackInfo<v8::Value> & info, int argpos)
|
NodeVitastorRequest* NodeVitastor::get_write_request(const Nan::FunctionCallbackInfo<v8::Value> & info, int argpos)
|
||||||
{
|
{
|
||||||
uint64_t offset = Nan::To<int64_t>(info[argpos+0]).FromJust();
|
uint64_t offset = get_ui64(info[argpos+0]);
|
||||||
char *buf = node::Buffer::Data(info[argpos+1]);
|
const auto & bufarg = info[argpos+1];
|
||||||
uint64_t len = node::Buffer::Length(info[argpos+1]);
|
|
||||||
uint64_t version = 0;
|
uint64_t version = 0;
|
||||||
|
if (!info[argpos+2].IsEmpty() &&
|
||||||
if (!info[argpos+2].IsEmpty() && info[argpos+2]->IsObject())
|
!info[argpos+2]->IsFunction() &&
|
||||||
|
info[argpos+2]->IsObject())
|
||||||
{
|
{
|
||||||
auto key = Nan::New<v8::String>("version").ToLocalChecked();
|
auto key = Nan::New<v8::String>("version").ToLocalChecked();
|
||||||
auto params = info[argpos+2].As<v8::Object>();
|
auto params = info[argpos+2].As<v8::Object>();
|
||||||
auto versionObj = Nan::Get(params, key).ToLocalChecked();
|
auto versionObj = Nan::Get(params, key).ToLocalChecked();
|
||||||
if (!versionObj.IsEmpty())
|
if (!versionObj.IsEmpty())
|
||||||
version = Nan::To<int64_t>(versionObj).FromJust();
|
version = get_ui64(versionObj);
|
||||||
argpos++;
|
argpos++;
|
||||||
}
|
}
|
||||||
|
|
||||||
v8::Local<v8::Function> callback = info[argpos+2].As<v8::Function>();
|
v8::Local<v8::Function> callback = info[argpos+2].As<v8::Function>();
|
||||||
auto req = new NodeVitastorRequest(callback);
|
auto req = new NodeVitastorRequest(this, callback);
|
||||||
|
|
||||||
req->offset = offset;
|
req->offset = offset;
|
||||||
req->len = len;
|
|
||||||
req->version = version;
|
req->version = version;
|
||||||
req->iov = { .iov_base = buf, .iov_len = req->len };
|
|
||||||
|
if (bufarg->IsArray())
|
||||||
|
{
|
||||||
|
auto buffers = bufarg.As<v8::Array>();
|
||||||
|
req->len = 0;
|
||||||
|
for (uint32_t i = 0; i < buffers->Length(); i++)
|
||||||
|
{
|
||||||
|
auto buffer_obj = Nan::Get(buffers, i).ToLocalChecked();
|
||||||
|
char *buf = node::Buffer::Data(buffer_obj);
|
||||||
|
uint64_t len = node::Buffer::Length(buffer_obj);
|
||||||
|
req->iov_list.push_back({ .iov_base = buf, .iov_len = len });
|
||||||
|
req->len += len;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
char *buf = node::Buffer::Data(bufarg);
|
||||||
|
uint64_t len = node::Buffer::Length(bufarg);
|
||||||
|
req->iov = { .iov_base = buf, .iov_len = len };
|
||||||
|
req->len = len;
|
||||||
|
}
|
||||||
|
|
||||||
return req;
|
return req;
|
||||||
}
|
}
|
||||||
|
|
||||||
// write(pool, inode, offset, buffer, { version }?, callback(err))
|
// write(pool, inode, offset, buf: Buffer | Buffer[], { version }?, callback(err))
|
||||||
NAN_METHOD(NodeVitastor::Write)
|
NAN_METHOD(NodeVitastor::Write)
|
||||||
{
|
{
|
||||||
TRACE("NodeVitastor::Write");
|
TRACE("NodeVitastor::Write");
|
||||||
|
if (info.Length() < 5)
|
||||||
|
Nan::ThrowError("Not enough arguments to write(pool, inode, offset, buf: Buffer | Buffer[], { version }?, callback(err))");
|
||||||
|
|
||||||
NodeVitastor* self = Nan::ObjectWrap::Unwrap<NodeVitastor>(info.This());
|
NodeVitastor* self = Nan::ObjectWrap::Unwrap<NodeVitastor>(info.This());
|
||||||
|
|
||||||
uint64_t pool = Nan::To<int64_t>(info[0]).FromJust();
|
uint64_t pool = get_ui64(info[0]);
|
||||||
uint64_t inode = Nan::To<int64_t>(info[1]).FromJust();
|
uint64_t inode = get_ui64(info[1]);
|
||||||
|
|
||||||
auto req = getWriteRequest(info, 2);
|
auto req = self->get_write_request(info, 2);
|
||||||
|
|
||||||
std::unique_lock<std::mutex> lock(self->mu);
|
self->Ref();
|
||||||
vitastor_c_write(self->c, ((pool << (64-POOL_ID_BITS)) | inode), req->offset, req->len, req->version, &req->iov, 1, on_write_finish, req);
|
vitastor_c_write(self->c, ((pool << (64-POOL_ID_BITS)) | inode), req->offset, req->len, req->version,
|
||||||
|
req->iov_list.size() ? req->iov_list.data() : &req->iov,
|
||||||
|
req->iov_list.size() ? req->iov_list.size() : 1,
|
||||||
|
on_write_finish, req);
|
||||||
}
|
}
|
||||||
|
|
||||||
// sync(callback(err))
|
// sync(callback(err))
|
||||||
NAN_METHOD(NodeVitastor::Sync)
|
NAN_METHOD(NodeVitastor::Sync)
|
||||||
{
|
{
|
||||||
TRACE("NodeVitastor::Sync");
|
TRACE("NodeVitastor::Sync");
|
||||||
|
if (info.Length() < 1)
|
||||||
|
Nan::ThrowError("Not enough arguments to sync(callback(err))");
|
||||||
|
|
||||||
NodeVitastor* self = Nan::ObjectWrap::Unwrap<NodeVitastor>(info.This());
|
NodeVitastor* self = Nan::ObjectWrap::Unwrap<NodeVitastor>(info.This());
|
||||||
|
|
||||||
v8::Local<v8::Function> callback = info[0].As<v8::Function>();
|
v8::Local<v8::Function> callback = info[0].As<v8::Function>();
|
||||||
auto req = new NodeVitastorRequest(callback);
|
auto req = new NodeVitastorRequest(self, callback);
|
||||||
|
|
||||||
std::unique_lock<std::mutex> lock(self->mu);
|
self->Ref();
|
||||||
vitastor_c_sync(self->c, on_write_finish, req);
|
vitastor_c_sync(self->c, on_write_finish, req);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -200,17 +239,20 @@ NAN_METHOD(NodeVitastor::Sync)
|
||||||
NAN_METHOD(NodeVitastor::ReadBitmap)
|
NAN_METHOD(NodeVitastor::ReadBitmap)
|
||||||
{
|
{
|
||||||
TRACE("NodeVitastor::ReadBitmap");
|
TRACE("NodeVitastor::ReadBitmap");
|
||||||
|
if (info.Length() < 6)
|
||||||
|
Nan::ThrowError("Not enough arguments to read_bitmap(pool, inode, offset, len, with_parents, callback(err, bitmap_buffer))");
|
||||||
|
|
||||||
NodeVitastor* self = Nan::ObjectWrap::Unwrap<NodeVitastor>(info.This());
|
NodeVitastor* self = Nan::ObjectWrap::Unwrap<NodeVitastor>(info.This());
|
||||||
|
|
||||||
uint64_t pool = Nan::To<int64_t>(info[0]).FromJust();
|
uint64_t pool = get_ui64(info[0]);
|
||||||
uint64_t inode = Nan::To<int64_t>(info[1]).FromJust();
|
uint64_t inode = get_ui64(info[1]);
|
||||||
uint64_t offset = Nan::To<int64_t>(info[2]).FromJust();
|
uint64_t offset = get_ui64(info[2]);
|
||||||
uint64_t len = Nan::To<int64_t>(info[3]).FromJust();
|
uint64_t len = get_ui64(info[3]);
|
||||||
bool with_parents = Nan::To<bool>(info[4]).FromJust();
|
bool with_parents = Nan::To<bool>(info[4]).FromJust();
|
||||||
v8::Local<v8::Function> callback = info[5].As<v8::Function>();
|
v8::Local<v8::Function> callback = info[5].As<v8::Function>();
|
||||||
|
|
||||||
auto req = new NodeVitastorRequest(callback);
|
auto req = new NodeVitastorRequest(self, callback);
|
||||||
|
self->Ref();
|
||||||
vitastor_c_read_bitmap(self->c, ((pool << (64-POOL_ID_BITS)) | inode), offset, len, with_parents, on_read_bitmap_finish, req);
|
vitastor_c_read_bitmap(self->c, ((pool << (64-POOL_ID_BITS)) | inode), offset, len, with_parents, on_read_bitmap_finish, req);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -227,6 +269,7 @@ static void on_error(NodeVitastorRequest *req, Nan::Callback & nanCallback, long
|
||||||
|
|
||||||
void NodeVitastor::on_read_finish(void *opaque, long retval, uint64_t version)
|
void NodeVitastor::on_read_finish(void *opaque, long retval, uint64_t version)
|
||||||
{
|
{
|
||||||
|
TRACE("NodeVitastor::on_read_finish");
|
||||||
Nan::HandleScope scope;
|
Nan::HandleScope scope;
|
||||||
NodeVitastorRequest *req = (NodeVitastorRequest *)opaque;
|
NodeVitastorRequest *req = (NodeVitastorRequest *)opaque;
|
||||||
Nan::Callback nanCallback(Nan::New(req->callback));
|
Nan::Callback nanCallback(Nan::New(req->callback));
|
||||||
|
@ -235,7 +278,7 @@ void NodeVitastor::on_read_finish(void *opaque, long retval, uint64_t version)
|
||||||
free(req->iov.iov_base);
|
free(req->iov.iov_base);
|
||||||
nanCallback.Call(0, NULL, req);
|
nanCallback.Call(0, NULL, req);
|
||||||
}
|
}
|
||||||
else if (retval < 0)
|
else if (retval < 0 || (uint64_t)retval != req->len)
|
||||||
{
|
{
|
||||||
free(req->iov.iov_base);
|
free(req->iov.iov_base);
|
||||||
on_error(req, nanCallback, retval);
|
on_error(req, nanCallback, retval);
|
||||||
|
@ -248,20 +291,33 @@ void NodeVitastor::on_read_finish(void *opaque, long retval, uint64_t version)
|
||||||
args[2] = v8::BigInt::NewFromUnsigned(v8::Isolate::GetCurrent(), version);
|
args[2] = v8::BigInt::NewFromUnsigned(v8::Isolate::GetCurrent(), version);
|
||||||
nanCallback.Call(3, args, req);
|
nanCallback.Call(3, args, req);
|
||||||
}
|
}
|
||||||
|
req->cli->Unref();
|
||||||
delete req;
|
delete req;
|
||||||
}
|
}
|
||||||
|
|
||||||
void NodeVitastor::on_write_finish(void *opaque, long retval)
|
void NodeVitastor::on_write_finish(void *opaque, long retval)
|
||||||
{
|
{
|
||||||
|
TRACE("NodeVitastor::on_write_finish");
|
||||||
Nan::HandleScope scope;
|
Nan::HandleScope scope;
|
||||||
NodeVitastorRequest *req = (NodeVitastorRequest *)opaque;
|
NodeVitastorRequest *req = (NodeVitastorRequest *)opaque;
|
||||||
Nan::Callback nanCallback(Nan::New(req->callback));
|
Nan::Callback nanCallback(Nan::New(req->callback));
|
||||||
on_error(req, nanCallback, retval);
|
if (retval < 0 || (uint64_t)retval != req->len)
|
||||||
|
{
|
||||||
|
on_error(req, nanCallback, retval);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
v8::Local<v8::Value> args[1];
|
||||||
|
args[0] = Nan::Null();
|
||||||
|
nanCallback.Call(1, args, req);
|
||||||
|
}
|
||||||
|
req->cli->Unref();
|
||||||
delete req;
|
delete req;
|
||||||
}
|
}
|
||||||
|
|
||||||
void NodeVitastor::on_read_bitmap_finish(void *opaque, long retval, uint8_t *bitmap)
|
void NodeVitastor::on_read_bitmap_finish(void *opaque, long retval, uint8_t *bitmap)
|
||||||
{
|
{
|
||||||
|
TRACE("NodeVitastor::on_read_bitmap_finish");
|
||||||
Nan::HandleScope scope;
|
Nan::HandleScope scope;
|
||||||
NodeVitastorRequest *req = (NodeVitastorRequest *)opaque;
|
NodeVitastorRequest *req = (NodeVitastorRequest *)opaque;
|
||||||
Nan::Callback nanCallback(Nan::New(req->callback));
|
Nan::Callback nanCallback(Nan::New(req->callback));
|
||||||
|
@ -276,6 +332,7 @@ void NodeVitastor::on_read_bitmap_finish(void *opaque, long retval, uint8_t *bit
|
||||||
args[1] = Nan::NewBuffer((char*)bitmap, (retval+7)/8).ToLocalChecked();
|
args[1] = Nan::NewBuffer((char*)bitmap, (retval+7)/8).ToLocalChecked();
|
||||||
nanCallback.Call(2, args, req);
|
nanCallback.Call(2, args, req);
|
||||||
}
|
}
|
||||||
|
req->cli->Unref();
|
||||||
delete req;
|
delete req;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -291,21 +348,23 @@ void NodeVitastor::on_read_bitmap_finish(void *opaque, long retval, uint8_t *bit
|
||||||
NAN_METHOD(NodeVitastorImage::Create)
|
NAN_METHOD(NodeVitastorImage::Create)
|
||||||
{
|
{
|
||||||
TRACE("NodeVitastorImage::Create");
|
TRACE("NodeVitastorImage::Create");
|
||||||
|
if (info.Length() < 2)
|
||||||
|
Nan::ThrowError("Not enough arguments to Image(client, name)");
|
||||||
|
|
||||||
v8::Local<v8::Object> parent = info[0].As<v8::Object>();
|
v8::Local<v8::Object> parent = info[0].As<v8::Object>();
|
||||||
std::string name = std::string(*Nan::Utf8String(info[1].As<v8::String>()));
|
std::string name = std::string(*Nan::Utf8String(info[1].As<v8::String>()));
|
||||||
NodeVitastor *cli = Nan::ObjectWrap::Unwrap<NodeVitastor>(parent);
|
NodeVitastor *cli = Nan::ObjectWrap::Unwrap<NodeVitastor>(parent);
|
||||||
|
|
||||||
NodeVitastorImage *img = new NodeVitastorImage();
|
NodeVitastorImage *img = new NodeVitastorImage();
|
||||||
|
img->Wrap(info.This());
|
||||||
|
|
||||||
img->cli = cli;
|
img->cli = cli;
|
||||||
img->name = name;
|
img->name = name;
|
||||||
|
|
||||||
img->Ref();
|
img->Ref();
|
||||||
cli->Ref();
|
cli->Ref();
|
||||||
std::unique_lock<std::mutex> lock(cli->mu);
|
|
||||||
vitastor_c_watch_inode(cli->c, (char*)img->name.c_str(), on_watch_start, img);
|
vitastor_c_watch_inode(cli->c, (char*)img->name.c_str(), on_watch_start, img);
|
||||||
|
|
||||||
img->Wrap(info.This());
|
|
||||||
info.GetReturnValue().Set(info.This());
|
info.GetReturnValue().Set(info.This());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -323,10 +382,12 @@ NodeVitastorImage::~NodeVitastorImage()
|
||||||
NAN_METHOD(NodeVitastorImage::Read)
|
NAN_METHOD(NodeVitastorImage::Read)
|
||||||
{
|
{
|
||||||
TRACE("NodeVitastorImage::Read");
|
TRACE("NodeVitastorImage::Read");
|
||||||
|
if (info.Length() < 3)
|
||||||
|
Nan::ThrowError("Not enough arguments to read(offset, len, callback(err, buffer, version))");
|
||||||
|
|
||||||
NodeVitastorImage* img = Nan::ObjectWrap::Unwrap<NodeVitastorImage>(info.This());
|
NodeVitastorImage* img = Nan::ObjectWrap::Unwrap<NodeVitastorImage>(info.This());
|
||||||
|
|
||||||
auto req = getReadRequest(info, 0);
|
auto req = img->cli->get_read_request(info, 0);
|
||||||
req->img = img;
|
req->img = img;
|
||||||
req->op = NODE_VITASTOR_READ;
|
req->op = NODE_VITASTOR_READ;
|
||||||
|
|
||||||
|
@ -337,24 +398,29 @@ NAN_METHOD(NodeVitastorImage::Read)
|
||||||
NAN_METHOD(NodeVitastorImage::Write)
|
NAN_METHOD(NodeVitastorImage::Write)
|
||||||
{
|
{
|
||||||
TRACE("NodeVitastorImage::Write");
|
TRACE("NodeVitastorImage::Write");
|
||||||
|
if (info.Length() < 3)
|
||||||
|
Nan::ThrowError("Not enough arguments to write(offset, buffer, { version }?, callback(err))");
|
||||||
|
|
||||||
NodeVitastorImage* img = Nan::ObjectWrap::Unwrap<NodeVitastorImage>(info.This());
|
NodeVitastorImage* img = Nan::ObjectWrap::Unwrap<NodeVitastorImage>(info.This());
|
||||||
|
|
||||||
auto req = getWriteRequest(info, 0);
|
auto req = img->cli->get_write_request(info, 0);
|
||||||
req->img = img;
|
req->img = img;
|
||||||
req->op = NODE_VITASTOR_WRITE;
|
req->op = NODE_VITASTOR_WRITE;
|
||||||
|
|
||||||
img->exec_or_wait(req);
|
img->exec_or_wait(req);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// sync(callback(err))
|
||||||
NAN_METHOD(NodeVitastorImage::Sync)
|
NAN_METHOD(NodeVitastorImage::Sync)
|
||||||
{
|
{
|
||||||
TRACE("NodeVitastorImage::Sync");
|
TRACE("NodeVitastorImage::Sync");
|
||||||
|
if (info.Length() < 1)
|
||||||
|
Nan::ThrowError("Not enough arguments to sync(callback(err))");
|
||||||
|
|
||||||
NodeVitastorImage* img = Nan::ObjectWrap::Unwrap<NodeVitastorImage>(info.This());
|
NodeVitastorImage* img = Nan::ObjectWrap::Unwrap<NodeVitastorImage>(info.This());
|
||||||
|
|
||||||
v8::Local<v8::Function> callback = info[0].As<v8::Function>();
|
v8::Local<v8::Function> callback = info[0].As<v8::Function>();
|
||||||
auto req = new NodeVitastorRequest(callback);
|
auto req = new NodeVitastorRequest(img->cli, callback);
|
||||||
req->img = img;
|
req->img = img;
|
||||||
req->op = NODE_VITASTOR_SYNC;
|
req->op = NODE_VITASTOR_SYNC;
|
||||||
|
|
||||||
|
@ -365,15 +431,17 @@ NAN_METHOD(NodeVitastorImage::Sync)
|
||||||
NAN_METHOD(NodeVitastorImage::ReadBitmap)
|
NAN_METHOD(NodeVitastorImage::ReadBitmap)
|
||||||
{
|
{
|
||||||
TRACE("NodeVitastorImage::ReadBitmap");
|
TRACE("NodeVitastorImage::ReadBitmap");
|
||||||
|
if (info.Length() < 4)
|
||||||
|
Nan::ThrowError("Not enough arguments to read_bitmap(offset, len, with_parents, callback(err, bitmap_buffer))");
|
||||||
|
|
||||||
NodeVitastorImage* img = Nan::ObjectWrap::Unwrap<NodeVitastorImage>(info.This());
|
NodeVitastorImage* img = Nan::ObjectWrap::Unwrap<NodeVitastorImage>(info.This());
|
||||||
|
|
||||||
uint64_t offset = Nan::To<int64_t>(info[0]).FromJust();
|
uint64_t offset = get_ui64(info[0]);
|
||||||
uint64_t len = Nan::To<int64_t>(info[1]).FromJust();
|
uint64_t len = get_ui64(info[1]);
|
||||||
bool with_parents = Nan::To<bool>(info[2]).FromJust();
|
bool with_parents = Nan::To<bool>(info[2]).FromJust();
|
||||||
v8::Local<v8::Function> callback = info[3].As<v8::Function>();
|
v8::Local<v8::Function> callback = info[3].As<v8::Function>();
|
||||||
|
|
||||||
auto req = new NodeVitastorRequest(callback);
|
auto req = new NodeVitastorRequest(img->cli, callback);
|
||||||
req->img = img;
|
req->img = img;
|
||||||
req->op = NODE_VITASTOR_READ_BITMAP;
|
req->op = NODE_VITASTOR_READ_BITMAP;
|
||||||
req->offset = offset;
|
req->offset = offset;
|
||||||
|
@ -383,14 +451,17 @@ NAN_METHOD(NodeVitastorImage::ReadBitmap)
|
||||||
img->exec_or_wait(req);
|
img->exec_or_wait(req);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// get_info(callback({ num, name, size, parent_id?, readonly?, meta?, mod_revision, block_size, bitmap_granularity, immediate_commit }))
|
||||||
NAN_METHOD(NodeVitastorImage::GetInfo)
|
NAN_METHOD(NodeVitastorImage::GetInfo)
|
||||||
{
|
{
|
||||||
TRACE("NodeVitastorImage::Sync");
|
TRACE("NodeVitastorImage::GetInfo");
|
||||||
|
if (info.Length() < 1)
|
||||||
|
Nan::ThrowError("Not enough arguments to get_info(callback({ num, name, size, parent_id?, readonly?, meta?, mod_revision, block_size, bitmap_granularity, immediate_commit }))");
|
||||||
|
|
||||||
NodeVitastorImage* img = Nan::ObjectWrap::Unwrap<NodeVitastorImage>(info.This());
|
NodeVitastorImage* img = Nan::ObjectWrap::Unwrap<NodeVitastorImage>(info.This());
|
||||||
|
|
||||||
v8::Local<v8::Function> callback = info[0].As<v8::Function>();
|
v8::Local<v8::Function> callback = info[0].As<v8::Function>();
|
||||||
auto req = new NodeVitastorRequest(callback);
|
auto req = new NodeVitastorRequest(img->cli, callback);
|
||||||
req->img = img;
|
req->img = img;
|
||||||
req->op = NODE_VITASTOR_GET_INFO;
|
req->op = NODE_VITASTOR_GET_INFO;
|
||||||
|
|
||||||
|
@ -412,21 +483,26 @@ void NodeVitastorImage::exec_or_wait(NodeVitastorRequest *req)
|
||||||
|
|
||||||
void NodeVitastorImage::exec_request(NodeVitastorRequest *req)
|
void NodeVitastorImage::exec_request(NodeVitastorRequest *req)
|
||||||
{
|
{
|
||||||
std::unique_lock<std::mutex> lock(cli->mu);
|
|
||||||
if (req->op == NODE_VITASTOR_READ)
|
if (req->op == NODE_VITASTOR_READ)
|
||||||
{
|
{
|
||||||
uint64_t ino = vitastor_c_inode_get_num(watch);
|
uint64_t ino = vitastor_c_inode_get_num(watch);
|
||||||
|
cli->Ref();
|
||||||
vitastor_c_read(cli->c, ino, req->offset, req->len, &req->iov, 1, NodeVitastor::on_read_finish, req);
|
vitastor_c_read(cli->c, ino, req->offset, req->len, &req->iov, 1, NodeVitastor::on_read_finish, req);
|
||||||
}
|
}
|
||||||
else if (req->op == NODE_VITASTOR_WRITE)
|
else if (req->op == NODE_VITASTOR_WRITE)
|
||||||
{
|
{
|
||||||
uint64_t ino = vitastor_c_inode_get_num(watch);
|
uint64_t ino = vitastor_c_inode_get_num(watch);
|
||||||
vitastor_c_write(cli->c, ino, req->offset, req->len, req->version, &req->iov, 1, NodeVitastor::on_write_finish, req);
|
cli->Ref();
|
||||||
|
vitastor_c_write(cli->c, ino, req->offset, req->len, req->version,
|
||||||
|
req->iov_list.size() ? req->iov_list.data() : &req->iov,
|
||||||
|
req->iov_list.size() ? req->iov_list.size() : 1,
|
||||||
|
NodeVitastor::on_write_finish, req);
|
||||||
}
|
}
|
||||||
else if (req->op == NODE_VITASTOR_SYNC)
|
else if (req->op == NODE_VITASTOR_SYNC)
|
||||||
{
|
{
|
||||||
uint64_t ino = vitastor_c_inode_get_num(watch);
|
uint64_t ino = vitastor_c_inode_get_num(watch);
|
||||||
uint32_t imm = vitastor_c_inode_get_immediate_commit(cli->c, ino);
|
uint32_t imm = vitastor_c_inode_get_immediate_commit(cli->c, ino);
|
||||||
|
cli->Ref();
|
||||||
if (imm != IMMEDIATE_ALL)
|
if (imm != IMMEDIATE_ALL)
|
||||||
{
|
{
|
||||||
vitastor_c_sync(cli->c, NodeVitastor::on_write_finish, req);
|
vitastor_c_sync(cli->c, NodeVitastor::on_write_finish, req);
|
||||||
|
@ -439,6 +515,7 @@ void NodeVitastorImage::exec_request(NodeVitastorRequest *req)
|
||||||
else if (req->op == NODE_VITASTOR_READ_BITMAP)
|
else if (req->op == NODE_VITASTOR_READ_BITMAP)
|
||||||
{
|
{
|
||||||
uint64_t ino = vitastor_c_inode_get_num(watch);
|
uint64_t ino = vitastor_c_inode_get_num(watch);
|
||||||
|
cli->Ref();
|
||||||
vitastor_c_read_bitmap(cli->c, ino, req->offset, req->len, req->with_parents, NodeVitastor::on_read_bitmap_finish, req);
|
vitastor_c_read_bitmap(cli->c, ino, req->offset, req->len, req->with_parents, NodeVitastor::on_read_bitmap_finish, req);
|
||||||
}
|
}
|
||||||
else if (req->op == NODE_VITASTOR_GET_INFO)
|
else if (req->op == NODE_VITASTOR_GET_INFO)
|
||||||
|
@ -508,10 +585,14 @@ void NodeVitastorImage::on_watch_start(void *opaque, long retval)
|
||||||
// NodeVitastorKV
|
// NodeVitastorKV
|
||||||
//////////////////////////////////////////////////
|
//////////////////////////////////////////////////
|
||||||
|
|
||||||
|
Nan::Persistent<v8::Function> NodeVitastorKV::listing_class;
|
||||||
|
|
||||||
// constructor(node_vitastor)
|
// constructor(node_vitastor)
|
||||||
NAN_METHOD(NodeVitastorKV::Create)
|
NAN_METHOD(NodeVitastorKV::Create)
|
||||||
{
|
{
|
||||||
TRACE("NodeVitastorKV::Create");
|
TRACE("NodeVitastorKV::Create");
|
||||||
|
if (info.Length() < 1)
|
||||||
|
Nan::ThrowError("Not enough arguments to new KV(client)");
|
||||||
|
|
||||||
v8::Local<v8::Object> parent = info[0].As<v8::Object>();
|
v8::Local<v8::Object> parent = info[0].As<v8::Object>();
|
||||||
NodeVitastor *cli = Nan::ObjectWrap::Unwrap<NodeVitastor>(parent);
|
NodeVitastor *cli = Nan::ObjectWrap::Unwrap<NodeVitastor>(parent);
|
||||||
|
@ -519,29 +600,32 @@ NAN_METHOD(NodeVitastorKV::Create)
|
||||||
NodeVitastorKV *kv = new NodeVitastorKV();
|
NodeVitastorKV *kv = new NodeVitastorKV();
|
||||||
kv->cli = cli;
|
kv->cli = cli;
|
||||||
{
|
{
|
||||||
std::unique_lock<std::mutex> lock(cli->mu);
|
|
||||||
kv->dbw = new vitastorkv_dbw_t((cluster_client_t*)vitastor_c_get_internal_client(cli->c));
|
kv->dbw = new vitastorkv_dbw_t((cluster_client_t*)vitastor_c_get_internal_client(cli->c));
|
||||||
}
|
}
|
||||||
|
|
||||||
kv->Wrap(info.This());
|
kv->Wrap(info.This());
|
||||||
|
cli->Ref();
|
||||||
info.GetReturnValue().Set(info.This());
|
info.GetReturnValue().Set(info.This());
|
||||||
}
|
}
|
||||||
|
|
||||||
NodeVitastorKV::~NodeVitastorKV()
|
NodeVitastorKV::~NodeVitastorKV()
|
||||||
{
|
{
|
||||||
delete dbw;
|
delete dbw;
|
||||||
|
cli->Unref();
|
||||||
}
|
}
|
||||||
|
|
||||||
// open(inode_id, { ...config }, callback(err))
|
// open(pool_id, inode_num, { ...config }, callback(err))
|
||||||
NAN_METHOD(NodeVitastorKV::Open)
|
NAN_METHOD(NodeVitastorKV::Open)
|
||||||
{
|
{
|
||||||
TRACE("NodeVitastorKV::Open");
|
TRACE("NodeVitastorKV::Open");
|
||||||
|
if (info.Length() < 4)
|
||||||
|
Nan::ThrowError("Not enough arguments to open(pool_id, inode_num, { ...config }, callback(err))");
|
||||||
|
|
||||||
NodeVitastorKV* kv = Nan::ObjectWrap::Unwrap<NodeVitastorKV>(info.This());
|
NodeVitastorKV* kv = Nan::ObjectWrap::Unwrap<NodeVitastorKV>(info.This());
|
||||||
|
|
||||||
uint64_t inode_id = Nan::To<int64_t>(info[0]).FromJust();
|
uint64_t inode_id = INODE_WITH_POOL(get_ui64(info[0]), get_ui64(info[1]));
|
||||||
|
|
||||||
v8::Local<v8::Object> jsParams = info[1].As<v8::Object>();
|
v8::Local<v8::Object> jsParams = info[2].As<v8::Object>();
|
||||||
v8::Local<v8::Array> keys = Nan::GetOwnPropertyNames(jsParams).ToLocalChecked();
|
v8::Local<v8::Array> keys = Nan::GetOwnPropertyNames(jsParams).ToLocalChecked();
|
||||||
std::map<std::string, std::string> cfg;
|
std::map<std::string, std::string> cfg;
|
||||||
for (uint32_t i = 0; i < keys->Length(); i++)
|
for (uint32_t i = 0; i < keys->Length(); i++)
|
||||||
|
@ -550,8 +634,8 @@ NAN_METHOD(NodeVitastorKV::Open)
|
||||||
cfg[std::string(*Nan::Utf8String(key))] = std::string(*Nan::Utf8String(Nan::Get(jsParams, key).ToLocalChecked()));
|
cfg[std::string(*Nan::Utf8String(key))] = std::string(*Nan::Utf8String(Nan::Get(jsParams, key).ToLocalChecked()));
|
||||||
}
|
}
|
||||||
|
|
||||||
v8::Local<v8::Function> callback = info[2].As<v8::Function>();
|
v8::Local<v8::Function> callback = info[3].As<v8::Function>();
|
||||||
auto req = new NodeVitastorRequest(callback);
|
auto req = new NodeVitastorRequest(kv->cli, callback);
|
||||||
|
|
||||||
kv->Ref();
|
kv->Ref();
|
||||||
kv->dbw->open(inode_id, cfg, [kv, req](int res)
|
kv->dbw->open(inode_id, cfg, [kv, req](int res)
|
||||||
|
@ -570,11 +654,13 @@ NAN_METHOD(NodeVitastorKV::Open)
|
||||||
NAN_METHOD(NodeVitastorKV::Close)
|
NAN_METHOD(NodeVitastorKV::Close)
|
||||||
{
|
{
|
||||||
TRACE("NodeVitastorKV::Close");
|
TRACE("NodeVitastorKV::Close");
|
||||||
|
if (info.Length() < 1)
|
||||||
|
Nan::ThrowError("Not enough arguments to close(callback(err))");
|
||||||
|
|
||||||
NodeVitastorKV* kv = Nan::ObjectWrap::Unwrap<NodeVitastorKV>(info.This());
|
NodeVitastorKV* kv = Nan::ObjectWrap::Unwrap<NodeVitastorKV>(info.This());
|
||||||
|
|
||||||
v8::Local<v8::Function> callback = info[0].As<v8::Function>();
|
v8::Local<v8::Function> callback = info[0].As<v8::Function>();
|
||||||
auto req = new NodeVitastorRequest(callback);
|
auto req = new NodeVitastorRequest(kv->cli, callback);
|
||||||
|
|
||||||
kv->Ref();
|
kv->Ref();
|
||||||
kv->dbw->close([kv, req]()
|
kv->dbw->close([kv, req]()
|
||||||
|
@ -591,6 +677,8 @@ NAN_METHOD(NodeVitastorKV::Close)
|
||||||
NAN_METHOD(NodeVitastorKV::SetConfig)
|
NAN_METHOD(NodeVitastorKV::SetConfig)
|
||||||
{
|
{
|
||||||
TRACE("NodeVitastorKV::SetConfig");
|
TRACE("NodeVitastorKV::SetConfig");
|
||||||
|
if (info.Length() < 1)
|
||||||
|
Nan::ThrowError("Not enough arguments to set_config({ ...config })");
|
||||||
|
|
||||||
NodeVitastorKV* kv = Nan::ObjectWrap::Unwrap<NodeVitastorKV>(info.This());
|
NodeVitastorKV* kv = Nan::ObjectWrap::Unwrap<NodeVitastorKV>(info.This());
|
||||||
|
|
||||||
|
@ -627,7 +715,7 @@ void NodeVitastorKV::get_impl(const Nan::FunctionCallbackInfo<v8::Value> & info,
|
||||||
std::string key(*Nan::Utf8String(info[0].As<v8::String>()));
|
std::string key(*Nan::Utf8String(info[0].As<v8::String>()));
|
||||||
|
|
||||||
v8::Local<v8::Function> callback = info[1].As<v8::Function>();
|
v8::Local<v8::Function> callback = info[1].As<v8::Function>();
|
||||||
auto req = new NodeVitastorRequest(callback);
|
auto req = new NodeVitastorRequest(kv->cli, callback);
|
||||||
|
|
||||||
kv->Ref();
|
kv->Ref();
|
||||||
kv->dbw->get(key, [kv, req](int res, const std::string & value)
|
kv->dbw->get(key, [kv, req](int res, const std::string & value)
|
||||||
|
@ -647,6 +735,8 @@ void NodeVitastorKV::get_impl(const Nan::FunctionCallbackInfo<v8::Value> & info,
|
||||||
NAN_METHOD(NodeVitastorKV::Get)
|
NAN_METHOD(NodeVitastorKV::Get)
|
||||||
{
|
{
|
||||||
TRACE("NodeVitastorKV::Get");
|
TRACE("NodeVitastorKV::Get");
|
||||||
|
if (info.Length() < 2)
|
||||||
|
Nan::ThrowError("Not enough arguments to get(key, callback(err, value))");
|
||||||
get_impl(info, false);
|
get_impl(info, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -654,6 +744,8 @@ NAN_METHOD(NodeVitastorKV::Get)
|
||||||
NAN_METHOD(NodeVitastorKV::GetCached)
|
NAN_METHOD(NodeVitastorKV::GetCached)
|
||||||
{
|
{
|
||||||
TRACE("NodeVitastorKV::GetCached");
|
TRACE("NodeVitastorKV::GetCached");
|
||||||
|
if (info.Length() < 2)
|
||||||
|
Nan::ThrowError("Not enough arguments to get_cached(key, callback(err, value))");
|
||||||
get_impl(info, true);
|
get_impl(info, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -672,10 +764,12 @@ static std::function<bool(int, const std::string &)> make_cas_callback(NodeVitas
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// set(key, value, callback(err), cas_compare(old_value))
|
// set(key, value, callback(err), cas_compare(old_value)?)
|
||||||
NAN_METHOD(NodeVitastorKV::Set)
|
NAN_METHOD(NodeVitastorKV::Set)
|
||||||
{
|
{
|
||||||
TRACE("NodeVitastorKV::Set");
|
TRACE("NodeVitastorKV::Set");
|
||||||
|
if (info.Length() < 3)
|
||||||
|
Nan::ThrowError("Not enough arguments to set(key, value, callback(err), cas_compare(old_value)?)");
|
||||||
|
|
||||||
NodeVitastorKV* kv = Nan::ObjectWrap::Unwrap<NodeVitastorKV>(info.This());
|
NodeVitastorKV* kv = Nan::ObjectWrap::Unwrap<NodeVitastorKV>(info.This());
|
||||||
|
|
||||||
|
@ -684,13 +778,13 @@ NAN_METHOD(NodeVitastorKV::Set)
|
||||||
std::string value(*Nan::Utf8String(info[1].As<v8::String>()));
|
std::string value(*Nan::Utf8String(info[1].As<v8::String>()));
|
||||||
|
|
||||||
v8::Local<v8::Function> callback = info[2].As<v8::Function>();
|
v8::Local<v8::Function> callback = info[2].As<v8::Function>();
|
||||||
NodeVitastorRequest *req = new NodeVitastorRequest(callback), *cas_req = NULL;
|
NodeVitastorRequest *req = new NodeVitastorRequest(kv->cli, callback), *cas_req = NULL;
|
||||||
|
|
||||||
std::function<bool(int, const std::string &)> cas_cb;
|
std::function<bool(int, const std::string &)> cas_cb;
|
||||||
if (info.Length() > 3 && info[3]->IsObject())
|
if (info.Length() > 3 && info[3]->IsObject())
|
||||||
{
|
{
|
||||||
v8::Local<v8::Function> cas_callback = info[3].As<v8::Function>();
|
v8::Local<v8::Function> cas_callback = info[3].As<v8::Function>();
|
||||||
cas_req = new NodeVitastorRequest(cas_callback);
|
cas_req = new NodeVitastorRequest(kv->cli, cas_callback);
|
||||||
cas_cb = make_cas_callback(cas_req);
|
cas_cb = make_cas_callback(cas_req);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -709,10 +803,12 @@ NAN_METHOD(NodeVitastorKV::Set)
|
||||||
}, cas_cb);
|
}, cas_cb);
|
||||||
}
|
}
|
||||||
|
|
||||||
// del(key, callback(err), cas_compare(old_value))
|
// del(key, callback(err), cas_compare(old_value)?)
|
||||||
NAN_METHOD(NodeVitastorKV::Del)
|
NAN_METHOD(NodeVitastorKV::Del)
|
||||||
{
|
{
|
||||||
TRACE("NodeVitastorKV::Del");
|
TRACE("NodeVitastorKV::Del");
|
||||||
|
if (info.Length() < 2)
|
||||||
|
Nan::ThrowError("Not enough arguments to del(key, callback(err), cas_compare(old_value)?)");
|
||||||
|
|
||||||
NodeVitastorKV* kv = Nan::ObjectWrap::Unwrap<NodeVitastorKV>(info.This());
|
NodeVitastorKV* kv = Nan::ObjectWrap::Unwrap<NodeVitastorKV>(info.This());
|
||||||
|
|
||||||
|
@ -720,13 +816,13 @@ NAN_METHOD(NodeVitastorKV::Del)
|
||||||
std::string key(*Nan::Utf8String(info[0].As<v8::String>()));
|
std::string key(*Nan::Utf8String(info[0].As<v8::String>()));
|
||||||
|
|
||||||
v8::Local<v8::Function> callback = info[1].As<v8::Function>();
|
v8::Local<v8::Function> callback = info[1].As<v8::Function>();
|
||||||
NodeVitastorRequest *req = new NodeVitastorRequest(callback), *cas_req = NULL;
|
NodeVitastorRequest *req = new NodeVitastorRequest(kv->cli, callback), *cas_req = NULL;
|
||||||
|
|
||||||
std::function<bool(int, const std::string &)> cas_cb;
|
std::function<bool(int, const std::string &)> cas_cb;
|
||||||
if (info.Length() > 2 && info[2]->IsObject())
|
if (info.Length() > 2 && info[2]->IsObject())
|
||||||
{
|
{
|
||||||
v8::Local<v8::Function> cas_callback = info[2].As<v8::Function>();
|
v8::Local<v8::Function> cas_callback = info[2].As<v8::Function>();
|
||||||
cas_req = new NodeVitastorRequest(cas_callback);
|
cas_req = new NodeVitastorRequest(kv->cli, cas_callback);
|
||||||
cas_cb = make_cas_callback(cas_req);
|
cas_cb = make_cas_callback(cas_req);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -762,6 +858,14 @@ NAN_METHOD(NodeVitastorKV::List)
|
||||||
info.GetReturnValue().Set(Nan::NewInstance(cons, narg, args).ToLocalChecked());
|
info.GetReturnValue().Set(Nan::NewInstance(cons, narg, args).ToLocalChecked());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*NAN_METHOD(NodeVitastorKV::Destroy)
|
||||||
|
{
|
||||||
|
TRACE("NodeVitastorKV::Destroy");
|
||||||
|
NodeVitastorKV* kv = Nan::ObjectWrap::Unwrap<NodeVitastorKV>(info.This());
|
||||||
|
if (!kv->dead)
|
||||||
|
kv->Unref();
|
||||||
|
}*/
|
||||||
|
|
||||||
//////////////////////////////////////////////////
|
//////////////////////////////////////////////////
|
||||||
// NodeVitastorKVListing
|
// NodeVitastorKVListing
|
||||||
//////////////////////////////////////////////////
|
//////////////////////////////////////////////////
|
||||||
|
@ -783,12 +887,10 @@ NAN_METHOD(NodeVitastorKVListing::Create)
|
||||||
|
|
||||||
NodeVitastorKVListing *list = new NodeVitastorKVListing();
|
NodeVitastorKVListing *list = new NodeVitastorKVListing();
|
||||||
list->kv = kv;
|
list->kv = kv;
|
||||||
{
|
list->handle = list->kv->dbw->list_start(start_key);
|
||||||
std::unique_lock<std::mutex> lock(kv->cli->mu);
|
|
||||||
list->handle = list->kv->dbw->list_start(start_key);
|
|
||||||
}
|
|
||||||
|
|
||||||
list->Wrap(info.This());
|
list->Wrap(info.This());
|
||||||
|
kv->Ref();
|
||||||
info.GetReturnValue().Set(info.This());
|
info.GetReturnValue().Set(info.This());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -796,35 +898,54 @@ NodeVitastorKVListing::~NodeVitastorKVListing()
|
||||||
{
|
{
|
||||||
if (handle)
|
if (handle)
|
||||||
{
|
{
|
||||||
std::unique_lock<std::mutex> lock(kv->cli->mu);
|
|
||||||
kv->dbw->list_close(handle);
|
kv->dbw->list_close(handle);
|
||||||
handle = NULL;
|
handle = NULL;
|
||||||
}
|
}
|
||||||
|
if (iter)
|
||||||
|
{
|
||||||
|
delete iter;
|
||||||
|
iter = NULL;
|
||||||
|
}
|
||||||
|
kv->Unref();
|
||||||
}
|
}
|
||||||
|
|
||||||
// next(callback(err, value))
|
// next(callback(err, value)?)
|
||||||
NAN_METHOD(NodeVitastorKVListing::Next)
|
NAN_METHOD(NodeVitastorKVListing::Next)
|
||||||
{
|
{
|
||||||
TRACE("NodeVitastorKVListing::Next");
|
TRACE("NodeVitastorKVListing::Next");
|
||||||
|
|
||||||
NodeVitastorKVListing* list = Nan::ObjectWrap::Unwrap<NodeVitastorKVListing>(info.This());
|
NodeVitastorKVListing* list = Nan::ObjectWrap::Unwrap<NodeVitastorKVListing>(info.This());
|
||||||
|
|
||||||
v8::Local<v8::Function> callback = info[0].As<v8::Function>();
|
if (info.Length() > 0)
|
||||||
auto req = new NodeVitastorRequest(callback);
|
{
|
||||||
|
v8::Local<v8::Function> callback = info[0].As<v8::Function>();
|
||||||
|
if (list->iter)
|
||||||
|
{
|
||||||
|
delete list->iter;
|
||||||
|
}
|
||||||
|
list->iter = new NodeVitastorRequest(list->kv->cli, callback);
|
||||||
|
}
|
||||||
if (!list->handle)
|
if (!list->handle)
|
||||||
{
|
{
|
||||||
// Already closed
|
// Already closed
|
||||||
Nan::Callback nanCallback(Nan::New(req->callback));
|
if (list->iter)
|
||||||
v8::Local<v8::Value> args[1];
|
{
|
||||||
args[0] = Nan::New<v8::Int32>(-EINVAL);
|
auto req = list->iter;
|
||||||
nanCallback.Call(1, args, req);
|
list->iter = NULL;
|
||||||
delete req;
|
Nan::Callback nanCallback(Nan::New(req->callback));
|
||||||
|
v8::Local<v8::Value> args[1];
|
||||||
|
args[0] = Nan::New<v8::Int32>(-EINVAL);
|
||||||
|
nanCallback.Call(1, args, req);
|
||||||
|
delete req;
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
list->kv->Ref();
|
list->kv->Ref();
|
||||||
list->kv->dbw->list_next(list->handle, [list, req](int res, const std::string & key, const std::string & value)
|
list->kv->dbw->list_next(list->handle, [list](int res, const std::string & key, const std::string & value)
|
||||||
{
|
{
|
||||||
|
auto req = list->iter;
|
||||||
|
list->iter = NULL;
|
||||||
Nan::HandleScope scope;
|
Nan::HandleScope scope;
|
||||||
Nan::Callback nanCallback(Nan::New(req->callback));
|
Nan::Callback nanCallback(Nan::New(req->callback));
|
||||||
v8::Local<v8::Value> args[3];
|
v8::Local<v8::Value> args[3];
|
||||||
|
@ -832,7 +953,10 @@ NAN_METHOD(NodeVitastorKVListing::Next)
|
||||||
args[1] = !res ? v8::Local<v8::Value>(Nan::New<v8::String>(key).ToLocalChecked()) : v8::Local<v8::Value>(Nan::Null());
|
args[1] = !res ? v8::Local<v8::Value>(Nan::New<v8::String>(key).ToLocalChecked()) : v8::Local<v8::Value>(Nan::Null());
|
||||||
args[2] = !res ? v8::Local<v8::Value>(Nan::New<v8::String>(value).ToLocalChecked()) : v8::Local<v8::Value>(Nan::Null());
|
args[2] = !res ? v8::Local<v8::Value>(Nan::New<v8::String>(value).ToLocalChecked()) : v8::Local<v8::Value>(Nan::Null());
|
||||||
nanCallback.Call(3, args, req);
|
nanCallback.Call(3, args, req);
|
||||||
delete req;
|
if (list->iter)
|
||||||
|
delete req;
|
||||||
|
else
|
||||||
|
list->iter = req;
|
||||||
list->kv->Unref();
|
list->kv->Unref();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -846,8 +970,12 @@ NAN_METHOD(NodeVitastorKVListing::Close)
|
||||||
|
|
||||||
if (list->handle)
|
if (list->handle)
|
||||||
{
|
{
|
||||||
std::unique_lock<std::mutex> lock(list->kv->cli->mu);
|
|
||||||
list->kv->dbw->list_close(list->handle);
|
list->kv->dbw->list_close(list->handle);
|
||||||
list->handle = NULL;
|
list->handle = NULL;
|
||||||
}
|
}
|
||||||
|
if (list->iter)
|
||||||
|
{
|
||||||
|
delete list->iter;
|
||||||
|
list->iter = NULL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,8 +4,6 @@
|
||||||
#ifndef NODE_VITASTOR_CLIENT_H
|
#ifndef NODE_VITASTOR_CLIENT_H
|
||||||
#define NODE_VITASTOR_CLIENT_H
|
#define NODE_VITASTOR_CLIENT_H
|
||||||
|
|
||||||
#include <mutex>
|
|
||||||
|
|
||||||
#include <nan.h>
|
#include <nan.h>
|
||||||
#include <vitastor_c.h>
|
#include <vitastor_c.h>
|
||||||
#include <vitastor_kv.h>
|
#include <vitastor_kv.h>
|
||||||
|
@ -19,7 +17,7 @@ public:
|
||||||
static NAN_METHOD(Create);
|
static NAN_METHOD(Create);
|
||||||
// read(pool, inode, offset, len, callback(err, buffer, version))
|
// read(pool, inode, offset, len, callback(err, buffer, version))
|
||||||
static NAN_METHOD(Read);
|
static NAN_METHOD(Read);
|
||||||
// write(pool, inode, offset, buffer, { version }?, callback(err))
|
// write(pool, inode, offset, buf: Buffer | Buffer[], { version }?, callback(err))
|
||||||
static NAN_METHOD(Write);
|
static NAN_METHOD(Write);
|
||||||
// sync(callback(err))
|
// sync(callback(err))
|
||||||
static NAN_METHOD(Sync);
|
static NAN_METHOD(Sync);
|
||||||
|
@ -34,8 +32,6 @@ private:
|
||||||
vitastor_c *c = NULL;
|
vitastor_c *c = NULL;
|
||||||
int eventfd = -1;
|
int eventfd = -1;
|
||||||
uv_poll_t poll_watcher;
|
uv_poll_t poll_watcher;
|
||||||
// FIXME: Is it really needed?
|
|
||||||
std::mutex mu;
|
|
||||||
|
|
||||||
NodeVitastor();
|
NodeVitastor();
|
||||||
|
|
||||||
|
@ -44,6 +40,9 @@ private:
|
||||||
static void on_write_finish(void *opaque, long retval);
|
static void on_write_finish(void *opaque, long retval);
|
||||||
static void on_read_bitmap_finish(void *opaque, long retval, uint8_t *bitmap);
|
static void on_read_bitmap_finish(void *opaque, long retval, uint8_t *bitmap);
|
||||||
|
|
||||||
|
NodeVitastorRequest* get_read_request(const Nan::FunctionCallbackInfo<v8::Value> & info, int argpos);
|
||||||
|
NodeVitastorRequest* get_write_request(const Nan::FunctionCallbackInfo<v8::Value> & info, int argpos);
|
||||||
|
|
||||||
friend class NodeVitastorImage;
|
friend class NodeVitastorImage;
|
||||||
friend class NodeVitastorKV;
|
friend class NodeVitastorKV;
|
||||||
friend class NodeVitastorKVListing;
|
friend class NodeVitastorKVListing;
|
||||||
|
@ -56,7 +55,7 @@ public:
|
||||||
static NAN_METHOD(Create);
|
static NAN_METHOD(Create);
|
||||||
// read(offset, len, callback(err, buffer, version))
|
// read(offset, len, callback(err, buffer, version))
|
||||||
static NAN_METHOD(Read);
|
static NAN_METHOD(Read);
|
||||||
// write(offset, buffer, { version }?, callback(err))
|
// write(offset, buf: Buffer | Buffer[], { version }?, callback(err))
|
||||||
static NAN_METHOD(Write);
|
static NAN_METHOD(Write);
|
||||||
// sync(callback(err))
|
// sync(callback(err))
|
||||||
static NAN_METHOD(Sync);
|
static NAN_METHOD(Sync);
|
||||||
|
@ -74,8 +73,6 @@ private:
|
||||||
std::vector<NodeVitastorRequest*> on_init;
|
std::vector<NodeVitastorRequest*> on_init;
|
||||||
Nan::Persistent<v8::Object> cliObj;
|
Nan::Persistent<v8::Object> cliObj;
|
||||||
|
|
||||||
NodeVitastorImage();
|
|
||||||
|
|
||||||
static void on_watch_start(void *opaque, long retval);
|
static void on_watch_start(void *opaque, long retval);
|
||||||
void exec_request(NodeVitastorRequest *req);
|
void exec_request(NodeVitastorRequest *req);
|
||||||
void exec_or_wait(NodeVitastorRequest *req);
|
void exec_or_wait(NodeVitastorRequest *req);
|
||||||
|
@ -86,7 +83,7 @@ class NodeVitastorKV: public Nan::ObjectWrap
|
||||||
public:
|
public:
|
||||||
// constructor(node_vitastor)
|
// constructor(node_vitastor)
|
||||||
static NAN_METHOD(Create);
|
static NAN_METHOD(Create);
|
||||||
// open(inode_id, { ...config }, callback(err))
|
// open(pool_id, inode_num, { ...config }, callback(err))
|
||||||
static NAN_METHOD(Open);
|
static NAN_METHOD(Open);
|
||||||
// set_config({ ...config })
|
// set_config({ ...config })
|
||||||
static NAN_METHOD(SetConfig);
|
static NAN_METHOD(SetConfig);
|
||||||
|
@ -98,9 +95,9 @@ public:
|
||||||
static NAN_METHOD(Get);
|
static NAN_METHOD(Get);
|
||||||
// get_cached(key, callback(err, value))
|
// get_cached(key, callback(err, value))
|
||||||
static NAN_METHOD(GetCached);
|
static NAN_METHOD(GetCached);
|
||||||
// set(key, value, callback(err), cas_compare(old_value))
|
// set(key, value, callback(err), cas_compare(old_value)?)
|
||||||
static NAN_METHOD(Set);
|
static NAN_METHOD(Set);
|
||||||
// del(key, callback(err), cas_compare(old_value))
|
// del(key, callback(err), cas_compare(old_value)?)
|
||||||
static NAN_METHOD(Del);
|
static NAN_METHOD(Del);
|
||||||
// list(start_key?)
|
// list(start_key?)
|
||||||
static NAN_METHOD(List);
|
static NAN_METHOD(List);
|
||||||
|
@ -113,8 +110,6 @@ private:
|
||||||
NodeVitastor *cli = NULL;
|
NodeVitastor *cli = NULL;
|
||||||
vitastorkv_dbw_t *dbw = NULL;
|
vitastorkv_dbw_t *dbw = NULL;
|
||||||
|
|
||||||
NodeVitastorKV();
|
|
||||||
|
|
||||||
static void get_impl(const Nan::FunctionCallbackInfo<v8::Value> & info, bool allow_cache);
|
static void get_impl(const Nan::FunctionCallbackInfo<v8::Value> & info, bool allow_cache);
|
||||||
|
|
||||||
friend class NodeVitastorKVListing;
|
friend class NodeVitastorKVListing;
|
||||||
|
@ -125,7 +120,7 @@ class NodeVitastorKVListing: public Nan::ObjectWrap
|
||||||
public:
|
public:
|
||||||
// constructor(node_vitastor_kv, start_key?)
|
// constructor(node_vitastor_kv, start_key?)
|
||||||
static NAN_METHOD(Create);
|
static NAN_METHOD(Create);
|
||||||
// next(callback(err, value))
|
// next(callback(err, value)?)
|
||||||
static NAN_METHOD(Next);
|
static NAN_METHOD(Next);
|
||||||
// close()
|
// close()
|
||||||
static NAN_METHOD(Close);
|
static NAN_METHOD(Close);
|
||||||
|
@ -135,8 +130,7 @@ public:
|
||||||
private:
|
private:
|
||||||
NodeVitastorKV *kv = NULL;
|
NodeVitastorKV *kv = NULL;
|
||||||
void *handle = NULL;
|
void *handle = NULL;
|
||||||
|
NodeVitastorRequest *iter = NULL;
|
||||||
NodeVitastorKVListing();
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
module.exports = require('bindings')('addon.node');
|
|
@ -0,0 +1 @@
|
||||||
|
See [../docs/installation/opennebula.en.md](../docs/installation/opennebula.en.md).
|
|
@ -0,0 +1,29 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
reapply_patch() {
|
||||||
|
if ! 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
|
||||||
|
echo "ERROR: Failed to patch file $1, please apply the patch $2 manually"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
echo "Reapplying Vitastor patches to OpenNebula's oned.conf, vmm_execrc and downloader.sh"
|
||||||
|
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 [[ "$already_applied" = 1 ]]; then
|
||||||
|
echo "OK: Vitastor OpenNebula patches are already applied"
|
||||||
|
elif [[ "$applied_ok" = 1 ]]; then
|
||||||
|
echo "OK: Vitastor OpenNebula patches successfully applied"
|
||||||
|
fi
|
||||||
|
if [[ -f /etc/apparmor.d/local/abstractions/libvirt-qemu ]]; then
|
||||||
|
if ! grep -q /etc/vitastor/vitastor.conf /etc/apparmor.d/local/abstractions/libvirt-qemu; then
|
||||||
|
echo ' "/etc/vitastor/vitastor.conf" r,' >> /etc/apparmor.d/local/abstractions/libvirt-qemu
|
||||||
|
fi
|
||||||
|
fi
|
|
@ -0,0 +1,76 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
# This script is used to copy a VM image (SRC) to the image repository as DST
|
||||||
|
|
||||||
|
# -------- Set up the environment to source common tools & conf ------------
|
||||||
|
if [ -z "${ONE_LOCATION}" ]; then
|
||||||
|
LIB_LOCATION=/usr/lib/one
|
||||||
|
else
|
||||||
|
LIB_LOCATION=$ONE_LOCATION/lib
|
||||||
|
fi
|
||||||
|
|
||||||
|
. $LIB_LOCATION/sh/scripts_common.sh
|
||||||
|
|
||||||
|
DRIVER_PATH=$(dirname $0)
|
||||||
|
source ${DRIVER_PATH}/../libfs.sh
|
||||||
|
|
||||||
|
# -------- Get cp and datastore arguments from OpenNebula core ------------
|
||||||
|
|
||||||
|
DRV_ACTION=`cat -`
|
||||||
|
ID=$1
|
||||||
|
|
||||||
|
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||||
|
|
||||||
|
unset i XPATH_ELEMENTS
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <($XPATH \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/IMAGE_PREFIX \
|
||||||
|
/DS_DRIVER_ACTION_DATA/IMAGE/PATH \
|
||||||
|
/DS_DRIVER_ACTION_DATA/IMAGE/SIZE \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VITASTOR_CONF)
|
||||||
|
|
||||||
|
unset i
|
||||||
|
|
||||||
|
BASE_PATH="${XPATH_ELEMENTS[i++]}"
|
||||||
|
BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
|
||||||
|
POOL_NAME="${XPATH_ELEMENTS[i++]}"
|
||||||
|
IMAGE_PREFIX="${XPATH_ELEMENTS[i++]:-one}"
|
||||||
|
SRC="${XPATH_ELEMENTS[i++]}"
|
||||||
|
SIZE="${XPATH_ELEMENTS[i++]}"
|
||||||
|
VITASTOR_CONF="${XPATH_ELEMENTS[i++]}"
|
||||||
|
|
||||||
|
DST_HOST=`get_destination_host $ID`
|
||||||
|
|
||||||
|
if [ -z "$DST_HOST" ]; then
|
||||||
|
error_message "Datastore template missing 'BRIDGE_LIST' attribute."
|
||||||
|
exit -1
|
||||||
|
fi
|
||||||
|
|
||||||
|
CLI=vitastor-cli
|
||||||
|
if [ -n "$VITASTOR_CONF" ]; then
|
||||||
|
CLI="$CLI --config_path ${VITASTOR_CONF}"
|
||||||
|
fi
|
||||||
|
if [ -n "$POOL_NAME" ]; then
|
||||||
|
CLI="$CLI --pool ${POOL_NAME}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
SAFE_DIRS=""
|
||||||
|
|
||||||
|
DST="${IMAGE_PREFIX}-${ID}"
|
||||||
|
|
||||||
|
ssh_exec_and_log "$DST_HOST" "$CLI create --parent $SRC $DST" \
|
||||||
|
"Error during $CLI create --parent $SRC $DST in $DST_HOST"
|
||||||
|
|
||||||
|
ssh_exec_and_log "$DST_HOST" "$CLI flatten $DST" \
|
||||||
|
"Error during $CLI create flatten $DST in $DST_HOST"
|
||||||
|
|
||||||
|
echo "$DST raw"
|
|
@ -0,0 +1,135 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
# This script is used to copy a local image SRC to the image repository as DST
|
||||||
|
|
||||||
|
# -------- Set up the environment to source common tools & conf ------------
|
||||||
|
|
||||||
|
if [ -z "${ONE_LOCATION}" ]; then
|
||||||
|
LIB_LOCATION=/usr/lib/one
|
||||||
|
else
|
||||||
|
LIB_LOCATION=$ONE_LOCATION/lib
|
||||||
|
fi
|
||||||
|
|
||||||
|
. $LIB_LOCATION/sh/scripts_common.sh
|
||||||
|
|
||||||
|
DRIVER_PATH=$(dirname $0)
|
||||||
|
source ${DRIVER_PATH}/../libfs.sh
|
||||||
|
|
||||||
|
# -------- Get cp and datastore arguments from OpenNebula core ------------
|
||||||
|
|
||||||
|
DRV_ACTION=`cat -`
|
||||||
|
ID=$1
|
||||||
|
|
||||||
|
export DRV_ACTION
|
||||||
|
|
||||||
|
UTILS_PATH="${DRIVER_PATH}/.."
|
||||||
|
|
||||||
|
XPATH="$UTILS_PATH/xpath.rb -b $DRV_ACTION"
|
||||||
|
|
||||||
|
unset i XPATH_ELEMENTS
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <($XPATH \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/RESTRICTED_DIRS \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/SAFE_DIRS \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/IMAGE_PREFIX \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/STAGING_DIR \
|
||||||
|
/DS_DRIVER_ACTION_DATA/IMAGE/PATH \
|
||||||
|
/DS_DRIVER_ACTION_DATA/IMAGE/SIZE \
|
||||||
|
/DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/MD5 \
|
||||||
|
/DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/SHA1 \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/NO_DECOMPRESS \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/LIMIT_TRANSFER_BW \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VITASTOR_CONF)
|
||||||
|
|
||||||
|
unset i
|
||||||
|
|
||||||
|
BASE_PATH="${XPATH_ELEMENTS[i++]}"
|
||||||
|
RESTRICTED_DIRS="${XPATH_ELEMENTS[i++]}"
|
||||||
|
SAFE_DIRS="${XPATH_ELEMENTS[i++]}"
|
||||||
|
BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
|
||||||
|
POOL_NAME="${XPATH_ELEMENTS[i++]}"
|
||||||
|
IMAGE_PREFIX="${XPATH_ELEMENTS[i++]:-one}"
|
||||||
|
STAGING_DIR="${XPATH_ELEMENTS[i++]:-/var/tmp}"
|
||||||
|
SRC="${XPATH_ELEMENTS[i++]}"
|
||||||
|
SIZE="${XPATH_ELEMENTS[i++]}"
|
||||||
|
MD5="${XPATH_ELEMENTS[i++]}"
|
||||||
|
SHA1="${XPATH_ELEMENTS[i++]}"
|
||||||
|
NO_DECOMPRESS="${XPATH_ELEMENTS[i++]}"
|
||||||
|
LIMIT_TRANSFER_BW="${XPATH_ELEMENTS[i++]}"
|
||||||
|
VITASTOR_CONF="${XPATH_ELEMENTS[i++]}"
|
||||||
|
|
||||||
|
DST_HOST=`get_destination_host $ID`
|
||||||
|
|
||||||
|
if [ -z "$DST_HOST" ]; then
|
||||||
|
error_message "Datastore template missing 'BRIDGE_LIST' attribute."
|
||||||
|
exit -1
|
||||||
|
fi
|
||||||
|
|
||||||
|
CLI=vitastor-cli
|
||||||
|
QEMU_ARG=""
|
||||||
|
if [ -n "$VITASTOR_CONF" ]; then
|
||||||
|
CLI="$CLI --config_path ${VITASTOR_CONF}"
|
||||||
|
QEMU_ARG=":config_path=${VITASTOR_CONF}"
|
||||||
|
fi
|
||||||
|
if [ -n "$POOL_NAME" ]; then
|
||||||
|
CLI="$CLI --pool ${POOL_NAME}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS"
|
||||||
|
|
||||||
|
IMAGE_HASH=`generate_image_hash`
|
||||||
|
TMP_DST="$STAGING_DIR/$IMAGE_HASH"
|
||||||
|
|
||||||
|
DST="${IMAGE_PREFIX}-${ID}"
|
||||||
|
|
||||||
|
DOWNLOADER_ARGS=`set_downloader_args "$MD5" "$SHA1" "$NO_DECOMPRESS" "$LIMIT_TRANSFER_BW" "$SRC" -`
|
||||||
|
|
||||||
|
COPY_COMMAND="$UTILS_PATH/downloader.sh $DOWNLOADER_ARGS"
|
||||||
|
|
||||||
|
case $SRC in
|
||||||
|
http://*|https://*)
|
||||||
|
log "Downloading $SRC to the image repository"
|
||||||
|
|
||||||
|
DUMP="$COPY_COMMAND"
|
||||||
|
;;
|
||||||
|
|
||||||
|
*)
|
||||||
|
if [ `check_restricted $SRC` -eq 1 ]; then
|
||||||
|
log_error "Not allowed to copy images from $RESTRICTED_DIRS"
|
||||||
|
error_message "Not allowed to copy image file $SRC"
|
||||||
|
exit -1
|
||||||
|
fi
|
||||||
|
|
||||||
|
log "Copying local image $SRC to the image repository"
|
||||||
|
|
||||||
|
DUMP="$COPY_COMMAND"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
multiline_exec_and_log "set -e -o pipefail; $DUMP | $SSH $DST_HOST $DD of=$TMP_DST bs=1M" \
|
||||||
|
"Error copying $SRC to $DST_HOST:$TMP_DST"
|
||||||
|
|
||||||
|
REGISTER_CMD=$(cat <<EOF
|
||||||
|
set -e -o pipefail
|
||||||
|
|
||||||
|
SIZE=\$($QEMU_IMG info --output json "$TMP_DST" | jq -r '.["virtual-size"]')
|
||||||
|
$CLI create -s \$SIZE "$DST"
|
||||||
|
$QEMU_IMG convert -O raw "$TMP_DST" "vitastor:image=$DST$QEMU_ARG"
|
||||||
|
|
||||||
|
# remove original
|
||||||
|
$RM -f $TMP_DST
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
ssh_exec_and_log "$DST_HOST" "$REGISTER_CMD" "Error registering $DST in $DST_HOST"
|
||||||
|
|
||||||
|
echo "$DST raw"
|
|
@ -0,0 +1,555 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# -------------------------------------------------------------------------- #
|
||||||
|
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
||||||
|
# #
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
||||||
|
# not use this file except in compliance with the License. You may obtain #
|
||||||
|
# a copy of the License at #
|
||||||
|
# #
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0 #
|
||||||
|
# #
|
||||||
|
# Unless required by applicable law or agreed to in writing, software #
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, #
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
|
||||||
|
# See the License for the specific language governing permissions and #
|
||||||
|
# limitations under the License. #
|
||||||
|
#--------------------------------------------------------------------------- #
|
||||||
|
|
||||||
|
if [ -z "${ONE_LOCATION}" ]; then
|
||||||
|
LIB_LOCATION=/usr/lib/one
|
||||||
|
VAR_LOCATION=/var/lib/one
|
||||||
|
else
|
||||||
|
LIB_LOCATION=$ONE_LOCATION/lib
|
||||||
|
VAR_LOCATION=$ONE_LOCATION/var
|
||||||
|
fi
|
||||||
|
|
||||||
|
. $LIB_LOCATION/sh/scripts_common.sh
|
||||||
|
|
||||||
|
DRIVER_PATH=$(dirname $0)
|
||||||
|
|
||||||
|
# Escape single quotes
|
||||||
|
function esc_sq
|
||||||
|
{
|
||||||
|
echo "$1" | sed -e "s/'/'\\\''/g"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Execute a command (first parameter) and use the first kb of stdout
|
||||||
|
# to determine the file type
|
||||||
|
function get_type
|
||||||
|
{
|
||||||
|
if [ "$NO_DECOMPRESS" = "yes" ]; then
|
||||||
|
echo "application/octet-stream"
|
||||||
|
else
|
||||||
|
command=$1
|
||||||
|
|
||||||
|
( eval "$command" | head -n 1024 | file -b --mime-type - ) 2>/dev/null
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Gets the command needed to decompress an stream.
|
||||||
|
function get_decompressor
|
||||||
|
{
|
||||||
|
type=$1
|
||||||
|
|
||||||
|
case "$type" in
|
||||||
|
"application/x-gzip"|"application/gzip")
|
||||||
|
echo "gunzip -c -"
|
||||||
|
;;
|
||||||
|
"application/x-bzip2")
|
||||||
|
echo "bunzip2 -qc -"
|
||||||
|
;;
|
||||||
|
"application/x-xz")
|
||||||
|
echo "unxz -c -"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "cat"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
# Function called to decompress a stream. The first parameter is the command
|
||||||
|
# used to decompress the stream. Second parameter is the output file or
|
||||||
|
# - for stdout.
|
||||||
|
function decompress
|
||||||
|
{
|
||||||
|
command="$1"
|
||||||
|
to="$2"
|
||||||
|
|
||||||
|
if [ "$to" = "-" ]; then
|
||||||
|
$command
|
||||||
|
else
|
||||||
|
$command > "$to"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Function called to hash a stream. First parameter is the algorithm name.
|
||||||
|
function hasher
|
||||||
|
{
|
||||||
|
if [ -n "$1" ]; then
|
||||||
|
openssl dgst -$1 | awk '{print $NF}' > $HASH_FILE
|
||||||
|
else
|
||||||
|
# Needs something consuming stdin or the pipe will break
|
||||||
|
cat >/dev/null
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Unarchives a tar or a zip a file to a directory with the same name.
|
||||||
|
function unarchive
|
||||||
|
{
|
||||||
|
TO="$1"
|
||||||
|
|
||||||
|
file_type=$(get_type "cat $TO")
|
||||||
|
|
||||||
|
tmp="$TO"
|
||||||
|
|
||||||
|
# Add full path if it is relative
|
||||||
|
if [ ${tmp:0:1} != "/" ]; then
|
||||||
|
tmp="$PWD/$tmp"
|
||||||
|
fi
|
||||||
|
|
||||||
|
IN="$tmp.tmp"
|
||||||
|
OUT="$tmp"
|
||||||
|
|
||||||
|
case "$file_type" in
|
||||||
|
"application/x-tar")
|
||||||
|
command="tar -xf $IN -C $OUT"
|
||||||
|
;;
|
||||||
|
"application/zip")
|
||||||
|
command="unzip -d $OUT $IN"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
command=""
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
if [ -n "$command" ]; then
|
||||||
|
mv "$OUT" "$IN"
|
||||||
|
mkdir "$OUT"
|
||||||
|
|
||||||
|
$command
|
||||||
|
|
||||||
|
if [ "$?" != "0" ]; then
|
||||||
|
echo "Error uncompressing archive" >&2
|
||||||
|
exit -1
|
||||||
|
fi
|
||||||
|
|
||||||
|
rm "$IN"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
function s3_env
|
||||||
|
{
|
||||||
|
XPATH="$DRIVER_PATH/xpath.rb -b $DRV_ACTION"
|
||||||
|
|
||||||
|
unset i j XPATH_ELEMENTS
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <($XPATH /DS_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/ACCESS_KEY_ID \
|
||||||
|
/DS_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/SECRET_ACCESS_KEY \
|
||||||
|
/DS_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/REGION \
|
||||||
|
/DS_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/AWS \
|
||||||
|
/DS_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/ENDPOINT)
|
||||||
|
|
||||||
|
S3_ACCESS_KEY_ID="${XPATH_ELEMENTS[j++]}"
|
||||||
|
S3_SECRET_ACCESS_KEY="${XPATH_ELEMENTS[j++]}"
|
||||||
|
S3_REGION="${XPATH_ELEMENTS[j++]}"
|
||||||
|
S3_AWS="${XPATH_ELEMENTS[j++]}"
|
||||||
|
S3_ENDPOINT="${XPATH_ELEMENTS[j++]}"
|
||||||
|
|
||||||
|
CURRENT_DATE_DAY="$(date -u '+%Y%m%d')"
|
||||||
|
CURRENT_DATE_ISO8601="${CURRENT_DATE_DAY}T$(date -u '+%H%M%S')Z"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Create an SHA-256 hash in hexadecimal.
|
||||||
|
# Usage:
|
||||||
|
# hash_sha256 <string>
|
||||||
|
function hash_sha256 {
|
||||||
|
printf "${1}" | openssl dgst -sha256 | sed 's/^.* //'
|
||||||
|
}
|
||||||
|
|
||||||
|
# Create an SHA-256 hmac in hexadecimal.
|
||||||
|
# Usage:
|
||||||
|
# hmac_sha256 <key> <data>
|
||||||
|
function hmac_sha256 {
|
||||||
|
printf "${2}" | openssl dgst -sha256 -mac HMAC -macopt "${1}" | sed 's/^.* //'
|
||||||
|
}
|
||||||
|
|
||||||
|
# Create the signature.
|
||||||
|
# Usage:
|
||||||
|
# create_signature
|
||||||
|
function create_signature {
|
||||||
|
stringToSign="AWS4-HMAC-SHA256\n${CURRENT_DATE_ISO8601}\n${CURRENT_DATE_DAY}/${S3_REGION}/s3/aws4_request\n$(hash_sha256 "${HTTP_CANONICAL_REQUEST}")"
|
||||||
|
dateKey=$(hmac_sha256 key:"AWS4${S3_SECRET_ACCESS_KEY}" "${CURRENT_DATE_DAY}")
|
||||||
|
regionKey=$(hmac_sha256 hexkey:"${dateKey}" "${S3_REGION}")
|
||||||
|
serviceKey=$(hmac_sha256 hexkey:"${regionKey}" "s3")
|
||||||
|
signingKey=$(hmac_sha256 hexkey:"${serviceKey}" "aws4_request")
|
||||||
|
|
||||||
|
printf "${stringToSign}" | openssl dgst -sha256 -mac HMAC -macopt hexkey:"${signingKey}" | sed 's/.*(stdin)= //'
|
||||||
|
}
|
||||||
|
|
||||||
|
function s3_curl_args
|
||||||
|
{
|
||||||
|
FROM="$1"
|
||||||
|
|
||||||
|
ENDPOINT="$S3_ENDPOINT"
|
||||||
|
OBJECT=$(basename "$FROM")
|
||||||
|
BUCKET=$(basename $(dirname "$FROM"))
|
||||||
|
|
||||||
|
DATE="`date -u +'%a, %d %b %Y %H:%M:%S GMT'`"
|
||||||
|
AUTH_STRING="GET\n\n\n${DATE}\n/${BUCKET}/${OBJECT}"
|
||||||
|
|
||||||
|
SIGNED_AUTH_STRING=`echo -en "$AUTH_STRING" | \
|
||||||
|
openssl sha1 -hmac ${S3_SECRET_ACCESS_KEY} -binary | \
|
||||||
|
base64`
|
||||||
|
|
||||||
|
echo " -H \"Date: ${DATE}\"" \
|
||||||
|
" -H \"Authorization: AWS ${S3_ACCESS_KEY_ID}:${SIGNED_AUTH_STRING}\"" \
|
||||||
|
" '$(esc_sq "${ENDPOINT}/${BUCKET}/${OBJECT}")'"
|
||||||
|
}
|
||||||
|
|
||||||
|
function s3_curl_args_aws
|
||||||
|
{
|
||||||
|
FROM="$1"
|
||||||
|
|
||||||
|
OBJECT=$(basename "$FROM")
|
||||||
|
BUCKET=$(basename "$(dirname "$FROM")")
|
||||||
|
|
||||||
|
ENDPOINT="$BUCKET.s3.amazonaws.com"
|
||||||
|
|
||||||
|
AWS_S3_PATH="$(echo $OBJECT | sed 's;^\([^/]\);/\1;')"
|
||||||
|
|
||||||
|
HTTP_REQUEST_PAYLOAD_HASH="$(echo "" | openssl dgst -sha256 | sed 's/^.* //')"
|
||||||
|
HTTP_CANONICAL_REQUEST_URI="${AWS_S3_PATH}"
|
||||||
|
HTTP_REQUEST_CONTENT_TYPE='application/octet-stream'
|
||||||
|
|
||||||
|
HTTP_CANONICAL_REQUEST_HEADERS="content-type:${HTTP_REQUEST_CONTENT_TYPE}
|
||||||
|
host:${ENDPOINT}
|
||||||
|
x-amz-content-sha256:${HTTP_REQUEST_PAYLOAD_HASH}
|
||||||
|
x-amz-date:${CURRENT_DATE_ISO8601}"
|
||||||
|
|
||||||
|
HTTP_REQUEST_SIGNED_HEADERS="content-type;host;x-amz-content-sha256;x-amz-date"
|
||||||
|
HTTP_CANONICAL_REQUEST="GET
|
||||||
|
${HTTP_CANONICAL_REQUEST_URI}\n
|
||||||
|
${HTTP_CANONICAL_REQUEST_HEADERS}\n
|
||||||
|
${HTTP_REQUEST_SIGNED_HEADERS}
|
||||||
|
${HTTP_REQUEST_PAYLOAD_HASH}"
|
||||||
|
|
||||||
|
SIGNATURE="$(create_signature)"
|
||||||
|
HTTP_REQUEST_AUTHORIZATION_HEADER="AWS4-HMAC-SHA256 Credential=${S3_ACCESS_KEY_ID}/${CURRENT_DATE_DAY}/${S3_REGION}/s3/aws4_request, SignedHeaders=${HTTP_REQUEST_SIGNED_HEADERS}, Signature=${SIGNATURE}"
|
||||||
|
|
||||||
|
echo " -H \"Authorization: ${HTTP_REQUEST_AUTHORIZATION_HEADER}\"" \
|
||||||
|
" -H \"content-type: ${HTTP_REQUEST_CONTENT_TYPE}\"" \
|
||||||
|
" -H \"x-amz-content-sha256: ${HTTP_REQUEST_PAYLOAD_HASH}\"" \
|
||||||
|
" -H \"x-amz-date: ${CURRENT_DATE_ISO8601}\"" \
|
||||||
|
" \"https://${ENDPOINT}${HTTP_CANONICAL_REQUEST_URI}\""
|
||||||
|
}
|
||||||
|
|
||||||
|
function get_rbd_cmd
|
||||||
|
{
|
||||||
|
local i j URL_ELEMENTS
|
||||||
|
|
||||||
|
FROM="$1"
|
||||||
|
|
||||||
|
URL_RB="$DRIVER_PATH/url.rb"
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
URL_ELEMENTS[i++]="$element"
|
||||||
|
done < <($URL_RB "$FROM" \
|
||||||
|
USER \
|
||||||
|
HOST \
|
||||||
|
SOURCE \
|
||||||
|
PARAM_DS \
|
||||||
|
PARAM_CEPH_USER \
|
||||||
|
PARAM_CEPH_KEY \
|
||||||
|
PARAM_CEPH_CONF)
|
||||||
|
|
||||||
|
USER="${URL_ELEMENTS[j++]}"
|
||||||
|
DST_HOST="${URL_ELEMENTS[j++]}"
|
||||||
|
SOURCE="${URL_ELEMENTS[j++]}"
|
||||||
|
DS="${URL_ELEMENTS[j++]}"
|
||||||
|
CEPH_USER="${URL_ELEMENTS[j++]}"
|
||||||
|
CEPH_KEY="${URL_ELEMENTS[j++]}"
|
||||||
|
CEPH_CONF="${URL_ELEMENTS[j++]}"
|
||||||
|
|
||||||
|
# Remove leading '/'
|
||||||
|
SOURCE="${SOURCE#/}"
|
||||||
|
|
||||||
|
if [ -n "$USER" ]; then
|
||||||
|
DST_HOST="$USER@$DST_HOST"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "$CEPH_USER" ]; then
|
||||||
|
RBD="$RBD --id '$(esc_sq "${CEPH_USER}")'"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "$CEPH_KEY" ]; then
|
||||||
|
RBD="$RBD --keyfile '$(esc_sq "${CEPH_KEY}")'"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "$CEPH_CONF" ]; then
|
||||||
|
RBD="$RBD --conf '$(esc_sq "${CEPH_CONF}")'"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "ssh '$(esc_sq "$DST_HOST")' \"$RBD export '$(esc_sq "$SOURCE")' -\""
|
||||||
|
}
|
||||||
|
|
||||||
|
function get_vitastor_cmd
|
||||||
|
{
|
||||||
|
local i j URL_ELEMENTS
|
||||||
|
|
||||||
|
FROM="$1"
|
||||||
|
|
||||||
|
URL_RB="$DRIVER_PATH/url.rb"
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
URL_ELEMENTS[i++]="$element"
|
||||||
|
done < <($URL_RB "$FROM" \
|
||||||
|
USER \
|
||||||
|
HOST \
|
||||||
|
SOURCE \
|
||||||
|
PARAM_DS \
|
||||||
|
PARAM_VITASTOR_CONF)
|
||||||
|
|
||||||
|
USER="${URL_ELEMENTS[j++]}"
|
||||||
|
DST_HOST="${URL_ELEMENTS[j++]}"
|
||||||
|
SOURCE="${URL_ELEMENTS[j++]}"
|
||||||
|
DS="${URL_ELEMENTS[j++]}"
|
||||||
|
VITASTOR_CONF="${URL_ELEMENTS[j++]}"
|
||||||
|
|
||||||
|
# Remove leading '/'
|
||||||
|
SOURCE="${SOURCE#/}"
|
||||||
|
|
||||||
|
if [ -n "$USER" ]; then
|
||||||
|
DST_HOST="$USER@$DST_HOST"
|
||||||
|
fi
|
||||||
|
|
||||||
|
local CLI
|
||||||
|
CLI="vitastor-cli"
|
||||||
|
if [ -n "$VITASTOR_CONF" ]; then
|
||||||
|
CLI="$CLI --config_path '$(esc_sq "${VITASTOR_CONF}")'"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "ssh '$(esc_sq "$DST_HOST")' \"$CLI dd iimg='$(esc_sq "$SOURCE")'\""
|
||||||
|
}
|
||||||
|
|
||||||
|
# Compare 2 version strings using sort -V
|
||||||
|
# Usage:
|
||||||
|
# verlte "3.2.9" "3.4.0"
|
||||||
|
function verlte() {
|
||||||
|
[ "$1" = "`echo -e "$1\n$2" | sort -V | head -n1`" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
# Returns curl retry options based on its version
|
||||||
|
function curl_retry_args {
|
||||||
|
[ "$NO_RETRY" = "yes" ] && return
|
||||||
|
|
||||||
|
RETRY_ARGS="--retry 3 --retry-delay 3"
|
||||||
|
|
||||||
|
CURL_VER=`curl --version | grep -o 'curl [0-9\.]*' | awk '{print $2}'`
|
||||||
|
|
||||||
|
# To retry also on conn-reset-by-peer fresh curl is needed
|
||||||
|
if verlte "7.71.0" "$CURL_VER" && [ -z ${MAX_SIZE} ] ; then
|
||||||
|
RETRY_ARGS+=" --retry-all-errors"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo $RETRY_ARGS
|
||||||
|
}
|
||||||
|
|
||||||
|
TEMP=`getopt -o m:s:l:c:no -l md5:,sha1:,limit:,max-size:,nodecomp,noretry -- "$@"`
|
||||||
|
|
||||||
|
if [ $? != 0 ] ; then
|
||||||
|
echo "Arguments error" >&2
|
||||||
|
exit -1
|
||||||
|
fi
|
||||||
|
|
||||||
|
eval set -- "$TEMP"
|
||||||
|
|
||||||
|
while true; do
|
||||||
|
case "$1" in
|
||||||
|
-m|--md5)
|
||||||
|
HASH_TYPE=md5
|
||||||
|
HASH=$2
|
||||||
|
shift 2
|
||||||
|
;;
|
||||||
|
-s|--sha1)
|
||||||
|
HASH_TYPE=sha1
|
||||||
|
HASH=$2
|
||||||
|
shift 2
|
||||||
|
;;
|
||||||
|
-n|--nodecomp)
|
||||||
|
export NO_DECOMPRESS="yes"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
-l|--limit)
|
||||||
|
export LIMIT_RATE="$2"
|
||||||
|
shift 2
|
||||||
|
;;
|
||||||
|
-c|--max-size)
|
||||||
|
export MAX_SIZE="$2"
|
||||||
|
shift 2
|
||||||
|
;;
|
||||||
|
-o|--noretry)
|
||||||
|
export NO_RETRY="yes"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
--)
|
||||||
|
shift
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
FROM="$1"
|
||||||
|
TO="$2"
|
||||||
|
|
||||||
|
if [ -n "${HASH_TYPE}" -a -n "${MAX_SIZE}" ]; then
|
||||||
|
echo "Hash check not supported for partial downloads" >&2
|
||||||
|
exit -1
|
||||||
|
else
|
||||||
|
# File used by the hasher function to store the resulting hash
|
||||||
|
export HASH_FILE="/tmp/downloader.hash.$$"
|
||||||
|
fi
|
||||||
|
|
||||||
|
GLOBAL_CURL_ARGS="--fail -sS -k -L $(curl_retry_args)"
|
||||||
|
|
||||||
|
case "$FROM" in
|
||||||
|
http://*|https://*)
|
||||||
|
# -k so it does not check the certificate
|
||||||
|
# -L to follow redirects
|
||||||
|
# -sS to hide output except on failure
|
||||||
|
# --limit_rate to limit the bw
|
||||||
|
curl_args="$GLOBAL_CURL_ARGS '$(esc_sq "${FROM}")'"
|
||||||
|
|
||||||
|
if [ -n "$LIMIT_RATE" ]; then
|
||||||
|
curl_args="--limit-rate $LIMIT_RATE $curl_args"
|
||||||
|
fi
|
||||||
|
|
||||||
|
command="curl $curl_args"
|
||||||
|
;;
|
||||||
|
ssh://*)
|
||||||
|
# pseudo-url for ssh transfers ssh://user@host:path
|
||||||
|
# -l to limit the bw
|
||||||
|
ssh_src=${FROM#ssh://}
|
||||||
|
ssh_arg=(${ssh_src/:/ })
|
||||||
|
|
||||||
|
rmt_cmd="\"cat '$(esc_sq "${ssh_arg[1]}")'\""
|
||||||
|
|
||||||
|
command="ssh ${ssh_arg[0]} $rmt_cmd"
|
||||||
|
;;
|
||||||
|
s3://*)
|
||||||
|
# Read s3 environment
|
||||||
|
s3_env
|
||||||
|
|
||||||
|
if [ -z "$S3_ACCESS_KEY_ID" -o -z "$S3_SECRET_ACCESS_KEY" ]; then
|
||||||
|
echo "S3_ACCESS_KEY_ID and S3_SECRET_ACCESS_KEY are required" >&2
|
||||||
|
exit -1
|
||||||
|
fi
|
||||||
|
|
||||||
|
curl_args=""
|
||||||
|
|
||||||
|
if [[ "$S3_AWS" =~ (no|NO) ]]; then
|
||||||
|
curl_args="$(s3_curl_args "$FROM")"
|
||||||
|
else
|
||||||
|
curl_args="$(s3_curl_args_aws "$FROM")"
|
||||||
|
fi
|
||||||
|
|
||||||
|
command="curl $GLOBAL_CURL_ARGS $curl_args"
|
||||||
|
;;
|
||||||
|
rbd://*)
|
||||||
|
command="$(get_rbd_cmd "$FROM")"
|
||||||
|
;;
|
||||||
|
vitastor://*)
|
||||||
|
command="$(get_vitastor_cmd "$FROM")"
|
||||||
|
;;
|
||||||
|
vcenter://*)
|
||||||
|
command="$VAR_LOCATION/remotes/datastore/vcenter_downloader.rb '$(esc_sq "$FROM")'"
|
||||||
|
;;
|
||||||
|
lxd://*)
|
||||||
|
file_type="application/octet-stream"
|
||||||
|
command="$VAR_LOCATION/remotes/datastore/lxd_downloader.sh \"$FROM\""
|
||||||
|
;;
|
||||||
|
restic://*)
|
||||||
|
eval `$VAR_LOCATION/remotes/datastore/restic_downloader.rb "$FROM" | grep -e '^command=' -e '^clean_command='`
|
||||||
|
;;
|
||||||
|
rsync://*)
|
||||||
|
eval `$VAR_LOCATION/remotes/datastore/rsync_downloader.rb "$FROM" | grep -e '^command=' -e '^clean_command='`
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
if [ ! -r $FROM ]; then
|
||||||
|
echo "Cannot read from $FROM" >&2
|
||||||
|
exit -1
|
||||||
|
fi
|
||||||
|
command="cat '$(esc_sq "$FROM")'"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
[ -z "$file_type" ] && file_type=$(get_type "$command")
|
||||||
|
decompressor=$(get_decompressor "$file_type")
|
||||||
|
|
||||||
|
if [ -z "${MAX_SIZE}" ]; then
|
||||||
|
eval "$command" | \
|
||||||
|
tee >( hasher $HASH_TYPE) | \
|
||||||
|
decompress "$decompressor" "$TO"
|
||||||
|
|
||||||
|
if [ "$?" != "0" -o "$PIPESTATUS" != "0" ]; then
|
||||||
|
echo "Error copying" >&2
|
||||||
|
exit -1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
# Order of the 'head' command is here on purpose:
|
||||||
|
# 1. We want to download more bytes than needed to get a requested
|
||||||
|
# number of bytes on the output. Decompressor may need more
|
||||||
|
# data to decompress the stream.
|
||||||
|
# 2. Decompressor command is also misused to detect SIGPIPE error.
|
||||||
|
eval "$command" | \
|
||||||
|
decompress "$decompressor" "$TO" 2>/dev/null | \
|
||||||
|
head -c "${MAX_SIZE}"
|
||||||
|
|
||||||
|
# Following table shows exit codes of each command
|
||||||
|
# in the pipe for various scenarios:
|
||||||
|
#
|
||||||
|
# ----------------------------------------------------
|
||||||
|
# | $COMMAND | TYPE | PIPESTATUS | BEHAVIOUR
|
||||||
|
# ----------------------------------------------------
|
||||||
|
# | cat | partial | 141 141 0 | OK
|
||||||
|
# | cat | full | 0 0 0 | OK
|
||||||
|
# | cat | error | 1 0 0 | fail
|
||||||
|
# | curl | partial | 23 141 0 | OK
|
||||||
|
# | curl | full | 0 0 0 | OK
|
||||||
|
# | curl | error | 22 0 0 | fail
|
||||||
|
# | ssh | partial | 255 141 0 | OK
|
||||||
|
# | ssh | full | 0 0 0 | OK
|
||||||
|
# | ssh | error ssh | 255 0 0 | fail
|
||||||
|
# | ssh | error ssh cat | 1 0 0 | fail
|
||||||
|
if [ \( "${PIPESTATUS[0]}" != '0' -a "${PIPESTATUS[1]}" = '0' \) \
|
||||||
|
-o \( "${PIPESTATUS[1]}" != '0' -a "${PIPESTATUS[1]}" != '141' \) \
|
||||||
|
-o \( "${PIPESTATUS[2]}" != "0" \) ];
|
||||||
|
then
|
||||||
|
echo "Error copying" >&2
|
||||||
|
exit -1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "$HASH_TYPE" ]; then
|
||||||
|
HASH_RESULT=$( cat $HASH_FILE)
|
||||||
|
rm $HASH_FILE
|
||||||
|
if [ "$HASH_RESULT" != "$HASH" ]; then
|
||||||
|
echo "Hash does not match" >&2
|
||||||
|
exit -1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Unarchive only if the destination is filesystem
|
||||||
|
if [ "$TO" != "-" ]; then
|
||||||
|
unarchive "$TO"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Perform any clean operation
|
||||||
|
if [ -n "${clean_command}" ]; then
|
||||||
|
eval "$clean_command"
|
||||||
|
fi
|
|
@ -0,0 +1,60 @@
|
||||||
|
diff --git /var/lib/one/remotes/datastore/downloader.sh /var/lib/one/remotes/datastore/downloader.sh
|
||||||
|
index 9b75d8ee4b..09d2a5d41d 100755
|
||||||
|
--- /var/lib/one/remotes/datastore/downloader.sh
|
||||||
|
+++ /var/lib/one/remotes/datastore/downloader.sh
|
||||||
|
@@ -295,6 +295,45 @@ function get_rbd_cmd
|
||||||
|
echo "ssh '$(esc_sq "$DST_HOST")' \"$RBD export '$(esc_sq "$SOURCE")' -\""
|
||||||
|
}
|
||||||
|
|
||||||
|
+function get_vitastor_cmd
|
||||||
|
+{
|
||||||
|
+ local i j URL_ELEMENTS
|
||||||
|
+
|
||||||
|
+ FROM="$1"
|
||||||
|
+
|
||||||
|
+ URL_RB="$DRIVER_PATH/url.rb"
|
||||||
|
+
|
||||||
|
+ while IFS= read -r -d '' element; do
|
||||||
|
+ URL_ELEMENTS[i++]="$element"
|
||||||
|
+ done < <($URL_RB "$FROM" \
|
||||||
|
+ USER \
|
||||||
|
+ HOST \
|
||||||
|
+ SOURCE \
|
||||||
|
+ PARAM_DS \
|
||||||
|
+ PARAM_VITASTOR_CONF)
|
||||||
|
+
|
||||||
|
+ USER="${URL_ELEMENTS[j++]}"
|
||||||
|
+ DST_HOST="${URL_ELEMENTS[j++]}"
|
||||||
|
+ SOURCE="${URL_ELEMENTS[j++]}"
|
||||||
|
+ DS="${URL_ELEMENTS[j++]}"
|
||||||
|
+ VITASTOR_CONF="${URL_ELEMENTS[j++]}"
|
||||||
|
+
|
||||||
|
+ # Remove leading '/'
|
||||||
|
+ SOURCE="${SOURCE#/}"
|
||||||
|
+
|
||||||
|
+ if [ -n "$USER" ]; then
|
||||||
|
+ DST_HOST="$USER@$DST_HOST"
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ local CLI
|
||||||
|
+ CLI="vitastor-cli"
|
||||||
|
+ if [ -n "$VITASTOR_CONF" ]; then
|
||||||
|
+ CLI="$CLI --config_path '$(esc_sq "${VITASTOR_CONF}")'"
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ echo "ssh '$(esc_sq "$DST_HOST")' \"$CLI dd iimg='$(esc_sq "$SOURCE")'\""
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
# Compare 2 version strings using sort -V
|
||||||
|
# Usage:
|
||||||
|
# verlte "3.2.9" "3.4.0"
|
||||||
|
@@ -424,6 +463,9 @@ s3://*)
|
||||||
|
rbd://*)
|
||||||
|
command="$(get_rbd_cmd "$FROM")"
|
||||||
|
;;
|
||||||
|
+vitastor://*)
|
||||||
|
+ command="$(get_vitastor_cmd "$FROM")"
|
||||||
|
+ ;;
|
||||||
|
vcenter://*)
|
||||||
|
command="$VAR_LOCATION/remotes/datastore/vcenter_downloader.rb '$(esc_sq "$FROM")'"
|
||||||
|
;;
|
|
@ -0,0 +1,114 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
# This script is used to export an image to qcow2 file
|
||||||
|
|
||||||
|
# ------------ Set up the environment to source common tools ------------
|
||||||
|
|
||||||
|
if [ -z "${ONE_LOCATION}" ]; then
|
||||||
|
LIB_LOCATION=/usr/lib/one
|
||||||
|
else
|
||||||
|
LIB_LOCATION=$ONE_LOCATION/lib
|
||||||
|
fi
|
||||||
|
|
||||||
|
. $LIB_LOCATION/sh/scripts_common.sh
|
||||||
|
|
||||||
|
DRIVER_PATH=$(dirname $0)
|
||||||
|
source ${DRIVER_PATH}/../libfs.sh
|
||||||
|
|
||||||
|
# -------- Get rm and datastore arguments from OpenNebula core ------------
|
||||||
|
|
||||||
|
DRV_ACTION=`cat -`
|
||||||
|
ID=$1
|
||||||
|
|
||||||
|
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||||
|
|
||||||
|
unset i XPATH_ELEMENTS
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <($XPATH \
|
||||||
|
/DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \
|
||||||
|
/DS_DRIVER_ACTION_DATA/IMAGE/SIZE \
|
||||||
|
/DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/MD5 \
|
||||||
|
/DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/SHA1 \
|
||||||
|
/DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/FORMAT \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VITASTOR_CONF)
|
||||||
|
|
||||||
|
unset i
|
||||||
|
|
||||||
|
SRC="${XPATH_ELEMENTS[i++]}"
|
||||||
|
SIZE="${XPATH_ELEMENTS[i++]}"
|
||||||
|
MD5="${XPATH_ELEMENTS[i++]}"
|
||||||
|
SHA1="${XPATH_ELEMENTS[i++]}"
|
||||||
|
FORMAT="${XPATH_ELEMENTS[i++]:-raw}"
|
||||||
|
BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
|
||||||
|
VITASTOR_CONF="${XPATH_ELEMENTS[i++]}"
|
||||||
|
|
||||||
|
DST_HOST=`get_destination_host $ID`
|
||||||
|
|
||||||
|
if [ -z "$DST_HOST" ]; then
|
||||||
|
error_message "Datastore template missing 'BRIDGE_LIST' attribute."
|
||||||
|
exit -1
|
||||||
|
fi
|
||||||
|
|
||||||
|
IMPORT_SOURCE="vitastor://$DST_HOST/$SRC"
|
||||||
|
IS_JOIN="?"
|
||||||
|
|
||||||
|
CLI=vitastor-cli
|
||||||
|
if [ -n "$VITASTOR_CONF" ]; then
|
||||||
|
CLI="$CLI --config_path $VITASTOR_CONF"
|
||||||
|
IMPORT_SOURCE="${IMPORT_SOURCE}${IS_JOIN}VITASTOR_CONF=${VITASTOR_CONF}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# FIXME: this is inefficient - it pipes the image twice...
|
||||||
|
|
||||||
|
INFO_SCRIPT=$(cat <<EOF
|
||||||
|
if [ -z "$MD5" ]; then
|
||||||
|
CHECKSUM=\$(
|
||||||
|
$CLI dd iimg=${SRC} | ${MD5SUM} | cut -f1 -d' '
|
||||||
|
ps=\$PIPESTATUS
|
||||||
|
|
||||||
|
if [ "\$ps" != "0" ]; then
|
||||||
|
exit \$ps
|
||||||
|
fi
|
||||||
|
)
|
||||||
|
|
||||||
|
status=\$?
|
||||||
|
|
||||||
|
[ "\$status" != "0" ] && exit \$status
|
||||||
|
else
|
||||||
|
CHECKSUM="$MD5"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -z "\$CHECKSUM" ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
cat <<EOT
|
||||||
|
<MD5><![CDATA[\$CHECKSUM]]></MD5>
|
||||||
|
<SIZE><![CDATA[$SIZE]]></SIZE>
|
||||||
|
<FORMAT><![CDATA[${FORMAT}]]></FORMAT>
|
||||||
|
EOT
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
INFO=$(ssh_monitor_and_log "$DST_HOST" "$INFO_SCRIPT" "Image info script" 2>&1)
|
||||||
|
INFO_STATUS=$?
|
||||||
|
|
||||||
|
if [ "$INFO_STATUS" != "0" ]; then
|
||||||
|
echo "$INFO"
|
||||||
|
exit $INFO_STATUS
|
||||||
|
fi
|
||||||
|
|
||||||
|
cat <<EOF
|
||||||
|
<IMPORT_INFO>
|
||||||
|
<IMPORT_SOURCE><![CDATA[$IMPORT_SOURCE]]></IMPORT_SOURCE>
|
||||||
|
$INFO
|
||||||
|
<DISPOSE>NO</DISPOSE>
|
||||||
|
</IMPORT_INFO>"
|
||||||
|
EOF
|
|
@ -0,0 +1,124 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
# This script is used to create a VM image (SRC) of size (SIZE) and formatted as (FS)
|
||||||
|
|
||||||
|
# -------- Set up the environment to source common tools & conf ------------
|
||||||
|
|
||||||
|
if [ -z "${ONE_LOCATION}" ]; then
|
||||||
|
LIB_LOCATION=/usr/lib/one
|
||||||
|
else
|
||||||
|
LIB_LOCATION=$ONE_LOCATION/lib
|
||||||
|
fi
|
||||||
|
|
||||||
|
. $LIB_LOCATION/sh/scripts_common.sh
|
||||||
|
|
||||||
|
DRIVER_PATH=$(dirname $0)
|
||||||
|
source ${DRIVER_PATH}/../libfs.sh
|
||||||
|
source ${DRIVER_PATH}/../../etc/datastore/datastore.conf
|
||||||
|
|
||||||
|
# -------- Get mkfs and datastore arguments from OpenNebula core ------------
|
||||||
|
|
||||||
|
DRV_ACTION=`cat -`
|
||||||
|
ID=$1
|
||||||
|
|
||||||
|
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||||
|
|
||||||
|
unset i XPATH_ELEMENTS
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <($XPATH \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/RESTRICTED_DIRS \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/SAFE_DIRS \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/IMAGE_PREFIX \
|
||||||
|
/DS_DRIVER_ACTION_DATA/IMAGE/FORMAT \
|
||||||
|
/DS_DRIVER_ACTION_DATA/IMAGE/SIZE \
|
||||||
|
/DS_DRIVER_ACTION_DATA/IMAGE/FS \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VITASTOR_CONF)
|
||||||
|
|
||||||
|
unset i
|
||||||
|
|
||||||
|
BASE_PATH="${XPATH_ELEMENTS[i++]}"
|
||||||
|
RESTRICTED_DIRS="${XPATH_ELEMENTS[i++]}"
|
||||||
|
SAFE_DIRS="${XPATH_ELEMENTS[i++]}"
|
||||||
|
BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
|
||||||
|
POOL_NAME="${XPATH_ELEMENTS[i++]}"
|
||||||
|
IMAGE_PREFIX="${XPATH_ELEMENTS[i++]:-one}"
|
||||||
|
FORMAT="${XPATH_ELEMENTS[i++]}"
|
||||||
|
SIZE="${XPATH_ELEMENTS[i++]}"
|
||||||
|
FS="${XPATH_ELEMENTS[i++]}"
|
||||||
|
VITASTOR_CONF="${XPATH_ELEMENTS[i++]}"
|
||||||
|
|
||||||
|
DST_HOST=`get_destination_host $ID`
|
||||||
|
|
||||||
|
if [ -z "$DST_HOST" ]; then
|
||||||
|
error_message "Datastore template missing 'BRIDGE_LIST' attribute."
|
||||||
|
exit -1
|
||||||
|
fi
|
||||||
|
|
||||||
|
CLI=
|
||||||
|
if [ -n "$VITASTOR_CONF" ]; then
|
||||||
|
CLI="$CLI --config_path ${VITASTOR_CONF}"
|
||||||
|
fi
|
||||||
|
if [ -n "$POOL_NAME" ]; then
|
||||||
|
CLI="$CLI --pool ${POOL_NAME}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS"
|
||||||
|
|
||||||
|
IMAGE_NAME="${IMAGE_PREFIX}-${ID}"
|
||||||
|
|
||||||
|
# ------------ Image to save_as disk, no need to create a new image ------------
|
||||||
|
|
||||||
|
if [ "$FORMAT" = "save_as" ]; then
|
||||||
|
echo "$IMAGE_NAME"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ------------ Create the image in the repository ------------
|
||||||
|
|
||||||
|
# FIXME: Duplicate code with tm/vitastor/mkimage
|
||||||
|
|
||||||
|
MKIMAGE_CMD=$(cat <<EOF
|
||||||
|
set -e -o pipefail
|
||||||
|
export PATH=/usr/sbin:/sbin:\$PATH
|
||||||
|
vitastor-cli $CLI create --pool "${POOL_NAME}" "$IMAGE_NAME" --size "${SIZE}M"
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
if [ -n "$FS" -o "$FORMAT" = "swap" ]; then
|
||||||
|
MKFS_CMD=`mkfs_command '$NBD' raw "$SIZE" "$SUPPORTED_FS" "$FS" "$FS_OPTS" | grep -v $QEMU_IMG`
|
||||||
|
fi
|
||||||
|
|
||||||
|
MKIMAGE_CMD=$(cat <<EOF
|
||||||
|
set -e -o pipefail
|
||||||
|
export PATH=/usr/sbin:/sbin:\$PATH
|
||||||
|
vitastor-cli $CLI create --pool "${POOL_NAME}" "$IMAGE_NAME" --size "${SIZE}M"
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
if [ ! -z $FS ]; then
|
||||||
|
set -e -o pipefail
|
||||||
|
|
||||||
|
IMAGE_HASH=`generate_image_hash`
|
||||||
|
FS_OPTS=$(eval $(echo "echo \$FS_OPTS_$FS"))
|
||||||
|
|
||||||
|
MKFS_CMD=`mkfs_command '$NBD' raw "$SIZE" "$SUPPORTED_FS" "$FS" "$FS_OPTS" | grep -v $QEMU_IMG`
|
||||||
|
MKIMAGE_CMD=$(cat <<EOF
|
||||||
|
$MKIMAGE_CMD
|
||||||
|
NBD=\$(sudo vitastor-nbd $CLI map --image "$IMAGE_NAME")
|
||||||
|
trap "sudo vitastor-nbd $CLI unmap \$NBD" EXIT
|
||||||
|
$MKFS_CMD
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
fi
|
||||||
|
|
||||||
|
ssh_exec_and_log "$DST_HOST" "$MKIMAGE_CMD" "Error registering $IMAGE_NAME in $DST_HOST"
|
||||||
|
|
||||||
|
echo "$IMAGE_NAME"
|
|
@ -0,0 +1,64 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
# This script is used to monitor the free and used space of a datastore
|
||||||
|
|
||||||
|
# -------- Set up the environment to source common tools & conf ------------
|
||||||
|
|
||||||
|
if [ -z "${ONE_LOCATION}" ]; then
|
||||||
|
LIB_LOCATION=/usr/lib/one
|
||||||
|
else
|
||||||
|
LIB_LOCATION=$ONE_LOCATION/lib
|
||||||
|
fi
|
||||||
|
|
||||||
|
. $LIB_LOCATION/sh/scripts_common.sh
|
||||||
|
|
||||||
|
DRIVER_PATH=$(dirname $0)
|
||||||
|
source ${DRIVER_PATH}/../../datastore/libfs.sh
|
||||||
|
|
||||||
|
# -------- Get datastore arguments from OpenNebula core ------------
|
||||||
|
|
||||||
|
DRV_ACTION=`cat -`
|
||||||
|
ID=$1
|
||||||
|
|
||||||
|
XPATH="${DRIVER_PATH}/../../datastore/xpath.rb -b $DRV_ACTION"
|
||||||
|
|
||||||
|
unset i j XPATH_ELEMENTS
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <($XPATH \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VITASTOR_CONF)
|
||||||
|
|
||||||
|
BRIDGE_LIST="${XPATH_ELEMENTS[j++]}"
|
||||||
|
POOL_NAME="${XPATH_ELEMENTS[j++]}"
|
||||||
|
VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
|
||||||
|
|
||||||
|
HOST=`get_destination_host`
|
||||||
|
|
||||||
|
if [ -z "$HOST" ]; then
|
||||||
|
error_message "Datastore template missing 'BRIDGE_LIST' attribute."
|
||||||
|
exit -1
|
||||||
|
fi
|
||||||
|
|
||||||
|
CLI=vitastor-cli
|
||||||
|
if [ -n "$VITASTOR_CONF" ]; then
|
||||||
|
CLI="$CLI --config_path ${VITASTOR_CONF}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ------------ Compute datastore usage -------------
|
||||||
|
|
||||||
|
MONITOR_SCRIPT=$(cat <<EOF
|
||||||
|
vitastor-cli df --json | jq -r '.[] | select(.name == "${POOL_NAME}") |
|
||||||
|
"TOTAL_MB="+(.total_raw/.raw_to_usable/1024/1024 | tostring)+
|
||||||
|
"\nUSED_MB="+(.used_raw/.raw_to_usable/1024/1024 | tostring)+
|
||||||
|
"\nFREE_MB="+(.max_available/1024/1024 | tostring)'
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
ssh_monitor_and_log $HOST "$MONITOR_SCRIPT 2>&1" "Error monitoring ${POOL_NAME} in $HOST"
|
|
@ -0,0 +1,73 @@
|
||||||
|
diff --git /etc/one/oned.conf /etc/one/oned.conf
|
||||||
|
index be02d646a8..27f876ec36 100644
|
||||||
|
--- /etc/one/oned.conf
|
||||||
|
+++ /etc/one/oned.conf
|
||||||
|
@@ -481,7 +481,7 @@ VM_MAD = [
|
||||||
|
NAME = "kvm",
|
||||||
|
SUNSTONE_NAME = "KVM",
|
||||||
|
EXECUTABLE = "one_vmm_exec",
|
||||||
|
- ARGUMENTS = "-t 15 -r 0 kvm -p",
|
||||||
|
+ ARGUMENTS = "-t 15 -r 0 kvm -p -l deploy=deploy.vitastor",
|
||||||
|
DEFAULT = "vmm_exec/vmm_exec_kvm.conf",
|
||||||
|
TYPE = "kvm",
|
||||||
|
KEEP_SNAPSHOTS = "yes",
|
||||||
|
@@ -592,7 +592,7 @@ VM_MAD = [
|
||||||
|
|
||||||
|
TM_MAD = [
|
||||||
|
EXECUTABLE = "one_tm",
|
||||||
|
- ARGUMENTS = "-t 15 -d dummy,lvm,shared,fs_lvm,fs_lvm_ssh,qcow2,ssh,ceph,dev,vcenter,iscsi_libvirt"
|
||||||
|
+ ARGUMENTS = "-t 15 -d dummy,lvm,shared,fs_lvm,fs_lvm_ssh,qcow2,ssh,ceph,vitastor,dev,vcenter,iscsi_libvirt"
|
||||||
|
]
|
||||||
|
|
||||||
|
#*******************************************************************************
|
||||||
|
@@ -612,7 +612,7 @@ TM_MAD = [
|
||||||
|
|
||||||
|
DATASTORE_MAD = [
|
||||||
|
EXECUTABLE = "one_datastore",
|
||||||
|
- ARGUMENTS = "-t 15 -d dummy,fs,lvm,ceph,dev,iscsi_libvirt,vcenter,restic,rsync -s shared,ssh,ceph,fs_lvm,fs_lvm_ssh,qcow2,vcenter"
|
||||||
|
+ ARGUMENTS = "-t 15 -d dummy,fs,lvm,ceph,vitastor,dev,iscsi_libvirt,vcenter,restic,rsync -s shared,ssh,ceph,vitastor,fs_lvm,fs_lvm_ssh,qcow2,vcenter"
|
||||||
|
]
|
||||||
|
|
||||||
|
#*******************************************************************************
|
||||||
|
@@ -1050,6 +1050,9 @@ INHERIT_DATASTORE_ATTR = "VCENTER_DS_IMAGE_DIR"
|
||||||
|
INHERIT_DATASTORE_ATTR = "VCENTER_DS_VOLATILE_DIR"
|
||||||
|
INHERIT_DATASTORE_ATTR = "VCENTER_INSTANCE_ID"
|
||||||
|
|
||||||
|
+INHERIT_DATASTORE_ATTR = "VITASTOR_CONF"
|
||||||
|
+INHERIT_DATASTORE_ATTR = "IMAGE_PREFIX"
|
||||||
|
+
|
||||||
|
INHERIT_IMAGE_ATTR = "DISK_TYPE"
|
||||||
|
INHERIT_IMAGE_ATTR = "VCENTER_ADAPTER_TYPE"
|
||||||
|
INHERIT_IMAGE_ATTR = "VCENTER_DISK_TYPE"
|
||||||
|
@@ -1180,6 +1183,14 @@ TM_MAD_CONF = [
|
||||||
|
CLONE_TARGET_SHARED = "SELF", DISK_TYPE_SHARED = "RBD"
|
||||||
|
]
|
||||||
|
|
||||||
|
+TM_MAD_CONF = [
|
||||||
|
+ NAME = "vitastor", LN_TARGET = "NONE", CLONE_TARGET = "SELF", SHARED = "YES",
|
||||||
|
+ DS_MIGRATE = "NO", DRIVER = "raw", ALLOW_ORPHANS="format",
|
||||||
|
+ TM_MAD_SYSTEM = "ssh,shared", LN_TARGET_SSH = "SYSTEM", CLONE_TARGET_SSH = "SYSTEM",
|
||||||
|
+ DISK_TYPE_SSH = "FILE", LN_TARGET_SHARED = "NONE",
|
||||||
|
+ CLONE_TARGET_SHARED = "SELF", DISK_TYPE_SHARED = "FILE"
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
TM_MAD_CONF = [
|
||||||
|
NAME = "iscsi_libvirt", LN_TARGET = "NONE", CLONE_TARGET = "SELF", SHARED = "YES",
|
||||||
|
DS_MIGRATE = "NO", DRIVER = "raw"
|
||||||
|
@@ -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,63 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
# This script is used to remove a VM image from the image repository
|
||||||
|
|
||||||
|
# ------------ Set up the environment to source common tools ------------
|
||||||
|
if [ -z "${ONE_LOCATION}" ]; then
|
||||||
|
LIB_LOCATION=/usr/lib/one
|
||||||
|
else
|
||||||
|
LIB_LOCATION=$ONE_LOCATION/lib
|
||||||
|
fi
|
||||||
|
|
||||||
|
. $LIB_LOCATION/sh/scripts_common.sh
|
||||||
|
|
||||||
|
DRIVER_PATH=$(dirname $0)
|
||||||
|
|
||||||
|
source ${DRIVER_PATH}/../libfs.sh
|
||||||
|
|
||||||
|
# -------- Get rm and datastore arguments from OpenNebula core ------------
|
||||||
|
|
||||||
|
DRV_ACTION=`cat -`
|
||||||
|
ID=$1
|
||||||
|
|
||||||
|
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||||
|
|
||||||
|
unset i j XPATH_ELEMENTS
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <($XPATH \
|
||||||
|
/DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VITASTOR_CONF)
|
||||||
|
|
||||||
|
IMAGE_NAME="${XPATH_ELEMENTS[j++]}"
|
||||||
|
BRIDGE_LIST="${XPATH_ELEMENTS[j++]}"
|
||||||
|
VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
|
||||||
|
|
||||||
|
DST_HOST=`get_destination_host $ID`
|
||||||
|
|
||||||
|
if [ -z "$DST_HOST" ]; then
|
||||||
|
error_message "Datastore template missing 'BRIDGE_LIST' attribute."
|
||||||
|
exit -1
|
||||||
|
fi
|
||||||
|
|
||||||
|
CLI=vitastor-cli
|
||||||
|
if [ -n "$VITASTOR_CONF" ]; then
|
||||||
|
CLI="$CLI --config_path ${VITASTOR_CONF}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# -------- Remove Image from Datastore ------------
|
||||||
|
|
||||||
|
log "Removing $IMAGE_NAME from the image repository in $DST_HOST"
|
||||||
|
|
||||||
|
DELETE_CMD=$(cat <<EOF
|
||||||
|
$CLI rm $IMAGE_NAME
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
ssh_exec_and_log "$DST_HOST" "$DELETE_CMD" "Error deleting $IMAGE_NAME in $DST_HOST"
|
|
@ -0,0 +1,64 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
# This script is used to delete a snapshot of an image
|
||||||
|
|
||||||
|
# -------- Set up the environment to source common tools & conf ------------
|
||||||
|
|
||||||
|
if [ -z "${ONE_LOCATION}" ]; then
|
||||||
|
LIB_LOCATION=/usr/lib/one
|
||||||
|
else
|
||||||
|
LIB_LOCATION=$ONE_LOCATION/lib
|
||||||
|
fi
|
||||||
|
|
||||||
|
. $LIB_LOCATION/sh/scripts_common.sh
|
||||||
|
|
||||||
|
DRIVER_PATH=$(dirname $0)
|
||||||
|
|
||||||
|
source ${DRIVER_PATH}/../libfs.sh
|
||||||
|
|
||||||
|
# -------- Get image and datastore arguments from OpenNebula core ------------
|
||||||
|
|
||||||
|
DRV_ACTION=`cat -`
|
||||||
|
ID=$1
|
||||||
|
|
||||||
|
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||||
|
|
||||||
|
unset i XPATH_ELEMENTS
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <($XPATH \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
|
||||||
|
/DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \
|
||||||
|
/DS_DRIVER_ACTION_DATA/IMAGE/TARGET_SNAPSHOT \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VITASTOR_CONF)
|
||||||
|
|
||||||
|
unset i
|
||||||
|
|
||||||
|
BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
|
||||||
|
IMAGE_NAME="${XPATH_ELEMENTS[i++]}"
|
||||||
|
SNAP_ID="${XPATH_ELEMENTS[i++]}"
|
||||||
|
VITASTOR_CONF="${XPATH_ELEMENTS[i++]}"
|
||||||
|
|
||||||
|
DST_HOST=`get_destination_host $ID`
|
||||||
|
|
||||||
|
if [ -z "$DST_HOST" ]; then
|
||||||
|
error_message "Datastore template missing 'BRIDGE_LIST' attribute."
|
||||||
|
exit -1
|
||||||
|
fi
|
||||||
|
|
||||||
|
CLI=vitastor-cli
|
||||||
|
if [ -n "$VITASTOR_CONF" ]; then
|
||||||
|
CLI="$CLI --config_path ${VITASTOR_CONF}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
SNAP_DELETE_CMD=$(cat <<EOF
|
||||||
|
$CLI rm ${IMAGE_NAME}@${SNAP_ID}
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
ssh_exec_and_log "$DST_HOST" "$SNAP_DELETE_CMD" "Error deleting snapshot $IMAGE_NAME-$SNAP_ID@$SNAP_ID"
|
|
@ -0,0 +1,69 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
# This script is used to flatten a snapshot of a persistent image
|
||||||
|
|
||||||
|
# -------- Set up the environment to source common tools & conf ------------
|
||||||
|
|
||||||
|
if [ -z "${ONE_LOCATION}" ]; then
|
||||||
|
LIB_LOCATION=/usr/lib/one
|
||||||
|
else
|
||||||
|
LIB_LOCATION=$ONE_LOCATION/lib
|
||||||
|
fi
|
||||||
|
|
||||||
|
. $LIB_LOCATION/sh/scripts_common.sh
|
||||||
|
|
||||||
|
DRIVER_PATH=$(dirname $0)
|
||||||
|
|
||||||
|
source ${DRIVER_PATH}/../libfs.sh
|
||||||
|
|
||||||
|
# -------- Get image and datastore arguments from OpenNebula core ------------
|
||||||
|
|
||||||
|
DRV_ACTION=`cat -`
|
||||||
|
ID=$1
|
||||||
|
|
||||||
|
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||||
|
|
||||||
|
unset i XPATH_ELEMENTS
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <($XPATH \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME \
|
||||||
|
/DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \
|
||||||
|
/DS_DRIVER_ACTION_DATA/IMAGE/TARGET_SNAPSHOT \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VITASTOR_CONF)
|
||||||
|
|
||||||
|
unset i
|
||||||
|
|
||||||
|
BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
|
||||||
|
POOL_NAME="${XPATH_ELEMENTS[i++]}"
|
||||||
|
IMAGE_NAME="${XPATH_ELEMENTS[i++]}"
|
||||||
|
SNAP_ID="${XPATH_ELEMENTS[i++]}"
|
||||||
|
VITASTOR_CONF="${XPATH_ELEMENTS[i++]}"
|
||||||
|
|
||||||
|
DST_HOST=`get_destination_host $ID`
|
||||||
|
|
||||||
|
if [ -z "$DST_HOST" ]; then
|
||||||
|
error_message "Datastore template missing 'BRIDGE_LIST' attribute."
|
||||||
|
exit -1
|
||||||
|
fi
|
||||||
|
|
||||||
|
CLI=vitastor-cli
|
||||||
|
if [ -n "$VITASTOR_CONF" ]; then
|
||||||
|
CLI="$CLI --config_path ${VITASTOR_CONF}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
SNAP_FLATTEN_CMD=$(cat <<EOF
|
||||||
|
set -e
|
||||||
|
$CLI flatten "$IMAGE_NAME@$SNAP_ID"
|
||||||
|
$CLI modify "$IMAGE_NAME@$SNAP_ID" --rename "$IMAGE_NAME"
|
||||||
|
$CLI rm --matching "$IMAGE_NAME@*"
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
ssh_exec_and_log "$DST_HOST" "$SNAP_FLATTEN_CMD" "Error flattening snapshot $SNAP_ID for $IMAGE_NAME"
|
|
@ -0,0 +1,72 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
# This script is used to revert a snapshot of an image
|
||||||
|
|
||||||
|
# -------- Set up the environment to source common tools & conf ------------
|
||||||
|
|
||||||
|
if [ -z "${ONE_LOCATION}" ]; then
|
||||||
|
LIB_LOCATION=/usr/lib/one
|
||||||
|
else
|
||||||
|
LIB_LOCATION=$ONE_LOCATION/lib
|
||||||
|
fi
|
||||||
|
|
||||||
|
. $LIB_LOCATION/sh/scripts_common.sh
|
||||||
|
|
||||||
|
DRIVER_PATH=$(dirname $0)
|
||||||
|
|
||||||
|
source ${DRIVER_PATH}/../libfs.sh
|
||||||
|
|
||||||
|
# -------- Get image and datastore arguments from OpenNebula core ------------
|
||||||
|
|
||||||
|
DRV_ACTION=`cat -`
|
||||||
|
ID=$1
|
||||||
|
|
||||||
|
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||||
|
|
||||||
|
unset i XPATH_ELEMENTS
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <($XPATH \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME \
|
||||||
|
/DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \
|
||||||
|
/DS_DRIVER_ACTION_DATA/IMAGE/TARGET_SNAPSHOT \
|
||||||
|
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VITASTOR_CONF)
|
||||||
|
|
||||||
|
unset i
|
||||||
|
|
||||||
|
BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
|
||||||
|
POOL_NAME="${XPATH_ELEMENTS[i++]}"
|
||||||
|
IMAGE_NAME="${XPATH_ELEMENTS[i++]}"
|
||||||
|
SNAP_ID="${XPATH_ELEMENTS[i++]}"
|
||||||
|
VITASTOR_CONF="${XPATH_ELEMENTS[i++]}"
|
||||||
|
|
||||||
|
DST_HOST=`get_destination_host $ID`
|
||||||
|
|
||||||
|
if [ -z "$DST_HOST" ]; then
|
||||||
|
error_message "Datastore template missing 'BRIDGE_LIST' attribute."
|
||||||
|
exit -1
|
||||||
|
fi
|
||||||
|
|
||||||
|
CLI=vitastor-cli
|
||||||
|
if [ -n "$VITASTOR_CONF" ]; then
|
||||||
|
CLI="$CLI --config_path ${VITASTOR_CONF}"
|
||||||
|
fi
|
||||||
|
if [ -n "$POOL_NAME" ]; then
|
||||||
|
CLI="$CLI --pool ${POOL_NAME}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
SNAP_REVERT_CMD=$(cat <<EOF
|
||||||
|
$CLI rm ${IMAGE_NAME}.flatten || true
|
||||||
|
$CLI create --pool "${POOL_NAME}" --parent ${IMAGE_NAME}@${SNAP_ID} ${IMAGE_NAME}.flatten
|
||||||
|
$CLI rm ${IMAGE_NAME} || true
|
||||||
|
$CLI modify ${IMAGE_NAME}.flatten --rename ${IMAGE_NAME}
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
ssh_exec_and_log "$DST_HOST" "$SNAP_REVERT_CMD" "Error reverting snapshot $SNAP_ID for $IMAGE_NAME"
|
|
@ -0,0 +1 @@
|
||||||
|
../ceph/stat
|
|
@ -0,0 +1,12 @@
|
||||||
|
diff --git /etc/one/vmm_exec/vmm_execrc /etc/one/vmm_exec/vmm_execrc
|
||||||
|
index e210526e63..cb51d3b5e8 100644
|
||||||
|
--- /etc/one/vmm_exec/vmm_execrc
|
||||||
|
+++ /etc/one/vmm_exec/vmm_execrc
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
# Space separated list of VMM-TM pairs that support live disk snapshots. VMM
|
||||||
|
# and TM must be separated by '-'
|
||||||
|
-LIVE_DISK_SNAPSHOTS="kvm-qcow2 kvm-shared kvm-ceph kvm-ssh qemu-qcow2 qemu-shared qemu-ceph qemu-ssh"
|
||||||
|
+LIVE_DISK_SNAPSHOTS="kvm-qcow2 kvm-shared kvm-ceph kvm-vitastor kvm-ssh qemu-qcow2 qemu-shared qemu-ceph qemu-ssh"
|
||||||
|
|
||||||
|
# Space separated list VNM_MAD-ACTION pairs that run locally
|
||||||
|
VNMAD_LOCAL_ACTIONS="elastic-post elastic-clean"
|
|
@ -0,0 +1,97 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
# clone fe:SOURCE host:remote_system_ds/disk.i size
|
||||||
|
# - fe is the front-end hostname
|
||||||
|
# - SOURCE is the path of the disk image in the form DS_BASE_PATH/disk
|
||||||
|
# - host is the target host to deploy the VM
|
||||||
|
# - remote_system_ds is the path for the system datastore in the host
|
||||||
|
|
||||||
|
SRC=$1
|
||||||
|
DST=$2
|
||||||
|
VM_ID=$3
|
||||||
|
DS_ID=$4
|
||||||
|
|
||||||
|
#--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
if [ -z "${ONE_LOCATION}" ]; then
|
||||||
|
TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
|
||||||
|
LIB_LOCATION=/usr/lib/one
|
||||||
|
else
|
||||||
|
TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh
|
||||||
|
LIB_LOCATION=$ONE_LOCATION/lib
|
||||||
|
fi
|
||||||
|
|
||||||
|
DRIVER_PATH=$(dirname $0)
|
||||||
|
|
||||||
|
source $TMCOMMON
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Compute the destination image name
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
DST_HOST=`arg_host $DST`
|
||||||
|
|
||||||
|
SRC_PATH=`arg_path $SRC`
|
||||||
|
DST_PATH=`arg_path $DST`
|
||||||
|
|
||||||
|
DST_DIR=`dirname $DST_PATH`
|
||||||
|
|
||||||
|
DISK_ID=$(echo $DST|awk -F. '{print $NF}')
|
||||||
|
VM_DST="${SRC_PATH}-${VM_ID}-${DISK_ID}"
|
||||||
|
DST_DS_ID=`echo $DST | sed s#//*#/#g | awk -F/ '{print $(NF-2)}'`
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Get Image information
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
|
||||||
|
|
||||||
|
unset i j XPATH_ELEMENTS
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <(onevm show -x $VM_ID | $XPATH \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/VITASTOR_CONF \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SIZE)
|
||||||
|
|
||||||
|
VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
|
||||||
|
SIZE="${XPATH_ELEMENTS[j++]}"
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Get Datastore information
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
unset i j XPATH_ELEMENTS
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <(onedatastore show -x $DST_DS_ID | $XPATH \
|
||||||
|
/DATASTORE/TEMPLATE/POOL_NAME)
|
||||||
|
|
||||||
|
POOL_NAME="${XPATH_ELEMENTS[j++]}"
|
||||||
|
|
||||||
|
disable_local_monitoring $DST_HOST $DST_DIR
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Clone the image
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
CLI=vitastor-cli
|
||||||
|
if [ -n "$VITASTOR_CONF" ]; then
|
||||||
|
CLI="$CLI --config_path ${VITASTOR_CONF}"
|
||||||
|
fi
|
||||||
|
if [ -n "$POOL_NAME" ]; then
|
||||||
|
CLI="$CLI --pool ${POOL_NAME}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
CLONE_CMD=$(cat <<EOF
|
||||||
|
$CLI create --parent $SRC_PATH --size ${SIZE}M $VM_DST
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
ssh_exec_and_log "$DST_HOST" "$CLONE_CMD" "Error cloning $SRC_PATH to $VM_DST in $DST_HOST"
|
||||||
|
exit 0
|
|
@ -0,0 +1 @@
|
||||||
|
../ceph/context
|
|
@ -0,0 +1,113 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
# cpds host:remote_system_ds/disk.i fe:SOURCE snapid vmid dsid
|
||||||
|
# - fe is the front-end hostname
|
||||||
|
# - SOURCE is the path of the disk image in the form DS_BASE_PATH/disk
|
||||||
|
# - host is the target host to deploy the VM
|
||||||
|
# - remote_system_ds is the path for the system datastore in the host
|
||||||
|
# - snapid is the snapshot id. "-1" for none
|
||||||
|
|
||||||
|
SRC=$1
|
||||||
|
DST=$2
|
||||||
|
SNAP_ID=$3
|
||||||
|
VM_ID=$4
|
||||||
|
DS_ID=$5
|
||||||
|
|
||||||
|
#--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
if [ -z "${ONE_LOCATION}" ]; then
|
||||||
|
TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
|
||||||
|
LIB_LOCATION=/usr/lib/one
|
||||||
|
else
|
||||||
|
TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh
|
||||||
|
LIB_LOCATION=$ONE_LOCATION/lib
|
||||||
|
fi
|
||||||
|
|
||||||
|
DRIVER_PATH=$(dirname $0)
|
||||||
|
|
||||||
|
source $TMCOMMON
|
||||||
|
source ${DRIVER_PATH}/../../datastore/libfs.sh
|
||||||
|
source ${DRIVER_PATH}/../../etc/vmm/kvm/kvmrc
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Set dst path and dir
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
SRC_HOST=`arg_host $SRC`
|
||||||
|
SRC_PATH=`arg_path $SRC`
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Get Image information
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
DISK_ID=$(echo "$SRC_PATH" | $AWK -F. '{print $NF}')
|
||||||
|
|
||||||
|
XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
|
||||||
|
|
||||||
|
unset i j XPATH_ELEMENTS
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <(onevm show -x $VM_ID | $XPATH \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SOURCE \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/VITASTOR_CONF \
|
||||||
|
/VM/LCM_STATE)
|
||||||
|
|
||||||
|
SRC_IMAGE="${XPATH_ELEMENTS[j++]}"
|
||||||
|
CLONE="${XPATH_ELEMENTS[j++]}"
|
||||||
|
VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
|
||||||
|
LCM_STATE="${XPATH_ELEMENTS[j++]}"
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Get Datastore information
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
unset i j XPATH_ELEMENTS
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <(onedatastore show -x $DS_ID | $XPATH \
|
||||||
|
/DATASTORE/TEMPLATE/POOL_NAME \
|
||||||
|
/DATASTORE/TEMPLATE/BRIDGE_LIST)
|
||||||
|
|
||||||
|
POOL_NAME="${XPATH_ELEMENTS[j++]}"
|
||||||
|
BRIDGE_LIST="${XPATH_ELEMENTS[j++]}"
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Copy Image back to the datastore
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
if [ "$CLONE" = "YES" ]; then
|
||||||
|
SRC_IMAGE="${SRC_IMAGE}-${VM_ID}-${DISK_ID}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
CLI=vitastor-cli
|
||||||
|
if [ -n "$VITASTOR_CONF" ]; then
|
||||||
|
CLI="$CLI --config_path ${VITASTOR_CONF}"
|
||||||
|
fi
|
||||||
|
if [ -n "$POOL_NAME" ]; then
|
||||||
|
CLI="$CLI --pool ${POOL_NAME}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Undeployed VM state, do not use front-end, choose host from bridge_list
|
||||||
|
if [ "$LCM_STATE" = '67' ] || [ "$LCM_STATE" = '68' ]; then
|
||||||
|
if [ -n "$BRIDGE_LIST" ]; then
|
||||||
|
SRC_HOST=`get_destination_host`
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$SNAP_ID" != "-1" ]; then
|
||||||
|
SRC_IMAGE=$SRC_IMAGE@$SNAP_ID
|
||||||
|
fi
|
||||||
|
|
||||||
|
COPY_CMD=$(cat <<EOF
|
||||||
|
$CLI dd iimg=$SRC_IMAGE oimg=$DST
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
ssh_exec_and_log "$SRC_HOST" "$COPY_CMD" "Error cloning $SRC_IMAGE to $DST in $SRC_HOST"
|
|
@ -0,0 +1,139 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
# DELETE <host:remote_system_ds/disk.i|host:remote_system_ds/>
|
||||||
|
# - host is the target host to deploy the VM
|
||||||
|
# - remote_system_ds is the path for the system datastore in the host
|
||||||
|
|
||||||
|
DST=$1
|
||||||
|
VM_ID=$2
|
||||||
|
DS_ID=$3
|
||||||
|
|
||||||
|
#--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
if [ -z "${ONE_LOCATION}" ]; then
|
||||||
|
TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
|
||||||
|
LIB_LOCATION=/usr/lib/one
|
||||||
|
else
|
||||||
|
TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh
|
||||||
|
LIB_LOCATION=$ONE_LOCATION/lib
|
||||||
|
fi
|
||||||
|
|
||||||
|
DRIVER_PATH=$(dirname $0)
|
||||||
|
|
||||||
|
source $TMCOMMON
|
||||||
|
source ${DRIVER_PATH}/../../datastore/libfs.sh
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Process destination
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
DST_PATH=`arg_path $DST`
|
||||||
|
DST_HOST=`arg_host $DST`
|
||||||
|
|
||||||
|
XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Delete and exit if directory
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
if [ `is_disk $DST_PATH` -eq 0 ]; then
|
||||||
|
# Directory: delete checkpoint and directory
|
||||||
|
|
||||||
|
unset i j XPATH_ELEMENTS
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <(onedatastore show -x $DS_ID | $XPATH \
|
||||||
|
/DATASTORE/TEMPLATE/SOURCE \
|
||||||
|
/DATASTORE/TEMPLATE/CLONE \
|
||||||
|
/DATASTORE/TEMPLATE/VITASTOR_CONF \
|
||||||
|
/DATASTORE/TEMPLATE/IMAGE_PREFIX \
|
||||||
|
/DATASTORE/TEMPLATE/POOL_NAME)
|
||||||
|
|
||||||
|
SRC="${XPATH_ELEMENTS[j++]}"
|
||||||
|
CLONE="${XPATH_ELEMENTS[j++]}"
|
||||||
|
VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
|
||||||
|
IMAGE_PREFIX="${XPATH_ELEMENTS[j++]:-one}"
|
||||||
|
POOL_NAME="${XPATH_ELEMENTS[j++]}"
|
||||||
|
|
||||||
|
CLI=vitastor-cli
|
||||||
|
if [ -n "$VITASTOR_CONF" ]; then
|
||||||
|
CLI="$CLI --config_path ${VITASTOR_CONF}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
SRC_CHECKPOINT="${IMAGE_PREFIX}-sys-${VM_ID}-checkpoint"
|
||||||
|
|
||||||
|
ssh_exec_and_log "$DST_HOST" "$CLI rm $SRC_CHECKPOINT 2>/dev/null || exit 0" \
|
||||||
|
"Error deleting $SRC_CHECKPOINT in $DST_HOST"
|
||||||
|
|
||||||
|
log "Deleting $DST_PATH"
|
||||||
|
ssh_exec_and_log "$DST_HOST" "rm -rf $DST_PATH" "Error deleting $DST_PATH"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Get Image information
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
DISK_ID=$(echo "$DST_PATH" | $AWK -F. '{print $NF}')
|
||||||
|
|
||||||
|
# Reads the disk parameters -- taken from image datastore
|
||||||
|
unset i j XPATH_ELEMENTS
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <(onevm show -x $VM_ID | $XPATH \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SOURCE \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/VITASTOR_CONF \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/IMAGE_PREFIX \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/POOL_NAME)
|
||||||
|
|
||||||
|
SRC="${XPATH_ELEMENTS[j++]}"
|
||||||
|
CLONE="${XPATH_ELEMENTS[j++]}"
|
||||||
|
VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
|
||||||
|
IMAGE_PREFIX="${XPATH_ELEMENTS[j++]:-one}"
|
||||||
|
POOL_NAME="${XPATH_ELEMENTS[j++]}"
|
||||||
|
|
||||||
|
if is_undeployed "$VM_ID" "$DST_HOST"; then
|
||||||
|
# get BRIDGE_LIST from datastore
|
||||||
|
XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
|
||||||
|
IFS= read -r -d '' BRIDGE_LIST < <(onedatastore show -x "$DS_ID" \
|
||||||
|
| $XPATH /DATASTORE/TEMPLATE/BRIDGE_LIST )
|
||||||
|
|
||||||
|
if [ -n "$BRIDGE_LIST" ]; then
|
||||||
|
DST_HOST=$(get_destination_host)
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# No need to delete not cloned images
|
||||||
|
if [ "$CLONE" = "NO" ]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
CLI=vitastor-cli
|
||||||
|
if [ -n "$VITASTOR_CONF" ]; then
|
||||||
|
CLI="$CLI --config_path ${VITASTOR_CONF}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "$SRC" ]; then
|
||||||
|
# cloned, so the name will be "one-<imageid>-<vmid>-<diskid>"
|
||||||
|
SRC_IMAGE="${SRC}-${VM_ID}-${DISK_ID}"
|
||||||
|
else
|
||||||
|
# volatile
|
||||||
|
SRC_IMAGE="${IMAGE_PREFIX}-sys-${VM_ID}-${DISK_ID}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Delete the image
|
||||||
|
|
||||||
|
log "Deleting $DST_PATH"
|
||||||
|
|
||||||
|
DELETE_CMD=$(cat <<EOF
|
||||||
|
$CLI rm $SRC_IMAGE
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
ssh_exec_and_log "$DST_HOST" "$DELETE_CMD" "Error deleting $SRC_IMAGE in $DST_HOST"
|
|
@ -0,0 +1 @@
|
||||||
|
../ceph/failmigrate
|
|
@ -0,0 +1,16 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
# <CLONE|LN>(.tm_mad_system) tm_mad fe:SOURCE host:remote_system_ds/disk.i vmid dsid
|
||||||
|
|
||||||
|
# LN = Attach disk to a VM (Vitastor doesn't need to do anything in this case)
|
||||||
|
|
||||||
|
SRC=$1
|
||||||
|
DST=$2
|
||||||
|
VM_ID=$3
|
||||||
|
DS_ID=$4
|
||||||
|
|
||||||
|
exit 0
|
|
@ -0,0 +1,120 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
# mkimage size format host:remote_system_ds/disk.i vmid dsid
|
||||||
|
# - size in MB of the image
|
||||||
|
# - format for the image
|
||||||
|
# - host is the target host to deploy the VM
|
||||||
|
# - remote_system_ds is the path for the system datastore in the host
|
||||||
|
# - vmid is the id of the VM
|
||||||
|
# - dsid is the target datastore (0 is the system datastore)
|
||||||
|
|
||||||
|
SIZE=$1
|
||||||
|
FORMAT=$2
|
||||||
|
DST=$3
|
||||||
|
|
||||||
|
VMID=$4
|
||||||
|
DSID=$5
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
if [ -z "${ONE_LOCATION}" ]; then
|
||||||
|
TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
|
||||||
|
LIB_LOCATION=/usr/lib/one
|
||||||
|
else
|
||||||
|
TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh
|
||||||
|
LIB_LOCATION=$ONE_LOCATION/lib
|
||||||
|
fi
|
||||||
|
|
||||||
|
DRIVER_PATH=$(dirname $0)
|
||||||
|
|
||||||
|
source $TMCOMMON
|
||||||
|
|
||||||
|
source ${DRIVER_PATH}/../../etc/datastore/datastore.conf
|
||||||
|
source ${DRIVER_PATH}/../../datastore/libfs.sh
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Set dst path and dir
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
DST_PATH=`arg_path $DST`
|
||||||
|
DST_HOST=`arg_host $DST`
|
||||||
|
DST_DIR=`dirname $DST_PATH`
|
||||||
|
|
||||||
|
DISK_ID=$(echo $DST|awk -F. '{print $NF}')
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Get Image information
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
|
||||||
|
|
||||||
|
unset i j XPATH_ELEMENTS
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <(onevm show -x $VMID | $XPATH \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/VITASTOR_CONF \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/POOL_NAME \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/IMAGE_PREFIX \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/FS)
|
||||||
|
|
||||||
|
VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
|
||||||
|
POOL_NAME="${XPATH_ELEMENTS[j++]}"
|
||||||
|
IMAGE_PREFIX="${XPATH_ELEMENTS[j++]:-one}"
|
||||||
|
FS="${XPATH_ELEMENTS[j++]}"
|
||||||
|
|
||||||
|
CLI=
|
||||||
|
QEMU_ARG=""
|
||||||
|
if [ -n "$VITASTOR_CONF" ]; then
|
||||||
|
CLI="$CLI --config_path ${VITASTOR_CONF}"
|
||||||
|
QEMU_ARG=":config_path=${VITASTOR_CONF}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
IMAGE_NAME="${IMAGE_PREFIX}-sys-${VMID}-${DISK_ID}"
|
||||||
|
|
||||||
|
ssh_make_path $DST_HOST $DST_DIR
|
||||||
|
|
||||||
|
set -e -o pipefail
|
||||||
|
|
||||||
|
# if user requested a swap or specifies a FS, we need to create a local
|
||||||
|
# formatted image and upload into existing Vitastor image
|
||||||
|
FS_OPTS=$(eval $(echo "echo \$FS_OPTS_$FS"))
|
||||||
|
|
||||||
|
MKIMAGE_CMD=$(cat <<EOF
|
||||||
|
set -e -o pipefail
|
||||||
|
export PATH=/usr/sbin:/sbin:\$PATH
|
||||||
|
vitastor-cli $CLI create --pool "${POOL_NAME}" "$IMAGE_NAME" --size "${SIZE}M"
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
if [ -n "$FS" -o "$FORMAT" = "swap" ]; then
|
||||||
|
MKFS_CMD=`mkfs_command '$NBD' raw "$SIZE" "$SUPPORTED_FS" "$FS" "$FS_OPTS" | grep -v $QEMU_IMG`
|
||||||
|
MKIMAGE_CMD=$(cat <<EOF
|
||||||
|
$MKIMAGE_CMD
|
||||||
|
NBD=\$(sudo vitastor-nbd $CLI map --image "$IMAGE_NAME")
|
||||||
|
trap "sudo vitastor-nbd $CLI unmap \$NBD" EXIT
|
||||||
|
$MKFS_CMD
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
fi
|
||||||
|
|
||||||
|
DELIMAGE_CMD=$(cat <<EOF
|
||||||
|
vitastor-cli $CLI rm "$IMAGE_NAME"
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
log "Making volatile disk of ${SIZE}M at $DST"
|
||||||
|
|
||||||
|
ssh_exec_and_log_no_error "$DST_HOST" "$MKIMAGE_CMD" "Error creating volatile disk.$DISK_ID ($IMAGE_NAME) in $DST_HOST in pool $POOL_NAME."
|
||||||
|
|
||||||
|
rc=$?
|
||||||
|
|
||||||
|
if [ $rc != 0 ]; then
|
||||||
|
ssh_exec_and_log_no_error "$DST_HOST" "$DELIMAGE_CMD" "Error removing image"
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit $rc
|
|
@ -0,0 +1 @@
|
||||||
|
../ceph/mkswap
|
|
@ -0,0 +1 @@
|
||||||
|
../../datastore/vitastor/monitor
|
|
@ -0,0 +1 @@
|
||||||
|
../ceph/mv
|
|
@ -0,0 +1,15 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
# mvds host:remote_system_ds/disk.i fe:SOURCE vmid dsid
|
||||||
|
# - fe is the front-end hostname
|
||||||
|
# - SOURCE is the path of the disk image in the form DS_BASE_PATH/disk
|
||||||
|
# - host is the target host to deploy the VM
|
||||||
|
# - remote_system_ds is the path for the system datastore in the host
|
||||||
|
# - vmid is the id of the VM
|
||||||
|
# - dsid is the target datastore (0 is the system datastore)
|
||||||
|
|
||||||
|
exit 0
|
|
@ -0,0 +1 @@
|
||||||
|
postbackup_live
|
|
@ -0,0 +1 @@
|
||||||
|
../ceph/postbackup_live
|
|
@ -0,0 +1 @@
|
||||||
|
../ceph/postmigrate
|
|
@ -0,0 +1,152 @@
|
||||||
|
#!/usr/bin/env ruby
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
ONE_LOCATION = ENV['ONE_LOCATION']
|
||||||
|
LIVE = ENV['LIVE']
|
||||||
|
|
||||||
|
if !ONE_LOCATION
|
||||||
|
RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
|
||||||
|
GEMS_LOCATION = '/usr/share/one/gems'
|
||||||
|
VMDIR = '/var/lib/one'
|
||||||
|
CONFIG_FILE = '/var/lib/one/config'
|
||||||
|
else
|
||||||
|
RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
|
||||||
|
GEMS_LOCATION = ONE_LOCATION + '/share/gems'
|
||||||
|
VMDIR = ONE_LOCATION + '/var'
|
||||||
|
CONFIG_FILE = ONE_LOCATION + '/var/config'
|
||||||
|
end
|
||||||
|
|
||||||
|
# %%RUBYGEMS_SETUP_BEGIN%%
|
||||||
|
if File.directory?(GEMS_LOCATION)
|
||||||
|
real_gems_path = File.realpath(GEMS_LOCATION)
|
||||||
|
if !defined?(Gem) || Gem.path != [real_gems_path]
|
||||||
|
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
|
||||||
|
|
||||||
|
# Suppress warnings from Rubygems
|
||||||
|
# https://github.com/OpenNebula/one/issues/5379
|
||||||
|
begin
|
||||||
|
verb = $VERBOSE
|
||||||
|
$VERBOSE = nil
|
||||||
|
require 'rubygems'
|
||||||
|
Gem.use_paths(real_gems_path)
|
||||||
|
ensure
|
||||||
|
$VERBOSE = verb
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
# %%RUBYGEMS_SETUP_END%%
|
||||||
|
|
||||||
|
$LOAD_PATH << RUBY_LIB_LOCATION
|
||||||
|
|
||||||
|
require 'rexml/document'
|
||||||
|
|
||||||
|
require_relative '../lib/tm_action'
|
||||||
|
require_relative '../lib/kvm'
|
||||||
|
require_relative '../lib/datastore'
|
||||||
|
|
||||||
|
if LIVE
|
||||||
|
# TODO: fsfreeze for each hypervisor based on VM_MAD
|
||||||
|
include TransferManager::KVM
|
||||||
|
end
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# BACKUP tm_mad host:remote_dir DISK_ID:...:DISK_ID deploy_id bjid vmid dsid
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
TransferManager::Datastore.load_env
|
||||||
|
|
||||||
|
vm_xml = STDIN.read
|
||||||
|
|
||||||
|
dir = ARGV[0].split ':'
|
||||||
|
disks = ARGV[1].split ':'
|
||||||
|
deploy_id = ARGV[2]
|
||||||
|
_bjid = ARGV[3]
|
||||||
|
vmid = ARGV[4]
|
||||||
|
_dsid = ARGV[5]
|
||||||
|
|
||||||
|
rhost = dir[0]
|
||||||
|
rdir = dir[1]
|
||||||
|
|
||||||
|
xml_doc = REXML::Document.new(vm_xml)
|
||||||
|
vm = xml_doc.root
|
||||||
|
|
||||||
|
ds = TransferManager::Datastore.from_vm_backup_ds(:vm_xml => vm_xml)
|
||||||
|
|
||||||
|
base_path = ENV['BACKUP_BASE_PATH']
|
||||||
|
|
||||||
|
bck_dir = if base_path
|
||||||
|
"#{base_path}/#{vmid}/backup"
|
||||||
|
else
|
||||||
|
"#{rdir}/backup"
|
||||||
|
end
|
||||||
|
|
||||||
|
snap_cmd = ''
|
||||||
|
expo_cmd = ''
|
||||||
|
clup_cmd = ''
|
||||||
|
|
||||||
|
vm.elements.each 'TEMPLATE/DISK' do |d|
|
||||||
|
did = d.elements['DISK_ID'].text
|
||||||
|
next unless disks.include? did
|
||||||
|
|
||||||
|
src = d.elements['SOURCE'].text
|
||||||
|
clon = d.elements['CLONE'].text
|
||||||
|
|
||||||
|
src_image = if clon == 'NO' then src else "#{src}-#{vmid}-#{did}" end
|
||||||
|
|
||||||
|
cmd = 'vitastor-cli'
|
||||||
|
qemu_arg = ''
|
||||||
|
if d.elements['VITASTOR_CONF']
|
||||||
|
cmd = cmd + ' --config_path ' + d.elements['VITASTOR_CONF']
|
||||||
|
qemu_arg += 'config_path='+d.elements['VITASTOR_CONF']+':'
|
||||||
|
end
|
||||||
|
|
||||||
|
draw = "#{bck_dir}/disk.#{did}.raw"
|
||||||
|
ddst = "#{bck_dir}/disk.#{did}.0"
|
||||||
|
|
||||||
|
expo_cmd << ds.cmd_confinement("qemu-img convert -m 4 -O qcow2 'vitastor:#{qemu_arg}image=#{src_image}' #{ddst}\n", rdir)
|
||||||
|
|
||||||
|
clup_cmd << "rm -f #{draw}\n"
|
||||||
|
rescue StandardError => e
|
||||||
|
STDERR.puts "Missing configuration attributes in DISK: #{e.message}"
|
||||||
|
exit(1)
|
||||||
|
end
|
||||||
|
|
||||||
|
if LIVE
|
||||||
|
freeze, thaw = fsfreeze(vm, deploy_id)
|
||||||
|
end
|
||||||
|
|
||||||
|
script = <<~EOS
|
||||||
|
set -ex -o pipefail
|
||||||
|
|
||||||
|
# Prepare backup folder
|
||||||
|
[ -d #{bck_dir} ] && rm -rf #{bck_dir}
|
||||||
|
|
||||||
|
mkdir -p #{bck_dir}
|
||||||
|
|
||||||
|
echo "#{Base64.encode64(vm_xml)}" > #{bck_dir}/vm.xml
|
||||||
|
|
||||||
|
#{freeze}
|
||||||
|
|
||||||
|
#{snap_cmd}
|
||||||
|
|
||||||
|
#{thaw}
|
||||||
|
|
||||||
|
#{expo_cmd}
|
||||||
|
|
||||||
|
#{clup_cmd}
|
||||||
|
EOS
|
||||||
|
|
||||||
|
rc = TransferManager::Action.ssh('prebackup_live',
|
||||||
|
:host => rhost,
|
||||||
|
:cmds => script,
|
||||||
|
:nostdout => false,
|
||||||
|
:nostderr => false
|
||||||
|
)
|
||||||
|
|
||||||
|
if rc.code != 0
|
||||||
|
STDERR.puts "Error preparing disk files: #{rc.stdout} #{rc.stderr}"
|
||||||
|
end
|
||||||
|
|
||||||
|
exit(rc.code)
|
|
@ -0,0 +1,8 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
export LIVE=1
|
||||||
|
`dirname $0`/prebackup $@
|
|
@ -0,0 +1 @@
|
||||||
|
../ceph/premigrate
|
|
@ -0,0 +1,81 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
# resize image size vmid
|
||||||
|
|
||||||
|
SRC=$1
|
||||||
|
SIZE=$2
|
||||||
|
VM_ID=$3
|
||||||
|
|
||||||
|
#--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
if [ -z "${ONE_LOCATION}" ]; then
|
||||||
|
TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
|
||||||
|
LIB_LOCATION=/usr/lib/one
|
||||||
|
else
|
||||||
|
TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh
|
||||||
|
LIB_LOCATION=$ONE_LOCATION/lib
|
||||||
|
fi
|
||||||
|
|
||||||
|
DRIVER_PATH=$(dirname $0)
|
||||||
|
|
||||||
|
source $TMCOMMON
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Set dst path and dir
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
SRC_HOST=`arg_host $SRC`
|
||||||
|
SRC_PATH=`arg_path $SRC`
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Get Image information
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
DISK_ID=$(echo "$SRC_PATH" | $AWK -F. '{print $NF}')
|
||||||
|
|
||||||
|
XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
|
||||||
|
|
||||||
|
unset i j XPATH_ELEMENTS
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <(onevm show -x $VM_ID | $XPATH \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SOURCE \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/VITASTOR_CONF \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/IMAGE_PREFIX \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/PERSISTENT)
|
||||||
|
|
||||||
|
SRC_IMAGE="${XPATH_ELEMENTS[j++]}"
|
||||||
|
VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
|
||||||
|
IMAGE_PREFIX="${XPATH_ELEMENTS[j++]:-one}"
|
||||||
|
PERSISTENT="${XPATH_ELEMENTS[j++]}"
|
||||||
|
|
||||||
|
if [ -n "${SRC_IMAGE}" ]; then
|
||||||
|
if [ "${PERSISTENT}" != 'YES' ]; then
|
||||||
|
SRC_IMAGE="${SRC_IMAGE}-${VM_ID}-${DISK_ID}"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
SRC_IMAGE="${IMAGE_PREFIX}-sys-${VM_ID}-${DISK_ID}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Resize disk
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
CLI=vitastor-cli
|
||||||
|
if [ -n "$VITASTOR_CONF" ]; then
|
||||||
|
CLI="$CLI --config_path ${VITASTOR_CONF}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
RESIZE_CMD=$(cat <<EOF
|
||||||
|
$CLI modify --resize ${SIZE}M "$SRC_IMAGE"
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
ssh_exec_and_log "$SRC_HOST" "$RESIZE_CMD" "Error resizing disk $SRC_IMAGE"
|
||||||
|
|
||||||
|
exit 0
|
|
@ -0,0 +1,201 @@
|
||||||
|
#!/usr/bin/env ruby
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
ONE_LOCATION = ENV['ONE_LOCATION']
|
||||||
|
|
||||||
|
if !ONE_LOCATION
|
||||||
|
RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
|
||||||
|
GEMS_LOCATION = '/usr/share/one/gems'
|
||||||
|
VMDIR = '/var/lib/one'
|
||||||
|
CONFIG_FILE = '/var/lib/one/config'
|
||||||
|
else
|
||||||
|
RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
|
||||||
|
GEMS_LOCATION = ONE_LOCATION + '/share/gems'
|
||||||
|
VMDIR = ONE_LOCATION + '/var'
|
||||||
|
CONFIG_FILE = ONE_LOCATION + '/var/config'
|
||||||
|
end
|
||||||
|
|
||||||
|
# %%RUBYGEMS_SETUP_BEGIN%%
|
||||||
|
if File.directory?(GEMS_LOCATION)
|
||||||
|
real_gems_path = File.realpath(GEMS_LOCATION)
|
||||||
|
if !defined?(Gem) || Gem.path != [real_gems_path]
|
||||||
|
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
|
||||||
|
|
||||||
|
# Suppress warnings from Rubygems
|
||||||
|
# https://github.com/OpenNebula/one/issues/5379
|
||||||
|
begin
|
||||||
|
verb = $VERBOSE
|
||||||
|
$VERBOSE = nil
|
||||||
|
require 'rubygems'
|
||||||
|
Gem.use_paths(real_gems_path)
|
||||||
|
ensure
|
||||||
|
$VERBOSE = verb
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
# %%RUBYGEMS_SETUP_END%%
|
||||||
|
|
||||||
|
$LOAD_PATH << RUBY_LIB_LOCATION
|
||||||
|
|
||||||
|
require 'rexml/document'
|
||||||
|
require 'json'
|
||||||
|
require 'securerandom'
|
||||||
|
|
||||||
|
require_relative '../lib/tm_action'
|
||||||
|
require_relative '../lib/datastore'
|
||||||
|
|
||||||
|
def get_vitastor_disks(vm_xml)
|
||||||
|
vm_xml = REXML::Document.new(vm_xml) if vm_xml.is_a?(String)
|
||||||
|
vm = vm_xml.root
|
||||||
|
vmid = vm.elements['VMID'].text
|
||||||
|
|
||||||
|
indexed_disks = []
|
||||||
|
vm.elements.each('DISK[TM_MAD="vitastor"]') do |d|
|
||||||
|
disk = new(vmid, d)
|
||||||
|
indexed_disks[disk.id] = disk
|
||||||
|
end
|
||||||
|
|
||||||
|
indexed_disks
|
||||||
|
end
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# RESTORE vm_id img_id inc_id disk_id
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
_dir = ARGV[0].split ':'
|
||||||
|
vm_id = ARGV[1]
|
||||||
|
bk_img_id = ARGV[2].to_i
|
||||||
|
inc_id = ARGV[3]
|
||||||
|
disk_id = ARGV[4].to_i
|
||||||
|
|
||||||
|
begin
|
||||||
|
action = TransferManager::Action.new(:action_name => 'restore',
|
||||||
|
:vm_id => vm_id)
|
||||||
|
# --------------------------------------------------------------------------
|
||||||
|
# Image & Datastore information
|
||||||
|
# --------------------------------------------------------------------------
|
||||||
|
bk_img = OpenNebula::Image.new_with_id(bk_img_id, action.one)
|
||||||
|
|
||||||
|
rc = bk_img.info
|
||||||
|
raise rc.message.to_s if OpenNebula.is_error?(rc)
|
||||||
|
|
||||||
|
bk_ds = TransferManager::Datastore.from_image_ds(:image => bk_img,
|
||||||
|
:client => action.one)
|
||||||
|
|
||||||
|
# --------------------------------------------------------------------------
|
||||||
|
# Backup information
|
||||||
|
# sample output: {"0":"rsync://100//0:3ffce7/var/lib/one/datastores/100/1/3ffce7/disk.0.0"}
|
||||||
|
# --------------------------------------------------------------------------
|
||||||
|
xml_data = <<~EOS
|
||||||
|
#{action.vm.to_xml}
|
||||||
|
#{bk_img.to_xml}
|
||||||
|
EOS
|
||||||
|
|
||||||
|
rc = bk_ds.action("ls -i #{inc_id}", xml_data)
|
||||||
|
|
||||||
|
raise 'cannot list backup contents' unless rc.code == 0
|
||||||
|
|
||||||
|
disk_urls = JSON.parse(rc.stdout)
|
||||||
|
disk_urls = disk_urls.select {|id, _url| id.to_i == disk_id } if disk_id != -1
|
||||||
|
|
||||||
|
# --------------------------------------------------------------------------
|
||||||
|
# Restore disk_urls in Host VM folder
|
||||||
|
# --------------------------------------------------------------------------
|
||||||
|
vitastor_disks = get_vitastor_disks(action.vm.template_xml)
|
||||||
|
success_disks = []
|
||||||
|
|
||||||
|
info = {}
|
||||||
|
|
||||||
|
disk_urls.each do |id, url|
|
||||||
|
vitastor_disk = vitastor_disks[id.to_i]
|
||||||
|
randsuffix = SecureRandom.hex(5)
|
||||||
|
|
||||||
|
vitastor_one_ds = OpenNebula::Datastore.new_with_id(
|
||||||
|
action.vm["/VM/TEMPLATE/DISK[DISK_ID = #{id}]/DATASTORE_ID"].to_i, action.one
|
||||||
|
)
|
||||||
|
vitastor_ds = TransferManager::Datastore.new(:ds => vitastor_one_ds, :client => action.one)
|
||||||
|
|
||||||
|
src_image = vitastor_disk.elements['SOURCE'].text
|
||||||
|
disk_id = vitastor_disk.elements['DISK_ID'].text
|
||||||
|
if vitastor_disk.elements['CLONE'].text == 'YES'
|
||||||
|
src_image += '-'+vm_id+'-'+disk_id
|
||||||
|
end
|
||||||
|
|
||||||
|
cli = 'vitastor-cli'
|
||||||
|
config_path = vitastor_disk.elements['VITASTOR_CONF']
|
||||||
|
qemu_args = ''
|
||||||
|
if config_path:
|
||||||
|
cli += ' --config_path "'+config_path.text+'"'
|
||||||
|
qemu_args += ':config_path='+config_path.text
|
||||||
|
|
||||||
|
info[vitastor_disk] = {
|
||||||
|
:br => vitastor_ds.pick_bridge,
|
||||||
|
:bak => "#{src_image}.backup.#{randsuffix}",
|
||||||
|
:old => "#{src_image}.old.#{randsuffix}",
|
||||||
|
:cli => cli,
|
||||||
|
:img => src_image,
|
||||||
|
}
|
||||||
|
|
||||||
|
upload_vitastor = <<~EOS
|
||||||
|
set -e
|
||||||
|
tmpimg="$(mktemp -t disk#{id}.XXXX)"
|
||||||
|
#{__dir__}/../../datastore/downloader.sh --nodecomp #{url} $tmpimg
|
||||||
|
#{cli} create -s $(qemu-img info --output json $tmpimg | jq -r '.["virtual-size"]') #{info[vitastor_disk][:bak]}
|
||||||
|
qemu-img convert -m 4 -O raw $tmpimg "vitastor:image=#{info[vitastor_disk][:bak]}#{qemu_args}"
|
||||||
|
rm -f $tmpimg
|
||||||
|
EOS
|
||||||
|
|
||||||
|
rc = action.ssh(:host => info[vitastor_disk][:br],
|
||||||
|
:cmds => upload_ceph,
|
||||||
|
:forward => false,
|
||||||
|
:nostdout => false,
|
||||||
|
:nostderr => false)
|
||||||
|
|
||||||
|
break if rc.code != 0
|
||||||
|
|
||||||
|
success_disks << vitastor_disk
|
||||||
|
end
|
||||||
|
|
||||||
|
# Rollback and raise error if it was unable to backup all disks
|
||||||
|
if success_disks.length != disk_urls.length
|
||||||
|
success_disks.each do |vitastor_disk|
|
||||||
|
cleanup = <<~EOS
|
||||||
|
#{info[vitastor_disk][:cli]} rm #{info[vitastor_disk][:bak]}
|
||||||
|
EOS
|
||||||
|
|
||||||
|
action.ssh(:host => info[vitastor_disk][:br],
|
||||||
|
:cmds => cleanup,
|
||||||
|
:forward => false,
|
||||||
|
:nostdout => false,
|
||||||
|
:nostderr => false)
|
||||||
|
end
|
||||||
|
|
||||||
|
raise "error uploading backup disk to Vitastor (#{success_disks.length}/#{disk_urls.length})"
|
||||||
|
end
|
||||||
|
|
||||||
|
# --------------------------------------------------------------------------
|
||||||
|
# Replace VM disk_urls with backup copies (~prolog)
|
||||||
|
# --------------------------------------------------------------------------
|
||||||
|
success_disks.each do |vitastor_disk|
|
||||||
|
move = <<~EOS
|
||||||
|
set -e
|
||||||
|
#{info[vitastor_disk][:cli]} mv #{info[vitastor_disk][:img]} #{info[vitastor_disk][:old]}
|
||||||
|
#{info[vitastor_disk][:cli]} mv #{info[vitastor_disk][:bak]} #{info[vitastor_disk][:img]}
|
||||||
|
#{info[vitastor_disk][:cli]} rm --matching "#{info[vitastor_disk][:img]}@*"
|
||||||
|
#{info[vitastor_disk][:cli]} rm #{info[vitastor_disk][:old]}
|
||||||
|
EOS
|
||||||
|
|
||||||
|
rc = action.ssh(:host => info[vitastor_disk][:br],
|
||||||
|
:cmds => move,
|
||||||
|
:forward => false,
|
||||||
|
:nostdout => false,
|
||||||
|
:nostderr => false)
|
||||||
|
|
||||||
|
warn 'cannot restore disk backup' if rc.code != 0
|
||||||
|
end
|
||||||
|
rescue StandardError => e
|
||||||
|
STDERR.puts "Error restoring VM disks: #{e.message}"
|
||||||
|
exit(1)
|
||||||
|
end
|
|
@ -0,0 +1,78 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
# snap_create host:parent_image snap_id vmid ds_id
|
||||||
|
|
||||||
|
SRC=$1
|
||||||
|
SNAP_ID=$2
|
||||||
|
VM_ID=$3
|
||||||
|
DS_ID=$4
|
||||||
|
|
||||||
|
#--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
if [ -z "${ONE_LOCATION}" ]; then
|
||||||
|
TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
|
||||||
|
LIB_LOCATION=/usr/lib/one
|
||||||
|
else
|
||||||
|
TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh
|
||||||
|
LIB_LOCATION=$ONE_LOCATION/lib
|
||||||
|
fi
|
||||||
|
|
||||||
|
DRIVER_PATH=$(dirname $0)
|
||||||
|
|
||||||
|
source $TMCOMMON
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Set dst path and dir
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
SRC_HOST=`arg_host $SRC`
|
||||||
|
SRC_PATH=`arg_path $SRC`
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Get Image information
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
DISK_ID=$(echo "$SRC_PATH" | $AWK -F. '{print $NF}')
|
||||||
|
|
||||||
|
XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
|
||||||
|
|
||||||
|
unset i j XPATH_ELEMENTS
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <(onevm show -x $VM_ID | $XPATH \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SOURCE \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/VITASTOR_CONF \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/TYPE )
|
||||||
|
|
||||||
|
SRC_IMAGE="${XPATH_ELEMENTS[j++]}"
|
||||||
|
CLONE="${XPATH_ELEMENTS[j++]}"
|
||||||
|
VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
|
||||||
|
TYPE="${XPATH_ELEMENTS[j++]}"
|
||||||
|
|
||||||
|
if [ "$CLONE" = "YES" ]; then
|
||||||
|
SRC_IMAGE="${SRC_IMAGE}-${VM_ID}-${DISK_ID}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
CLI=vitastor-cli
|
||||||
|
if [ -n "$VITASTOR_CONF" ]; then
|
||||||
|
CLI="$CLI --config_path ${VITASTOR_CONF}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Create snapshots
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
SNAP_CREATE_CMD=$(cat <<EOF
|
||||||
|
$CLI snap-create "$SRC_IMAGE@$SNAP_ID"
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
ssh_exec_and_log "$SRC_HOST" "$SNAP_CREATE_CMD" "Error creating snapshot $SRC_IMAGE@$SNAP_ID"
|
||||||
|
|
||||||
|
exit 0
|
|
@ -0,0 +1 @@
|
||||||
|
snap_create
|
|
@ -0,0 +1,75 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
# snap_delete host:parent_image snap_id vmid ds_id
|
||||||
|
|
||||||
|
SRC=$1
|
||||||
|
SNAP_ID=$2
|
||||||
|
VM_ID=$3
|
||||||
|
DS_ID=$4
|
||||||
|
|
||||||
|
# FIXME: copypaste below, down to "delete snapshot"
|
||||||
|
#--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
if [ -z "${ONE_LOCATION}" ]; then
|
||||||
|
TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
|
||||||
|
LIB_LOCATION=/usr/lib/one
|
||||||
|
else
|
||||||
|
TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh
|
||||||
|
LIB_LOCATION=$ONE_LOCATION/lib
|
||||||
|
fi
|
||||||
|
|
||||||
|
DRIVER_PATH=$(dirname $0)
|
||||||
|
|
||||||
|
source $TMCOMMON
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Set dst path and dir
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
SRC_HOST=`arg_host $SRC`
|
||||||
|
SRC_PATH=`arg_path $SRC`
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Get Image information
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
DISK_ID=$(echo "$SRC_PATH" | $AWK -F. '{print $NF}')
|
||||||
|
|
||||||
|
XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
|
||||||
|
|
||||||
|
unset i j XPATH_ELEMENTS
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <(onevm show -x $VM_ID | $XPATH \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SOURCE \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/VITASTOR_CONF )
|
||||||
|
|
||||||
|
SRC_IMAGE="${XPATH_ELEMENTS[j++]}"
|
||||||
|
CLONE="${XPATH_ELEMENTS[j++]}"
|
||||||
|
VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
|
||||||
|
|
||||||
|
if [ "$CLONE" = "YES" ]; then
|
||||||
|
SRC_IMAGE="${SRC_IMAGE}-${VM_ID}-${DISK_ID}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
CLI=vitastor-cli
|
||||||
|
if [ -n "$VITASTOR_CONF" ]; then
|
||||||
|
CLI="$CLI --config_path ${VITASTOR_CONF}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Delete snapshot
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
SNAP_DELETE_CMD=$(cat <<EOF
|
||||||
|
$CLI rm "$SRC_IMAGE@$SNAP_ID"
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
ssh_exec_and_log "$SRC_HOST" "$SNAP_DELETE_CMD" "Error deleting snapshot $SRC_IMAGE@$SNAP_ID"
|
|
@ -0,0 +1,79 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
# snap_revert host:parent_image snap_id vmid ds_id
|
||||||
|
|
||||||
|
SRC=$1
|
||||||
|
SNAP_ID=$2
|
||||||
|
VM_ID=$3
|
||||||
|
DS_ID=$4
|
||||||
|
|
||||||
|
#--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
if [ -z "${ONE_LOCATION}" ]; then
|
||||||
|
TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
|
||||||
|
LIB_LOCATION=/usr/lib/one
|
||||||
|
else
|
||||||
|
TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh
|
||||||
|
LIB_LOCATION=$ONE_LOCATION/lib
|
||||||
|
fi
|
||||||
|
|
||||||
|
DRIVER_PATH=$(dirname $0)
|
||||||
|
|
||||||
|
source $TMCOMMON
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Set dst path and dir
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
SRC_HOST=`arg_host $SRC`
|
||||||
|
SRC_PATH=`arg_path $SRC`
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Get Image information
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
DISK_ID=$(echo "$SRC_PATH" | $AWK -F. '{print $NF}')
|
||||||
|
|
||||||
|
XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
|
||||||
|
|
||||||
|
unset i j XPATH_ELEMENTS
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <(onevm show -x $VM_ID | $XPATH \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SOURCE \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/VITASTOR_CONF \
|
||||||
|
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/TYPE )
|
||||||
|
|
||||||
|
SRC_IMAGE="${XPATH_ELEMENTS[j++]}"
|
||||||
|
CLONE="${XPATH_ELEMENTS[j++]}"
|
||||||
|
VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
|
||||||
|
TYPE="${XPATH_ELEMENTS[j++]}"
|
||||||
|
|
||||||
|
if [ "$CLONE" = "YES" ]; then
|
||||||
|
SRC_IMAGE="${SRC_IMAGE}-${VM_ID}-${DISK_ID}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
CLI=vitastor-cli
|
||||||
|
if [ -n "$VITASTOR_CONF" ]; then
|
||||||
|
CLI="$CLI --config_path ${VITASTOR_CONF}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Revert to snapshot (== remove current image and recreate it as a clone)
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
SNAP_REVERT_CMD=$(cat <<EOF
|
||||||
|
set -e
|
||||||
|
$CLI ls --json "$SRC_IMAGE@$SNAP_ID" | jq -s -e '[ .[][] | select(.name == "$SRC_IMAGE@$SNAP_ID") ] | length > 0'
|
||||||
|
$CLI rm "$SRC_IMAGE" || true
|
||||||
|
$CLI create --parent "$SRC_IMAGE@$SNAP_ID" "$SRC_IMAGE"
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
ssh_exec_and_log "$SRC_HOST" "$SNAP_REVERT_CMD" "Error reverting snapshot $SNAP_ID for $SRC_IMAGE"
|
|
@ -0,0 +1,18 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# 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" | ssh "$HOST" "'${SCRIPTS_REMOTE_DIR:-/var/tmp/one}/vmm/kvm/deploy' '$DEP_FILE'"
|
|
@ -0,0 +1,57 @@
|
||||||
|
#!/usr/bin/env python3
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
import base64
|
||||||
|
from sys import argv, stderr
|
||||||
|
from xml.etree import ElementTree as ET
|
||||||
|
|
||||||
|
dep_file = argv[1]
|
||||||
|
with open(dep_file, 'rb') as fd:
|
||||||
|
dep_txt = base64.b64decode(fd.read())
|
||||||
|
dep = ET.fromstring(dep_txt)
|
||||||
|
|
||||||
|
vm_file = argv[2]
|
||||||
|
with open(vm_file, 'rb') as fd:
|
||||||
|
vm_txt = base64.b64decode(fd.read())
|
||||||
|
vm = ET.fromstring(vm_txt)
|
||||||
|
|
||||||
|
ET.register_namespace('qemu', 'http://libvirt.org/schemas/domain/qemu/1.0')
|
||||||
|
ET.register_namespace('one', 'http://opennebula.org/xmlns/libvirt/1.0')
|
||||||
|
|
||||||
|
vm_id = vm.find('./ID').text
|
||||||
|
context_disk_id = vm.find('./TEMPLATE/CONTEXT/DISK_ID').text
|
||||||
|
changed = 0
|
||||||
|
txt = lambda x: '' if x is None else x.text
|
||||||
|
|
||||||
|
for disk in dep.findall('./devices/disk[@type="file"]'):
|
||||||
|
try:
|
||||||
|
disk_id = disk.find('./source').attrib['file'].split('.')[-1]
|
||||||
|
vm_disk = vm.find('./TEMPLATE/DISK[DISK_ID="{}"]'.format(disk_id))
|
||||||
|
if vm_disk is None:
|
||||||
|
continue
|
||||||
|
tm_mad = txt(vm_disk.find('./TM_MAD'))
|
||||||
|
if tm_mad != 'vitastor':
|
||||||
|
continue
|
||||||
|
src_image = txt(vm_disk.find('./SOURCE'))
|
||||||
|
clone = txt(vm_disk.find('./CLONE'))
|
||||||
|
vitastor_conf = txt(vm_disk.find('./VITASTOR_CONF'))
|
||||||
|
if clone == "YES":
|
||||||
|
src_image += "-"+vm_id+"-"+disk_id
|
||||||
|
# modify
|
||||||
|
changed = 1
|
||||||
|
disk.attrib['type'] = 'network'
|
||||||
|
disk.remove(disk.find('./source'))
|
||||||
|
src = ET.SubElement(disk, 'source')
|
||||||
|
src.attrib['protocol'] = 'vitastor'
|
||||||
|
src.attrib['name'] = src_image
|
||||||
|
if vitastor_conf:
|
||||||
|
# path to config should be added to /etc/apparmor.d/local/abstractions/libvirt-qemu
|
||||||
|
config = ET.SubElement(src, 'config')
|
||||||
|
config.text = vitastor_conf
|
||||||
|
except Exception as e:
|
||||||
|
print("Error: {}".format(e), file=stderr)
|
||||||
|
|
||||||
|
ET.ElementTree(dep).write(dep_file)
|
|
@ -0,0 +1,40 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
DRIVER_PATH=$(dirname $0)
|
||||||
|
|
||||||
|
source $DRIVER_PATH/../../etc/vmm/kvm/kvmrc
|
||||||
|
source $DRIVER_PATH/../../scripts_common.sh
|
||||||
|
|
||||||
|
FILE=$1
|
||||||
|
DST_HOST=$2
|
||||||
|
DEPLOY_ID=$3
|
||||||
|
VM_ID=$4
|
||||||
|
DS_ID=$5
|
||||||
|
|
||||||
|
XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <(cat | $XPATH \
|
||||||
|
/VMM_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VITASTOR_CONF \
|
||||||
|
/VMM_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/IMAGE_PREFIX)
|
||||||
|
|
||||||
|
VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
|
||||||
|
IMAGE_PREFIX="${XPATH_ELEMENTS[j++]:-one}"
|
||||||
|
|
||||||
|
CLI=vitastor-cli
|
||||||
|
if [ -n "$VITASTOR_CONF" ]; then
|
||||||
|
CLI="$CLI --config_path $VITASTOR_CONF"
|
||||||
|
fi
|
||||||
|
|
||||||
|
SRC_IMAGE="${IMAGE_PREFIX}-sys-${VM_ID}-checkpoint"
|
||||||
|
|
||||||
|
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"
|
||||||
|
|
||||||
|
set -e
|
||||||
|
ssh "$DST_HOST" "'${SCRIPTS_REMOTE_DIR:-/var/tmp/one}/vmm/kvm/restore' $@"
|
|
@ -0,0 +1,51 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Vitastor OpenNebula driver
|
||||||
|
# Copyright (c) Vitaliy Filippov, 2024+
|
||||||
|
# License: Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
DRIVER_PATH=$(dirname $0)
|
||||||
|
|
||||||
|
source $DRIVER_PATH/../../etc/vmm/kvm/kvmrc
|
||||||
|
source $DRIVER_PATH/../../scripts_common.sh
|
||||||
|
|
||||||
|
DEPLOY_ID=$1
|
||||||
|
FILE=$2
|
||||||
|
SRC_HOST=$3
|
||||||
|
VM_ID=$4
|
||||||
|
DS_ID=$5
|
||||||
|
|
||||||
|
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"
|
||||||
|
|
||||||
|
unset i j XPATH_ELEMENTS
|
||||||
|
|
||||||
|
while IFS= read -r -d '' element; do
|
||||||
|
XPATH_ELEMENTS[i++]="$element"
|
||||||
|
done < <(cat | $XPATH \
|
||||||
|
/VMM_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VITASTOR_CONF \
|
||||||
|
/VMM_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/IMAGE_PREFIX \
|
||||||
|
/VMM_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME)
|
||||||
|
|
||||||
|
VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
|
||||||
|
IMAGE_PREFIX="${XPATH_ELEMENTS[j++]:-one}"
|
||||||
|
POOL_NAME="${XPATH_ELEMENTS[j++]}"
|
||||||
|
|
||||||
|
CLI=vitastor-cli
|
||||||
|
if [ -n "$VITASTOR_CONF" ]; then
|
||||||
|
CLI="$CLI --config_path ${VITASTOR_CONF}"
|
||||||
|
fi
|
||||||
|
if [ -n "$POOL_NAME" ]; then
|
||||||
|
CLI="$CLI --pool ${POOL_NAME}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
DST_IMAGE="${IMAGE_PREFIX}-sys-${VM_ID}-checkpoint"
|
||||||
|
|
||||||
|
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
|
|
@ -0,0 +1 @@
|
||||||
|
oneadmin ALL=(ALL) NOPASSWD: /usr/bin/vitastor-nbd
|
|
@ -0,0 +1,10 @@
|
||||||
|
NAME = "Vitastor Images"
|
||||||
|
DS_MAD = "vitastor"
|
||||||
|
TM_MAD = "vitastor"
|
||||||
|
TYPE = "IMAGE_DS"
|
||||||
|
DISK_TYPE = "file"
|
||||||
|
BRIDGE_LIST = "opennebula1"
|
||||||
|
POOL_NAME = "test1"
|
||||||
|
IMAGE_PREFIX = "one"
|
||||||
|
STAGING_DIR = "/var/tmp"
|
||||||
|
VITASTOR_CONF = "/etc/vitastor/vitastor.conf"
|
|
@ -0,0 +1,7 @@
|
||||||
|
NAME = "Vitastor System"
|
||||||
|
TM_MAD = "vitastor"
|
||||||
|
TYPE = "SYSTEM_DS"
|
||||||
|
BRIDGE_LIST = "opennebula1"
|
||||||
|
POOL_NAME = "test1"
|
||||||
|
IMAGE_PREFIX = "one"
|
||||||
|
VITASTOR_CONF = "/etc/vitastor/vitastor.conf"
|
|
@ -50,7 +50,7 @@ from cinder.volume import configuration
|
||||||
from cinder.volume import driver
|
from cinder.volume import driver
|
||||||
from cinder.volume import volume_utils
|
from cinder.volume import volume_utils
|
||||||
|
|
||||||
VERSION = '1.7.1'
|
VITASTOR_VERSION = '1.9.1'
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
@ -238,7 +238,7 @@ class VitastorDriver(driver.CloneableImageVD,
|
||||||
|
|
||||||
stats = {
|
stats = {
|
||||||
'vendor_name': 'Vitastor',
|
'vendor_name': 'Vitastor',
|
||||||
'driver_version': self.VERSION,
|
'driver_version': VITASTOR_VERSION,
|
||||||
'storage_protocol': 'vitastor',
|
'storage_protocol': 'vitastor',
|
||||||
'total_capacity_gb': 'unknown',
|
'total_capacity_gb': 'unknown',
|
||||||
'free_capacity_gb': 'unknown',
|
'free_capacity_gb': 'unknown',
|
||||||
|
|
|
@ -43,5 +43,5 @@ RUN set -e; \
|
||||||
rpmbuild -ba vitastor.spec; \
|
rpmbuild -ba vitastor.spec; \
|
||||||
mkdir -p /root/packages/vitastor-el7; \
|
mkdir -p /root/packages/vitastor-el7; \
|
||||||
rm -rf /root/packages/vitastor-el7/*; \
|
rm -rf /root/packages/vitastor-el7/*; \
|
||||||
cp ~/rpmbuild/RPMS/*/vitastor* /root/packages/vitastor-el7/; \
|
cp ~/rpmbuild/RPMS/*/*vitastor* /root/packages/vitastor-el7/; \
|
||||||
cp ~/rpmbuild/SRPMS/vitastor* /root/packages/vitastor-el7/
|
cp ~/rpmbuild/SRPMS/vitastor* /root/packages/vitastor-el7/
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
Name: vitastor
|
Name: vitastor
|
||||||
Version: 1.7.1
|
Version: 1.9.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Vitastor, a fast software-defined clustered block storage
|
Summary: Vitastor, a fast software-defined clustered block storage
|
||||||
|
|
||||||
License: Vitastor Network Public License 1.1
|
License: Vitastor Network Public License 1.1
|
||||||
URL: https://vitastor.io/
|
URL: https://vitastor.io/
|
||||||
Source0: vitastor-1.7.1.el7.tar.gz
|
Source0: vitastor-1.9.1.el7.tar.gz
|
||||||
|
|
||||||
BuildRequires: liburing-devel >= 0.6
|
BuildRequires: liburing-devel >= 0.6
|
||||||
BuildRequires: gperftools-devel
|
BuildRequires: gperftools-devel
|
||||||
|
@ -89,6 +89,20 @@ Requires: fio = 3.7-1.el7
|
||||||
Vitastor fio drivers for benchmarking.
|
Vitastor fio drivers for benchmarking.
|
||||||
|
|
||||||
|
|
||||||
|
%package -n vitastor-opennebula
|
||||||
|
Summary: Vitastor for OpenNebula
|
||||||
|
Group: Development/Libraries
|
||||||
|
Requires: vitastor-client
|
||||||
|
Requires: jq
|
||||||
|
Requires: python3-lxml
|
||||||
|
Requires: patch
|
||||||
|
Requires: qemu-kvm-block-vitastor
|
||||||
|
|
||||||
|
|
||||||
|
%description -n vitastor-opennebula
|
||||||
|
Vitastor storage plugin for OpenNebula.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
|
@ -113,6 +127,11 @@ mkdir -p %buildroot/lib/systemd/system
|
||||||
cp mon/scripts/vitastor.target mon/scripts/vitastor-mon.service mon/scripts/vitastor-osd@.service %buildroot/lib/systemd/system
|
cp mon/scripts/vitastor.target mon/scripts/vitastor-mon.service mon/scripts/vitastor-osd@.service %buildroot/lib/systemd/system
|
||||||
mkdir -p %buildroot/lib/udev/rules.d
|
mkdir -p %buildroot/lib/udev/rules.d
|
||||||
cp mon/scripts/90-vitastor.rules %buildroot/lib/udev/rules.d
|
cp mon/scripts/90-vitastor.rules %buildroot/lib/udev/rules.d
|
||||||
|
mkdir -p %buildroot/var/lib/one
|
||||||
|
cp -r opennebula/remotes %buildroot/var/lib/one
|
||||||
|
cp opennebula/install.sh %buildroot/var/lib/one/remotes/datastore/vitastor/
|
||||||
|
mkdir -p %buildroot/etc/
|
||||||
|
cp -r opennebula/sudoers.d %buildroot/etc/
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
|
@ -173,4 +192,18 @@ chown vitastor:vitastor /var/lib/vitastor
|
||||||
%_libdir/libfio_vitastor_sec.so
|
%_libdir/libfio_vitastor_sec.so
|
||||||
|
|
||||||
|
|
||||||
|
%files -n vitastor-opennebula
|
||||||
|
/var/lib/one
|
||||||
|
/etc/sudoers.d/opennebula-vitastor
|
||||||
|
|
||||||
|
|
||||||
|
%triggerin -n vitastor-opennebula -- opennebula
|
||||||
|
[ $2 = 0 ] || exit 0
|
||||||
|
/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
|
%changelog
|
||||||
|
|
|
@ -42,5 +42,5 @@ RUN set -e; \
|
||||||
rpmbuild -ba vitastor.spec; \
|
rpmbuild -ba vitastor.spec; \
|
||||||
mkdir -p /root/packages/vitastor-el8; \
|
mkdir -p /root/packages/vitastor-el8; \
|
||||||
rm -rf /root/packages/vitastor-el8/*; \
|
rm -rf /root/packages/vitastor-el8/*; \
|
||||||
cp ~/rpmbuild/RPMS/*/vitastor* /root/packages/vitastor-el8/; \
|
cp ~/rpmbuild/RPMS/*/*vitastor* /root/packages/vitastor-el8/; \
|
||||||
cp ~/rpmbuild/SRPMS/vitastor* /root/packages/vitastor-el8/
|
cp ~/rpmbuild/SRPMS/vitastor* /root/packages/vitastor-el8/
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
Name: vitastor
|
Name: vitastor
|
||||||
Version: 1.7.1
|
Version: 1.9.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Vitastor, a fast software-defined clustered block storage
|
Summary: Vitastor, a fast software-defined clustered block storage
|
||||||
|
|
||||||
License: Vitastor Network Public License 1.1
|
License: Vitastor Network Public License 1.1
|
||||||
URL: https://vitastor.io/
|
URL: https://vitastor.io/
|
||||||
Source0: vitastor-1.7.1.el8.tar.gz
|
Source0: vitastor-1.9.1.el8.tar.gz
|
||||||
|
|
||||||
BuildRequires: liburing-devel >= 0.6
|
BuildRequires: liburing-devel >= 0.6
|
||||||
BuildRequires: gperftools-devel
|
BuildRequires: gperftools-devel
|
||||||
|
@ -87,6 +87,20 @@ Requires: fio = 3.7-3.el8
|
||||||
Vitastor fio drivers for benchmarking.
|
Vitastor fio drivers for benchmarking.
|
||||||
|
|
||||||
|
|
||||||
|
%package -n vitastor-opennebula
|
||||||
|
Summary: Vitastor for OpenNebula
|
||||||
|
Group: Development/Libraries
|
||||||
|
Requires: vitastor-client
|
||||||
|
Requires: jq
|
||||||
|
Requires: python3-lxml
|
||||||
|
Requires: patch
|
||||||
|
Requires: qemu-kvm-block-vitastor
|
||||||
|
|
||||||
|
|
||||||
|
%description -n vitastor-opennebula
|
||||||
|
Vitastor storage plugin for OpenNebula.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
|
@ -110,6 +124,11 @@ mkdir -p %buildroot/lib/systemd/system
|
||||||
cp mon/scripts/vitastor.target mon/scripts/vitastor-mon.service mon/scripts/vitastor-osd@.service %buildroot/lib/systemd/system
|
cp mon/scripts/vitastor.target mon/scripts/vitastor-mon.service mon/scripts/vitastor-osd@.service %buildroot/lib/systemd/system
|
||||||
mkdir -p %buildroot/lib/udev/rules.d
|
mkdir -p %buildroot/lib/udev/rules.d
|
||||||
cp mon/scripts/90-vitastor.rules %buildroot/lib/udev/rules.d
|
cp mon/scripts/90-vitastor.rules %buildroot/lib/udev/rules.d
|
||||||
|
mkdir -p %buildroot/var/lib/one
|
||||||
|
cp -r opennebula/remotes %buildroot/var/lib/one
|
||||||
|
cp opennebula/install.sh %buildroot/var/lib/one/remotes/datastore/vitastor/
|
||||||
|
mkdir -p %buildroot/etc/
|
||||||
|
cp -r opennebula/sudoers.d %buildroot/etc/
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
|
@ -170,4 +189,18 @@ chown vitastor:vitastor /var/lib/vitastor
|
||||||
%_libdir/libfio_vitastor_sec.so
|
%_libdir/libfio_vitastor_sec.so
|
||||||
|
|
||||||
|
|
||||||
|
%files -n vitastor-opennebula
|
||||||
|
/var/lib/one
|
||||||
|
/etc/sudoers.d/opennebula-vitastor
|
||||||
|
|
||||||
|
|
||||||
|
%triggerin -n vitastor-opennebula -- opennebula
|
||||||
|
[ $2 = 0 ] || exit 0
|
||||||
|
/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
|
%changelog
|
||||||
|
|
|
@ -25,5 +25,5 @@ RUN set -e; \
|
||||||
rpmbuild -ba vitastor.spec; \
|
rpmbuild -ba vitastor.spec; \
|
||||||
mkdir -p /root/packages/vitastor-el9; \
|
mkdir -p /root/packages/vitastor-el9; \
|
||||||
rm -rf /root/packages/vitastor-el9/*; \
|
rm -rf /root/packages/vitastor-el9/*; \
|
||||||
cp ~/rpmbuild/RPMS/*/vitastor* /root/packages/vitastor-el9/; \
|
cp ~/rpmbuild/RPMS/*/*vitastor* /root/packages/vitastor-el9/; \
|
||||||
cp ~/rpmbuild/SRPMS/vitastor* /root/packages/vitastor-el9/
|
cp ~/rpmbuild/SRPMS/vitastor* /root/packages/vitastor-el9/
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
Name: vitastor
|
Name: vitastor
|
||||||
Version: 1.7.1
|
Version: 1.9.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Vitastor, a fast software-defined clustered block storage
|
Summary: Vitastor, a fast software-defined clustered block storage
|
||||||
|
|
||||||
License: Vitastor Network Public License 1.1
|
License: Vitastor Network Public License 1.1
|
||||||
URL: https://vitastor.io/
|
URL: https://vitastor.io/
|
||||||
Source0: vitastor-1.7.1.el9.tar.gz
|
Source0: vitastor-1.9.1.el9.tar.gz
|
||||||
|
|
||||||
BuildRequires: liburing-devel >= 0.6
|
BuildRequires: liburing-devel >= 0.6
|
||||||
BuildRequires: gperftools-devel
|
BuildRequires: gperftools-devel
|
||||||
|
@ -81,6 +81,20 @@ Requires: fio = 3.27-8.el9
|
||||||
Vitastor fio drivers for benchmarking.
|
Vitastor fio drivers for benchmarking.
|
||||||
|
|
||||||
|
|
||||||
|
%package -n vitastor-opennebula
|
||||||
|
Summary: Vitastor for OpenNebula
|
||||||
|
Group: Development/Libraries
|
||||||
|
Requires: vitastor-client
|
||||||
|
Requires: jq
|
||||||
|
Requires: python3-lxml
|
||||||
|
Requires: patch
|
||||||
|
Requires: qemu-kvm-block-vitastor
|
||||||
|
|
||||||
|
|
||||||
|
%description -n vitastor-opennebula
|
||||||
|
Vitastor storage plugin for OpenNebula.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
|
@ -103,6 +117,11 @@ mkdir -p %buildroot/lib/systemd/system
|
||||||
cp mon/scripts/vitastor.target mon/scripts/vitastor-mon.service mon/scripts/vitastor-osd@.service %buildroot/lib/systemd/system
|
cp mon/scripts/vitastor.target mon/scripts/vitastor-mon.service mon/scripts/vitastor-osd@.service %buildroot/lib/systemd/system
|
||||||
mkdir -p %buildroot/lib/udev/rules.d
|
mkdir -p %buildroot/lib/udev/rules.d
|
||||||
cp mon/scripts/90-vitastor.rules %buildroot/lib/udev/rules.d
|
cp mon/scripts/90-vitastor.rules %buildroot/lib/udev/rules.d
|
||||||
|
mkdir -p %buildroot/var/lib/one
|
||||||
|
cp -r opennebula/remotes %buildroot/var/lib/one
|
||||||
|
cp opennebula/install.sh %buildroot/var/lib/one/remotes/datastore/vitastor/
|
||||||
|
mkdir -p %buildroot/etc/
|
||||||
|
cp -r opennebula/sudoers.d %buildroot/etc/
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
|
@ -163,4 +182,18 @@ chown vitastor:vitastor /var/lib/vitastor
|
||||||
%_libdir/libfio_vitastor_sec.so
|
%_libdir/libfio_vitastor_sec.so
|
||||||
|
|
||||||
|
|
||||||
|
%files -n vitastor-opennebula
|
||||||
|
/var/lib/one
|
||||||
|
/etc/sudoers.d/opennebula-vitastor
|
||||||
|
|
||||||
|
|
||||||
|
%triggerin -n vitastor-opennebula -- opennebula
|
||||||
|
[ $2 = 0 ] || exit 0
|
||||||
|
/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
|
%changelog
|
||||||
|
|
|
@ -19,7 +19,7 @@ if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/local/?$")
|
||||||
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
|
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_definitions(-DVERSION="1.7.1")
|
add_definitions(-DVITASTOR_VERSION="1.9.1")
|
||||||
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_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)
|
add_link_options(-fno-omit-frame-pointer)
|
||||||
if (${WITH_ASAN})
|
if (${WITH_ASAN})
|
||||||
|
|
|
@ -13,7 +13,7 @@ target_link_libraries(vitastor_blk
|
||||||
# for timerfd_manager
|
# for timerfd_manager
|
||||||
vitastor_common
|
vitastor_common
|
||||||
)
|
)
|
||||||
set_target_properties(vitastor_blk PROPERTIES VERSION ${VERSION} SOVERSION 0)
|
set_target_properties(vitastor_blk PROPERTIES VERSION ${VITASTOR_VERSION} SOVERSION 0)
|
||||||
|
|
||||||
if (${WITH_FIO})
|
if (${WITH_FIO})
|
||||||
# libfio_vitastor_blk.so
|
# libfio_vitastor_blk.so
|
||||||
|
|
|
@ -29,7 +29,7 @@ target_link_libraries(vitastor_client
|
||||||
${LIBURING_LIBRARIES}
|
${LIBURING_LIBRARIES}
|
||||||
${IBVERBS_LIBRARIES}
|
${IBVERBS_LIBRARIES}
|
||||||
)
|
)
|
||||||
set_target_properties(vitastor_client PROPERTIES VERSION ${VERSION} SOVERSION 0)
|
set_target_properties(vitastor_client PROPERTIES VERSION ${VITASTOR_VERSION} SOVERSION 0)
|
||||||
configure_file(vitastor.pc.in vitastor.pc @ONLY)
|
configure_file(vitastor.pc.in vitastor.pc @ONLY)
|
||||||
|
|
||||||
if (${WITH_FIO})
|
if (${WITH_FIO})
|
||||||
|
|
|
@ -58,6 +58,7 @@ cluster_client_t::cluster_client_t(ring_loop_t *ringloop, timerfd_manager_t *tfd
|
||||||
st_cli.on_reload_hook = [this]() { st_cli.load_global_config(); };
|
st_cli.on_reload_hook = [this]() { st_cli.load_global_config(); };
|
||||||
|
|
||||||
st_cli.parse_config(config);
|
st_cli.parse_config(config);
|
||||||
|
st_cli.infinite_start = false;
|
||||||
st_cli.load_global_config();
|
st_cli.load_global_config();
|
||||||
|
|
||||||
scrap_buffer_size = SCRAP_BUFFER_SIZE;
|
scrap_buffer_size = SCRAP_BUFFER_SIZE;
|
||||||
|
@ -452,11 +453,10 @@ void cluster_client_t::on_change_pg_state_hook(pool_id_t pool_id, pg_num_t pg_nu
|
||||||
if (pg_cfg.cur_primary != prev_primary)
|
if (pg_cfg.cur_primary != prev_primary)
|
||||||
{
|
{
|
||||||
// Repeat this PG operations because an OSD which stopped being primary may not fsync operations
|
// Repeat this PG operations because an OSD which stopped being primary may not fsync operations
|
||||||
if (wb->repeat_ops_for(this, 0, pool_id, pg_num) > 0)
|
wb->repeat_ops_for(this, 0, pool_id, pg_num);
|
||||||
{
|
|
||||||
continue_ops();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
// Always continue to resume operations hung because of lack of the primary OSD
|
||||||
|
continue_ops();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool cluster_client_t::get_immediate_commit(uint64_t inode)
|
bool cluster_client_t::get_immediate_commit(uint64_t inode)
|
||||||
|
@ -1066,18 +1066,18 @@ bool cluster_client_t::try_send(cluster_op_t *op, int i)
|
||||||
!pg_it->second.pause && pg_it->second.cur_primary)
|
!pg_it->second.pause && pg_it->second.cur_primary)
|
||||||
{
|
{
|
||||||
osd_num_t primary_osd = pg_it->second.cur_primary;
|
osd_num_t primary_osd = pg_it->second.cur_primary;
|
||||||
|
part->osd_num = primary_osd;
|
||||||
auto peer_it = msgr.osd_peer_fds.find(primary_osd);
|
auto peer_it = msgr.osd_peer_fds.find(primary_osd);
|
||||||
if (peer_it != msgr.osd_peer_fds.end())
|
if (peer_it != msgr.osd_peer_fds.end())
|
||||||
{
|
{
|
||||||
int peer_fd = peer_it->second;
|
int peer_fd = peer_it->second;
|
||||||
part->osd_num = primary_osd;
|
|
||||||
part->flags |= PART_SENT;
|
part->flags |= PART_SENT;
|
||||||
op->inflight_count++;
|
op->inflight_count++;
|
||||||
uint64_t pg_bitmap_size = (pool_cfg.data_block_size / pool_cfg.bitmap_granularity / 8) * (
|
uint64_t pg_bitmap_size = (pool_cfg.data_block_size / pool_cfg.bitmap_granularity / 8) * (
|
||||||
pool_cfg.scheme == POOL_SCHEME_REPLICATED ? 1 : pool_cfg.pg_size-pool_cfg.parity_chunks
|
pool_cfg.scheme == POOL_SCHEME_REPLICATED ? 1 : pool_cfg.pg_size-pool_cfg.parity_chunks
|
||||||
);
|
);
|
||||||
uint64_t meta_rev = 0;
|
uint64_t meta_rev = 0;
|
||||||
if (op->opcode != OSD_OP_READ_BITMAP && op->opcode != OSD_OP_READ_CHAIN_BITMAP && op->opcode != OSD_OP_DELETE)
|
if (op->opcode != OSD_OP_READ_BITMAP && op->opcode != OSD_OP_DELETE)
|
||||||
{
|
{
|
||||||
auto ino_it = st_cli.inode_config.find(op->inode);
|
auto ino_it = st_cli.inode_config.find(op->inode);
|
||||||
if (ino_it != st_cli.inode_config.end())
|
if (ino_it != st_cli.inode_config.end())
|
||||||
|
@ -1287,7 +1287,11 @@ void cluster_client_t::handle_op_part(cluster_op_part_t *part)
|
||||||
if (op->opcode == OSD_OP_READ || op->opcode == OSD_OP_READ_BITMAP || op->opcode == OSD_OP_READ_CHAIN_BITMAP)
|
if (op->opcode == OSD_OP_READ || op->opcode == OSD_OP_READ_BITMAP || op->opcode == OSD_OP_READ_CHAIN_BITMAP)
|
||||||
{
|
{
|
||||||
copy_part_bitmap(op, part);
|
copy_part_bitmap(op, part);
|
||||||
op->version = op->parts.size() == 1 ? part->op.reply.rw.version : 0;
|
if (op->inode == op->cur_inode)
|
||||||
|
{
|
||||||
|
// Read only returns the version of the uppermost layer
|
||||||
|
op->version = op->parts.size() == 1 ? part->op.reply.rw.version : 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if (op->opcode == OSD_OP_WRITE)
|
else if (op->opcode == OSD_OP_WRITE)
|
||||||
{
|
{
|
||||||
|
|
|
@ -121,6 +121,7 @@ void etcd_state_client_t::etcd_call(std::string api, json11::Json payload, int t
|
||||||
"Connection: keep-alive\r\n"
|
"Connection: keep-alive\r\n"
|
||||||
"Keep-Alive: timeout="+std::to_string(etcd_keepalive_timeout)+"\r\n"
|
"Keep-Alive: timeout="+std::to_string(etcd_keepalive_timeout)+"\r\n"
|
||||||
"\r\n"+req;
|
"\r\n"+req;
|
||||||
|
retries--;
|
||||||
auto cb = [this, api, payload, timeout, retries, interval, callback,
|
auto cb = [this, api, payload, timeout, retries, interval, callback,
|
||||||
cur_addr = selected_etcd_address](const http_response_t *response)
|
cur_addr = selected_etcd_address](const http_response_t *response)
|
||||||
{
|
{
|
||||||
|
@ -144,11 +145,11 @@ void etcd_state_client_t::etcd_call(std::string api, json11::Json payload, int t
|
||||||
{
|
{
|
||||||
tfd->set_timer(interval, false, [this, api, payload, timeout, retries, interval, callback](int)
|
tfd->set_timer(interval, false, [this, api, payload, timeout, retries, interval, callback](int)
|
||||||
{
|
{
|
||||||
etcd_call(api, payload, timeout, retries-1, interval, callback);
|
etcd_call(api, payload, timeout, retries, interval, callback);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
etcd_call(api, payload, timeout, retries-1, interval, callback);
|
etcd_call(api, payload, timeout, retries, interval, callback);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
callback(err, data);
|
callback(err, data);
|
||||||
|
@ -333,7 +334,10 @@ void etcd_state_client_t::start_etcd_watcher()
|
||||||
etcd_watch_ws = NULL;
|
etcd_watch_ws = NULL;
|
||||||
}
|
}
|
||||||
if (this->log_level > 1)
|
if (this->log_level > 1)
|
||||||
fprintf(stderr, "Trying to connect to etcd websocket at %s, watch from revision %ju\n", etcd_address.c_str(), etcd_watch_revision);
|
{
|
||||||
|
fprintf(stderr, "Trying to connect to etcd websocket at %s, watch from revision %ju/%ju/%ju\n", etcd_address.c_str(),
|
||||||
|
etcd_watch_revision_config, etcd_watch_revision_osd, etcd_watch_revision_pg);
|
||||||
|
}
|
||||||
etcd_watch_ws = open_websocket(tfd, etcd_address, etcd_api_path+"/watch", etcd_slow_timeout,
|
etcd_watch_ws = open_websocket(tfd, etcd_address, etcd_api_path+"/watch", etcd_slow_timeout,
|
||||||
[this, cur_addr = selected_etcd_address](const http_response_t *msg)
|
[this, cur_addr = selected_etcd_address](const http_response_t *msg)
|
||||||
{
|
{
|
||||||
|
@ -348,16 +352,20 @@ void etcd_state_client_t::start_etcd_watcher()
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
uint64_t watch_id = data["result"]["watch_id"].uint64_value();
|
||||||
if (data["result"]["created"].bool_value())
|
if (data["result"]["created"].bool_value())
|
||||||
{
|
{
|
||||||
uint64_t watch_id = data["result"]["watch_id"].uint64_value();
|
|
||||||
if (watch_id == ETCD_CONFIG_WATCH_ID ||
|
if (watch_id == ETCD_CONFIG_WATCH_ID ||
|
||||||
watch_id == ETCD_PG_STATE_WATCH_ID ||
|
watch_id == ETCD_PG_STATE_WATCH_ID ||
|
||||||
watch_id == ETCD_PG_HISTORY_WATCH_ID ||
|
|
||||||
watch_id == ETCD_OSD_STATE_WATCH_ID)
|
watch_id == ETCD_OSD_STATE_WATCH_ID)
|
||||||
|
{
|
||||||
etcd_watches_initialised++;
|
etcd_watches_initialised++;
|
||||||
|
}
|
||||||
if (etcd_watches_initialised == ETCD_TOTAL_WATCHES && this->log_level > 0)
|
if (etcd_watches_initialised == ETCD_TOTAL_WATCHES && this->log_level > 0)
|
||||||
fprintf(stderr, "Successfully subscribed to etcd at %s, revision %ju\n", cur_addr.c_str(), etcd_watch_revision);
|
{
|
||||||
|
fprintf(stderr, "Successfully subscribed to etcd at %s, revision %ju/%ju/%ju\n", cur_addr.c_str(),
|
||||||
|
etcd_watch_revision_config, etcd_watch_revision_osd, etcd_watch_revision_pg);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (data["result"]["canceled"].bool_value())
|
if (data["result"]["canceled"].bool_value())
|
||||||
{
|
{
|
||||||
|
@ -375,7 +383,7 @@ void etcd_state_client_t::start_etcd_watcher()
|
||||||
data["result"]["compact_revision"].uint64_value());
|
data["result"]["compact_revision"].uint64_value());
|
||||||
http_close(etcd_watch_ws);
|
http_close(etcd_watch_ws);
|
||||||
etcd_watch_ws = NULL;
|
etcd_watch_ws = NULL;
|
||||||
etcd_watch_revision = 0;
|
etcd_watch_revision_config = etcd_watch_revision_osd = etcd_watch_revision_pg = 0;
|
||||||
on_reload_hook();
|
on_reload_hook();
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
|
@ -393,13 +401,29 @@ void etcd_state_client_t::start_etcd_watcher()
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Save revision only if it's present in the message - because sometimes etcd sends something without a header, like:
|
||||||
|
// {"error": {"grpc_code": 14, "http_code": 503, "http_status": "Service Unavailable", "message": "error reading from server: EOF"}}
|
||||||
if (etcd_watches_initialised == ETCD_TOTAL_WATCHES && !data["result"]["header"]["revision"].is_null())
|
if (etcd_watches_initialised == ETCD_TOTAL_WATCHES && !data["result"]["header"]["revision"].is_null())
|
||||||
{
|
{
|
||||||
// Protect against a revision beign split into multiple messages and some
|
// Restart watchers from the same revision number as in the last received message,
|
||||||
// of them being lost. Even though I'm not sure if etcd actually splits them
|
// not from the next one to protect against revision being split into multiple messages,
|
||||||
// Also sometimes etcd sends something without a header, like:
|
// even though etcd guarantees not to do that **within a single watcher** without fragment=true:
|
||||||
// {"error": {"grpc_code": 14, "http_code": 503, "http_status": "Service Unavailable", "message": "error reading from server: EOF"}}
|
// https://etcd.io/docs/v3.5/learning/api_guarantees/#watch-apis
|
||||||
etcd_watch_revision = data["result"]["header"]["revision"].uint64_value();
|
// Revision contents are ALWAYS split into separate messages for different watchers though!
|
||||||
|
// So generally we have to resume each watcher from its own revision...
|
||||||
|
// Progress messages may have watch_id=-1 if sent on behalf of multiple watchers though.
|
||||||
|
// And antietcd has an advanced semantic which merges the same revision for all watchers
|
||||||
|
// into one message and just omits watch_id.
|
||||||
|
// So we also have to handle the case where watch_id is -1 or not present (0).
|
||||||
|
auto watch_rev = data["result"]["header"]["revision"].uint64_value();
|
||||||
|
if (!watch_id || watch_id == UINT64_MAX)
|
||||||
|
etcd_watch_revision_config = etcd_watch_revision_osd = etcd_watch_revision_pg = watch_rev;
|
||||||
|
else if (watch_id == ETCD_CONFIG_WATCH_ID)
|
||||||
|
etcd_watch_revision_config = watch_rev;
|
||||||
|
else if (watch_id == ETCD_PG_STATE_WATCH_ID)
|
||||||
|
etcd_watch_revision_pg = watch_rev;
|
||||||
|
else if (watch_id == ETCD_OSD_STATE_WATCH_ID)
|
||||||
|
etcd_watch_revision_osd = watch_rev;
|
||||||
addresses_to_try.clear();
|
addresses_to_try.clear();
|
||||||
}
|
}
|
||||||
// First gather all changes into a hash to remove multiple overwrites
|
// First gather all changes into a hash to remove multiple overwrites
|
||||||
|
@ -457,7 +481,7 @@ void etcd_state_client_t::start_etcd_watcher()
|
||||||
{ "create_request", json11::Json::object {
|
{ "create_request", json11::Json::object {
|
||||||
{ "key", base64_encode(etcd_prefix+"/config/") },
|
{ "key", base64_encode(etcd_prefix+"/config/") },
|
||||||
{ "range_end", base64_encode(etcd_prefix+"/config0") },
|
{ "range_end", base64_encode(etcd_prefix+"/config0") },
|
||||||
{ "start_revision", etcd_watch_revision },
|
{ "start_revision", etcd_watch_revision_config },
|
||||||
{ "watch_id", ETCD_CONFIG_WATCH_ID },
|
{ "watch_id", ETCD_CONFIG_WATCH_ID },
|
||||||
{ "progress_notify", true },
|
{ "progress_notify", true },
|
||||||
} }
|
} }
|
||||||
|
@ -466,29 +490,21 @@ void etcd_state_client_t::start_etcd_watcher()
|
||||||
{ "create_request", json11::Json::object {
|
{ "create_request", json11::Json::object {
|
||||||
{ "key", base64_encode(etcd_prefix+"/osd/state/") },
|
{ "key", base64_encode(etcd_prefix+"/osd/state/") },
|
||||||
{ "range_end", base64_encode(etcd_prefix+"/osd/state0") },
|
{ "range_end", base64_encode(etcd_prefix+"/osd/state0") },
|
||||||
{ "start_revision", etcd_watch_revision },
|
{ "start_revision", etcd_watch_revision_osd },
|
||||||
{ "watch_id", ETCD_OSD_STATE_WATCH_ID },
|
{ "watch_id", ETCD_OSD_STATE_WATCH_ID },
|
||||||
{ "progress_notify", true },
|
{ "progress_notify", true },
|
||||||
} }
|
} }
|
||||||
}).dump());
|
}).dump());
|
||||||
http_post_message(etcd_watch_ws, WS_TEXT, json11::Json(json11::Json::object {
|
http_post_message(etcd_watch_ws, WS_TEXT, json11::Json(json11::Json::object {
|
||||||
{ "create_request", json11::Json::object {
|
{ "create_request", json11::Json::object {
|
||||||
{ "key", base64_encode(etcd_prefix+"/pg/state/") },
|
{ "key", base64_encode(etcd_prefix+"/pg/") },
|
||||||
{ "range_end", base64_encode(etcd_prefix+"/pg/state0") },
|
{ "range_end", base64_encode(etcd_prefix+"/pg0") },
|
||||||
{ "start_revision", etcd_watch_revision },
|
{ "start_revision", etcd_watch_revision_pg },
|
||||||
{ "watch_id", ETCD_PG_STATE_WATCH_ID },
|
{ "watch_id", ETCD_PG_STATE_WATCH_ID },
|
||||||
{ "progress_notify", true },
|
{ "progress_notify", true },
|
||||||
} }
|
} }
|
||||||
}).dump());
|
}).dump());
|
||||||
http_post_message(etcd_watch_ws, WS_TEXT, json11::Json(json11::Json::object {
|
// FIXME: Do not watch /pg/history/ at all in client code (not in OSD)
|
||||||
{ "create_request", json11::Json::object {
|
|
||||||
{ "key", base64_encode(etcd_prefix+"/pg/history/") },
|
|
||||||
{ "range_end", base64_encode(etcd_prefix+"/pg/history0") },
|
|
||||||
{ "start_revision", etcd_watch_revision },
|
|
||||||
{ "watch_id", ETCD_PG_HISTORY_WATCH_ID },
|
|
||||||
{ "progress_notify", true },
|
|
||||||
} }
|
|
||||||
}).dump());
|
|
||||||
if (on_start_watcher_hook)
|
if (on_start_watcher_hook)
|
||||||
{
|
{
|
||||||
on_start_watcher_hook(etcd_watch_ws);
|
on_start_watcher_hook(etcd_watch_ws);
|
||||||
|
@ -543,15 +559,22 @@ void etcd_state_client_t::load_global_config()
|
||||||
{
|
{
|
||||||
etcd_call("/kv/range", json11::Json::object {
|
etcd_call("/kv/range", json11::Json::object {
|
||||||
{ "key", base64_encode(etcd_prefix+"/config/global") }
|
{ "key", base64_encode(etcd_prefix+"/config/global") }
|
||||||
}, etcd_slow_timeout, max_etcd_attempts, 0, [this](std::string err, json11::Json data)
|
}, etcd_quick_timeout, max_etcd_attempts, 0, [this](std::string err, json11::Json data)
|
||||||
{
|
{
|
||||||
if (err != "")
|
if (err != "")
|
||||||
{
|
{
|
||||||
fprintf(stderr, "Error reading OSD configuration from etcd: %s\n", err.c_str());
|
fprintf(stderr, "Error reading configuration from etcd: %s\n", err.c_str());
|
||||||
tfd->set_timer(etcd_slow_timeout, false, [this](int timer_id)
|
if (infinite_start)
|
||||||
{
|
{
|
||||||
load_global_config();
|
tfd->set_timer(etcd_slow_timeout, false, [this](int timer_id)
|
||||||
});
|
{
|
||||||
|
load_global_config();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
json11::Json::object global_config;
|
json11::Json::object global_config;
|
||||||
|
@ -591,6 +614,11 @@ void etcd_state_client_t::load_pgs()
|
||||||
{ "key", base64_encode(etcd_prefix+"/config/pgs") },
|
{ "key", base64_encode(etcd_prefix+"/config/pgs") },
|
||||||
} }
|
} }
|
||||||
},
|
},
|
||||||
|
json11::Json::object {
|
||||||
|
{ "request_range", json11::Json::object {
|
||||||
|
{ "key", base64_encode(etcd_prefix+"/pg/config") },
|
||||||
|
} }
|
||||||
|
},
|
||||||
json11::Json::object {
|
json11::Json::object {
|
||||||
{ "request_range", json11::Json::object {
|
{ "request_range", json11::Json::object {
|
||||||
{ "key", base64_encode(etcd_prefix+"/config/inode/") },
|
{ "key", base64_encode(etcd_prefix+"/config/inode/") },
|
||||||
|
@ -640,13 +668,10 @@ void etcd_state_client_t::load_pgs()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
reset_pg_exists();
|
reset_pg_exists();
|
||||||
if (!etcd_watch_revision)
|
etcd_watch_revision_config = etcd_watch_revision_osd = etcd_watch_revision_pg = data["header"]["revision"].uint64_value()+1;
|
||||||
|
if (this->log_level > 3)
|
||||||
{
|
{
|
||||||
etcd_watch_revision = data["header"]["revision"].uint64_value()+1;
|
fprintf(stderr, "Loaded revision %ju of PG configuration\n", etcd_watch_revision_pg-1);
|
||||||
if (this->log_level > 3)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "Loaded revision %ju of PG configuration\n", etcd_watch_revision-1);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
for (auto & res: data["responses"].array_items())
|
for (auto & res: data["responses"].array_items())
|
||||||
{
|
{
|
||||||
|
@ -713,7 +738,7 @@ void etcd_state_client_t::clean_nonexistent_pgs()
|
||||||
{
|
{
|
||||||
if (!pg_cfg.state_exists)
|
if (!pg_cfg.state_exists)
|
||||||
{
|
{
|
||||||
if (this->log_level > 3)
|
if (this->log_level > 3 && (pg_cfg.cur_primary || pg_cfg.cur_state))
|
||||||
{
|
{
|
||||||
fprintf(stderr, "PG %u/%u primary OSD disappeared after reload, forgetting it\n", pool_item.first, pg_it->first);
|
fprintf(stderr, "PG %u/%u primary OSD disappeared after reload, forgetting it\n", pool_item.first, pg_it->first);
|
||||||
}
|
}
|
||||||
|
@ -723,7 +748,7 @@ void etcd_state_client_t::clean_nonexistent_pgs()
|
||||||
}
|
}
|
||||||
if (!pg_cfg.history_exists)
|
if (!pg_cfg.history_exists)
|
||||||
{
|
{
|
||||||
if (this->log_level > 3)
|
if (this->log_level > 3 && (pg_cfg.target_history.size() || pg_cfg.all_peers.size() || pg_cfg.epoch || pg_cfg.next_scrub))
|
||||||
{
|
{
|
||||||
fprintf(stderr, "PG %u/%u history disappeared after reload, forgetting it\n", pool_item.first, pg_it->first);
|
fprintf(stderr, "PG %u/%u history disappeared after reload, forgetting it\n", pool_item.first, pg_it->first);
|
||||||
}
|
}
|
||||||
|
@ -895,8 +920,17 @@ void etcd_state_client_t::parse_state(const etcd_kv_t & kv)
|
||||||
on_change_pool_config_hook();
|
on_change_pool_config_hook();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (key == etcd_prefix+"/config/pgs")
|
else if (key == etcd_prefix+"/pg/config" || key == etcd_prefix+"/config/pgs")
|
||||||
{
|
{
|
||||||
|
if (key == etcd_prefix+"/pg/config")
|
||||||
|
{
|
||||||
|
new_pg_config = !value.is_null();
|
||||||
|
}
|
||||||
|
else if (new_pg_config)
|
||||||
|
{
|
||||||
|
// Ignore old key if the new one is present
|
||||||
|
return;
|
||||||
|
}
|
||||||
for (auto & pool_item: this->pool_config)
|
for (auto & pool_item: this->pool_config)
|
||||||
{
|
{
|
||||||
for (auto & pg_item: pool_item.second.pg_config)
|
for (auto & pg_item: pool_item.second.pg_config)
|
||||||
|
|
|
@ -10,10 +10,9 @@
|
||||||
#include "timerfd_manager.h"
|
#include "timerfd_manager.h"
|
||||||
|
|
||||||
#define ETCD_CONFIG_WATCH_ID 1
|
#define ETCD_CONFIG_WATCH_ID 1
|
||||||
#define ETCD_PG_STATE_WATCH_ID 2
|
#define ETCD_OSD_STATE_WATCH_ID 2
|
||||||
#define ETCD_PG_HISTORY_WATCH_ID 3
|
#define ETCD_PG_STATE_WATCH_ID 3
|
||||||
#define ETCD_OSD_STATE_WATCH_ID 4
|
#define ETCD_TOTAL_WATCHES 3
|
||||||
#define ETCD_TOTAL_WATCHES 4
|
|
||||||
|
|
||||||
#define DEFAULT_BLOCK_SIZE 128*1024
|
#define DEFAULT_BLOCK_SIZE 128*1024
|
||||||
#define MIN_DATA_BLOCK_SIZE 4*1024
|
#define MIN_DATA_BLOCK_SIZE 4*1024
|
||||||
|
@ -95,7 +94,7 @@ protected:
|
||||||
std::string selected_etcd_address;
|
std::string selected_etcd_address;
|
||||||
std::vector<std::string> addresses_to_try;
|
std::vector<std::string> addresses_to_try;
|
||||||
std::vector<inode_watch_t*> watches;
|
std::vector<inode_watch_t*> watches;
|
||||||
http_co_t *etcd_watch_ws = NULL, *keepalive_client = NULL;
|
bool new_pg_config = false;
|
||||||
int ws_keepalive_timer = -1;
|
int ws_keepalive_timer = -1;
|
||||||
int ws_alive = 0;
|
int ws_alive = 0;
|
||||||
bool rand_initialized = false;
|
bool rand_initialized = false;
|
||||||
|
@ -107,6 +106,7 @@ public:
|
||||||
int max_etcd_attempts = 5;
|
int max_etcd_attempts = 5;
|
||||||
int etcd_quick_timeout = 1000;
|
int etcd_quick_timeout = 1000;
|
||||||
int etcd_slow_timeout = 5000;
|
int etcd_slow_timeout = 5000;
|
||||||
|
bool infinite_start = true;
|
||||||
uint64_t global_block_size = DEFAULT_BLOCK_SIZE;
|
uint64_t global_block_size = DEFAULT_BLOCK_SIZE;
|
||||||
uint32_t global_bitmap_granularity = DEFAULT_BITMAP_GRANULARITY;
|
uint32_t global_bitmap_granularity = DEFAULT_BITMAP_GRANULARITY;
|
||||||
uint32_t global_immediate_commit = IMMEDIATE_NONE;
|
uint32_t global_immediate_commit = IMMEDIATE_NONE;
|
||||||
|
@ -115,8 +115,11 @@ public:
|
||||||
int log_level = 0;
|
int log_level = 0;
|
||||||
timerfd_manager_t *tfd = NULL;
|
timerfd_manager_t *tfd = NULL;
|
||||||
|
|
||||||
|
http_co_t *etcd_watch_ws = NULL, *keepalive_client = NULL;
|
||||||
int etcd_watches_initialised = 0;
|
int etcd_watches_initialised = 0;
|
||||||
uint64_t etcd_watch_revision = 0;
|
uint64_t etcd_watch_revision_config = 0;
|
||||||
|
uint64_t etcd_watch_revision_osd = 0;
|
||||||
|
uint64_t etcd_watch_revision_pg = 0;
|
||||||
std::map<pool_id_t, pool_config_t> pool_config;
|
std::map<pool_id_t, pool_config_t> pool_config;
|
||||||
std::map<osd_num_t, json11::Json> peer_states;
|
std::map<osd_num_t, json11::Json> peer_states;
|
||||||
std::set<osd_num_t> seen_peers;
|
std::set<osd_num_t> seen_peers;
|
||||||
|
|
|
@ -253,7 +253,7 @@ nla_put_failure:
|
||||||
const char *exe_name = NULL;
|
const char *exe_name = NULL;
|
||||||
|
|
||||||
const char *help_text =
|
const char *help_text =
|
||||||
"Vitastor NBD proxy " VERSION "\n"
|
"Vitastor NBD proxy " VITASTOR_VERSION "\n"
|
||||||
"(c) Vitaliy Filippov, 2020+ (VNPL-1.1)\n"
|
"(c) Vitaliy Filippov, 2020+ (VNPL-1.1)\n"
|
||||||
"\n"
|
"\n"
|
||||||
"COMMANDS:\n"
|
"COMMANDS:\n"
|
||||||
|
@ -626,7 +626,6 @@ help:
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
printf("%d %d\n", r, errno);
|
|
||||||
perror("run_nbd");
|
perror("run_nbd");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,7 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
|
||||||
|
|
||||||
Name: Vitastor
|
Name: Vitastor
|
||||||
Description: Vitastor client library
|
Description: Vitastor client library
|
||||||
Version: 1.7.1
|
Version: 1.9.1
|
||||||
Libs: -L${libdir} -lvitastor_client
|
Libs: -L${libdir} -lvitastor_client
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir}
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,7 @@ add_library(vitastor_cli STATIC
|
||||||
cli_fix.cpp
|
cli_fix.cpp
|
||||||
cli_ls.cpp
|
cli_ls.cpp
|
||||||
cli_create.cpp
|
cli_create.cpp
|
||||||
|
cli_dd.cpp
|
||||||
cli_modify.cpp
|
cli_modify.cpp
|
||||||
cli_modify_osd.cpp
|
cli_modify_osd.cpp
|
||||||
cli_osd_tree.cpp
|
cli_osd_tree.cpp
|
||||||
|
@ -18,6 +19,7 @@ add_library(vitastor_cli STATIC
|
||||||
cli_flatten.cpp
|
cli_flatten.cpp
|
||||||
cli_merge.cpp
|
cli_merge.cpp
|
||||||
cli_rm_data.cpp
|
cli_rm_data.cpp
|
||||||
|
cli_rm_wildcard.cpp
|
||||||
cli_rm.cpp
|
cli_rm.cpp
|
||||||
cli_rm_osd.cpp
|
cli_rm_osd.cpp
|
||||||
cli_pool_cfg.cpp
|
cli_pool_cfg.cpp
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
static const char *exe_name = NULL;
|
static const char *exe_name = NULL;
|
||||||
|
|
||||||
static const char* help_text =
|
static const char* help_text =
|
||||||
"Vitastor command-line tool " VERSION "\n"
|
"Vitastor command-line tool " VITASTOR_VERSION "\n"
|
||||||
"(c) Vitaliy Filippov, 2019+ (VNPL-1.1)\n"
|
"(c) Vitaliy Filippov, 2019+ (VNPL-1.1)\n"
|
||||||
"\n"
|
"\n"
|
||||||
"COMMANDS:\n"
|
"COMMANDS:\n"
|
||||||
|
@ -30,6 +30,7 @@ static const char* help_text =
|
||||||
"\n"
|
"\n"
|
||||||
"vitastor-cli ls [-l] [-p POOL] [--sort FIELD] [-r] [-n N] [<glob> ...]\n"
|
"vitastor-cli ls [-l] [-p POOL] [--sort FIELD] [-r] [-n N] [<glob> ...]\n"
|
||||||
" List images (only matching <glob> patterns if passed).\n"
|
" List images (only matching <glob> patterns if passed).\n"
|
||||||
|
" --exact Do not match glob patterns as names, select only exact name matches.\n"
|
||||||
" -p|--pool POOL Filter images by pool ID or name\n"
|
" -p|--pool POOL Filter images by pool ID or name\n"
|
||||||
" -l|--long Also report allocated size and I/O statistics\n"
|
" -l|--long Also report allocated size and I/O statistics\n"
|
||||||
" --del Also include delete operation statistics\n"
|
" --del Also include delete operation statistics\n"
|
||||||
|
@ -53,14 +54,43 @@ static const char* help_text =
|
||||||
" -f|--force Proceed with shrinking or setting readwrite flag even if the image has children.\n"
|
" -f|--force Proceed with shrinking or setting readwrite flag even if the image has children.\n"
|
||||||
" --down-ok Proceed with shrinking even if some data will be left on unavailable OSDs.\n"
|
" --down-ok Proceed with shrinking even if some data will be left on unavailable OSDs.\n"
|
||||||
"\n"
|
"\n"
|
||||||
"vitastor-cli rm <from> [<to>] [--writers-stopped] [--down-ok]\n"
|
"vitastor-cli dd [iimg=<image> | if=<file>] [oimg=<image> | of=<file>] [bs=1M]\n"
|
||||||
" Remove <from> or all layers between <from> and <to> (<to> must be a child of <from>),\n"
|
" [count=N] [seek/oseek=N] [skip/iseek=M] [iodepth=N] [status=progress]\n"
|
||||||
" rebasing all their children accordingly. --writers-stopped allows merging to be a bit\n"
|
" [conv=nocreat,noerror,nofsync,trunc,nosparse] [iflag=direct] [oflag=direct,append]\n"
|
||||||
" more effective in case of a single 'slim' read-write child and 'fat' removed parent:\n"
|
" Copy data between Vitastor images, files and pipes.\n"
|
||||||
" the child is merged into parent and parent is renamed to child in that case.\n"
|
" Options can be specified in classic dd style (key=value) or like usual (--key value).\n"
|
||||||
" In other cases parent layers are always merged into children.\n"
|
" iimg=<image> Copy from Vitastor image <image>\n"
|
||||||
" Other options:\n"
|
" if=<file> Copy from file <file>\n"
|
||||||
" --down-ok Continue deletion/merging even if some data will be left on unavailable OSDs.\n"
|
" oimg=<image> Copy to Vitastor image <image>\n"
|
||||||
|
" of=<file> Copy to file <file>\n"
|
||||||
|
" bs=1M Set copy block size\n"
|
||||||
|
" count=N Copy only N input blocks. If N ends in B it counts bytes, not blocks\n"
|
||||||
|
" seek/oseek=N Skip N output blocks. If N ends in B it counts bytes, not blocks\n"
|
||||||
|
" skip/iseek=N Skip N input blocks. If N ends in B it counts bytes, not blocks\n"
|
||||||
|
" iodepth=N Send N reads or writes in parallel (default 4)\n"
|
||||||
|
" status=LEVEL The LEVEL of information to print to stderr: none/noxfer/progress\n"
|
||||||
|
" size=N Specify size for the created output file/image (defaults to input size)\n"
|
||||||
|
" iflag=direct For input files only: use direct I/O\n"
|
||||||
|
" oflag=direct For output files only: use direct I/O\n"
|
||||||
|
" oflag=append For files only: append to output file\n"
|
||||||
|
" conv=nocreat Do not create output file/image\n"
|
||||||
|
" conv=trunc Truncate output file/image\n"
|
||||||
|
" conv=noerror Continue copying after errors\n"
|
||||||
|
" conv=nofsync Do not call fsync before finishing (default behaviour is fsync)\n"
|
||||||
|
" conv=nosparse Write all output blocks including all-zero blocks\n"
|
||||||
|
"\n"
|
||||||
|
"vitastor-cli rm <from> [<to>]\n"
|
||||||
|
"vitastor-cli rm (--exact|--matching) <glob> ...\n"
|
||||||
|
" Remove layer(s) and rebase all their children accordingly.\n"
|
||||||
|
" In the first form, remove <from> or layers between <from> and its child <to>.\n"
|
||||||
|
" In the second form, remove all images with exact or pattern-matched names.\n"
|
||||||
|
" --writers-stopped allows optimised removal in case of a single 'slim' read-write\n"
|
||||||
|
" child and 'fat' removed parent: the child is merged into parent and parent is renamed\n"
|
||||||
|
" to child in that case. In other cases parent layers are always merged into children.\n"
|
||||||
|
" --exact Remove multiple images with names matching given glob patterns.\n"
|
||||||
|
" --matching Remove multiple images with given names\n"
|
||||||
|
" --writers-stopped Allow renaming inodes over their read/write children.\n"
|
||||||
|
" --down-ok Continue deletion/merging even if some data will be left on unavailable OSDs.\n"
|
||||||
"\n"
|
"\n"
|
||||||
"vitastor-cli flatten <layer>\n"
|
"vitastor-cli flatten <layer>\n"
|
||||||
" Flatten a layer, i.e. merge data and detach it from parents.\n"
|
" Flatten a layer, i.e. merge data and detach it from parents.\n"
|
||||||
|
@ -251,6 +281,7 @@ static json11::Json::object parse_args(int narg, const char *args[])
|
||||||
!strcmp(opt, "down-ok") || !strcmp(opt, "down_ok") ||
|
!strcmp(opt, "down-ok") || !strcmp(opt, "down_ok") ||
|
||||||
!strcmp(opt, "dry-run") || !strcmp(opt, "dry_run") ||
|
!strcmp(opt, "dry-run") || !strcmp(opt, "dry_run") ||
|
||||||
!strcmp(opt, "help") || !strcmp(opt, "all") ||
|
!strcmp(opt, "help") || !strcmp(opt, "all") ||
|
||||||
|
!strcmp(opt, "exact") || !strcmp(opt, "matching") ||
|
||||||
!strcmp(opt, "writers-stopped") || !strcmp(opt, "writers_stopped"))
|
!strcmp(opt, "writers-stopped") || !strcmp(opt, "writers_stopped"))
|
||||||
{
|
{
|
||||||
cfg[opt] = "1";
|
cfg[opt] = "1";
|
||||||
|
@ -382,6 +413,20 @@ static int run(cli_tool_t *p, json11::Json::object cfg)
|
||||||
}
|
}
|
||||||
action_cb = p->start_flatten(cfg);
|
action_cb = p->start_flatten(cfg);
|
||||||
}
|
}
|
||||||
|
else if (cmd[0] == "dd")
|
||||||
|
{
|
||||||
|
// Read or write to/from cluster
|
||||||
|
for (int i = 0; i < cmd.size(); i++)
|
||||||
|
{
|
||||||
|
auto arg = cmd[i].string_value();
|
||||||
|
ssize_t p = arg.find("=");
|
||||||
|
if (p != std::string::npos)
|
||||||
|
{
|
||||||
|
cfg[arg.substr(0, p)] = arg.substr(p+1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
action_cb = p->start_dd(cfg);
|
||||||
|
}
|
||||||
else if (cmd[0] == "rm")
|
else if (cmd[0] == "rm")
|
||||||
{
|
{
|
||||||
// Remove multiple snapshots and rebase their children
|
// Remove multiple snapshots and rebase their children
|
||||||
|
@ -485,8 +530,6 @@ static int run(cli_tool_t *p, json11::Json::object cfg)
|
||||||
p->ringloop = new ring_loop_t(RINGLOOP_DEFAULT_SIZE);
|
p->ringloop = new ring_loop_t(RINGLOOP_DEFAULT_SIZE);
|
||||||
p->epmgr = new epoll_manager_t(p->ringloop);
|
p->epmgr = new epoll_manager_t(p->ringloop);
|
||||||
p->cli = new cluster_client_t(p->ringloop, p->epmgr->tfd, cfg_j);
|
p->cli = new cluster_client_t(p->ringloop, p->epmgr->tfd, cfg_j);
|
||||||
// Smaller timeout by default for more interactiveness
|
|
||||||
p->cli->st_cli.etcd_slow_timeout = p->cli->st_cli.etcd_quick_timeout;
|
|
||||||
p->loop_and_wait(action_cb, [&](const cli_result_t & r)
|
p->loop_and_wait(action_cb, [&](const cli_result_t & r)
|
||||||
{
|
{
|
||||||
result = r;
|
result = r;
|
||||||
|
|
|
@ -75,7 +75,9 @@ public:
|
||||||
std::function<bool(cli_result_t &)> start_rm(json11::Json);
|
std::function<bool(cli_result_t &)> start_rm(json11::Json);
|
||||||
std::function<bool(cli_result_t &)> start_rm_data(json11::Json);
|
std::function<bool(cli_result_t &)> start_rm_data(json11::Json);
|
||||||
std::function<bool(cli_result_t &)> start_rm_osd(json11::Json);
|
std::function<bool(cli_result_t &)> start_rm_osd(json11::Json);
|
||||||
|
std::function<bool(cli_result_t &)> start_rm_wildcard(json11::Json);
|
||||||
std::function<bool(cli_result_t &)> start_status(json11::Json);
|
std::function<bool(cli_result_t &)> start_status(json11::Json);
|
||||||
|
std::function<bool(cli_result_t &)> start_dd(json11::Json);
|
||||||
|
|
||||||
// Should be called like loop_and_wait(start_status(), <completion callback>)
|
// Should be called like loop_and_wait(start_status(), <completion callback>)
|
||||||
void loop_and_wait(std::function<bool(cli_result_t &)> loop_cb, std::function<void(const cli_result_t &)> complete_cb);
|
void loop_and_wait(std::function<bool(cli_result_t &)> loop_cb, std::function<void(const cli_result_t &)> complete_cb);
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue