Add tweak for WorkQueueManager #1479
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
amaltaro
requested changes
May 16, 2024
docker/pypi/wmagent/init.sh
Outdated
| @@ -415,6 +421,10 @@ agent_tweakconfig() { | |||
| GLOBAL_DBS_URL=https://cmsweb-testbed.cern.ch/dbs/int/global/DBSReader | |||
| sed -i "s+DBSInterface.globalDBSUrl = 'https://cmsweb.cern.ch/dbs/prod/global/DBSReader'+DBSInterface.globalDBSUrl = '$GLOBAL_DBS_URL'+" $WMA_CONFIG_DIR/config.py | |||
| sed -i "s+DBSInterface.DBSUrl = 'https://cmsweb.cern.ch/dbs/prod/global/DBSReader'+DBSInterface.DBSUrl = '$GLOBAL_DBS_URL'+" $WMA_CONFIG_DIR/config.py | |||
| rucio_host=http://cms-rucio.cern.ch | |||
| rucio_auth=https://cms-rucio-auth.cern.ch | |||
| sed -i "s+WorkQueueManager.rucioUrl =.*+WorkQueueManager.rucioUrl+WorkQueueManager.rucioUrl = $rucio_host'+" $WMA_CONFIG_DIR/config.py | |||
There was a problem hiding this comment.
You have one item extra in this sed command, in addition to be missing a single quote. The command you wanted is likely: sed -i "s+WorkQueueManager.rucioUrl =.*+WorkQueueManager.rucioUrl = '$rucio_host'+" $WMA_CONFIG_DIR/config.py
But please make sure to test these out
docker/pypi/wmagent/init.sh
Outdated
| rucio_host=http://cms-rucio.cern.ch | ||
| rucio_auth=https://cms-rucio-auth.cern.ch | ||
| sed -i "s+WorkQueueManager.rucioUrl =.*+WorkQueueManager.rucioUrl+WorkQueueManager.rucioUrl = $rucio_host'+" $WMA_CONFIG_DIR/config.py | ||
| sed -i "s+WorkQueueManager.rucioAuthUrl =.*+WorkQueueManager.rucioUrl+WorkQueueManager.rucioAuthUrl = $rucio_auth'+" $WMA_CONFIG_DIR/config.py |
amaltaro
requested changes
May 16, 2024
docker/pypi/wmagent/init.sh
Outdated
| @@ -415,6 +421,10 @@ agent_tweakconfig() { | |||
| GLOBAL_DBS_URL=https://cmsweb-testbed.cern.ch/dbs/int/global/DBSReader | |||
| sed -i "s+DBSInterface.globalDBSUrl = 'https://cmsweb.cern.ch/dbs/prod/global/DBSReader'+DBSInterface.globalDBSUrl = '$GLOBAL_DBS_URL'+" $WMA_CONFIG_DIR/config.py | |||
| sed -i "s+DBSInterface.DBSUrl = 'https://cmsweb.cern.ch/dbs/prod/global/DBSReader'+DBSInterface.DBSUrl = '$GLOBAL_DBS_URL'+" $WMA_CONFIG_DIR/config.py | |||
| rucio_host=http://cms-rucio.cern.ch | |||
| rucio_auth=https://cms-rucio-auth.cern.ch | |||
| sed -i "s+WorkQueueManager.rucioUrl = .*+WorkQueueManager.rucioUrl = $rucio_host+" $WMA_CONFIG_DIR/config.py | |||
There was a problem hiding this comment.
This will break the configuration file, as you ditched out the single quotes making the url string.
There was a problem hiding this comment.
fixed
Here is the output of applying the lines to the config file:
(WMAgent-2.3.4rc3) [cmst1@vocms0260:current]$ sed -i "s+WorkQueueManager.rucioAuthUrl = .*+WorkQueueManager.rucioAuthUrl = '$rucio_auth'+" $WMA_CONFIG_DIR/config.py
(WMAgent-2.3.4rc3) [cmst1@vocms0260:current]$ sed -i "s+WorkQueueManager.rucioUrl = .*+WorkQueueManager.rucioUrl = '$rucio_host'+" $WMA_CONFIG_DIR/config.py
(WMAgent-2.3.4rc3) [cmst1@vocms0260:current]$ grep cms-rucio $WMA_CONFIG_DIR/config.py |grep WorkQueueManager
config.WorkQueueManager.rucioUrl = 'http://cms-rucio.cern.ch'
config.WorkQueueManager.rucioAuthUrl = 'http://cms-rucio-auth.cern.ch'
amaltaro
approved these changes
May 17, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes dmwm/WMCore#11986
With this change we add the forgotten tweaks for testbed agents to use Producion Rucio instead of integration.