search

ayufan / pve-patches

Repository with public Proxmox patches
223 stars 54 forks source link

Proxmox 6.2-9 - patch set does not apply anymore #58

Open dw2412 opened 4 years ago

dw2412 commented 4 years ago

Hi Ayufan,

Proxmox release PVE 6.2-9 - because of their Backup Server they seemed to have changed again some parts of their PVE Perl Code.

Actually the 6.2-4 Patch Set does not apply in these sub parts:

root@proxmox:~# ./pve-6.2-diff-backup-addon test Proxmox VE 6.2-4 - differential backup support, v3 Kamil Trzcinski, http://ayufan.eu/, ayufan@ayufan.eu

$ patch_apply / --dry-run --batch checking file usr/share/perl5/PVE/LXC/Create.pm checking file usr/share/perl5/PVE/QemuServer.pm Hunk #1 succeeded at 5493 (offset -128 lines). Hunk #2 succeeded at 6139 (offset -126 lines). Hunk #3 succeeded at 6349 (offset -126 lines). checking file usr/share/perl5/PVE/Storage.pm Hunk #1 succeeded at 536 (offset 1 line). Hunk #2 FAILED at 1397. Hunk #3 succeeded at 1433 with fuzz 1 (offset 29 lines). Hunk #4 succeeded at 1479 (offset 29 lines). 1 out of 4 hunks FAILED checking file usr/share/perl5/PVE/Storage/Plugin.pm Hunk #1 succeeded at 436 (offset -1 lines). Hunk #2 FAILED at 941. 1 out of 2 hunks FAILED checking file usr/share/perl5/PVE/VZDump.pm Hunk #2 succeeded at 642 (offset 2 lines). Hunk #3 succeeded at 731 with fuzz 2 (offset 2 lines). Hunk #4 FAILED at 952. Hunk #5 succeeded at 965 with fuzz 1 (offset -3 lines). Hunk #6 succeeded at 983 (offset -3 lines). 1 out of 6 hunks FAILED checking file usr/share/perl5/PVE/VZDump/Common.pm checking file usr/share/perl5/PVE/VZDump/LXC.pm Hunk #1 succeeded at 325 (offset 8 lines). Hunk #2 succeeded at 420 (offset 8 lines). checking file usr/share/perl5/PVE/VZDump/QemuServer.pm Hunk #1 succeeded at 241 (offset -2 lines). Hunk #2 succeeded at 249 (offset -2 lines). Hunk #3 succeeded at 537 (offset 65 lines). Hunk #4 succeeded at 612 (offset 65 lines). checking file usr/share/pve-manager/js/pvemanagerlib.js Hunk #1 succeeded at 9231 (offset -32432 lines).

The alt Patch Set for the 6.2-4 showes similar output...

Thanks for help if you find some time to adapt your patch set since not everyone has a second server he could use as a simple Proxmox Backup Server...

Andreas

Power2All commented 4 years ago

I could look into it, I have some little bit of Perl knowledge, but not the best. So sad that Proxmox developers do not include this backup solution as a optional thing, even though it does not work for everybody, it works for the most part for a lot of people.

manofring commented 4 years ago

workaround: apt-get install pve-manager=6.2-4 qemu-server=6.2-4 libpve-storage-perl=6.1-8

cd;apt install git -y;git clone https://github.com/ayufan/pve-patches cd pve-patches/ wget https://github.com/ayufan/pve-xdelta3/releases/download/3.0.11.zstd/pve-xdelta3_3.0.11-dfsg-1ubuntu1.zstd.ayufan2_amd64.deb dpkg -i pve-xdelta3_3.0.11-dfsg-1ubuntu1.zstd.ayufan2_amd64.deb

./pve-6.2-4-diff-backup-addon test ./pve-6.2-4-diff-backup-addon apply

dw2412 commented 4 years ago

workaround: apt-get install pve-manager=6.2-4 qemu-server=6.2-4 libpve-storage-perl=6.1-8

cd;apt install git -y;git clone https://github.com/ayufan/pve-patches cd pve-patches/ wget https://github.com/ayufan/pve-xdelta3/releases/download/3.0.11.zstd/pve-xdelta3_3.0.11-dfsg-1ubuntu1.zstd.ayufan2_amd64.deb dpkg -i pve-xdelta3_3.0.11-dfsg-1ubuntu1.zstd.ayufan2_amd64.deb

./pve-6.2-4-diff-backup-addon test ./pve-6.2-4-diff-backup-addon apply

This is what I actually always do if such issue exists. But well - this prevents from updates, therefor I open a new issue here to make others aware of... at least if not possible to easily fix by my own skills...

Maybe for reference it would be nice3 to have the above commands incl. a comment how to work with the version number for the once with less experience in the Readme of this repo...

Still hope that Kamil will find some time for updating the patch set ;-)

Andreas

pojlFDlxCOvZ4Kg8y1l4 commented 4 years ago

Thanks for help if you find some time to adapt your patch set since not everyone has a second server he could use as a simple Proxmox Backup Server... @dw2412

I've read multiple times that it's not advisable, but possible to run the PBS on the same Proxmox host.
I thought I read it somewhere "official", but for now I can only find forum posts from other users.

amegyeri commented 4 years ago

@ayufan Is there a chance that you will prepare a patch for 6.2-11 in the near future? Unfortunately I haven't got the time/skills to do so, and Storage.pm appears to be quite much changed... Thank you for your efforts so far!