From be37edc0b52685089a7d3a721945fdde08caa87e Mon Sep 17 00:00:00 2001 From: Mrt134 Date: Fri, 21 Aug 2020 09:14:52 -0400 Subject: [PATCH] NAS-107302: Clarify two Periodic Snapshot error messages - Rework dataset not found to be clear that a dataset or zvol was not found. This should solve multi-window/user situations where a dataset/zvol is deleted while the other window has it selected. - Clarify the exclude message a little. (cherry picked from commit 07aa0d756f58effd36216a232c0abe7fd8cdb55d) --- src/middlewared/middlewared/plugins/snapshot.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/middlewared/middlewared/plugins/snapshot.py b/src/middlewared/middlewared/plugins/snapshot.py index d6a063b8e88c..6d3e7de5470a 100644 --- a/src/middlewared/middlewared/plugins/snapshot.py +++ b/src/middlewared/middlewared/plugins/snapshot.py @@ -294,13 +294,13 @@ async def _validate(self, data): if data['dataset'] not in (await self.middleware.call('pool.filesystem_choices')): verrors.add( 'dataset', - 'Invalid ZFS dataset' + 'ZFS dataset or zvol not found' ) if not data['recursive'] and data['exclude']: verrors.add( 'exclude', - 'Excluding datasets has no sense for non-recursive periodic snapshot tasks' + 'Excluding datasets is not necessary for non-recursive periodic snapshot tasks' ) for i, v in enumerate(data['exclude']):