[IMP] modules: skip autoinstall of unintalled modules

In the case where an autoninstall module is uninstalled by
users prior to the upgrade start, this module could be
reinstalled during the upgrade if there were dependency
changes and those dependencies get force installed.
This improvement keeps track of any module that was
elligible for autoinstall before the upgrade starts and skips
its force installation when dependencies change.

Author: jjmaksoud

src/base/0.0.0/pre-00-upgrade-start.py

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+from odoo.addons.base.maintenance.migrations import util
+from odoo.addons.base.maintenance.migrations.util.modules import _get_autoinstallable_modules
 
 
 def migrate(cr, version):
@@ -13,3 +14,4 @@ def migrate(cr, version):
          WHERE EXCLUDED.value::timestamp - ir_config_parameter.value::timestamp > interval '72 hours'
         """
     )
+    util.ENVIRON["__modules_to_skip_autoinstall"] = _get_autoinstallable_modules(cr)

src/util/const.py

@@ -13,6 +13,7 @@
     "__renamed_fields": collections.defaultdict(dict),
     "__modules_auto_discovery_force_installs": {},
     "__modules_auto_discovery_force_upgrades": {},
+    "__modules_to_skip_autoinstall": set(),
     "__fix_fk_allowed_cascade": [],
     "__no_model_data_delete": {},
 }

src/util/modules.py

@@ -342,6 +342,7 @@ def remove_module(cr, module):
 
     ENVIRON["__modules_auto_discovery_force_installs"].pop(module, None)
     ENVIRON["__modules_auto_discovery_force_upgrades"].pop(module, None)
+    ENVIRON["__modules_to_skip_autoinstall"].discard(module)
 
 
 def remove_theme(cr, theme, base_theme=None):
@@ -362,6 +363,7 @@ def remove_theme(cr, theme, base_theme=None):
 
     ENVIRON["__modules_auto_discovery_force_installs"].pop(theme, None)
     ENVIRON["__modules_auto_discovery_force_upgrades"].pop(theme, None)
+    ENVIRON["__modules_to_skip_autoinstall"].discard(theme)
 
 
 def _update_view_key(cr, old, new):
@@ -415,6 +417,10 @@ def rename_module(cr, old, new):
     fu = ENVIRON["__modules_auto_discovery_force_upgrades"]
     if old in fu:
         fu[new] = fu.pop(old)
+    si = ENVIRON["__modules_to_skip_autoinstall"]
+    if old in si:
+        si.discard(old)
+        si.add(new)
 
 
 @_warn_usage_outside_base
@@ -450,6 +456,9 @@ def merge_module(cr, old, into, update_dependers=True):
             version = fu[old][1] if parse_version(fu[old][1]) < parse_version(fu[into][1]) else fu[into][1]
             del fu[old]
             fu[into] = (init, version)
+    si = ENVIRON["__modules_to_skip_autoinstall"]
+    if old in si and into in si:
+        si.discard(old)
 
     if old not in mod_ids:
         # this can happen in case of temp modules added after a release if the database does not
@@ -721,14 +730,24 @@ def _force_install_module(cr, module, if_installed=None, reason="it has been exp
             [toinstall, list(INSTALLED_MODULE_STATES)],
         )
         for (mod,) in cr.fetchall():
-            _force_install_module(
-                cr,
-                mod,
-                reason=(
-                    "it is an auto install module that got all its auto install dependencies installed "
-                    "by the force install of {!r}"
-                ).format(module),
-            )
+            if mod in ENVIRON["__modules_to_skip_autoinstall"]:
+                _logger.info(
+                    (
+                        "Skipping the auto installation of module %s after all its auto install dependencies were installed by "
+                        "the force install of %s, because it was previously uninstalled."
+                    ),
+                    mod,
+                    module,
+                )
+            else:
+                _force_install_module(
+                    cr,
+                    mod,
+                    reason=(
+                        "it is an auto install module that got all its auto install dependencies installed "
+                        "by the force install of {!r}"
+                    ).format(module),
+                )
 
     # TODO handle module exclusions
 
@@ -828,10 +847,21 @@ def module_auto_install(cr, module, auto_install):
 @_warn_usage_outside_base
 def trigger_auto_install(cr, module):
     _assert_modules_exists(cr, module)
+    to_autoinstall = _get_autoinstallable_modules(cr, module)
+    if to_autoinstall:
+        if module in ENVIRON["__modules_to_skip_autoinstall"]:
+            _logger.info("Skipping the auto installation of module %s because it was previously uninstalled.", module)
+            return False
+        force_install_module(cr, module, reason="it's an auto install module and all its dependencies are installed")
+        return True
+    return False
+
+
+def _get_autoinstallable_modules(cr, module=None):
     if AUTO_INSTALL == "none":
-        return False
+        return set()
 
-    dep_match = "true"
+    dep_match = "TRUE"
     if column_exists(cr, "ir_module_module_dependency", "auto_install_required"):
         dep_match = "d.auto_install_required = true"
 
@@ -856,34 +886,35 @@ def trigger_auto_install(cr, module):
            )
         """
 
-    cat_match = "true"
+    cat_match = "TRUE"
     if AUTO_INSTALL == "only_link_modules":
         # even if we skip auto installs, we still need to auto install the real link-modules.
         # those are in the "Hidden" category
         hidden = ref(cr, "base.module_category_hidden")
         cat_match = cr.mogrify("m.category_id = %s", [hidden]).decode()
 
+    name_match = "TRUE"
+    if module:
+        name_match = cr.mogrify("m.name = %s", [module]).decode()
+
     query = """
-            SELECT m.id
+            SELECT m.name
               FROM ir_module_module_dependency d
               JOIN ir_module_module m ON m.id = d.module_id
               JOIN ir_module_module md ON md.name = d.name
                 {}
-             WHERE m.name = %s
+             WHERE {}
                AND m.state = 'uninstalled'
                AND m.auto_install = true
                AND {}
                AND {}
-          GROUP BY m.id
+          GROUP BY m.name
             HAVING bool_and(md.state IN %s)
                 {}
-    """.format(country_join, dep_match, cat_match, country_match)
+    """.format(country_join, name_match, dep_match, cat_match, country_match)
 
-    cr.execute(query, [module, INSTALLED_MODULE_STATES])
-    if cr.rowcount:
-        force_install_module(cr, module, reason="it's an auto install module and all its dependencies are installed")
-        return True
-    return False
+    cr.execute(query, [INSTALLED_MODULE_STATES])
+    return {m[0] for m in cr.fetchall()}
 
 
 def _set_module_category(cr, module, category):