Parameterise changes

Signed-off-by: Anthony Whalley <anton@venshare.com>

Author: No9

Cargo.lock

@@ -47,6 +47,10 @@ spec:
             value:  {{ .Values.composer.crioImageCmd }}
           - name: COMP_POD_SELECTOR_LABEL
             value:  {{ .Values.composer.podSelectorLabel }}
+          - name: COMP_TIMEOUT
+            value:  {{ .Values.composer.timeout | quote }}
+          - name: COMP_COMPRESSION
+            value:  {{ .Values.composer.compression | quote }}
           - name: DEPLOY_CRIO_CONFIG
             value:  {{ .Values.daemonset.deployCrioConfig | quote }}
           - name: CRIO_ENDPOINT

charts/core-dump-handler/templates/daemonset.yaml

@@ -115,14 +115,23 @@
                 },
                 "podSelectorLabel": {
                     "type": "string"
+                },
+                "timeout": {
+                    "type": "integer",
+                    "minimum": 120
+                },
+                "compression": {
+                    "type": "boolean"
                 }
             },
             "required": [
                 "crioImageCmd",
                 "ignoreCrio",
                 "logLevel",
                 "logLength",
-                "filenameTemplate"
+                "filenameTemplate",
+                "timeout",
+                "compression"
             ],
             "title": "Composer"
         },
@@ -183,7 +192,7 @@
                             "hostContainerRuntimeEndpoint"
                         ]
                     }
-                 }
+                }
             ],
             "properties": {
                 "name": {
@@ -316,4 +325,4 @@
             "title": "ServiceAccount"
         }
     }
-}
+}

charts/core-dump-handler/values.schema.json

@@ -27,6 +27,8 @@ composer:
   filenameTemplate: "{uuid}-dump-{timestamp}-{hostname}-{exe_name}-{pid}-{signal}"
   logLength: 500
   podSelectorLabel: ""
+  timeout: 600
+  compression: true
 
 daemonset:
   name: "core-dump-handler"

charts/core-dump-handler/values.yaml

@@ -473,11 +473,15 @@ fn create_env_file(host_location: &str) -> Result<(), std::io::Error> {
     });
     let log_length = env::var("LOG_LENGTH").unwrap_or_else(|_| "500".to_string());
     let pod_selector_label = env::var("COMP_POD_SELECTOR_LABEL").unwrap_or_default();
+    let timeout = env::var("COMP_TIMEOUT").unwrap_or_else(|_| "600".to_string());
+    let compression = env::var("COMP_COMPRESSION")
+        .unwrap_or_else(|_| "true".to_string())
+        .to_lowercase();
     info!("Creating {} file with LOG_LEVEL={}", destination, loglevel);
     let mut env_file = File::create(destination)?;
     let text = format!(
-        "LOG_LEVEL={}\nIGNORE_CRIO={}\nCRIO_IMAGE_CMD={}\nUSE_CRIO_CONF={}\nFILENAME_TEMPLATE={}\nLOG_LENGTH={}\nPOD_SELECTOR_LABEL={}\n",
-        loglevel, ignore_crio, crio_image, use_crio_config, filename_template, log_length, pod_selector_label
+        "LOG_LEVEL={}\nIGNORE_CRIO={}\nCRIO_IMAGE_CMD={}\nUSE_CRIO_CONF={}\nFILENAME_TEMPLATE={}\nLOG_LENGTH={}\nPOD_SELECTOR_LABEL={}\nTIMEOUT={}\nCOMPRESSION={}\n",
+        loglevel, ignore_crio, crio_image, use_crio_config, filename_template, log_length, pod_selector_label, timeout, compression
     );
     info!("Writing composer .env \n{}", text);
     env_file.write_all(text.as_bytes())?;

core-dump-agent/src/main.rs

@@ -95,7 +95,7 @@ fn basic() -> Result<(), std::io::Error> {
         "FILENAME_TEMPLATE={uuid}-dump-{timestamp}-{hostname}-{exe_name}-{pid}-{signal}"
     ));
     assert!(env_content.contains("LOG_LENGTH=500"));
-    assert_eq!(env_content.lines().count(), 7);
+    assert_eq!(env_content.lines().count(), 9);
     //TODO: [No9] Test uploading of a corefile
     //TODO: [No9] Test remove option
     //TODO: [No9] Test sweep option

core-dump-agent/tests/basic.rs

@@ -21,12 +21,13 @@ pub struct CoreConfig {
     pub pod_selector_label: String,
     pub use_crio_config: bool,
     pub ignore_crio: bool,
+    pub timeout: u32,
+    pub compression: bool,
     pub image_command: ImageCommand,
     pub bin_path: String,
     pub os_hostname: String,
     pub filename_template: String,
     pub params: CoreParams,
-    pub disable_compression: bool,
 }
 
 #[derive(Serialize)]
@@ -39,7 +40,6 @@ pub struct CoreParams {
     pub directory: String,
     pub hostname: String,
     pub pathname: String,
-    pub timeout: u64,
     pub namespace: Option<String>,
     pub podname: Option<String>,
     pub uuid: Uuid,
@@ -58,12 +58,12 @@ impl CoreConfig {
         let directory = matches.value_of("directory").unwrap_or("").to_string();
         let hostname = matches.value_of("hostname").unwrap_or("").to_string();
         let pathname = matches.value_of("pathname").unwrap_or("").to_string();
-        let timeout = matches
-            .value_of("timeout")
-            .unwrap_or("600")
-            .parse::<u64>()
-            .unwrap();
-        let disable_compression = matches.contains_id("disable-compression");
+        // let timeout = matches
+        //     .value_of("timeout")
+        //     .unwrap_or("600")
+        //     .parse::<u64>()
+        //     .unwrap();
+        // let disable_compression = matches.contains_id("disable-compression");
 
         let uuid = Uuid::new_v4();
 
@@ -76,7 +76,6 @@ impl CoreConfig {
             directory,
             hostname,
             pathname,
-            timeout,
             namespace: None,
             podname: None,
             uuid,
@@ -112,6 +111,14 @@ impl CoreConfig {
             .unwrap_or_else(|_| "false".to_string().to_lowercase())
             .parse::<bool>()
             .unwrap();
+        let compression = env::var("COMPRESSION")
+            .unwrap_or_else(|_| "true".to_string().to_lowercase())
+            .parse::<bool>()
+            .unwrap();
+        let timeout = env::var("TIMEOUT")
+            .unwrap_or_else(|_| "600".to_string())
+            .parse::<u32>()
+            .unwrap();
         let os_hostname = hostname::get()
             .unwrap_or_else(|_| OsString::from_str("unknown").unwrap_or_default())
             .into_string()
@@ -146,7 +153,8 @@ impl CoreConfig {
             filename_template,
             log_length,
             params,
-            disable_compression,
+            compression,
+            timeout,
         })
     }
 

core-dump-composer/src/config.rs

@@ -21,14 +21,13 @@ mod logging;
 fn main() -> Result<(), anyhow::Error> {
     let (send, recv) = channel();
     let cc = config::CoreConfig::new()?;
-    let timeout = cc.params.timeout;
-
+    let recv_time: u64 = cc.timeout as u64;
     thread::spawn(move || {
         let result = handle(cc);
         send.send(result).unwrap();
     });
 
-    let result = recv.recv_timeout(Duration::from_secs(timeout));
+    let result = recv.recv_timeout(Duration::from_secs(recv_time));
 
     match result {
         Ok(inner_result) => inner_result,
@@ -111,10 +110,10 @@ fn handle(mut cc: config::CoreConfig) -> Result<(), anyhow::Error> {
     cc.set_podname(podname.to_string());
 
     // Create the base zip file that we are going to put everything into
-    let compression_method = if cc.disable_compression {
-        zip::CompressionMethod::Stored
-    } else {
+    let compression_method = if cc.compression {
         zip::CompressionMethod::Deflated
+    } else {
+        zip::CompressionMethod::Stored
     };
     let options = FileOptions::default()
         .compression_method(compression_method)

core-dump-composer/src/main.rs

@@ -44,6 +44,7 @@ fn timeout_scenario() -> Result<(), std::io::Error> {
         .unwrap();
 
     let cdc = Command::new("../target/debug/core-dump-composer")
+        .env("TIMEOUT", "1")
         .arg("-c")
         .arg("1000000000")
         .arg("-e")
@@ -60,8 +61,6 @@ fn timeout_scenario() -> Result<(), std::io::Error> {
         .arg("1588462466")
         .arg("-h")
         .arg("crashing-app-699c49b4ff-86wrh")
-        .arg("--timeout")
-        .arg("1")
         .stdin(cat)
         .output()
         .expect("Couldn't execute");