YunoHost-Apps/garage_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/garage_ynh.git synced 2024-09-03 18:36:32 +02:00
Code Issues Activity Actions

fix wrong weight update

Browse source
This commit is contained in:
oiseauroch 2023-02-22 20:55:54 +01:00
parent 1828687c09
commit 4c76428026
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
conf/mount_disk.sh
View file

@ -17,5 +17,8 @@ then
mkfs.ext4 /dev/nbd$i mkfs.ext4 /dev/nbd$i
fi fi
mkdir -p $datadir/data mkdir -p $datadir/data
chown __APP__:__APP__ $datadir/data
mount /dev/nbd$i $datadir/data/ mount /dev/nbd$i $datadir/data/
fi fi

29
scripts/config
View file

@ -18,7 +18,7 @@ final_path=$(ynh_app_setting_get $app final_path)
node_id=$(ynh_app_setting_get $app node_id) node_id=$(ynh_app_setting_get $app node_id)
virtualisation=$(ynh_app_setting_get $app virtualisation) virtualisation=$(ynh_app_setting_get $app virtualisation)
datadir=$(ynh_app_setting_get $app datadir) datadir=$(ynh_app_setting_get $app datadir)
nbd_index=$(ynh_app_setting_get $app nbd_index) nbd_index=$(cat $datadir/nbd_index)
command="$final_path/garage -c $final_path/garage.toml" command="$final_path/garage -c $final_path/garage.toml"
get__weight() { get__weight() {
@ -28,26 +28,24 @@ get__weight() {
set__weight() { set__weight() {
if [ "$virtualisation" = "true" ] if [ "$virtualisation" = "true" ]
then then
systemctl stop $YNH_APP_INSTANCE_NAME systemctl stop $app
old_weight="$ynh_app_setting_get --app=$app --key=weight" old_weight="$(ynh_app_setting_get --app=$app --key=weight)"
if [ $old_weight -le $weight } if [ $old_weight -le $weight ]
then then
$final_path/umount_disk.sh $nbd_index qemu-img resize $datadir/garage_data.qcow2 "$weight"G
qemu-img resize $datadir/$datadir/garage_data.qcow2 $weightG qemu-nbd --connect /dev/nbd$nbd_index $datadir/garage_data.qcow2
qemu-nbd --connect /dev/nbd$nbd_index $datadir/garage.qcow2 e2fsck -f -y /dev/nbd$nbd_index
e2fsck -f /dev/nbd$nbd_index
resize2fs /dev/nbd$nbd_index resize2fs /dev/nbd$nbd_index
mount /dev/nbd$nbd_index $datadir/data/ qemu-nbd --disconnect /dev/nbd$nbd_index
else else
umount /dev/nbd$nbd_index e2fsck -f -y /dev/nbd0
e2fsck -f /dev/nbd$nbd_index
resize2fs /dev/nbd$nbd_index $weightG resize2fs /dev/nbd$nbd_index $weightG
qemu-nbd --disconnect /dev/nbd$nbd_index qemu-nbd --disconnect /dev/nbd$nbd_index
qemu-img resize $datadir/$datadir/garage_data.qcow2 $weightG qemu-img resize --shrink $datadir/garage_data.qcow2 "$weight"G
$nbd_index=$(final_path/mount_disk.sh false)
ynh_app_setting_set --app=$app --key=nbd_index --value=$nbd_index
fi fi
systemctl start $YNH_APP_INSTANCE_NAME $final_path/umount_disk.sh
systemctl start $app
sleep 3
fi fi
$command layout assign $node_id -c $weight 2>/dev/null $command layout assign $node_id -c $weight 2>/dev/null
apply_layout "$command" apply_layout "$command"
@ -55,6 +53,7 @@ set__weight() {
} }
get__bootstrap_peers() { get__bootstrap_peers() {
ynh_app_setting_get --app=$app --key=bootstrap_peers ynh_app_setting_get --app=$app --key=bootstrap_peers
} }