Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add fork as a host function #1254

Closed
wants to merge 4 commits into from
+166 −94
Closed

Add fork as a host function #1254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c7a6ff8
Add fork
afsalthaj Jan 21, 2025
6fdc1e8
Fix durability package
afsalthaj Jan 21, 2025
3066c97
Update to api1_1_1
afsalthaj Jan 22, 2025
dfae423
Add fork function
afsalthaj Jan 22, 2025
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
9 changes: 7 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ futures = "0.3"
futures-core = "0.3.31"
futures-util = "0.3.31"
git-version = "0.3.9"
golem-wit = { version = "=1.1.2" }
golem-wit = { git = "https://github.com/golemcloud/golem-wit.git", branch = "add_fork" }
hex = "0.4.3"
http = "1.2.0" # keep in sync with wasmtime
humansize = "2.1.3"
Expand Down
6 changes: 3 additions & 3 deletions golem-worker-executor-base/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ fn preview2_mod_gen(golem_wit_path: &str) -> String {

world golem {{
import golem:api/host@0.2.0;
import golem:api/host@1.1.0;
import golem:api/oplog@1.1.0;
import golem:api/durability@1.2.0;
import golem:api/host@1.1.1;
import golem:api/oplog@1.1.1;
import golem:durability/durability@1.2.0;

import wasi:blobstore/blobstore;
import wasi:blobstore/container;
Expand Down
90 changes: 37 additions & 53 deletions golem-worker-executor-base/src/durable_host/durability.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use crate::error::GolemError;
use crate::metrics::wasm::record_host_function_call;
use crate::model::PersistenceLevel;
use crate::preview2::golem;
use crate::preview2::golem::api1_2_0;
use crate::preview2::golem::durability::durability;
use crate::services::oplog::{CommitLevel, OplogOps};
use crate::workerctx::WorkerCtx;
use async_trait::async_trait;
Expand Down Expand Up @@ -105,62 +105,48 @@ pub trait DurabilityHost {
) -> Result<PersistedDurableFunctionInvocation, GolemError>;
}

impl From<api1_2_0::durability::DurableFunctionType> for DurableFunctionType {
fn from(value: api1_2_0::durability::DurableFunctionType) -> Self {
impl From<durability::DurableFunctionType> for DurableFunctionType {
fn from(value: durability::DurableFunctionType) -> Self {
match value {
api1_2_0::durability::DurableFunctionType::WriteRemote => {
DurableFunctionType::WriteRemote
}
api1_2_0::durability::DurableFunctionType::WriteLocal => {
DurableFunctionType::WriteLocal
}
api1_2_0::durability::DurableFunctionType::WriteRemoteBatched(oplog_index) => {
durability::DurableFunctionType::WriteRemote => DurableFunctionType::WriteRemote,
durability::DurableFunctionType::WriteLocal => DurableFunctionType::WriteLocal,
durability::DurableFunctionType::WriteRemoteBatched(oplog_index) => {
DurableFunctionType::WriteRemoteBatched(oplog_index.map(OplogIndex::from_u64))
}
api1_2_0::durability::DurableFunctionType::ReadRemote => {
DurableFunctionType::ReadRemote
}
api1_2_0::durability::DurableFunctionType::ReadLocal => DurableFunctionType::ReadLocal,
durability::DurableFunctionType::ReadRemote => DurableFunctionType::ReadRemote,
durability::DurableFunctionType::ReadLocal => DurableFunctionType::ReadLocal,
}
}
}

impl From<DurableFunctionType> for api1_2_0::durability::DurableFunctionType {
impl From<DurableFunctionType> for durability::DurableFunctionType {
fn from(value: DurableFunctionType) -> Self {
match value {
DurableFunctionType::WriteRemote => {
api1_2_0::durability::DurableFunctionType::WriteRemote
}
DurableFunctionType::WriteLocal => {
api1_2_0::durability::DurableFunctionType::WriteLocal
}
DurableFunctionType::WriteRemote => durability::DurableFunctionType::WriteRemote,
DurableFunctionType::WriteLocal => durability::DurableFunctionType::WriteLocal,
DurableFunctionType::WriteRemoteBatched(oplog_index) => {
api1_2_0::durability::DurableFunctionType::WriteRemoteBatched(
durability::DurableFunctionType::WriteRemoteBatched(
oplog_index.map(|idx| idx.into()),
)
}
DurableFunctionType::ReadRemote => {
api1_2_0::durability::DurableFunctionType::ReadRemote
}
DurableFunctionType::ReadLocal => api1_2_0::durability::DurableFunctionType::ReadLocal,
DurableFunctionType::ReadRemote => durability::DurableFunctionType::ReadRemote,
DurableFunctionType::ReadLocal => durability::DurableFunctionType::ReadLocal,
}
}
}

impl From<OplogEntryVersion> for api1_2_0::durability::OplogEntryVersion {
impl From<OplogEntryVersion> for durability::OplogEntryVersion {
fn from(value: OplogEntryVersion) -> Self {
match value {
OplogEntryVersion::V1 => api1_2_0::durability::OplogEntryVersion::V1,
OplogEntryVersion::V2 => api1_2_0::durability::OplogEntryVersion::V2,
OplogEntryVersion::V1 => durability::OplogEntryVersion::V1,
OplogEntryVersion::V2 => durability::OplogEntryVersion::V2,
}
}
}

impl From<PersistedDurableFunctionInvocation>
for api1_2_0::durability::PersistedDurableFunctionInvocation
{
impl From<PersistedDurableFunctionInvocation> for durability::PersistedDurableFunctionInvocation {
fn from(value: PersistedDurableFunctionInvocation) -> Self {
api1_2_0::durability::PersistedDurableFunctionInvocation {
durability::PersistedDurableFunctionInvocation {
timestamp: value.timestamp.into(),
function_name: value.function_name,
response: value.response,
Expand All @@ -171,7 +157,7 @@ impl From<PersistedDurableFunctionInvocation>
}

#[async_trait]
impl<Ctx: WorkerCtx> api1_2_0::durability::Host for DurableWorkerCtx<Ctx> {
impl<Ctx: WorkerCtx> durability::Host for DurableWorkerCtx<Ctx> {
async fn observe_function_call(
&mut self,
iface: String,
Expand All @@ -183,16 +169,16 @@ impl<Ctx: WorkerCtx> api1_2_0::durability::Host for DurableWorkerCtx<Ctx> {

async fn begin_durable_function(
&mut self,
function_type: api1_2_0::durability::DurableFunctionType,
) -> anyhow::Result<api1_2_0::durability::OplogIndex> {
function_type: durability::DurableFunctionType,
) -> anyhow::Result<durability::OplogIndex> {
let oplog_idx = DurabilityHost::begin_durable_function(self, &function_type.into()).await?;
Ok(oplog_idx.into())
}

async fn end_durable_function(
&mut self,
function_type: api1_2_0::durability::DurableFunctionType,
begin_index: api1_2_0::durability::OplogIndex,
function_type: durability::DurableFunctionType,
begin_index: durability::OplogIndex,
) -> anyhow::Result<()> {
DurabilityHost::end_durable_function(
self,
Expand All @@ -205,11 +191,11 @@ impl<Ctx: WorkerCtx> api1_2_0::durability::Host for DurableWorkerCtx<Ctx> {

async fn current_durable_execution_state(
&mut self,
) -> anyhow::Result<api1_2_0::durability::DurableExecutionState> {
) -> anyhow::Result<durability::DurableExecutionState> {
let state = DurabilityHost::durable_execution_state(self);
let persistence_level: golem::api0_2_0::host::PersistenceLevel =
state.persistence_level.into();
Ok(api1_2_0::durability::DurableExecutionState {
Ok(durability::DurableExecutionState {
is_live: state.is_live,
persistence_level: persistence_level.into(),
})
Expand All @@ -220,7 +206,7 @@ impl<Ctx: WorkerCtx> api1_2_0::durability::Host for DurableWorkerCtx<Ctx> {
function_name: String,
request: Vec<u8>,
response: Vec<u8>,
function_type: api1_2_0::durability::DurableFunctionType,
function_type: durability::DurableFunctionType,
) -> anyhow::Result<()> {
DurabilityHost::persist_durable_function_invocation(
self,
Expand All @@ -236,21 +222,19 @@ impl<Ctx: WorkerCtx> api1_2_0::durability::Host for DurableWorkerCtx<Ctx> {
async fn persist_typed_durable_function_invocation(
&mut self,
function_name: String,
request: api1_2_0::durability::ValueAndType,
response: api1_2_0::durability::ValueAndType,
function_type: api1_2_0::durability::DurableFunctionType,
request: durability::ValueAndType,
response: durability::ValueAndType,
function_type: durability::DurableFunctionType,
) -> anyhow::Result<()> {
let request = unsafe {
transmute::<
api1_2_0::durability::ValueAndType,
golem_wasm_rpc::golem::rpc::types::ValueAndType,
>(request)
transmute::<durability::ValueAndType, golem_wasm_rpc::golem::rpc::types::ValueAndType>(
request,
)
};
let response = unsafe {
transmute::<
api1_2_0::durability::ValueAndType,
golem_wasm_rpc::golem::rpc::types::ValueAndType,
>(response)
transmute::<durability::ValueAndType, golem_wasm_rpc::golem::rpc::types::ValueAndType>(
response,
)
};
DurabilityHost::persist_typed_durable_function_invocation(
self,
Expand All @@ -265,7 +249,7 @@ impl<Ctx: WorkerCtx> api1_2_0::durability::Host for DurableWorkerCtx<Ctx> {

async fn read_persisted_durable_function_invocation(
&mut self,
) -> anyhow::Result<api1_2_0::durability::PersistedDurableFunctionInvocation> {
) -> anyhow::Result<durability::PersistedDurableFunctionInvocation> {
let invocation = DurabilityHost::read_persisted_durable_function_invocation(self).await?;
Ok(invocation.into())
}
Expand Down
Loading
Loading