Skip to content
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

Define RelVal Rucio account for WorkQueue and Microservices #1101

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Define RelVal Rucio account for WorkQueue and Microservices #1101

Show file tree
Hide file tree
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
34 changes: 18 additions & 16 deletions reqmgr2ms/config-ruleCleaner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
"""

import socket
import time
import sys
import time
from os import path

from WMCore.Configuration import Configuration

# globals
Expand All @@ -23,19 +24,17 @@
from ReqMgr2MSSecrets import USER_AMQ, PASS_AMQ, AMQ_TOPIC

if BASE_URL == "https://cmsweb.cern.ch":
RUCIO_AUTH_URL="https://cms-rucio-auth.cern.ch"
RUCIO_URL="http://cms-rucio.cern.ch"
RUCIO_WMA_ACCT="wma_prod"
RUCIO_AUTH_URL = "https://cms-rucio-auth.cern.ch"
RUCIO_URL = "http://cms-rucio.cern.ch"
RUCIO_WMA_ACCT = "wma_prod"
ARCH_DELAY_HOURS = 24 * 2
else:
RUCIO_AUTH_URL="https://cms-rucio-auth-int.cern.ch"
RUCIO_URL="http://cms-rucio-int.cern.ch"
RUCIO_WMA_ACCT="wma_test"
RUCIO_AUTH_URL = "https://cms-rucio-auth-int.cern.ch"
RUCIO_URL = "http://cms-rucio-int.cern.ch"
RUCIO_WMA_ACCT = "wma_test"
ARCH_DELAY_HOURS = 6

RUCIO_ACCT = RUCIO_WMA_ACCT
RUCIO_MSTR_ACCT = "wmcore_transferor"

RUCIO_MSTR_RELVAL_ACCT = "wmcore_transferor_relval"

config = Configuration()

Expand All @@ -44,11 +43,11 @@
srv.thread_pool = 30
main.application = "ms-rulecleaner"
main.port = 8244 # main application port it listens on
main.index = 'ui' # Configuration requires index attribute
main.index = 'ui' # Configuration requires index attribute

# Security configuration
main.authz_defaults = {"role": None, "group": None, "site": None}
#set default logging (prevent duplicate)
# set default logging (prevent duplicate)
main.log_screen = True

sec = main.section_("tools").section_("cms_auth")
Expand Down Expand Up @@ -85,9 +84,10 @@
data.verbose = True
data.interval = 60 * 60 * 8 # run it every 8 hours
data.services = ['ruleCleaner']
data.rucioAccount = RUCIO_ACCT
data.rucioMstrAccount = RUCIO_MSTR_ACCT
data.rucioAccount = RUCIO_WMA_ACCT
data.rucioWmaAccount = RUCIO_WMA_ACCT
data.rucioMstrAccount = RUCIO_MSTR_ACCT
data.rucioMstrRelValAccount = RUCIO_MSTR_RELVAL_ACCT
data.rucioAuthUrl = RUCIO_AUTH_URL
data.rucioUrl = RUCIO_URL
data.enableRealMode = True
Expand All @@ -103,7 +103,9 @@
heartbeatMonitor.wmstats_url = "%s/%s" % (data.couch_host, data.couch_wmstats_db)
heartbeatMonitor.wmstatsSvc_url = "%s/wmstatsserver" % BASE_URL
heartbeatMonitor.heartbeatCheckDuration = 60 * 10 # every 10 min
heartbeatMonitor.log_file = '%s/logs/reqmgr2ms/heartbeatMonitor_rulecleaner-%s-%s.log' % (__file__.rsplit('/', 4)[0], HOST.split('.', 1)[0], time.strftime("%Y%m%d"))
heartbeatMonitor.log_file = '%s/logs/reqmgr2ms/heartbeatMonitor_rulecleaner-%s-%s.log' % (__file__.rsplit('/', 4)[0],
HOST.split('.', 1)[0],
time.strftime("%Y%m%d"))
heartbeatMonitor.central_logdb_url = LOG_DB_URL
heartbeatMonitor.log_reporter = LOG_REPORTER
# AMQ MonIT settings
Expand All @@ -112,5 +114,5 @@
heartbeatMonitor.pass_amq = PASS_AMQ
heartbeatMonitor.topic_amq = AMQ_TOPIC
heartbeatMonitor.host_port_amq = AMQ_HOST_PORT
#list all the thread need to be monitored
# list all the thread need to be monitored
heartbeatMonitor.thread_list = [a.object.split('.')[-1] for a in config.section_("extensions")]
6 changes: 5 additions & 1 deletion reqmgr2ms/config-transferor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
RULE_LIFETIME=24 * 60 * 60 # 24h
RUCIO_AUTH_URL="https://cms-rucio-auth-int.cern.ch"
RUCIO_URL="http://cms-rucio-int.cern.ch"
RUCIO_PROD_ACCT = "wmcore_transferor"
RUCIO_RELVAL_ACCT = "wmcore_transferor_relval"


# load AMQ credentials
sys.path.append(path.join(ROOTDIR, 'auth/reqmgr2ms'))
Expand Down Expand Up @@ -79,7 +82,8 @@
data.minimumThreshold = 1 * (1000 ** 4) # 1 TB (terabyte)
data.rulesLifetime = RULE_LIFETIME
data.rucioRuleWeight = "ddm_quota"
data.rucioAccount = "wmcore_transferor"
data.rucioAccount = RUCIO_PROD_ACCT
data.rucioAccountRelVal = RUCIO_RELVAL_ACCT
data.rucioAuthUrl = RUCIO_AUTH_URL
data.rucioUrl = RUCIO_URL
data.toAddr = ["[email protected]", "[email protected]", "[email protected]", "[email protected]"]
Expand Down
4 changes: 3 additions & 1 deletion workqueue/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,15 @@
PASS_AMQ=None
AMQ_TOPIC=None

RUCIO_ACCT = "wmcore_transferor"
# Production service has to point to production Rucio, anything else will use pre-production
if BASE_URL == "https://cmsweb.cern.ch":
RUCIO_AUTH_URL="https://cms-rucio-auth.cern.ch"
RUCIO_URL="http://cms-rucio.cern.ch"
else:
RUCIO_AUTH_URL="https://cms-rucio-auth-int.cern.ch"
RUCIO_URL="http://cms-rucio-int.cern.ch"
RUCIO_ACCT = "wmcore_transferor"
RUCIO_RELVAL_ACCT = "wmcore_transferor_relval"

config = Configuration()

Expand Down Expand Up @@ -97,6 +98,7 @@ def setWorkQueueCommonConfig(config):
config.queueParams['central_logdb_url'] = LOG_DB_URL
config.queueParams['log_reporter'] = LOG_REPORTER
config.queueParams['rucioAccount'] = RUCIO_ACCT
config.queueParams['rucioAccountRelVal'] = RUCIO_RELVAL_ACCT
config.queueParams['rucioAuthUrl'] = RUCIO_AUTH_URL
config.queueParams['rucioUrl'] = RUCIO_URL

Expand Down