Skip to content
This repository has been archived by the owner on Dec 17, 2024. It is now read-only.

Drop use of ops (after VirtFS support) #160

Merged
merged 2 commits into from
Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-reco
curl \
qemu-system

# Install Ops.
RUN /bin/curl -Lo /bin/ops https://storage.googleapis.com/cli/linux/ops && chmod 755 /bin/ops && /bin/ops update

COPY ./crates/node/migrations /migrations

RUN mkdir -p /var/lib/gevulot
Expand Down
1 change: 0 additions & 1 deletion crates/node/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ use types::{transaction::Validated, Hash, Transaction};

mod cli;
mod mempool;
mod nanos;
mod networking;
mod rpc_server;
mod scheduler;
Expand Down
1 change: 0 additions & 1 deletion crates/node/src/nanos/mod.rs

This file was deleted.

156 changes: 0 additions & 156 deletions crates/node/src/nanos/volume.rs

This file was deleted.

13 changes: 0 additions & 13 deletions crates/node/src/vmm/qemu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ use vsock::get_local_cid;
use super::{vm_server::ProgramRegistry, Provider, VMClient, VMHandle, VMId};
use crate::{
cli::Config,
nanos,
types::{Hash, Program},
vmm::ResourceRequest,
};
Expand Down Expand Up @@ -163,14 +162,6 @@ impl Provider for Qemu {
.collect::<String>()
.to_lowercase();

// XXX: This isn't async and will call out to `ops` for now.
// tracing::debug!("creating workspace volume:{workspace_volume_label:?} for the VM");
// let workspace_file =
// nanos::volume::create(&self.config.data_directory, &workspace_volume_label, "2g")?
// .into_os_string();
// let workspace_file = workspace_file.to_str().expect("workspace volume path");
// tracing::debug!("workspace volume:{workspace_file:?} created");

let cpus = req.cpus;
let mem_req = req.mem;
let cid = self.allocate_cid();
Expand Down Expand Up @@ -344,10 +335,6 @@ impl Provider for Qemu {
p.wait()
})?;

// GC ephemeral workspace volume.
// XXX: This isn't async and will call out to `ops`.
nanos::volume::delete(&qemu_vm_handle.workspace_volume_label)?;

let cid = qemu_vm_handle.cid;
self.release_cid(cid);

Expand Down
Loading