diff --git a/curl_slurmrestd.sh b/curl_slurmrestd.sh index e3826ee..a52cd70 100755 --- a/curl_slurmrestd.sh +++ b/curl_slurmrestd.sh @@ -1,3 +1,4 @@ JWT="eyJhbGciOiJSUzI1NiIsICJ0eXAiOiJKV1QifQ.eyJpc3MiOiJzbHVybSJ9.dzAHf1Ojoa149uRCCWY1eP3vDyCIZCOZ3h554R-KJJ8-OP0CJ0ymvSkFISLcYcyd9vVKmaYdSN3tWEF6bNZEmyX7G560i1MbkNFvhkhNVSPLKEKNPs38h5ra3ZlTlLlxAlDzXRAAn6UEEgKdm5vx4Jhec7ptaRL_zeSFpTS5fJPc0QE1Cm7e7nU39-9e8l4WU4KpRMxT6ANFm22_G4-mSA-AgCAvKQFzj2FInKsXDUTGlliNJuAgFxf-9LQxoeAknOQhEqcTXii_yBy9DNcT03pdNcAu5Ru4_qlX62vroInU_eh5mWQyiUdXN9Wj_OfMmfLoYFkJeUFYexBMZnSBgg" -curl -X 'GET' -v 'http://localhost:6820/slurm/v0.0.39/ping' -H "X-SLURM-USER-NAME:slurm" -H "X-SLURM-USER-TOKEN:$SLURM_JWT" +# curl -X 'GET' -v 'http://localhost:6820/slurm/v0.0.39/ping' -H "X-SLURM-USER-NAME:slurm" -H "X-SLURM-USER-TOKEN:$SLURM_JWT" +curl -v --unix-socket data/slurm/tmp/slurmrestd.socket 'http://localhost:6820/slurm/v0.0.39/ping' \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index f04fd8b..51e3354 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -72,6 +72,7 @@ services: volumes: - ${DATADIR}/slurm/home:/home - ${DATADIR}/slurm/secret:/.secret + - ${DATADIR}/slurm/tmp:/tmp:rw - ./slurm/controller/slurm.conf:/home/config/slurm.conf - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro diff --git a/slurm/controller/docker-entrypoint.sh b/slurm/controller/docker-entrypoint.sh index 2871c8d..6fca56d 100755 --- a/slurm/controller/docker-entrypoint.sh +++ b/slurm/controller/docker-entrypoint.sh @@ -129,7 +129,7 @@ _slurmctld() { slurm-slurmctld-$SLURM_VERSION*.$ARCH.rpm echo "checking for slurmdbd.conf" while [ ! -f /.secret/slurmdbd.conf ]; do - echo -n "." + echo "." sleep 1 done echo "" @@ -170,7 +170,7 @@ _slurmctld() { else cp /.secret/jwt.key /etc/config/jwt.key chown slurm: /etc/config/jwt.key - chmod 0400 /etc/config/jwt.key + chmod 0600 /etc/config/jwt.key fi _generate_jwt_token @@ -178,6 +178,7 @@ _slurmctld() { sudo yum install -y nc sudo yum install -y procps sudo yum install -y iputils + sudo yum install -y lsof while ! nc -z slurmdbd 6819; do echo "Waiting for slurmdbd to be ready..." diff --git a/slurm/database/docker-entrypoint.sh b/slurm/database/docker-entrypoint.sh index 2b968fb..c9227ae 100755 --- a/slurm/database/docker-entrypoint.sh +++ b/slurm/database/docker-entrypoint.sh @@ -70,11 +70,12 @@ _slurmdbd() { cp /home/config/slurmdbd.conf /etc/slurm/slurmdbd.conf chown slurm: /etc/slurm/slurmdbd.conf chmod 600 /etc/slurm/slurmdbd.conf + cp /etc/slurm/slurmdbd.conf /.secret/slurmdbd.conf fi - echo -n "checking for jwt.key" + echo "checking for jwt.key" while [ ! -f /.secret/jwt.key ]; do - echo -n "." + echo "." sleep 1 done @@ -87,8 +88,6 @@ _slurmdbd() { sudo yum install -y nc sudo yum install -y procps sudo yum install -y iputils - - cp /etc/slurm/slurmdbd.conf /.secret/slurmdbd.conf echo "Starting slurmdbd" /usr/sbin/slurmdbd -Dvv diff --git a/slurm/rest/docker-entrypoint.sh b/slurm/rest/docker-entrypoint.sh index fc0f726..3c0cddd 100755 --- a/slurm/rest/docker-entrypoint.sh +++ b/slurm/rest/docker-entrypoint.sh @@ -113,8 +113,8 @@ _slurmrestd() { touch /var/log/slurmrestd.log chown slurm: /var/log/slurmrestd.log - chown slurm: /tmp - chmod 777 /tmp + chown worker: /tmp + chmod 770 /tmp if [[ ! -f /home/config/slurmrestd.conf ]]; then echo "### Missing slurm.conf ###" @@ -125,15 +125,17 @@ _slurmrestd() { cp /home/config/slurm.conf /etc/config/slurm.conf fi - echo -n "checking for jwt.key" + echo "checking for jwt.key" while [ ! -f /.secret/jwt.key ]; do - echo -n "." + echo "." sleep 1 done sudo yum install -y nc sudo yum install -y procps sudo yum install -y iputils + sudo yum install -y lsof + sudo yum install -y socat cp /.secret/jwt.key /etc/config/jwt.key chown slurm: /etc/config/jwt.key @@ -146,7 +148,7 @@ _slurmrestd() { # _enable_slurmrestd # sudo ln -s /usr/lib/systemd/system/slurmrestd.service /etc/systemd/system/multi-user.target.wants/slurmrestd.service - /usr/sbin/slurmrestd -f /etc/config/slurmrestd.conf -vvvvvv -s dbv0.0.39,v0.0.39 -u slurm unix:$SLURMRESTD 0.0.0.0:6820 + /usr/sbin/slurmrestd -f /etc/config/slurmrestd.conf -vvvvvv -s dbv0.0.39,v0.0.39 -u worker unix:$SLURMRESTD 0.0.0.0:6820 echo "Started slurmrestd" }