Skip to content

Temporary fix to let CouchDB replications go through the standard port - wmagent branch #10453

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

Merged
amaltaro merged 1 commit into from
Apr 19, 2021
Merged

Temporary fix to let CouchDB replications go through the standard port - wmagent branch #10453

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions src/python/WMComponent/AgentStatusWatcher/AgentStatusPoller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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"})
Expand All @@ -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,
Expand Down