Merge pull request #452 from PanDAWMS/proxy_sites

Remove old glExec code from getJobs
PanDAWMS · Nov 18, 2024 · 7e73040 · 7e73040
2 parents 9e351be + d374ea8
commit 7e73040
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 62 deletions.
diff --git a/pandaserver/jobdispatcher/JobDispatcher.py b/pandaserver/jobdispatcher/JobDispatcher.py
@@ -20,10 +20,9 @@
 from pandaserver.brokerage.SiteMapper import SiteMapper
 from pandaserver.config import panda_config
 from pandaserver.dataservice.adder_gen import AdderGen
-from pandaserver.jobdispatcher import DispatcherUtils, Protocol
+from pandaserver.jobdispatcher import Protocol
 from pandaserver.proxycache import panda_proxy_cache, token_cache
 from pandaserver.srvcore import CoreUtils
-from pandaserver.taskbuffer import EventServiceUtils
 
 # logger
 _logger = PandaLogger().getLogger("JobDispatcher")
@@ -164,7 +163,6 @@ def getJob(
     ):
         t_getJob_start = time.time()
         jobs = []
-        useProxyCache = False
         try:
             tmpNumJobs = int(nJobs)
         except Exception:
@@ -237,55 +235,6 @@ def getJob(
                     response.appendNode("secrets", secrets_map[tmpJob.prodUserName])
                 if panda_config.pilot_secrets in secrets_map and secrets_map[panda_config.pilot_secrets]:
                     response.appendNode("pilotSecrets", secrets_map[panda_config.pilot_secrets])
-                # check if proxy cache is used
-                if hasattr(panda_config, "useProxyCache") and panda_config.useProxyCache is True:
-                    self.specialDispatchParams.update()
-                    if "proxyCacheSites" not in self.specialDispatchParams:
-                        proxyCacheSites = {}
-                    else:
-                        proxyCacheSites = self.specialDispatchParams["proxyCacheSites"]
-                    if siteName in proxyCacheSites:
-                        useProxyCache = True
-                # set proxy
-                if useProxyCache:
-                    try:
-                        #  get compact
-                        compactDN = self.taskBuffer.cleanUserID(realDN)
-                        # check permission
-                        self.specialDispatchParams.update()
-                        if "allowProxy" not in self.specialDispatchParams:
-                            allowProxy = []
-                        else:
-                            allowProxy = self.specialDispatchParams["allowProxy"]
-                        if compactDN not in allowProxy:
-                            tmpLog.warning(f"{siteName} {node} '{compactDN}' no permission to retrieve user proxy")
-                        else:
-                            if useProxyCache:
-                                tmpStat, tmpOut = self.set_user_proxy(
-                                    response,
-                                    proxyCacheSites[siteName]["dn"],
-                                    proxyCacheSites[siteName]["role"],
-                                )
-                            else:
-                                tmpStat, tmpOut = self.set_user_proxy(response)
-                            if not tmpStat:
-                                tmpLog.warning(f"{siteName} {node} failed to get user proxy : {tmpOut}")
-                    except Exception as e:
-                        tmpLog.warning(f"{siteName} {node} failed to get user proxy with {str(e)}")
-                # panda proxy
-                if (
-                    "pandaProxySites" in self.specialDispatchParams
-                    and siteName in self.specialDispatchParams["pandaProxySites"]
-                    and (EventServiceUtils.isEventServiceJob(tmpJob) or EventServiceUtils.isEventServiceMerge(tmpJob))
-                ):
-                    # get secret key
-                    tmpSecretKey, tmpErrMsg = DispatcherUtils.getSecretKey(tmpJob.PandaID)
-                    if tmpSecretKey is None:
-                        tmpLog.warning(f"PandaID={tmpJob.PandaID} site={siteName} failed to get panda proxy secret key : {tmpErrMsg}")
-                    else:
-                        # set secret key
-                        tmpLog.debug(f"PandaID={tmpJob.PandaID} set key={tmpSecretKey}")
-                        response.setPandaProxySecretKey(tmpSecretKey)
                 # add
                 responseList.append(response.data)
             # make response for bulk

diff --git a/templates/panda_server.cfg.rpmnew.template b/templates/panda_server.cfg.rpmnew.template
@@ -196,16 +196,6 @@ useJEDI = True
 
 
 
-##########################
-#
-# Proxy Cache
-#
-
-# use Proxy Cache
-useProxyCache = False
-
-
-
 ##########################
 #
 # Plugin setup