Disable client-initiated vgrid and resource map refresh in vgridman and resman

backends if janitor is enabled since it takes care of all refresh handling.

Author: jonasbardino

mig/shared/functionality/resman.py

@@ -4,7 +4,7 @@
 # --- BEGIN_HEADER ---
 #
 # resman - manage resources
-# Copyright (C) 2003-2021  The MiG Project lead by Brian Vinter
+# Copyright (C) 2003-2025  The MiG Project lead by the Science HPC Center at UCPH
 #
 # This file is part of MiG.
 #
@@ -20,7 +20,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+# USA.
 #
 # -- END_HEADER ---
 #
@@ -41,7 +42,7 @@
 from mig.shared.modified import pending_resources_update, pending_vgrids_update
 from mig.shared.resource import anon_to_real_res_map
 from mig.shared.vgridaccess import user_visible_res_confs, get_resource_map, \
-    OWNERS, CONF
+    load_resource_map, CONF, OWNERS
 
 list_operations = ['showlist', 'list']
 show_operations = ['show', 'showlist']
@@ -155,7 +156,11 @@ def main(client_id, user_arguments_dict):
         logger.info("get vgrid and resource map with caching %s" % caching)
         visible_res_confs = user_visible_res_confs(configuration, client_id,
                                                    caching)
-        res_map = get_resource_map(configuration, caching)
+        # NOTE: prevent refresh if janitor is enabled as it handles all updates
+        if configuration.site_enable_janitor:
+            (res_map, _) = load_resource_map(configuration, caching=caching)
+        else:
+            res_map = get_resource_map(configuration, caching)
         anon_map = anon_to_real_res_map(configuration.resource_home)
 
         # NOTE: use simple pending check if caching to avoid lock during update

mig/shared/functionality/vgridman.py

@@ -20,7 +20,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+# USA.
 #
 # -- END_HEADER ---
 #
@@ -40,7 +41,8 @@
 from mig.shared.modified import pending_vgrids_update
 from mig.shared.useradm import get_full_user_map
 from mig.shared.vgrid import vgrid_create_allowed
-from mig.shared.vgridaccess import get_vgrid_map, VGRIDS, OWNERS, MEMBERS, SETTINGS
+from mig.shared.vgridaccess import get_vgrid_map, load_vgrid_map, MEMBERS, \
+    OWNERS, SETTINGS, VGRIDS
 
 list_operations = ['showlist', 'list']
 show_operations = ['show', 'showlist']
@@ -185,7 +187,11 @@ def main(client_id, user_arguments_dict):
 
     if operation in list_operations:
         logger.info("get vgrid map with caching %s" % caching)
-        vgrid_map = get_vgrid_map(configuration, caching=caching)
+        # NOTE: prevent refresh if janitor is enabled as it handles all updates
+        if configuration.site_enable_janitor:
+            (vgrid_map, _) = load_vgrid_map(configuration, caching=caching)
+        else:
+            vgrid_map = get_vgrid_map(configuration, caching=caching)
         # NOTE: use simple pending check if caching to avoid lock during update
         if caching:
             pending_updates = pending_vgrids_update(configuration)