working on test setup

ALU-Schumacher · Sep 14, 2022 · 41cd5b8 · 41cd5b8
1 parent d792553
commit 41cd5b8
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 278 deletions.
diff --git a/auditor/Cargo.toml b/auditor/Cargo.toml
@@ -33,15 +33,15 @@ path = "src/main.rs"
 
 [[bin]]
 name = "auditor-slurm-epilog-collector-old"
-path = "src/collectors/slurm_epilog/main.rs"
+path = "src/collectors/slurm_epilog_old/main.rs"
 
 [[bin]]
 name = "auditor-slurm-epilog-collector-client"
-path = "src/collectors/slurm_epilog_2/client.rs"
+path = "src/collectors/slurm_epilog/client.rs"
 
 [[bin]]
 name = "auditor-slurm-epilog-collector"
-path = "src/collectors/slurm_epilog_2/server.rs"
+path = "src/collectors/slurm_epilog/server.rs"
 
 [[bin]]
 name = "auditor-priority-plugin"

diff --git a/...r/src/collectors/slurm_epilog_2/client.rs → ...tor/src/collectors/slurm_epilog/client.rs b/...r/src/collectors/slurm_epilog_2/client.rs → ...tor/src/collectors/slurm_epilog/client.rs
diff --git a/auditor/src/collectors/slurm_epilog/configuration.rs b/auditor/src/collectors/slurm_epilog/configuration.rs
diff --git a/...rs/slurm_epilog_2/configuration_client.rs → ...tors/slurm_epilog/configuration_client.rs b/...rs/slurm_epilog_2/configuration_client.rs → ...tors/slurm_epilog/configuration_client.rs
diff --git a/...rs/slurm_epilog_2/configuration_server.rs → ...tors/slurm_epilog/configuration_server.rs b/...rs/slurm_epilog_2/configuration_server.rs → ...tors/slurm_epilog/configuration_server.rs
diff --git a/auditor/src/collectors/slurm_epilog/main.rs b/auditor/src/collectors/slurm_epilog/main.rs
diff --git a/.../src/collectors/slurm_epilog_2/message.rs → ...or/src/collectors/slurm_epilog/message.rs b/.../src/collectors/slurm_epilog_2/message.rs → ...or/src/collectors/slurm_epilog/message.rs
diff --git a/...r/src/collectors/slurm_epilog_2/server.rs → ...tor/src/collectors/slurm_epilog/server.rs b/...r/src/collectors/slurm_epilog_2/server.rs → ...tor/src/collectors/slurm_epilog/server.rs
diff --git a/containers/docker-centos7-slurm/collector_config.yaml b/containers/docker-centos7-slurm/collector_config.yaml
@@ -4,20 +4,26 @@ record_prefix: "slurm"
 site_id: "site"
 components:
   - name: "Cores"
-    key: "NumCPUs"
+    key: "NCPUS"
     scores:
       - name: "HEPSPECK"
         factor: 1.1
         only_if:
           key: "Partition"
           matches: "^part1$"
   - name: "Cores"
-    key: "NumCPUs"
+    key: "NCPUS"
     scores:
       - name: "HEPSPECK"
         factor: 1.2
         only_if:
           key: "Partition"
           matches: "^part2$"
+  # - name: "SystemCPU"
+  #   key: "SystemCPU"
+  #   key_type: Time
+  #   only_if:
+  #     key: "Partition"
+  #     matches: "^part1$"
   - name: "Memory"
-    key: "Mem"
+    key: "MaxRSS"
diff --git a/containers/docker-centos7-slurm/epilog.sh b/containers/docker-centos7-slurm/epilog.sh
@@ -10,4 +10,4 @@ exec 2>> /epilog_logs/epilog.log
 # AUDITOR_ADDR=host.docker.internal AUDITOR_PORT=8000 /auditor-slurm-epilog-collector
 # Set DEBUG loglevel (verbose)
 # RUST_LOG=debug /auditor-slurm-epilog-collector collector_config.yaml
-/auditor-slurm-epilog-collector collector_config.yaml
+AUDITOR_SLURM_EPILOG_COLLECTOR__ADDR=host.docker.internal /auditor-slurm-epilog-collector-client