Commit 68e4c3ff authored by Sergiu Weisz's avatar Sergiu Weisz
Browse files

Make slurm take into account environment correctly

parent f6bbcd6a
Pipeline #2817833 failed with stage
in 26 seconds
...@@ -5,7 +5,7 @@ maxjobs: 3000 ...@@ -5,7 +5,7 @@ maxjobs: 3000
maxqueuedjobs: 300 maxqueuedjobs: 300
matcharg: CPUCORES=1 matcharg: CPUCORES=1
cerequirements:other.cpucores>=1 cerequirements:other.cpucores>=1
submitarg: "-c 1" submitarg: --export-file=/home/submituser/slurm-environment.config -c 1
name: firstce name: firstce
objectclass: AliEnCE objectclass: AliEnCE
objectclass: top objectclass: top
......
...@@ -2,9 +2,10 @@ dn: name=secondce,ou=CE,ou=Services,ou=JTestSite,ou=Sites,o=localhost,dc=localdo ...@@ -2,9 +2,10 @@ dn: name=secondce,ou=CE,ou=Services,ou=JTestSite,ou=Sites,o=localhost,dc=localdo
host: secondhost.localdomain host: secondhost.localdomain
installmethod: CVMFS installmethod: CVMFS
maxjobs: 3000 maxjobs: 3000
cerequirements:other.cpucores>=4 environment: proxy_cache_file=/data/secondhost/proxy
submitarg: "-c 4" environment: SLURM_LOG_PATH=/data/secondhost/log
matcharg: CPUCORES=4 submitarg: --export-file=/home/submituser/slurm-environment.config -c 4
matcharg: CPUCORES=0
maxqueuedjobs: 300 maxqueuedjobs: 300
name: secondce name: secondce
objectclass: AliEnCE objectclass: AliEnCE
......
...@@ -15,7 +15,6 @@ echo "submituser:toor" | chpasswd ...@@ -15,7 +15,6 @@ echo "submituser:toor" | chpasswd
service munge start service munge start
cp $HOST_CONFIG/slurm-environment-$1.config /home/submituser/slurm-environment.config cp $HOST_CONFIG/slurm-environment-$1.config /home/submituser/slurm-environment.config
export SUBMIT_ARGS="--export-file=/home/submituser/slurm-environment.config"
[ ! -e /home/submituser/tmp ] && su submituser -c "mkdir -p /home/submituser/tmp /home/submituser/logs" [ ! -e /home/submituser/tmp ] && su submituser -c "mkdir -p /home/submituser/tmp /home/submituser/logs"
#run CE with auto reloading #run CE with auto reloading
......
...@@ -26,6 +26,7 @@ ProctrackType=proctrack/linuxproc ...@@ -26,6 +26,7 @@ ProctrackType=proctrack/linuxproc
CacheGroups=0 CacheGroups=0
#FirstJobId= #FirstJobId=
ReturnToService=0 ReturnToService=0
TaskPlugin=task/affinity,task/cgroup
#MaxJobCount= #MaxJobCount=
#PlugStackConfig= #PlugStackConfig=
#PropagatePrioProcess= #PropagatePrioProcess=
...@@ -57,7 +58,7 @@ SchedulerType=sched/backfill ...@@ -57,7 +58,7 @@ SchedulerType=sched/backfill
#SchedulerPort= #SchedulerPort=
#SchedulerRootFilter= #SchedulerRootFilter=
SelectType=select/cons_res SelectType=select/cons_res
SelectTypeParameters=CR_CPU_Memory SelectTypeParameters=CR_CPU
FastSchedule=1 FastSchedule=1
#PriorityType=priority/multifactor #PriorityType=priority/multifactor
#PriorityDecayHalfLife=14-0 #PriorityDecayHalfLife=14-0
...@@ -88,7 +89,7 @@ AccountingStorageLoc=slurm_acct_db ...@@ -88,7 +89,7 @@ AccountingStorageLoc=slurm_acct_db
#AccountingStorageUser= #AccountingStorageUser=
# #
# COMPUTE NODES # COMPUTE NODES
NodeName=c[1-2] CPUs=8 RealMemory=1000 State=UNKNOWN NodeName=c[1-2] CPUs=8 RealMemory=4000 State=UNKNOWN
# #
# PARTITIONS # PARTITIONS
PartitionName=normal Default=yes Nodes=c[1-2] Priority=50 DefMemPerCPU=500 Shared=NO MaxNodes=1 MaxTime=5-00:00:00 DefaultTime=5-00:00:00 State=UP PartitionName=normal Default=yes Nodes=c[1-2] Priority=50 DefMemPerCPU=1 Shared=NO MaxNodes=1 MaxTime=5-00:00:00 DefaultTime=5-00:00:00 State=UP
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