Merge pull request #6 from thomas-mauran/wip/db_ownership

feat mutex for kv

controller/src/main.rs

@@ -4,8 +4,8 @@ mod routes;
 mod store;
 mod types;
 
-use orka_proto::scheduler_controller::{self, WorkloadInstance};
 use store::kv_manager::DB_STORE;
+use orka_proto::scheduler_controller::{self, WorkloadInstance};
 use store::kv_manager::{KeyValueBatch, DB_BATCH};
 use tokio::sync::mpsc;
 use tokio_stream::wrappers::ReceiverStream;

controller/src/routes/instances.rs

@@ -7,7 +7,7 @@ use crate::types::instance_request::InstanceRequest;
 use crate::types::instance_status::InstanceStatus;
 use axum::extract::Path;
 use axum::Json;
-use log::{error, trace, warn};
+use log::{trace, warn, error};
 use orka_proto::scheduler_controller::{SchedulingRequest, Workload, WorkloadInstance};
 use serde_json::{self, json, Value};
 use validator::Validate;

controller/src/types/instance_status.rs

@@ -52,21 +52,43 @@ impl From<Option<Resources>> for InstanceResources {
 
 #[derive(Debug, Validate, Deserialize, Serialize, Clone)]
 pub struct InstanceStatusCode {
-    pub code: i32,
-    pub message: Option<String>,
+    pub code: Code,
+    pub message: String,
 }
 
 impl From<Option<Status>> for InstanceStatusCode {
     fn from(status: Option<Status>) -> Self {
         match status {
             Some(st) => InstanceStatusCode {
-                code: st.code,
-                message: st.message,
+                code: Code::from_i32(st.code),
+                message: if st.message.is_some() {
+                    st.message.unwrap()
+                } else {
+                    String::from("")
+                },
             },
             None => InstanceStatusCode {
-                code: 0,
-                message: Some(String::from("No status found")),
+                code: Code::Waiting,
+                message: String::from("No status found"),
             },
         }
     }
 }
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub enum Code {
+    Waiting,
+    Running,
+    Terminated,
+}
+
+impl Code {
+    fn from_i32(value: i32) -> Code {
+        match value {
+            0 => Code::Waiting,
+            1 => Code::Running,
+            2 => Code::Terminated,
+            _ => panic!("Unknown value: {}", value),
+        }
+    }
+}