From 0741ac1f4e00a17f1f1f7861332a6b8012986797 Mon Sep 17 00:00:00 2001 From: Alan Malta Rodrigues Date: Fri, 16 Apr 2021 10:44:56 +0200 Subject: [PATCH] Temporary fix to let CouchDB replications go through the standard port - wmagent --- .../WMComponent/AgentStatusWatcher/AgentStatusPoller.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/python/WMComponent/AgentStatusWatcher/AgentStatusPoller.py b/src/python/WMComponent/AgentStatusWatcher/AgentStatusPoller.py index 04eb78cc86..cf45cdd418 100644 --- a/src/python/WMComponent/AgentStatusWatcher/AgentStatusPoller.py +++ b/src/python/WMComponent/AgentStatusWatcher/AgentStatusPoller.py @@ -14,7 +14,6 @@ from pprint import pformat from Utils.Timers import timeFunction from Utils.Utilities import numberCouchProcess -from Utils.PortForward import PortForward from WMComponent.AgentStatusWatcher.DrainStatusPoller import DrainStatusPoller from WMComponent.AnalyticsDataCollector.DataCollectAPI import WMAgentDBData, initAgentInfo from WMCore.Credential.Proxy import Proxy @@ -55,9 +54,6 @@ def __init__(self, config): self.credThresholds = {'proxy': {'error': 3, 'warning': 5}, 'certificate': {'error': 10, 'warning': 20}} - # create a portForwarder to be used for rerouting the replication process - self.portForwarder = PortForward(8443) - # Monitoring setup self.userAMQ = getattr(config.AgentStatusWatcher, "userAMQ", None) self.passAMQ = getattr(config.AgentStatusWatcher, "passAMQ", None) @@ -81,7 +77,6 @@ def setUpCouchDBReplication(self): # set up common replication code wmstatsSource = self.config.JobStateMachine.jobSummaryDBName wmstatsTarget = self.config.General.centralWMStatsURL - wmstatsTarget = self.portForwarder(wmstatsTarget) self.replicatorDocs.append({'source': wmstatsSource, 'target': wmstatsTarget, 'filter': "WMStatsAgent/repfilter"}) @@ -94,9 +89,7 @@ def setUpCouchDBReplication(self): # set up workqueue replication wqfilter = 'WorkQueue/queueFilter' parentQURL = self.config.WorkQueueManager.queueParams["ParentQueueCouchUrl"] - parentQURL = self.portForwarder(parentQURL) childURL = self.config.WorkQueueManager.queueParams["QueueURL"] - childURL = self.portForwarder(childURL) query_params = {'childUrl': childURL, 'parentUrl': sanitizeURL(parentQURL)['url']} localQInboxURL = "%s_inbox" % self.config.AnalyticsDataCollector.localQueueURL self.replicatorDocs.append({'source': sanitizeURL(parentQURL)['url'], 'target': localQInboxURL,