Skip to content

Commit

Permalink
restructured log files again. Removed outdated key warnings from bibi…
Browse files Browse the repository at this point in the history
…grid.yml
  • Loading branch information
XaverStiensmeier committed Dec 5, 2023
1 parent ec1530d commit 95ce6a6
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
8 changes: 4 additions & 4 deletions bibigrid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@

## Volumes and snapshots that will be mounted to master
# autoMount: False # WARNING: will overwrite unidentified filesystems
#masterMounts: # KEY NOT FULLY IMPLEMENTED YET
#masterMounts:
# - [mount one]

#nfsShares: # KEY NOT FULLY IMPLEMENTED YET; /vol/spool/ is automatically created as a nfs
#nfsShares: /vol/spool/ is automatically created as a nfs
# - [nfsShare one]

## Ansible (Galaxy) roles can be added for execution # KEY NOT IMPLEMENTED YET
Expand Down Expand Up @@ -48,7 +48,7 @@
#nfs: True
#ide: True # A nice way to view your cluster as if you were using Visual Studio Code

useMasterAsCompute: True # Currently ignored by slurm
useMasterAsCompute: True

#waitForServices: # existing service name that runs after an instance is launched. BiBiGrid's playbook will wait until service is "stopped" to avoid issues
# - de.NBI_Bielefeld_environment.service # uncomment for cloud site Bielefeld
Expand Down Expand Up @@ -104,4 +104,4 @@

#features: # list

#- [next configurations] # KEY NOT IMPLEMENTED YET
#- [next configurations]
6 changes: 4 additions & 2 deletions resources/playbook/roles/bibigrid/files/slurm/create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ process_string() {
}

mkdir -p worker_logs
mkdir -p worker_logs/out
mkdir -p worker_logs/err

# redirect stderr and stdout
exec >> "/var/log/slurm/worker_logs/create$(date '+%Y-%m-%d_%H:%M:%S')_$(process_string "$1").out.log"
exec 2>> "/var/log/slurm/worker_logs/create$(date '+%Y-%m-%d_%H:%M:%S')_$(process_string "$1").err.log"
exec >> "/var/log/slurm/worker_logs/out/$(process_string "$1")_$(date '+%Y-%m-%d_%H:%M:%S').log"
exec 2>> "/var/log/slurm/worker_logs/err/$(process_string "$1")_$(date '+%Y-%m-%d_%H:%M:%S').log"

function log {
echo "$(date) $*"
Expand Down
6 changes: 4 additions & 2 deletions resources/playbook/roles/bibigrid/files/slurm/fail.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ process_string() {
}

mkdir -p worker_logs
mkdir -p worker_logs/out
mkdir -p worker_logs/err

# redirect stderr and stdout
exec >> "/var/log/slurm/worker_logs/fail$(date '+%Y-%m-%d_%H:%M:%S')_$(process_string "$1").out.log"
exec 2>> "/var/log/slurm/worker_logs/fail$(date '+%Y-%m-%d_%H:%M:%S')_$(process_string "$1").err.log"
exec >> "/var/log/slurm/worker_logs/out/$(process_string "$1")_$(date '+%Y-%m-%d_%H:%M:%S').log"
exec 2>> "/var/log/slurm/worker_logs/err/$(process_string "$1")_$(date '+%Y-%m-%d_%H:%M:%S').log"

function log {
echo "$(date) $*"
Expand Down

0 comments on commit 95ce6a6

Please sign in to comment.