Merge branch 'master-ATR-22483' into 'master'

Fix frontier access for TriggerDB

Closes ATR-22483

See merge request atlas/athena!38964

Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfFrontier.py

@@ -42,9 +42,30 @@ def testUrl(url):
         return False
     return True
 
+def resolveUrl(url):
+    """
+    Expects input string to be a URL or $FRONTIER_SERVER
+    Returns an accessible URL or None"""
+    import re
+    if re.match("http://",url): # simple URL specification http://...
+        return url if testUrl(url) else None
+
+    if re.match(r'\(serverurl=(.*?)\)',url): # syntax of FRONTIER_SERVER
+        for url in getServerUrls(url):
+            if testUrl(url):
+                return url     
+        return None
+
+
 def getFrontierCursor(url, schema, loglevel = logging.INFO):
     log = logging.getLogger( "TrigConfFrontier.py" )
     log.setLevel(loglevel)
+    url = resolveUrl(url)
+    if url is None:
+        log.warning("Cannot find a valid frontier connection, will not return a Frontier cursor")
+        return None
+    else:
+        log.info(f"Will use Frontier server at {url}")
     if useFrontierClient:
         log.info("Using frontier_client from TrigConfDBConnection")
         return FrontierCursor2( url = url, schema = schema)
@@ -201,8 +222,6 @@ class FrontierCursor(object):
         queryStart = time.localtime()
         log.debug("Query started: %s", time.strftime("%m/%d/%y %H:%M:%S %Z", queryStart))
 
-        print(request)
-
         t1 = time.time()
         result = urllib.request.urlopen(request,None,10).read().decode()
         t2 = time.time()
@@ -308,21 +327,15 @@ def testQuery(query, bindvars):
 
     from TrigConfigSvc.TrigConfigSvcUtils import interpretConnection
     connectionParameters = interpretConnection("TRIGGERDBMC")
-    for url in getServerUrls( connectionParameters['url'] ):
-        if not testUrl(url):
-            log.info("Skipping %s (failing connection test)", url)
-            continue
-        log.info("Testing %s", url)
-        cursor = getFrontierCursor( url = url, schema = connectionParameters['schema'])
-        cursor.execute(query, bindvars)
-        log.info("Raw response:")
-        print(cursor.result)
-        cursor.decodeResult()
-        log.info("Decoded response:")
-        log.info(cursor.result[0][0])        
-        if cursor.result[0][0] != 'MC_pp_v7':
-            return 1
-        break
+    cursor = getFrontierCursor( url = connectionParameters['url'], schema = connectionParameters['schema'])
+    cursor.execute(query, bindvars)
+    log.info("Raw response:")
+    print(cursor.result)
+    cursor.decodeResult()
+    log.info("Decoded response:")
+    log.info(cursor.result[0][0])        
+    if cursor.result[0][0] != 'MC_pp_v7':
+        return 1
     return 0
 
 

Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcUtils.py

@@ -249,9 +249,10 @@ def getTriggerDBCursor(connection):
         schema = connectionParameters["schema"].rstrip('.') + '.'
 
     elif technology == 'frontier':
-        from TrigConfigSvc.TrigConfFrontier import getFrontierCursor 
-        cursor = getFrontierCursor(connectionParameters["url"], connectionParameters["schema"], logging.getLogger("TrigConfigSvcUtils.py").level)
-        schema = connectionParameters["schema"].rstrip('.') + '.'
+        from TrigConfigSvc.TrigConfFrontier import getFrontierCursor
+        schema = connectionParameters["schema"].rstrip('.')
+        cursor = getFrontierCursor( url = connectionParameters['url'], schema = schema, loglevel = logging.getLogger("TrigConfigSvcUtils.py").level)
+        schema = schema + '.'
 
     elif technology == 'mysql':
         cursor = _get_mysql_cursor(connectionParameters["server"], connectionParameters["dbname"], connectionParameters["user"], connectionParameters["passwd"]),''
@@ -986,7 +987,8 @@ def test():
 ####################################""")
     
 
-
+def test1():
+    getMenuNameFromDB("TRIGGERDBMC",321)
 
 def test2():
     log.setLevel(logging.WARNING)
@@ -1016,4 +1018,4 @@ def test2():
 
 if __name__=="__main__":
     import sys
-    sys.exit(test2())
+    sys.exit(test1())