Integration work to get flowctl-go able to invoke flow-firecracker

Author: jshearer

Cargo.lock

@@ -201,6 +201,7 @@ mnl = { version = "0.2.2", features = ["mnl-1-0-4"] }
 
 tracing-log = "0.1.3"
 which = "4.4.0"
+serde_plain = "1.0.1"
 
 [profile.release]
 incremental = true

Cargo.toml

@@ -50,6 +50,8 @@ WORKDIR  = $(realpath .)/.build
 # Packaged build outputs.
 PKGDIR = ${WORKDIR}/package
 
+ASSETS_PATH = $(realpath .)/assets
+
 # Etcd release we pin within Flow distributions.
 ETCD_VERSION = v3.5.5
 
@@ -165,6 +167,10 @@ ${RUSTBIN}/agent:
 ${RUSTBIN}/flowctl:
 	cargo build --release --locked -p flowctl
 
+.PHONY: ${RUSTBIN}/flow-firecracker
+${RUSTBIN}/flow-firecracker:
+	cargo build --release --locked -p task-runtime
+
 # Statically linked binaries using MUSL:
 
 .PHONY: ${RUST_MUSL_BIN}/flow-connector-init
@@ -197,6 +203,8 @@ GNU_TARGETS = \
 	${PKGDIR}/bin/gazette \
 	${PKGDIR}/bin/sops \
 	${PKGDIR}/bin/flowctl \
+	${PKGDIR}/bin/flow-firecracker \
+	${PKGDIR}/bin/vmlinux.bin \
 
 MUSL_TARGETS = \
 	${PKGDIR}/bin/flow-connector-init \
@@ -250,6 +258,12 @@ ${PKGDIR}/bin/flow-schemalate: ${RUST_MUSL_BIN}/flow-schemalate | ${PKGDIR}
 ${PKGDIR}/bin/flowctl: ${RUSTBIN}/flowctl | ${PKGDIR}
 	cp ${RUSTBIN}/flowctl $@
 
+${PKGDIR}/bin/flow-firecracker: ${RUSTBIN}/flow-firecracker | ${PKGDIR}
+	cp ${RUSTBIN}/flow-firecracker $@
+
+${PKGDIR}/bin/vmlinux.bin: ${ASSETS_PATH}/vmlinux.bin | ${PKGDIR}
+	cp ${ASSETS_PATH}/vmlinux.bin $@
+
 # Control-plane binaries
 
 ${PKGDIR}/bin/agent: ${RUSTBIN}/agent | ${PKGDIR}

Makefile

@@ -9,16 +9,18 @@ repository.workspace = true
 license.workspace = true
 
 [[bin]]
-name = "test-firecracker"
+name = "flow-firecracker"
 path = "src/main.rs"
 
 [dependencies]
 connector-init = { path = "../connector-init" }
+ops = { path = "../ops" }
 
 cmd_lib = { workspace = true }
 uuid = { workspace = true }
 tempfile = { workspace = true }
 
+time = { workspace = true }
 async-trait = { workspace = true }
 firec = { workspace = true }
 bollard = { workspace = true }
@@ -36,6 +38,7 @@ clap = { workspace = true }
 which = { workspace = true }
 lazy_static = { workspace = true }
 fancy-regex = { workspace = true }
+serde_plain = { workspace = true }
 
 #-- Prune:
 anyhow = { workspace = true }

assets/vmlinux.bin

@@ -1,6 +1,7 @@
-use std::str::FromStr;
+use core::fmt;
+use std::{fmt::Display, str::FromStr};
 
-use anyhow::Context;
+use anyhow::{anyhow, Context};
 use fancy_regex::Regex;
 use serde::{Deserialize, Serialize};
 
@@ -32,6 +33,14 @@ pub enum PortMappingProtocol {
     TCP,
     UDP,
 }
+
+impl fmt::Display for PortMappingProtocol {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let val = serde_plain::to_string(self).unwrap_or("unknown".to_owned());
+        write!(f, "{}", val)
+    }
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct PortMapping {
@@ -41,7 +50,7 @@ pub struct PortMapping {
 }
 
 lazy_static::lazy_static! {
-    static ref PORT_RE: Regex = Regex::new(r"^([0-9]{1,5}):([0-9]{1,5})(/(tcp|udp))?$").unwrap();
+    static ref PORT_RE: Regex = Regex::new(r"^([0-9]{1,5}):([0-9]{1,5})(/(\w+))?$").unwrap();
 }
 
 impl FromStr for PortMapping {
@@ -68,11 +77,8 @@ impl FromStr for PortMapping {
             .as_str()
             .parse::<usize>()?;
         let protocol = capture_groups
-            .get(3)
-            .map(|proto| {
-                let val = proto.as_str();
-                serde_json::de::from_str::<PortMappingProtocol>(&format!(r#""{val}""#))
-            })
+            .get(4)
+            .map(|proto| serde_plain::from_str(proto.as_str()))
             .unwrap_or(Ok(PortMappingProtocol::TCP))?;
 
         Ok(Self {

crates/task-runtime/Cargo.toml

@@ -10,7 +10,7 @@ use std::{
     path::{Path, PathBuf},
 };
 use tokio::runtime::Handle;
-use tracing::{debug, error};
+use tracing::{debug, error, info};
 use uuid::Uuid;
 
 use crate::cni::PortMapping;
@@ -36,8 +36,8 @@ pub fn setup_init_fs(
 
     run_cmd!(
         cd $temp_dir;
-        fallocate -l 64M initfs;
-        mkfs.ext2 initfs;
+        dd if=/dev/zero of=initfs bs=512 count=125000;
+        mkfs.ext2 -q initfs;
         mkdir initmount;
         mount -o loop,noatime initfs initmount;
         chown $user:$user initmount;
@@ -234,6 +234,15 @@ impl FirecrackerNetworking {
         let plugins_path = self.cni_plugins_path.clone();
 
         let cni_response = if self.port_mappings.len() > 0 {
+            for PortMapping {
+                protocol,
+                host_port,
+                container_port,
+            } in self.port_mappings.iter()
+            {
+                info!("Binding host {protocol} port {host_port} to guest port {container_port} ")
+            }
+
             let capability_args_val =
                 serde_json::to_string(&json!({"portMappings": self.port_mappings}))
                     .context("Serializing port mappings")?;