diff --git a/Dockerfile b/Dockerfile index b884bf18..753a4f82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,6 +57,17 @@ RUN chown atlpan -R /opt/idds RUN chown atlpan -R /var/log/idds RUN chown apache -R /var/idds/wsgisocks/ +# redis +RUN chmod a+rx /etc/redis* +# RUN chmod a+rwx /var/log/redis +# RUN chmod a+rwx /var/lib/redis +RUN rm -fr /var/log/redis +RUN rm -fr /var/lib/redis +RUN mkdir /var/log/idds/redis +RUN chmod a+rwx /var/log/idds/redis +RUN ln -s /var/log/idds/redis /var/log/redis +RUN ln -s /var/log/idds/redis /var/lib/redis + # setup conda virtual env ADD requirements.yaml /opt/idds/ # ADD start-daemon.sh /opt/idds/ diff --git a/main/config_default/auth.cfg b/main/config_default/auth.cfg index 37c0b87f..d9defddf 100644 --- a/main/config_default/auth.cfg +++ b/main/config_default/auth.cfg @@ -4,3 +4,4 @@ allow_vos = panda_dev,Rubin,Rubin.production [Users] allow_users = DC=cern,DC=slac ban_users = testuser +super_users = idds,wguan,Wen Guan,CN=518174849,/DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=atlpilo1/CN=614260/CN=Robot: ATLAS Pilot1/CN=545485199/CN=518174849 diff --git a/main/config_default/idds.cfg b/main/config_default/idds.cfg index 2a5b3d8f..576d6045 100755 --- a/main/config_default/idds.cfg +++ b/main/config_default/idds.cfg @@ -22,17 +22,28 @@ host = https://localhost:443/idds cacher_dir = /var/log/idds [main] -agents = clerk, transformer, carrier, conductor +# agents = clerk, transformer, carrier, conductor +agents = clerk, transformer, submitter, poller, receiver, trigger, finisher, conductor [clerk] num_threads = 4 +poll_period = 1800 +new_poll_period = 10 +update_poll_period = 1800 +new_command_poll_period = 10 +update_command_poll_period = 600 + poll_time_period = 60 poll_operation_time_period = 60 retrieve_bulk_size = 4 -pending_time = 4 +pending_time = 30 [transformer] num_threads = 8 +poll_period = 1800 +new_poll_period = 60 +update_poll_period = 1800 + poll_time_period = 60 retrieve_bulk_size = 4 poll_operation_time_period = 240 @@ -43,17 +54,36 @@ domapandawork.num_retries = 0 [carrier] num_threads = 8 +max_number_workers = 2 +trigger_max_number_workers = 6 +finisher_max_number_workers = 6 + +poll_period = 3600 +new_poll_period = 10 +update_poll_period = 300 + poll_time_period = 60 poll_operation_time_period = 240 retrieve_bulk_size = 4 message_bulk_size = 1000 +plugin.receiver = idds.agents.common.plugins.messaging.MessagingReceiver +plugin.receiver.brokers = atlas-mb.cern.ch +plugin.receiver.port = 61013 +# plugin.notifier.vhost = +plugin.receiver.destination = /topic/doma.panda_idds +plugin.receiver.username = user +plugin.receiver.password = password +plugin.receiver.broker_timeout = 10 # domapandawork.life_time = 86400 domapandawork.num_retries = 0 domapandawork.poll_panda_jobs_chunk_size = 10000 [conductor] +delay = 120 +replay_times = 2 + threshold_to_release_messages = 1000 random_delay = 60 diff --git a/main/tools/env/setup_panda.sh b/main/tools/env/setup_panda.sh index 0c201024..8117d503 100644 --- a/main/tools/env/setup_panda.sh +++ b/main/tools/env/setup_panda.sh @@ -13,11 +13,14 @@ export PANDA_BEHIND_REAL_LB=true if [ "$instance" == "k8s" ]; then export PANDA_AUTH=oidc - export PANDA_URL_SSL=https://pandaserver-doma.cern.ch:25443/server/panda - export PANDA_URL=http://pandaserver-doma.cern.ch:25080/server/panda - export PANDAMON_URL=https://panda-doma.cern.ch + export PANDA_BEHIND_REAL_LB=true + export PANDA_VERIFY_HOST=off + export PANDA_URL_SSL=https://panda-server-dev.cern.ch:443/server/panda + export PANDA_URL=http://panda-server-dev.cern.ch:80/server/panda + export PANDAMON_URL=https://panda-server-dev.cern.ch export PANDA_AUTH_VO=panda_dev + export PANDACACHE_URL=$PANDA_URL_SSL # export PANDA_CONFIG_ROOT=/afs/cern.ch/user/w/wguan/workdisk/iDDS/main/etc/panda/ export PANDA_CONFIG_ROOT=~/.panda/ elif [ "$instance" == "slac" ]; then diff --git a/start-daemon.sh b/start-daemon.sh index 4b618ade..b118ef88 100755 --- a/start-daemon.sh +++ b/start-daemon.sh @@ -156,6 +156,13 @@ if ! [ -f /opt/idds/config/.token ]; then fi # start redis +mkdir /var/log/idds/redis +if [ ! -f /var/log/redis ]; then + ln -s /var/log/idds/redis /var/log/redis +fi +if [ ! -f /var/lib/redis ]; then + ln -s /var/log/idds/redis /var/lib/redis +fi /usr/bin/redis-server /etc/redis.conf --supervised systemd & if [ "${IDDS_SERVICE}" == "rest" ]; then