Skip to content

Replace urls with cmsweb only endpoints (no cmsweb-prod), for WMAgent. #12431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
khurtado wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Replace urls with cmsweb only endpoints (no cmsweb-prod), for WMAgent. #12431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0b9c9a
Replace urls with cmsweb only endpoints (no cmsweb-prod), for WMAgent.
khurtado Aug 29, 2025
2ac901d
Change etc configuration to use cmsweb rather than cmsweb-prod
khurtado Aug 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion etc/WMAgentConfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

# DBS Information.
localDBSVersion = "DBS_2_0_8"
globalDBSUrl = "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader"
globalDBSUrl = "https://cmsweb.cern.ch/dbs/prod/global/DBSReader"
globalDBSVersion = "DBS_2_0_8"

# Job retry information. How long it will sit in cool off.
Expand Down
2 changes: 1 addition & 1 deletion etc/dbsVerify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def connectToDB():
blocks[row[0]].append(row[1])

args = {}
args["url"] = "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader"
args["url"] = "https://cmsweb.cern.ch/dbs/prod/global/DBSReader"
args["version"] = "DBS_2_0_9"
args["mode"] = "GET"
dbsApi = DbsApi(args)
Expand Down
2 changes: 1 addition & 1 deletion etc/harvestingInjector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def injectFilesFromDBS(inputFileset, datasetPath, runsWhiteList=[]):
"""
print("injecting files from %s into %s, please wait..." % (datasetPath, inputFileset.name))
args = {}
args["url"] = "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader"
args["url"] = "https://cmsweb.cern.ch/dbs/prod/global/DBSReader"
args["version"] = "DBS_2_1_1"
args["mode"] = "GET"
dbsApi = DbsApi(args)
Expand Down
2 changes: 1 addition & 1 deletion etc/injectReRecoWorkflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def injectFilesFromDBS(inputFileset, datasetPath):
"""
print("injecting files from %s into %s, please wait..." % (datasetPath, inputFileset.name))
args={}
args["url"] = "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader"
args["url"] = "https://cmsweb.cern.ch/dbs/prod/global/DBSReader"
args["version"] = "DBS_2_0_9"
args["mode"] = "GET"
dbsApi = DbsApi(args)
Expand Down
2 changes: 1 addition & 1 deletion etc/injectStoreResults.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def injectFilesFromDBS(inputFileset, datasetPath):
"""
print("injecting files from %s into %s, please wait..." % (datasetPath, inputFileset.name))
args={}
args["url"] = "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader"
args["url"] = "https://cmsweb.cern.ch/dbs/prod/global/DBSReader"
args["mode"] = "GET"
dbsApi = DbsApi(args)
dbsResults = dbsApi.listFileArray(path = datasetPath, retriveList = ["retrive_lumi", "retrive_run"])
Expand Down
3 changes: 2 additions & 1 deletion src/python/WMComponent/WorkflowUpdater/WorkflowUpdaterPoller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@ def __init__(self, config):

# parse mandatory attributes from the configuration
self.config = config
dbsUrl = "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader"
#dbsUrl = "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader"
dbsUrl = "https://cmsweb.cern.ch/dbs/prod/global/DBSReader"
Copy link
Copy Markdown
Contributor

@amaltaro amaltaro Sep 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is important.

self.dbsUrl = getattr(config.WorkflowUpdater, "dbsUrl", dbsUrl)
if not self.dbsUrl:
self.dbsUrl = dbsUrl
Expand Down
2 changes: 1 addition & 1 deletion src/python/WMCore/ReqMgr/DataStructs/Request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def replaceDbsProdUrl(requestArgs):
"""
# TODO: this url conversion below can be removed in one year from now, thus March 2022
if requestArgs.get("DbsUrl"):
requestArgs["DbsUrl"] = requestArgs["DbsUrl"].replace("cmsweb.cern.ch", "cmsweb-prod.cern.ch")
#requestArgs["DbsUrl"] = requestArgs["DbsUrl"].replace("cmsweb.cern.ch", "cmsweb-prod.cern.ch")
requestArgs["DbsUrl"] = requestArgs["DbsUrl"].rstrip("/")


Expand Down
3 changes: 2 additions & 1 deletion src/python/WMCore/ReqMgr/Tools/cms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,8 @@ def dqm_urls():
def dbs_urls():
"Return list of DBS urls"
urls = []
base = "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader"
#base = "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader"
base = "https://cmsweb.cern.ch/dbs/prod/global/DBSReader"
for inst in ["prod", "phys01", "phys02", "phys03"]:
urls.append(base.replace("prod", inst))
return urls
Expand Down
3 changes: 2 additions & 1 deletion src/python/WMCore/Services/DBS/DBS3Reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ def __init__(self, url, logger=None, parallel=None, **contact):

# instantiate dbs api object
try:
self.dbsURL = url.replace("cmsweb.cern.ch", "cmsweb-prod.cern.ch")
self.dbsURL = url.replace("cmsweb-prod.cern.ch", "cmsweb.cern.ch")
self.dbsURL = url
Copy link
Copy Markdown
Contributor

@amaltaro amaltaro Sep 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is important.

Copy link
Copy Markdown
Contributor

@amaltaro amaltaro Sep 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And maybe we should check like:

if cmsweb-prod.cern.ch:
 then set cmsweb.cern.ch

Copy link
Copy Markdown
Contributor Author

@khurtado khurtado Sep 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, I am doing the inverse replacement now

self.dbs = DbsApi(self.dbsURL, **contact)
self.logger = logger or logging.getLogger(self.__class__.__name__)
self.parallel = parallel
Expand Down
6 changes: 4 additions & 2 deletions src/python/WMCore/WMSpec/StdSpecs/StdBase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def __call__(self, workloadName, arguments):

# TODO: this replace can be removed in one year from now, thus March 2022
if hasattr(self, "dbsUrl"):
self.dbsUrl = self.dbsUrl.replace("cmsweb.cern.ch", "cmsweb-prod.cern.ch")
#self.dbsUrl = self.dbsUrl.replace("cmsweb.cern.ch", "cmsweb-prod.cern.ch")
self.dbsUrl = self.dbsUrl.rstrip("/")

return self.workloadName
Expand Down Expand Up @@ -1058,8 +1058,10 @@ def getWorkloadCreateArgs():
"validate": lambda x: x >= 0},
"GlobalTagConnect": {"null": True},
"LumiList": {"default": {}, "type": makeLumiList},
"DbsUrl": {"default": "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader",
"DbsUrl": {"default": "https://cmsweb.cern.ch/dbs/prod/global/DBSReader",
"null": True, "validate": checkDBSURL},
#"DbsUrl": {"default": "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader",
# "null": True, "validate": checkDBSURL},
"DashboardHost": {"default": "cms-jobmon.cern.ch"},
"DashboardPort": {"default": 8884, "type": int,
"validate": lambda x: x > 0},
Expand Down
5 changes: 3 additions & 2 deletions src/python/WMCore/WMSpec/WMWorkload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,7 +1222,7 @@ def setDbsUrl(self, dbsUrl):
Set the workload level DbsUrl.
"""
# TODO: this replace can be removed in one year from now, thus March 2022
dbsUrl = dbsUrl.replace("cmsweb.cern.ch", "cmsweb-prod.cern.ch")
#dbsUrl = dbsUrl.replace("cmsweb.cern.ch", "cmsweb-prod.cern.ch")
# stripping any end slashes, which no longer work in the Go-based server
self.data.dbsUrl = dbsUrl.rstrip("/")

Expand All @@ -1238,7 +1238,8 @@ def getDbsUrl(self):
if hasattr(self.data, "request"):
if hasattr(self.data.request, "schema"):
if not getattr(self.data.request.schema, "DbsUrl", None):
return "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader"
#return "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader"
return "https://cmsweb.cern.ch/dbs/prod/global/DBSReader"

return getattr(self.data.request.schema, "DbsUrl")

Expand Down
3 changes: 2 additions & 1 deletion src/python/WMCore/WMSpec/WMWorkloadTools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ def validateInputDatasSetAndParentFlag(arguments):
# TODO: this replace can be removed in one year from now, thus March 2022
dbsURL = arguments.get("DbsUrl")
if dbsURL:
dbsURL = dbsURL.replace("cmsweb.cern.ch", "cmsweb-prod.cern.ch")
#dbsURL = dbsURL.replace("cmsweb.cern.ch", "cmsweb-prod.cern.ch")
Comment thread
khurtado marked this conversation as resolved.
dbsURL = dbsURL.replace("cmsweb-prod.cern.ch", "cmsweb.cern.ch")
dbsURL = dbsURL.rstrip("/")

if includeParents and not inputdataset:
Expand Down