Merge branch 'main' of gitea:jheuel/zoidberg

backends/htcondor/run.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/bash
 
 # apparently this vodoo kills all processes opened in this script
-trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT
+# trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT
+# ssh -N -L 8080:localhost:8080 lxplus7103 &
+# sleep 10
 
-ssh -N -L 8080:localhost:8080 lxplus7103 &
+/home/home4/institut_1b/jheuel/repositories/zoidberg/target/release/zoidberg_client
 
-sleep 10
-/afs/cern.ch/work/j/jheuel/zoidberg/target/debug/zoidberg_client http://localhost:8080

backends/htcondor/worker.submit

@@ -6,9 +6,10 @@ error        = output/stderr.$(Process)
 log          = output/log.$(Process)
 
 request_cpus   = 1
-#request_memory = 1024
+request_memory = 4096
 #request_disk   = 10240
 
+getenv = True
 should_transfer_files = no
 
-queue 150
+queue 20

zoidberg_client/src/main.rs

@@ -136,7 +136,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
         .arg(
             Arg::with_name("server")
                 .takes_value(true)
-                .required(true)
                 .help("Set Zoidberg server address"),
         )
         .arg(
@@ -145,7 +144,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
                 .value_parser(value_parser!(i32)),
         )
         .get_matches();
-    let server = matches.value_of("server").unwrap();
     let threads: i32 = if let Some(t) = matches.get_one::<i32>("threads") {
         *t
     } else {
@@ -157,8 +155,12 @@ async fn main() -> Result<(), Box<dyn Error>> {
         std::process::exit(1);
     });
 
+    let server = std::env::var("ZOIDBERG_SERVER").unwrap_or_else(|_| {
+        String::from(matches.value_of("server").unwrap())
+    });
+
     let client = Arc::new(
-        Worker::new(server, &secret, threads)
+        Worker::new(&server, &secret, threads)
             .await
             .expect("Could not create client"),
     );

zoidberg_server/src/main.rs

@@ -41,7 +41,13 @@ impl State {
 async fn index(data: web::Data<State>) -> impl Responder {
     let workers = data.workers.lock().unwrap();
     let jobs = data.jobs.lock().unwrap();
-    let page = webpage::render(&*jobs, &*workers);
+    let filtered_jobs: Vec<Job> = jobs
+        .to_vec()
+        .iter()
+        .filter(|x| !matches!(x.status, Status::Completed))
+        .cloned()
+        .collect();
+    let page = webpage::render(&filtered_jobs, &*workers);
     HttpResponse::Ok().body(page)
 }