Skip to content

Commit

Permalink
fixed a few vpnwkr -> vpngtw remnants. Excluded vpngtw from slurm setup
Browse files Browse the repository at this point in the history
  • Loading branch information
XaverStiensmeier committed Feb 14, 2024
1 parent 71f3214 commit 03f088c
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 9 deletions.
29 changes: 26 additions & 3 deletions documentation/markdown/features/cluster_commands.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,33 @@
# BiBiGrid Cluster Commands

## [bibiinfo](../../../resources/bin/bibiinfo)
Similar to `sinfo` but shows detailed information regarding node features.

## [bibilog](../../../resources/bin/bibilog)
`bibilog` executes `tail -f` on the most recent worker creation out log.
Thereby, it helps you with understanding any startup issues.

## [bibiplay](../../../resources/bin/bibiplay)
`bibiplay` is mainly a shortcut for `ansible-playbook /opt/playbook/site.yml -i /opt/playbook/ansible_hosts`
which allows you to execute the ansible playbook more easily.

### Examples
You have changed something in the common configuration and want to propagate this change to the master.
```sh
bibiplay -l master
# executes the playbook only for the master
```

You have changed something in the slurm configuration and want to propagate this change to the master.
```sh
bibiplay -l master -t slurm
```

## [bibiname](../../../resources/playbook/roles/bibigrid/templates/bin/bibiname.j2)[m|v|default: w] [number]

This command creates node names for the user without them needing to copy the cluster-id.
Takes two arguments. The first defines whether a master, vpnwkr or worker is meant. Worker is the default.
The second parameter - if vpnwkr or worker is selected - defines which vpnwkr or worker is meant.
Takes two arguments. The first defines whether a master, vpngtw or worker is meant. Worker is the default.
The second parameter - if vpngtw or worker is selected - defines which vpngtw or worker is meant.

### Examples
Assume the cluster-id `20ozebsutekrjj4`.
Expand All @@ -16,7 +39,7 @@ bibiname m

```sh
bibiname v 0
# bibigrid-vpnwkr-20ozebsutekrjj4-0
# bibigrid-vpngtw-20ozebsutekrjj4-0
```

```sh
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion resources/playbook/roles/bibigrid/files/slurm/create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ process_string() {
fifth=${elements[4]}

# Replace undesired characters in the second element
second=$(echo "$second" | sed -E 's/worker-/worker_/; s/vpnwkr-/vpnwkr_/')
second=$(echo "$second" | sed -E 's/worker-/worker_/; s/vpngtw-/vpngtw_/')

# Check if the fifth element is not empty
if [[ ! -z $fifth ]]; then
Expand Down
2 changes: 1 addition & 1 deletion resources/playbook/roles/bibigrid/files/slurm/fail.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ process_string() {
fifth=${elements[4]}

# Replace undesired characters in the second element
second=$(echo "$second" | sed -E 's/worker-/worker_/; s/vpnwkr-/vpnwkr_/')
second=$(echo "$second" | sed -E 's/worker-/worker_/; s/vpngtw-/vpngtw_/')

# Check if the fifth element is not empty
if [[ ! -z $fifth ]]; then
Expand Down
3 changes: 0 additions & 3 deletions resources/playbook/roles/bibigrid/handlers/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,12 @@
systemd:
name: slurmdbd
state: restarted
when: "'vpnwkr' not in group_names"

- name: slurmrestd
systemd:
name: slurmrestd
state: restarted
daemon_reload: true
when: "'vpnwkr' not in group_names"

- name: slurmctld
systemd:
Expand All @@ -36,7 +34,6 @@
systemd:
name: slurmd
state: restarted
when: "'vpnwkr' not in group_names"

- name: zabbix-agent
systemd:
Expand Down
2 changes: 1 addition & 1 deletion resources/playbook/roles/bibigrid/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
- debug:
msg: "[BIBIGRID] Setup Slurm"
- import_tasks: 042-slurm.yml
when: "'vpnwkr' not in group_names"
when: "'vpngtw' not in group_names"
- import_tasks: 042-slurm-server.yml
when: "'master' in group_names"

Expand Down

0 comments on commit 03f088c

Please sign in to comment.