[CouchDB] Do not sanitize couch url at the component layer

src/python/WMComponent/JobAccountant/AccountantWorker.py

@@ -23,7 +23,6 @@
 from WMCore.Database.CMSCouch import CouchServer
 from WMCore.FwkJobReport.Report import Report
 from WMCore.JobStateMachine.ChangeState import ChangeState
-from WMCore.Lexicon import sanitizeURL
 from WMCore.Services.WMStats.WMStatsWriter import WMStatsWriter
 from WMCore.WMBS.File import File
 from WMCore.WMBS.Job import Job
@@ -104,9 +103,8 @@ def __init__(self, config):
         self.dataCollection = DataCollectionService(url=config.ACDC.couchurl,
                                                     database=config.ACDC.database)
 
-        jobDBurl = sanitizeURL(config.JobStateMachine.couchurl)['url']
         self.jobDBName = config.JobStateMachine.couchDBName
-        self.jobCouchdb = CouchServer(jobDBurl)
+        self.jobCouchdb = CouchServer(config.JobStateMachine.couchurl)
         self.fwjrCouchDB = None
         self.localWMStats = WMStatsWriter(config.TaskArchiver.localWMStatsURL, appName="WMStatsAgent")
 

src/python/WMComponent/TaskArchiver/CleanCouchPoller.py

@@ -121,24 +121,23 @@ def setup(self, parameters=None):
             self.centralRequestDBWriter = RequestDBWriter(self.config.AnalyticsDataCollector.localT0RequestDBURL,
                                                           couchapp=self.config.AnalyticsDataCollector.RequestCouchApp)
 
-        jobDBurl = sanitizeURL(self.config.JobStateMachine.couchurl)['url']
         jobDBName = self.config.JobStateMachine.couchDBName
-        workDBName = getattr(self.config.TaskArchiver, 'workloadSummaryCouchDBName',
-                             'workloadsummary')
-        workDBurl = getattr(self.config.TaskArchiver, 'workloadSummaryCouchURL')
-
-        self.jobCouchdb = CouchServer(jobDBurl)
+        self.jobCouchdb = CouchServer(self.config.JobStateMachine.couchurl)
         self.jobsdatabase = self.jobCouchdb.connectDatabase("%s/jobs" % jobDBName)
         self.fwjrdatabase = self.jobCouchdb.connectDatabase("%s/fwjrs" % jobDBName)
         self.fwjrService = FWJRDBAPI(self.fwjrdatabase)
 
+        workDBName = getattr(self.config.TaskArchiver, 'workloadSummaryCouchDBName',
+                             'workloadsummary')
+        workDBurl = getattr(self.config.TaskArchiver, 'workloadSummaryCouchURL')
         self.workCouchdb = CouchServer(workDBurl)
         self.workdatabase = self.workCouchdb.connectDatabase(workDBName)
 
         statSummaryDBName = self.config.JobStateMachine.summaryStatsDBName
         self.statsumdatabase = self.jobCouchdb.connectDatabase(statSummaryDBName)
 
-        logging.debug("Using url %s/%s for job", jobDBurl, jobDBName)
+        logging.debug("Using url %s/%s for job",
+                      sanitizeURL(self.config.JobStateMachine.couchurl)['url'], jobDBName)
         logging.debug("Writing to  %s/%s for workloadSummary", sanitizeURL(workDBurl)['url'], workDBName)
 
     @timeFunction

src/python/WMCore/Database/CMSCouch.py

@@ -124,6 +124,7 @@ def makeRequest(self, uri=None, data=None, type='GET', incoming_headers=None,
         TODO: set caching in the calling methods.
         """
         incoming_headers = incoming_headers or {}
+        incoming_headers.update(self.additionalHeaders)
         try:
             if not cache:
                 incoming_headers.update({'Cache-Control': 'no-cache'})

src/python/WMCore/WorkQueue/WorkQueueBackend.py

@@ -142,7 +142,7 @@ def insertWMSpec(self, wmspec):
     def getWMSpec(self, name):
         """Get the spec"""
         wmspec = WMWorkloadHelper()
-        wmspec.load(self.db['host'] + "/%s/%s/spec" % (self.db.name, name))
+        wmspec.load(self.hostWithAuth + "/%s/%s/spec" % (self.db.name, name))
         return wmspec
 
     def insertElements(self, units, parent=None):