Commit 077bc9c7 authored by Marta Bertran Ferrer's avatar Marta Bertran Ferrer
Browse files

Merge branch 'multi-core-setup' into site-addition

parents b2a0b8b7 b5e49ab9
......@@ -14,8 +14,12 @@ do
#$MYSQLCALL "insert into JOBAGENT (entryId,priority,noce,fileBroker,revision,price,partition,disk,ttl,oldestQueueId,ce,userId,site,counter) values (1,100,NULL,0,0,1.0,NULL,50000000,80000,0,'LOCALHOST::JTESTSITE::FIRSTSE',6,'JTESTSITE',1);"
#$MYSQLCALL "insert into JOBAGENT (entryId,priority,noce,fileBroker,revision,price,disk,ttl,oldestQueueId,ce,userId,packages,site,counter) values (1,100,'',0,0,1,0,0,0,'LOCALHOST::JTESTSITE::FIRSTSE',1235890,'%','JTESTSITE',1);"
$MYSQLCALL 'insert into JOBAGENT (entryId,priority,noce,fileBroker,`partition`,disk,ttl,ce,userId,packages,site,counter,price,oldestQueueId,revision,cpucores) values (1,100,"",0,",,",0,0,",ALICE::JTestSite::firstce,",1235890,"%",",JTestSite,",1,1,0,0,8);'
<<<<<<< HEAD
$MYSQLCALL 'insert into JOBAGENT (entryId,priority,noce,fileBroker,`partition`,disk,ttl,ce,userId,packages,site,counter,price,oldestQueueId,revision,cpucores) values (2,100,"",0,",,",0,0,",ALICE::JTestSite::secondce,",1235890,"%",",JTestSite,",1,1,0,0,8);'
#Register jobs transitioned to "Waiting" with the JOBAGENT entry
=======
#Register jobs transitioned to "Waiting" with the JOBAGENT entry
>>>>>>> multi-core-setup
$MYSQLCALL "update QUEUE set agentId=1 where statusId=5;"
#Cleanup killed jobs
$MYSQLCALL "delete from QUEUE where statusId='-14';"
......
......@@ -39,12 +39,14 @@ services:
environment:
CONDOR_HOST: "schedd"
USE_POOL_PASSWORD: "yes"
NUM_CPUS: 8
volumes:
- /cvmfs/alice.cern.ch:/cvmfs/alice.cern.ch
- $JALIEN_SETUP_DIR/ce-setup:/ce-setup:ro
- $SHARED_VOLUME:/jalien-dev
- $JALIEN_SETUP_DIR/ce-setup/htcondor-conf/pool_password:/root/secrets/pool_password
- $JALIEN_SETUP_DIR/ce-setup/htcondor-conf/01-slotusers.conf:/etc/condor/config.d/01-slotusers.conf
JCentral-dev-CE:
image: "jalien-base"
command: bash /ce-setup/ce-entrypoint.sh first
......
......@@ -5,9 +5,9 @@ maxjobs: 3000
environment: CE_LCGCE=schedd:9618
environment: USE_JOB_ROUTER=1
environment: ROUTES_LIST=[ schedd:9618 ]
environment: SUBMIT_ARGS=-append "+RequestCpus=1"
environment: SUBMIT_ARGS=-append "+RequestCpus=2"
matcharg: CPUCORES=0
maxqueuedjobs: 300
maxqueuedjobs: 300
name: firstce
objectclass: AliEnCE
objectclass: top
......
......@@ -10,5 +10,9 @@ else {
#start htcondor
bash /start.sh
for n in {1..64}
do
useradd "slot$n"
done
}
fi
DEDICATED_EXECUTE_ACCOUNT_REGEXP = slot[0-9]+
STARTER_ALLOW_RUNAS_OWNER = False
SLOT1_1_USER = slot1
SLOT1_2_USER = slot2
SLOT1_3_USER = slot3
SLOT1_4_USER = slot4
SLOT1_5_USER = slot5
SLOT1_6_USER = slot6
SLOT2_1_USER = slot7
SLOT2_2_USER = slot8
SLOT2_3_USER = slot9
SLOT2_4_USER = slot10
SLOT2_5_USER = slot11
SLOT2_6_USER = slot12
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment