Commit fdcf36b5 authored by Marta Bertran Ferrer's avatar Marta Bertran Ferrer
Browse files

Added ce requirements on cpu cores

parent 077bc9c7
Pipeline #2384725 failed with stage
in 12 seconds
...@@ -13,13 +13,9 @@ do ...@@ -13,13 +13,9 @@ do
#$MYSQLCALL "insert into JOBAGENT(entryId,priority,noce,fileBroker,revision,price,partition,disk,ttl,oldestQueueId,ce,userId,packages,site,counter)values('1','100','','0','0','1','%','50000000','80000','0',',ALICE::JALIEN::CEJALIEN,','6','%',',JALIEN,',1)" #$MYSQLCALL "insert into JOBAGENT(entryId,priority,noce,fileBroker,revision,price,partition,disk,ttl,oldestQueueId,ce,userId,packages,site,counter)values('1','100','','0','0','1','%','50000000','80000','0',',ALICE::JALIEN::CEJALIEN,','6','%',',JALIEN,',1)"
#$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,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,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);' $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::secondce,",1235890,"%",",JTestSite,",1,1,0,0,2);'
<<<<<<< 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::firstce,",1235890,"%",",JTestSite,",1,1,0,0,1);'
$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
=======
#Register jobs transitioned to "Waiting" with the JOBAGENT entry
>>>>>>> multi-core-setup
$MYSQLCALL "update QUEUE set agentId=1 where statusId=5;" $MYSQLCALL "update QUEUE set agentId=1 where statusId=5;"
#Cleanup killed jobs #Cleanup killed jobs
$MYSQLCALL "delete from QUEUE where statusId='-14';" $MYSQLCALL "delete from QUEUE where statusId='-14';"
......
...@@ -78,6 +78,3 @@ services: ...@@ -78,6 +78,3 @@ services:
volumes: volumes:
jsite-storage: jsite-storage:
networks:
first-site: {}
second-site: {}
...@@ -2,11 +2,12 @@ dn: name=firstce,ou=CE,ou=Services,ou=JTestSite,ou=Sites,o=localhost,dc=localdom ...@@ -2,11 +2,12 @@ dn: name=firstce,ou=CE,ou=Services,ou=JTestSite,ou=Sites,o=localhost,dc=localdom
host: localhost.localdomain host: localhost.localdomain
installmethod: CVMFS installmethod: CVMFS
maxjobs: 3000 maxjobs: 3000
cerequirements: other.cpucores==1
environment: CE_LCGCE=schedd:9618 environment: CE_LCGCE=schedd:9618
environment: USE_JOB_ROUTER=1 environment: USE_JOB_ROUTER=1
environment: ROUTES_LIST=[ schedd:9618 ] environment: ROUTES_LIST=[ schedd:9618 ]
environment: SUBMIT_ARGS=-append "+RequestCpus=2" environment: SUBMIT_ARGS=-append "+RequestCpus=1"
matcharg: CPUCORES=0 matcharg: CPUCORES=1
maxqueuedjobs: 300 maxqueuedjobs: 300
name: firstce name: firstce
objectclass: AliEnCE objectclass: AliEnCE
......
...@@ -2,11 +2,12 @@ dn: name=secondce,ou=CE,ou=Services,ou=JTestSite,ou=Sites,o=localhost,dc=localdo ...@@ -2,11 +2,12 @@ dn: name=secondce,ou=CE,ou=Services,ou=JTestSite,ou=Sites,o=localhost,dc=localdo
host: localhost2.localdomain host: localhost2.localdomain
installmethod: CVMFS installmethod: CVMFS
maxjobs: 3000 maxjobs: 3000
cerequirements:other.cpucores>=4
environment: CE_LCGCE=schedd:9618 environment: CE_LCGCE=schedd:9618
environment: USE_JOB_ROUTER=1 environment: USE_JOB_ROUTER=1
environment: ROUTES_LIST=[ schedd:9618 ] environment: ROUTES_LIST=[ schedd:9618 ]
environment: SUBMIT_ARGS=-append "+RequestCpus=1" environment: SUBMIT_ARGS=-append "+RequestCpus=4"
matcharg: CPUCORES=0 matcharg: CPUCORES=4
maxqueuedjobs: 300 maxqueuedjobs: 300
name: secondce name: secondce
objectclass: AliEnCE objectclass: AliEnCE
......
...@@ -263,6 +263,7 @@ CREATE TABLE `QUEUE` ( ...@@ -263,6 +263,7 @@ CREATE TABLE `QUEUE` (
`started` int DEFAULT NULL, `started` int DEFAULT NULL,
`expires` int DEFAULT NULL, `expires` int DEFAULT NULL,
`remoteTimeout` int DEFAULT NULL, `remoteTimeout` int DEFAULT NULL,
`cpucores` int DEFAULT '1',
PRIMARY KEY (`queueId`), PRIMARY KEY (`queueId`),
KEY `notifyId` (`notifyId`), KEY `notifyId` (`notifyId`),
KEY `userId` (`userId`), KEY `userId` (`userId`),
...@@ -693,7 +694,7 @@ UNLOCK TABLES; ...@@ -693,7 +694,7 @@ UNLOCK TABLES;
/*!50001 SET character_set_results = latin1 */; /*!50001 SET character_set_results = latin1 */;
/*!50001 SET collation_connection = latin1_swedish_ci */; /*!50001 SET collation_connection = latin1_swedish_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ /*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
/*!50001 VIEW `QUEUE_VIEW` AS select `QUEUE`.`queueId` AS `queueId`,`QUEUE`.`statusId` AS `statusId`,`QUEUE`.`userId` AS `userId`,`QUEUE`.`priority` AS `priority`,`QUEUE`.`submitHostId` AS `submitHostId`,`QUEUE`.`finalPrice` AS `finalPrice`,`QUEUE`.`sent` AS `sent`,`QUEUE`.`split` AS `split`,`QUEUE`.`nodeId` AS `nodeId`,`QUEUE`.`execHostId` AS `execHostId`,`QUEUE`.`mtime` AS `mtime`,`QUEUE`.`agentId` AS `agentId`,`QUEUE`.`price` AS `price`,`QUEUE`.`finished` AS `finished`,`QUEUE`.`masterjob` AS `masterjob`,`QUEUE`.`splitting` AS `splitting`,`QUEUE`.`notifyId` AS `notifyId`,`QUEUE`.`optimized` AS `optimized`,`QUEUE`.`commandId` AS `commandId`,`QUEUE`.`error` AS `error`,`QUEUE`.`resubmission` AS `resubmission`,`QUEUE`.`received` AS `received`,`QUEUE`.`validate` AS `validate`,`QUEUE`.`merging` AS `merging`,`QUEUE`.`chargeStatus` AS `chargeStatus`,`QUEUE`.`siteId` AS `siteId`,`QUEUE`.`started` AS `started`,`QUEUE`.`expires` AS `expires`,`QUEUE_USER`.`user` AS `user`,`QUEUE_STATUS`.`status` AS `status`,`QUEUEJDL`.`origJdl` AS `origJdl`,`QUEUEJDL`.`resultsJdl` AS `resultsJdl`,`QUEUEJDL`.`path` AS `path` from (((`QUEUE` join `QUEUE_USER` on((`QUEUE`.`userId` = `QUEUE_USER`.`userId`))) join `QUEUE_STATUS` on((`QUEUE`.`statusId` = `QUEUE_STATUS`.`statusId`))) join `QUEUEJDL` on((`QUEUE`.`queueId` = `QUEUEJDL`.`queueId`))) */; /*!50001 VIEW `QUEUE_VIEW` AS select `QUEUE`.`queueId` AS `queueId`,`QUEUE`.`statusId` AS `statusId`,`QUEUE`.`userId` AS `userId`,`QUEUE`.`priority` AS `priority`,`QUEUE`.`submitHostId` AS `submitHostId`,`QUEUE`.`finalPrice` AS `finalPrice`,`QUEUE`.`sent` AS `sent`,`QUEUE`.`split` AS `split`,`QUEUE`.`nodeId` AS `nodeId`,`QUEUE`.`execHostId` AS `execHostId`,`QUEUE`.`mtime` AS `mtime`,`QUEUE`.`agentId` AS `agentId`,`QUEUE`.`price` AS `price`,`QUEUE`.`finished` AS `finished`,`QUEUE`.`masterjob` AS `masterjob`,`QUEUE`.`splitting` AS `splitting`,`QUEUE`.`notifyId` AS `notifyId`,`QUEUE`.`optimized` AS `optimized`,`QUEUE`.`commandId` AS `commandId`,`QUEUE`.`error` AS `error`,`QUEUE`.`resubmission` AS `resubmission`,`QUEUE`.`received` AS `received`,`QUEUE`.`validate` AS `validate`,`QUEUE`.`merging` AS `merging`,`QUEUE`.`chargeStatus` AS `chargeStatus`,`QUEUE`.`siteId` AS `siteId`,`QUEUE`.`started` AS `started`,`QUEUE`.`expires` AS `expires`,`QUEUE_USER`.`user` AS `user`,`QUEUE_STATUS`.`status` AS `status`,`QUEUEJDL`.`origJdl` AS `origJdl`,`QUEUEJDL`.`resultsJdl` AS `resultsJdl`,`QUEUEJDL`.`path` AS `path` from (((`QUEUE` join `QUEUE_USER` on((`QUEUE`.`userId` = `QUEUE_USER`.`userId`))) join `QUEUE_STATUS` on((`QUEUE`.`statusId` = `QUEUE_STATUS`.`statusId`))) join `QUEUEJDL` on((`QUEUE`.`queueId` = `QUEUEJDL`.`queueId`))) */;
/*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET character_set_results = @saved_cs_results */;
......
#!/bin/bash #!/bin/bash
set -e set -e
echo "MARTA: Received $1"
JALIEN_DEV=/jalien-dev JALIEN_DEV=/jalien-dev
CE_CONFIG=$JALIEN_DEV/config/ComputingElement/docker CE_CONFIG=$JALIEN_DEV/config/ComputingElement/docker
LOGS=$JALIEN_DEV/logs LOGS=$JALIEN_DEV/logs
......
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