Merge pull request #6055 from tomachalek/supp2877_b

Handle legacy/removed corpora names when transfering deprec. settings

lib/plugins/mysql_settings_storage/__init__.py

@@ -18,10 +18,11 @@
 
 import logging
 from collections import defaultdict
-from typing import Any, Dict, List, Optional
+from typing import Dict, List, Optional
 
 import plugins
 import ujson as json
+from pymysql.err import IntegrityError
 from plugin_types.common import Serializable
 from plugin_types.settings_storage import AbstractSettingsStorage
 from plugins import inject
@@ -72,7 +73,11 @@ async def _upgrade_general_settings(self, data: Dict[str, Serializable], user_id
                 gen[k] = v
 
         for corp, data in corp_set.items():
-            await self.save(user_id, corp, data)
+            try:
+                await self.save(user_id, corp, data)
+            except IntegrityError:
+                logging.getLogger(__name__).warning(
+                    f'Failed to transfer legacy format settings for corpus {corp}. Throwing the setting away.')
 
         if len(gen) < len(data):
             logging.getLogger(__name__).warning(