]> git.proxmox.com Git - pve-storage.git/log
pve-storage.git
3 years agolvmthin: Match snapshot remove regex to allowed names
Dominic Jäger [Wed, 28 Oct 2020 10:04:54 +0000 (11:04 +0100)]
lvmthin: Match snapshot remove regex to allowed names

We allow snapshot names that match pve-configid but during qm destroy we have
not removed all snapshots that match pve-configid so far. For example, the name
x-y was allowed but the resulting snap_vm-105-disk-0_x-y was not removed.

Reported-by: Hannes Laimer <h.laimer@proxmox.com>
Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
3 years agoprune: allow having all prune options zero/missing
Fabian Ebner [Fri, 13 Nov 2020 13:08:55 +0000 (14:08 +0100)]
prune: allow having all prune options zero/missing

This is basically necessary for the GUI's prune widget, because we want to
pass along all options equal to zero when all the number fields are cleared.
And it's more similar to how it's done in PBS now.

Bumped the APIAGE and APIVER, in case some external plugin needs to adapt to
the now less restrictive schema for 'prune-backups'.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agoprune mark: keep all if all prune options are zero/missing
Fabian Ebner [Fri, 13 Nov 2020 13:08:54 +0000 (14:08 +0100)]
prune mark: keep all if all prune options are zero/missing

as an additional safety measure. And add some tests.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agodon't pass along keep-options equal to zero to PBS
Fabian Ebner [Fri, 13 Nov 2020 13:08:53 +0000 (14:08 +0100)]
don't pass along keep-options equal to zero to PBS

In PBS, zero is not allowed for these options.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agopbs: add/update: return enc. key, if newly set or auto-generated
Thomas Lamprecht [Thu, 12 Nov 2020 17:05:26 +0000 (18:05 +0100)]
pbs: add/update: return enc. key, if newly set or auto-generated

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoapi: storage create/update: return parts of the configuration
Thomas Lamprecht [Thu, 12 Nov 2020 17:01:41 +0000 (18:01 +0100)]
api: storage create/update: return parts of the configuration

First, doing such things can make client work slightly easier, as the
submitted values do not need to be made available in any callback
handling the response.

But the actual reason for doing this now is, that this is a
preparatory step for allowing the user to download/print/.. an
autogenerated PBS client encryption key.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoavoid unecessary try for over optimization
Thomas Lamprecht [Thu, 12 Nov 2020 16:31:16 +0000 (17:31 +0100)]
avoid unecessary try for over optimization

That was lots of code and hash map touching for the case where one
avoided a extra stat, which result probably was in the page cache
anyway, for the case that a backup has a comment.

A case which is rather  be unlikely - comments are normally done for
the occasional explicit backup (e.g., before major upgrade, before a
configuration change in that guest, ...), at least not worth some
relatively complicated effort making that sub harder to read and
maintain.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agostorage: get subdirectory files: read .comment files for comments
Dominik Csapak [Thu, 12 Nov 2020 15:26:02 +0000 (16:26 +0100)]
storage: get subdirectory files: read .comment files for comments

we have no way of setting them yet via the API, but we can read them
now

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
3 years agoapi: content listing: add comment and verification fields
Dominik Csapak [Thu, 12 Nov 2020 15:26:01 +0000 (16:26 +0100)]
api: content listing: add comment and verification fields

for now only for PBS, since we do not have such info elsewhere

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
3 years agopbs: autogen encryption key: bubble up error message
Thomas Lamprecht [Thu, 12 Nov 2020 10:49:01 +0000 (11:49 +0100)]
pbs: autogen encryption key: bubble up error message

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoapi/config: fix indentation
Thomas Lamprecht [Wed, 11 Nov 2020 08:35:53 +0000 (09:35 +0100)]
api/config: fix indentation

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agobump version to 6.2-10
Thomas Lamprecht [Tue, 10 Nov 2020 18:03:07 +0000 (19:03 +0100)]
bump version to 6.2-10

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agofix #3030: always activate volumes in storage_migrate
Fabian Ebner [Fri, 6 Nov 2020 14:30:55 +0000 (15:30 +0100)]
fix #3030: always activate volumes in storage_migrate

AFAICT the snapshot activation is not necessary for our plugins at the moment,
but it doesn't really hurt and might be relevant in the future or for external
plugins.

Deactivating volumes is up to the caller, because for example, for replication
on a running guest, we obviously don't want to deactivate volumes.

Suggested-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agoadd check for fsfreeze before snapshot
Stoiko Ivanov [Fri, 6 Nov 2020 14:19:40 +0000 (15:19 +0100)]
add check for fsfreeze before snapshot

In order to take a snapshot of a container volume, which can be mounted
read-only with RBD, the volume needs to be frozen (fsfreeze (8)) before taking
the snapshot.

This commit adds helpers to determine if the FIFREEZE ioctl needs to be called
for the volume.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
3 years agofix typo in comment
Stoiko Ivanov [Fri, 6 Nov 2020 14:19:39 +0000 (15:19 +0100)]
fix typo in comment

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
3 years agoDiskmanage: Use S.M.A.R.T. attributes for SSDs wearout lookup
Jan-Jonas Sämann [Fri, 30 Oct 2020 03:57:22 +0000 (04:57 +0100)]
Diskmanage: Use S.M.A.R.T. attributes for SSDs wearout lookup

This replaces a locally maintained hardware map in
get_wear_leveling_info() by commonly used register names of
smartmontool. Smartmontool maintains a labeled register database that
contains a majority of drives (including versions). The current lookup
produces false estimates, this approach hopefully provides more reliable
data.

Signed-off-by: Jan-Jonas Sämann <sprinterfreak@binary-kitchen.de>
3 years agoUpdate disk_tests/ssd_smart/sde data
Jan-Jonas Sämann [Fri, 30 Oct 2020 03:57:21 +0000 (04:57 +0100)]
Update disk_tests/ssd_smart/sde data

Provides recent test data for disk_tests/ssd_smart/sde_smart. The
previous data was created using an older smartmontools version, which
did not yet support the drive and therefore had bogus attribute mapping.

Signed-off-by: Jan-Jonas Sämann <sprinterfreak@binary-kitchen.de>
3 years agofix #1452: also log stderr of remote command with insecure storage migration
Fabian Ebner [Thu, 1 Oct 2020 08:11:36 +0000 (10:11 +0200)]
fix #1452: also log stderr of remote command with insecure storage migration

Commit 8fe00d99449b7c80e81ab3c9826625a4fcd89aa4 already
introduced the necessary logging for the secure code path,
so presumably the bug was already fixed for most people.

Delay the potential die for the send command to be able to log
the ouput+error from the receive command. Like this we also see e.g.
'volume ... already exists' instead of just 'broken pipe'.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agoavoid output of zfs get command on volume import
Fabian Ebner [Thu, 1 Oct 2020 08:11:35 +0000 (10:11 +0200)]
avoid output of zfs get command on volume import

quiet takes care of both the error and success case.
Without this, there are lines like:
myzpool/vm-4352-disk-0@__replicate_4352-7_1601538554__ name myzpool/vm-4352-disk-0@__replicate_4352-7_1601538554__ -
in the log if the dataset exists, and this information is
already present in more readable form.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agofix #3097: cifs, nfs: increase connection check timeout to 10s
Thomas Lamprecht [Tue, 27 Oct 2020 06:03:17 +0000 (07:03 +0100)]
fix #3097: cifs, nfs: increase connection check timeout to 10s

we already have the ZFS pool plugin as precedent to use 10s, at for
network with remote off-site storage one can get to 200 - 300ms
RTT latency, which means that for a protocol needing multiple rounds of
communication, one can easily get over 2s while not being in a broken
network.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agobump version to 6.2-9
Thomas Lamprecht [Tue, 13 Oct 2020 09:14:10 +0000 (11:14 +0200)]
bump version to 6.2-9

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoLIO: drop unused statements
Stoiko Ivanov [Mon, 12 Oct 2020 15:34:58 +0000 (17:34 +0200)]
LIO: drop unused statements

minor cleanup of left-over/unused statements.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
3 years agoLIO: untaint values read from remote config
Stoiko Ivanov [Mon, 12 Oct 2020 15:34:57 +0000 (17:34 +0200)]
LIO: untaint values read from remote config

The LIO backend for ZFS over iSCSI fetches the json-config periodically from
the target.
This patch reduces the stored config values to those which are actually used
and additonally untaints the values read from the remote host's config-file.

Since the LUN index is used in calls to targetcli on the remote host (via
run_command), untainting prevents the call to crash when run with '-T'.

Tested by creating a zfs over iscsi backed VM, starting it, adding disks,
resizing disks, removing disks, creating snapshots, rolling back to a snapshot.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
3 years agoZFSPlugin: untaint lun number
Stoiko Ivanov [Fri, 9 Oct 2020 15:13:44 +0000 (17:13 +0200)]
ZFSPlugin: untaint lun number

ZFS over iSCSI fetches information about the disk-images via ssh, thus
the obtainted data is tainted (perlsec (1)).

Since pvedaemon runs with '-T' enabled trying to start a VM via GUI/API failed,
while it still worked via `qm` or `pvesh`.

The issue surfaced after commit cb9db10c1a9855cf40ff13e81f9dd97d6a9b2698 in
pve-common ('run_command: improve performance for logging and long lines'),
and results from concatenating the original (tainted) buffer to a variable,
instead of a captured subgroup.

Untainting the value in ZFSPlugin should not cause any regressiosn, since the
other 3 target providers already have a match on '\d+' for retrieving the
lun number.

reported via pve-user [0].

reproduced and tested by setting up a LIO-target (on top of a virtual PVE),
adding it as storage and trying to start a guest (with a disk on the
ZFS over iSCSI storage) with `perl -T /usr/sbin/qm start $vmid`

[0] https://lists.proxmox.com/pipermail/pve-user/2020-October/172055.html

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
3 years agodisk management: set more specific type for nvme
Thomas Lamprecht [Fri, 9 Oct 2020 16:06:33 +0000 (18:06 +0200)]
disk management: set more specific type for nvme

some users are confused, and it's nicer to have the more specific
type presented here.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agocode cleanup
Thomas Lamprecht [Fri, 9 Oct 2020 16:06:07 +0000 (18:06 +0200)]
code cleanup

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agofile_size_info: handle dangling symlinks
Fabian Grünbichler [Fri, 2 Oct 2020 11:55:15 +0000 (13:55 +0200)]
file_size_info: handle dangling symlinks

and other stat failure modes.

this method returns undef if 'qemu-img info ...' fails to return
information, so callers must handle this already.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
3 years agobump version to 6.2-8
Thomas Lamprecht [Fri, 2 Oct 2020 14:09:15 +0000 (16:09 +0200)]
bump version to 6.2-8

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoPBS: use simple TCP ping for online check for now
Thomas Lamprecht [Fri, 2 Oct 2020 13:55:03 +0000 (15:55 +0200)]
PBS: use simple TCP ping for online check for now

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoPBS: add support to specify port
Thomas Lamprecht [Fri, 2 Oct 2020 13:49:48 +0000 (15:49 +0200)]
PBS: add support to specify port

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agobump version to 6.2-7
Thomas Lamprecht [Tue, 29 Sep 2020 16:56:04 +0000 (18:56 +0200)]
bump version to 6.2-7

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agocheck for service exsitance before enabling zfs-import service
Thomas Lamprecht [Tue, 29 Sep 2020 15:33:13 +0000 (17:33 +0200)]
check for service exsitance before enabling zfs-import service

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoDisks: instantiate import unit for created zpool
Stoiko Ivanov [Wed, 16 Sep 2020 12:14:19 +0000 (14:14 +0200)]
Disks: instantiate import unit for created zpool

When creating a new ZFS storage, also instantiate an import-unit for the pool.
This should help mitigate the case where some pools don't get imported during
boot, because they are not listed in an existing zpool.cache file.

This patch needs the corresponding addition of 'zfs-import@.service' in
the zfsonlinux repository.

Suggested-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
3 years agofix regression in zfs volume activation
Stoiko Ivanov [Tue, 29 Sep 2020 16:49:44 +0000 (18:49 +0200)]
fix regression in zfs volume activation

commit 815df2dd08ac4c7295135262e60d64fbb57b8f5c introduced a small issue
when activating linked clone volumes - the volname passed contains
basevol/subvol, which needs to be translated to subvol.

using the path method should be a robust way to get the actual path for
activation.

Found and tested by building the package as root (otherwise the zfs
regressiontests are skipped).

Reported-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
3 years agozfs pool: clean up use statements
Thomas Lamprecht [Tue, 29 Sep 2020 03:08:57 +0000 (05:08 +0200)]
zfs pool: clean up use statements

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoZFS: mount subvols in activate_volume
Fabian Ebner [Mon, 28 Sep 2020 09:48:37 +0000 (11:48 +0200)]
ZFS: mount subvols in activate_volume

Makes it possible to clone and start a container whose
ZFS subvols are not yet mounted for some reason. If a
subvol cannot be mounted, there's a better error now:
zfs error: cannot mount '/myzpool/subvol-103-disk-0': directory is not empty

Previously, cloning would quietly do an "empty" clone,
and startup would fail with:
mount_autodev: 1074 Permission denied - Failed to create "/dev" directory
lxc_setup: 3238 Failed to mount "/dev"
do_start: 1224 Failed to setup container "103"
__sync_wait: 41 An error occurred in another process (expected sequence number 5)

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agozfs: rollback: improve error message
Fabian Grünbichler [Tue, 22 Sep 2020 06:56:13 +0000 (08:56 +0200)]
zfs: rollback: improve error message

we don't even know whether $snap exists at all, so the old variant could
be rather misleading..

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
3 years agozfs: handle unexpectedly missing snapshots better
Fabian Grünbichler [Tue, 22 Sep 2020 06:56:12 +0000 (08:56 +0200)]
zfs: handle unexpectedly missing snapshots better

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
3 years agofix indentation of $prune_backups_format
Thomas Lamprecht [Thu, 3 Sep 2020 16:21:09 +0000 (18:21 +0200)]
fix indentation of $prune_backups_format

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoprune-backups: improve command description
Fabian Ebner [Mon, 31 Aug 2020 08:48:02 +0000 (10:48 +0200)]
prune-backups: improve command description

This is shown in the man page, so it's not important to mention
that this is a wrapper. Also mention the fact that the keep options
from the storage configuration serve as a fallback, which was previously
mentioned in the description of the (now removed) prune-backups parameter.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agoprune-backups CLI: use keep-options directly
Fabian Ebner [Mon, 31 Aug 2020 08:48:01 +0000 (10:48 +0200)]
prune-backups CLI: use keep-options directly

Makes the interface cleaner; e.g. --keep-daily=2 instead of
--prune-backups=keep-daily=2

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agoprune_backups CLI: print different message when there's no backups at all
Fabian Ebner [Thu, 20 Aug 2020 11:50:10 +0000 (13:50 +0200)]
prune_backups CLI: print different message when there's no backups at all

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agoprune_backups: fix message
Fabian Ebner [Thu, 20 Aug 2020 11:50:09 +0000 (13:50 +0200)]
prune_backups: fix message

For prune selections, it doesn't matter what the current time is,
only the timestamps of the backups matter.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agostorage_migrate: log bandwidth limit
Fabian Ebner [Wed, 29 Jul 2020 09:44:18 +0000 (11:44 +0200)]
storage_migrate: log bandwidth limit

and avoid undefined post-if declaration of @cstream.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agobump version to 6.2-6
Thomas Lamprecht [Fri, 24 Jul 2020 17:10:06 +0000 (19:10 +0200)]
bump version to 6.2-6

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agopbs: check if encryption key could be deleted
Thomas Lamprecht [Fri, 24 Jul 2020 17:06:01 +0000 (19:06 +0200)]
pbs: check if encryption key could be deleted

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoconfig: add hint for set encryption key, die on unlink error
Thomas Lamprecht [Fri, 24 Jul 2020 14:47:47 +0000 (16:47 +0200)]
config: add hint for set encryption key, die on unlink error

as else the API cannot easily know if this is set, it cannot check
with -f as the key is in a restricted area and we do not want that a
GET runs as protected.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoAdd API and pvesm call for prune_backups
Fabian Ebner [Thu, 9 Jul 2020 12:45:43 +0000 (14:45 +0200)]
Add API and pvesm call for prune_backups

For the pvesm call use a wrapper and a --dry-run option to redirect
to the correct API call.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agoAdd prune_backups to storage API
Fabian Ebner [Thu, 9 Jul 2020 12:45:42 +0000 (14:45 +0200)]
Add prune_backups to storage API

Implement it for generic storages supporting backups
(i.e. directory-based storages) and add a wrapper for PBS.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agoIntroduce prune-backups property for directory-based storages
Fabian Ebner [Thu, 9 Jul 2020 12:45:41 +0000 (14:45 +0200)]
Introduce prune-backups property for directory-based storages

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agobump version to 6.2-5
Wolfgang Bumiller [Tue, 14 Jul 2020 11:58:44 +0000 (13:58 +0200)]
bump version to 6.2-5

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
3 years agopvesm: pass-through 'autogen' special value for encryption key
Wolfgang Bumiller [Tue, 14 Jul 2020 11:57:55 +0000 (13:57 +0200)]
pvesm: pass-through 'autogen' special value for encryption key

so that the on-update hook can handle its creation

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
3 years agofix another encryption_key vs encryption-key instance
Wolfgang Bumiller [Tue, 14 Jul 2020 11:51:26 +0000 (13:51 +0200)]
fix another encryption_key vs encryption-key instance

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
3 years agobump version to 6.2-4
Wolfgang Bumiller [Tue, 14 Jul 2020 11:45:29 +0000 (13:45 +0200)]
bump version to 6.2-4

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
3 years agoparam mapping fixup
Wolfgang Bumiller [Fri, 10 Jul 2020 08:52:45 +0000 (10:52 +0200)]
param mapping fixup

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
3 years agovdisk_list: skip scanning storages which cannot have images/rootdisks
Thomas Lamprecht [Thu, 9 Jul 2020 14:14:04 +0000 (16:14 +0200)]
vdisk_list: skip scanning storages which cannot have images/rootdisks

Do not try to scan (and thus activate) storages which aren't
configured to support (or cannot support) "vdisks" anyway.

Avoids seemingly strange failures of VM migrations due to a backup storage
not being currently online - even if that storage isn't referenced in
the VM config anywhere..

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agouse ssh -X for upload
Wolfgang Bumiller [Thu, 9 Jul 2020 13:00:38 +0000 (15:00 +0200)]
use ssh -X for upload

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
3 years agobump version to 6.2-3
Wolfgang Bumiller [Thu, 9 Jul 2020 13:00:10 +0000 (15:00 +0200)]
bump version to 6.2-3

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
3 years agoquick fixup for prune command in vzdump
Wolfgang Bumiller [Thu, 9 Jul 2020 12:50:13 +0000 (14:50 +0200)]
quick fixup for prune command in vzdump

This is a hack and we should get rid of `run_client_cmd` and
`run_raw_client_cmd` as an API entry!

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
3 years agobump version to 6.2-2
Thomas Lamprecht [Thu, 9 Jul 2020 12:03:33 +0000 (14:03 +0200)]
bump version to 6.2-2

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agod/control: depend on proxmox-backup-client
Thomas Lamprecht [Thu, 9 Jul 2020 10:34:51 +0000 (12:34 +0200)]
d/control: depend on proxmox-backup-client

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agopbs: activate_storage: query status to ensure we can connect
Thomas Lamprecht [Thu, 9 Jul 2020 09:54:13 +0000 (11:54 +0200)]
pbs: activate_storage: query status to ensure we can connect

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agopbs: allow to autogen an encryption key
Thomas Lamprecht [Thu, 9 Jul 2020 09:53:51 +0000 (11:53 +0200)]
pbs: allow to autogen an encryption key

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agopbs: rename encryption_key param to encryption-key
Thomas Lamprecht [Thu, 9 Jul 2020 09:53:27 +0000 (11:53 +0200)]
pbs: rename encryption_key param to encryption-key

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agopvesm: encryption key parameter should load files
Wolfgang Bumiller [Thu, 9 Jul 2020 08:25:44 +0000 (10:25 +0200)]
pvesm: encryption key parameter should load files

also `pvesm set` and `pvesm add` should behave the same with
respect to how configuration options are treated

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
3 years agorefactor sensitive parameter handling
Wolfgang Bumiller [Thu, 9 Jul 2020 08:25:43 +0000 (10:25 +0200)]
refactor sensitive parameter handling

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
3 years agopbs: encryption support, split "raw client command" API
Wolfgang Bumiller [Thu, 9 Jul 2020 08:25:42 +0000 (10:25 +0200)]
pbs: encryption support, split "raw client command" API

(And deprecate it...)

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
3 years agocifs: use more general name for password description
Thomas Lamprecht [Thu, 9 Jul 2020 08:34:53 +0000 (10:34 +0200)]
cifs: use more general name for password description

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoarchive_info: relax custom name handling
Fabian Grünbichler [Wed, 8 Jul 2020 10:05:02 +0000 (12:05 +0200)]
archive_info: relax custom name handling

we already differentiate between standard and non-standard names anyway
and don't detect and return the VMID in the latter case anyway. drop it
from the RE as well to allow names like 'vzdump-qemu-template.vma.lzo'
without the need for a fake VMID.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
3 years agoarchive_info: use timelocal correctly
Fabian Ebner [Wed, 8 Jul 2020 08:22:19 +0000 (10:22 +0200)]
archive_info: use timelocal correctly

Because we always have 4-digit years, we can simply pass
the year itself to timelocal instead of subtracting 1900.
Like this it will also work for years not in the range 2000-2999.

See also:
https://perldoc.perl.org/Time/Local.html#Year-Value-Interpretation

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agobump version to 6.2-1
Thomas Lamprecht [Tue, 7 Jul 2020 17:23:58 +0000 (19:23 +0200)]
bump version to 6.2-1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agofix #2460: use dm-uuid-mpath- as fallback for multipath
Mira Limbeck [Tue, 7 Jul 2020 14:14:54 +0000 (16:14 +0200)]
fix #2460: use dm-uuid-mpath- as fallback for multipath

With Debian Buster it looks like the 'scsi-' method is no longer
reliable. In addition to that, which is also used for non-multipath
systems, add the 'dm-uuid-mpath-' method as fallback. This is also used
by openstack (see os-brick
https://github.com/openstack/os-brick/blob/39b201160bbff39117fca46b2709ff3f74c53d80/os_brick/initiator/linuxscsi.py#L400)

Also sort the output of readdir so 'scsi-' is always after
'dm-uuid-mpath-' so the output of pvesm list does not change for systems
that worked before.

Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
3 years agopbs: run_raw_client_cmd: fix typo, and drop repetive info
Thomas Lamprecht [Tue, 7 Jul 2020 08:14:00 +0000 (10:14 +0200)]
pbs: run_raw_client_cmd: fix typo, and drop repetive info

It would be s/bps/pbs/ but as we already have "proxmox-backup-client"
included in the log through the executable name, so it should be
clear that this is a PBS command - so drop that part entirely.

Now using:
> run: /usr/bin/proxmox-backup-client ...

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoscan_cifs: fix scanning server with no SMB1 fallback
Thomas Lamprecht [Wed, 1 Jul 2020 13:33:14 +0000 (15:33 +0200)]
scan_cifs: fix scanning server with no SMB1 fallback

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoscan cifs: fix passing "no pass" parameter
Thomas Lamprecht [Wed, 1 Jul 2020 10:17:02 +0000 (12:17 +0200)]
scan cifs: fix passing "no pass" parameter

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoscan storage: order scanned shares alphabetically
Thomas Lamprecht [Wed, 1 Jul 2020 08:25:32 +0000 (10:25 +0200)]
scan storage: order scanned shares alphabetically

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoscan_cifs: do not add NT_STATUS lines to result
Thomas Lamprecht [Wed, 1 Jul 2020 08:25:07 +0000 (10:25 +0200)]
scan_cifs: do not add NT_STATUS lines to result

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoscan_cifs: do not enforce password for users
Thomas Lamprecht [Wed, 1 Jul 2020 10:07:19 +0000 (12:07 +0200)]
scan_cifs: do not enforce password for users

there can be accounts with explicit null password others than the
mapped guest account.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoscan_cifs: pass user/pass over environment
Thomas Lamprecht [Tue, 30 Jun 2020 13:15:08 +0000 (15:15 +0200)]
scan_cifs: pass user/pass over environment

As command line argument they are readable by ever user in the same
PID namespace.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoscan_cifs: add workgroup domain independent of user param
Thomas Lamprecht [Tue, 30 Jun 2020 13:14:33 +0000 (15:14 +0200)]
scan_cifs: add workgroup domain independent of user param

they are not really bound to each other

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoscan_cifs: raise smbclient errors
Thomas Lamprecht [Tue, 30 Jun 2020 13:13:02 +0000 (15:13 +0200)]
scan_cifs: raise smbclient errors

Silencing error messages can extend the search for an issue while
having to advantage.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoscan_cifs: fix comment typo and indentation
Thomas Lamprecht [Tue, 30 Jun 2020 13:12:19 +0000 (15:12 +0200)]
scan_cifs: fix comment typo and indentation

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoadd trailing newline to error message
Thomas Lamprecht [Tue, 30 Jun 2020 12:19:24 +0000 (14:19 +0200)]
add trailing newline to error message

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoPBSPlugin: Add print_volid helper
Fabian Ebner [Tue, 30 Jun 2020 08:24:20 +0000 (10:24 +0200)]
PBSPlugin: Add print_volid helper

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agoAdd archive_remove
Fabian Ebner [Tue, 30 Jun 2020 08:24:19 +0000 (10:24 +0200)]
Add archive_remove

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agoExtend archive_info to include filename and logfilename
Fabian Ebner [Tue, 30 Jun 2020 08:24:18 +0000 (10:24 +0200)]
Extend archive_info to include filename and logfilename

Only expect the logfilename if the archive has a standard name.
This also gives a mechanism to get an untainted filename.

archive_info can take either a volume ID or a path as it's
currently implemented. This is useful for vzdump when there
is no storage (i.e. for 'vzdump --dumpdir'). Add a test case for this.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agoWhitespace cleanup
Fabian Ebner [Tue, 30 Jun 2020 08:24:22 +0000 (10:24 +0200)]
Whitespace cleanup

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agoFix 2763: Revert "storage_migrate: check if target storage supports content type"
Fabian Ebner [Mon, 25 May 2020 07:41:58 +0000 (09:41 +0200)]
Fix 2763: Revert "storage_migrate: check if target storage supports content type"

This reverts commit 95015dbbf24b710011965805e689c03923fb830c.

parse_volname always gives 'images' and not 'rootdir'. In most
cases the volume name alone does not contain the needed information,
e.g. vm-123-disk-0 can be both a VM volume or a container volume.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agodoc: Clarify that pvesm export is mostly internal
Dominic Jäger [Tue, 2 Jun 2020 09:56:49 +0000 (11:56 +0200)]
doc: Clarify that pvesm export is mostly internal

3 years agobase plugin: fall back to empty hash to avoid checking archive info definedness
Thomas Lamprecht [Sat, 6 Jun 2020 17:40:06 +0000 (19:40 +0200)]
base plugin: fall back to empty hash to avoid checking archive info definedness

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoExpand archive_info to include ctime, vmid and is_std_name
Fabian Ebner [Thu, 4 Jun 2020 09:08:34 +0000 (11:08 +0200)]
Expand archive_info to include ctime, vmid and is_std_name

where 'is_std_name' shows whether the backup name uses the standard naming
schema and most likely was created by our tools.

Also adds a '^' to the existing filename matching regex, which
should be fine since basename() is used beforehand.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agoPBSPlugin: list_volumes: filter by vmid if specified
Fabian Ebner [Thu, 4 Jun 2020 09:08:33 +0000 (11:08 +0200)]
PBSPlugin: list_volumes: filter by vmid if specified

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
3 years agofix #2777 create zpools with stable dev paths
Stoiko Ivanov [Fri, 5 Jun 2020 13:24:56 +0000 (15:24 +0200)]
fix #2777 create zpools with stable dev paths

when compiling the disk list add a property with a stable
/dev/disk/by-id/ path for a block device when available.

This is needed to create zpools with the stable by-id links

The /dev/disk/by-id/ directory can contain multiple links to the same device
(e.g. when it's used as a LVM PV, or one for the wwn/nvme-eui in addition
to the one with vendor and serial). We take the first one which matches
the bus where the disk is attached. For nvme disks we exclude the one
containing the nvme-eui.

The patch assumes that not all disks need to have such a link (e.g.
virtio-block devices as we pass them to guests).

Additionally the tests were adapted to run successfully.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
3 years agoPBSPlugin.pm: avoid ascii-art in proxmox-backup-client output
Dietmar Maurer [Wed, 3 Jun 2020 09:07:01 +0000 (11:07 +0200)]
PBSPlugin.pm: avoid ascii-art in proxmox-backup-client output

3 years agoceph: get_local_version: allow optional v prefix for version number
Thomas Lamprecht [Fri, 22 May 2020 16:50:06 +0000 (18:50 +0200)]
ceph: get_local_version: allow optional v prefix for version number

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agobump version to 6.1-8
Thomas Lamprecht [Fri, 15 May 2020 17:41:25 +0000 (19:41 +0200)]
bump version to 6.1-8

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agotests: re-add virt "none" negative test
Thomas Lamprecht [Fri, 15 May 2020 17:32:21 +0000 (19:32 +0200)]
tests: re-add virt "none" negative test

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoarchive info: keep some basic strictness
Thomas Lamprecht [Fri, 15 May 2020 17:18:22 +0000 (19:18 +0200)]
archive info: keep some basic strictness

we want to enforce at least the strictness that our tools can do
something with a backup archive..

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoarchive info: include archive name in error message
Thomas Lamprecht [Fri, 15 May 2020 17:13:37 +0000 (19:13 +0200)]
archive info: include archive name in error message

so that we have some context if users report issues with it..

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agotests: archive info: avoid assembling arrays to just de-assemble them directly
Thomas Lamprecht [Fri, 15 May 2020 17:11:48 +0000 (19:11 +0200)]
tests: archive info: avoid assembling arrays to just de-assemble them directly

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>