Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 4 additions & 6 deletions reqmgr2ms/config-monitor.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,8 @@
sys.path.append(path.join(ROOTDIR, 'auth/reqmgr2ms'))
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"
else:
RUCIO_AUTH_URL="https://cms-rucio-auth-int.cern.ch"
RUCIO_URL="http://cms-rucio-int.cern.ch"
RUCIO_AUTH_URL="https://cms-rucio-auth.cern.ch"
RUCIO_URL="http://cms-rucio.cern.ch"

config = Configuration()

Expand Down Expand Up @@ -71,6 +67,8 @@
data.enableStatusTransition = True
data.verbose = True
data.interval = 600
# interval to evaluate data transfers, every hour
data.updateInterval = 1 * 60 * 60
data.services = ['monitor']
data.rucioAccount = "wmcore_transferor"
data.rucioAuthUrl = RUCIO_AUTH_URL
Expand Down
2 changes: 1 addition & 1 deletion reqmgr2ms/config-output.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
data.relvalPolicy = [{"datatier": "GEN-SIM", "destinations": ["T2_CH_CERN"]},
{"datatier": "ALCARECO", "destinations": ["T2_CH_CERN"]},
{"datatier": "default", "destinations": ["T2_CH_CERN"]}]
data.rucioRSEAttribute = "ddm_quota"
data.rucioRSEAttribute = None # "ddm_quota"
data.rucioDiskRuleWeight = "ddm_quota"
data.rucioTapeExpression = "rse_type=TAPE\cms_type=test" # "rse_type=TAPE\cms_type=test\\rse=T0_CH_CERN_Tape"
data.rulesLifetime = RULE_LIFETIME
Expand Down
11 changes: 3 additions & 8 deletions reqmgr2ms/config-transferor.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,9 @@
LOG_REPORTER = "reqmgr2ms_transferor"
ROOTDIR = __file__.rsplit('/', 3)[0]
AMQ_HOST_PORT = [('cms-mb.cern.ch', 61313)]
if BASE_URL == "https://cmsweb.cern.ch":
RULE_LIFETIME=None
RUCIO_AUTH_URL="https://cms-rucio-auth.cern.ch"
RUCIO_URL="http://cms-rucio.cern.ch"
else:
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_AUTH_URL="https://cms-rucio-auth.cern.ch"
RUCIO_URL="http://cms-rucio.cern.ch"
RULE_LIFETIME=3 * 24 * 60 * 60 # 3 days

# load AMQ credentials
sys.path.append(path.join(ROOTDIR, 'auth/reqmgr2ms'))
Expand Down
2 changes: 2 additions & 0 deletions reqmgr2ms/manage
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ else
CFGFILERCLEAN=$CFGDIR/config-ruleCleaner.py
CFGFILEUNMERGED=$CFGDIR/config-unmerged.py
fi
CFGFILEOUT=$CFGDIR # force ms-output to be disabled
CFGFILEUNMERGED=$CFGDIR # force ms-unmerged to be disabled

LOG_TRANS=ms-transferor
LOG_MON=ms-monitor
Expand Down
9 changes: 2 additions & 7 deletions workqueue/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,8 @@
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_AUTH_URL="https://cms-rucio-auth.cern.ch"
RUCIO_URL="http://cms-rucio.cern.ch"

config = Configuration()

Expand Down
2 changes: 2 additions & 0 deletions workqueue/deploy
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ deploy_workqueue_sw()
base_url="https://`hostname -f`"
;;
esac
rucio_host_url=http://cms-rucio.cern.ch
rucio_auth_url=https://cms-rucio-auth.cern.ch
perl -p -i -e "s{\"\@\@BASE_URL\@\@\"}{\"$base_url\"}g;" \
$root/$cfgversion/config/$project/config.py

Expand Down