Improve snap name

Author: sonicaj

src/middlewared/middlewared/plugins/apps/upgrade.py

@@ -12,6 +12,7 @@
 from .ix_apps.path import get_installed_app_path
 from .ix_apps.upgrade import upgrade_config
 from .version_utils import get_latest_version_from_app_versions
+from .utils import get_upgrade_snap_name
 
 
 logger = logging.getLogger('app_lifecycle')
@@ -49,7 +50,7 @@ def take_snapshot_of_hostpath_and_stop_app(self, app, snapshot_hostpath):
 
                 continue
 
-            snap_name = f'{dataset}@{app_info["version"]}'
+            snap_name = f'{dataset}@{get_upgrade_snap_name(app_info["name"], app_info["version"])}'
             if self.middleware.call_sync('zfs.snapshot.query', [['id', '=', snap_name]]):
                 logger.debug('Snapshot %r already exists for %r app', snap_name, app_info['name'])
                 continue

src/middlewared/middlewared/plugins/apps/utils.py

@@ -5,6 +5,11 @@
 
 
 PROJECT_PREFIX = 'ix-'
+UPGRADE_SNAP_PREFIX = 'ix-app-upgrade-'
+
+
+def get_upgrade_snap_name(app_name: str, app_version: str) -> str:
+    return f'{UPGRADE_SNAP_PREFIX}{app_name}-{app_version}'
 
 
 def get_app_stop_cache_key(app_name: str) -> str: