Skip to content

Commit accd683

Browse files
committed
chore(release): update version to 2.3.0-rc.5
1 parent ebe92ca commit accd683

156 files changed

Lines changed: 510 additions & 1811 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cargo.lock

Lines changed: 66 additions & 66 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ members = [
7171
]
7272

7373
[workspace.package]
74-
version = "2.3.0-rc.4"
74+
version = "2.3.0-rc.5"
7575
edition = "2024"
7676
authors = [ "Rivet Gaming, LLC <developer@rivet.gg>" ]
7777
license = "Apache-2.0"

engine/artifacts/openapi.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

engine/packages/depot-client/src/vfs.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -860,10 +860,12 @@ impl VfsState {
860860
if !can_read_cached_page(config, pgno) {
861861
return None;
862862
}
863-
self
864-
.committed_page_cache
863+
self.committed_page_cache
865864
.get(&pgno)
866-
.or_else(|| self.protected_page_cache.read_sync(&pgno, |_, bytes| bytes.clone()))
865+
.or_else(|| {
866+
self.protected_page_cache
867+
.read_sync(&pgno, |_, bytes| bytes.clone())
868+
})
867869
.or_else(|| self.page_cache.get(&pgno))
868870
}
869871

engine/packages/depot-client/tests/inline/fault/scenario.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -649,11 +649,13 @@ impl FaultScenarioCtx {
649649
*candidate_pgno / depot::keys::SHARD_SIZE == pgno / depot::keys::SHARD_SIZE
650650
})
651651
.map(|candidate_pgno| {
652-
let bytes = state.cached_page(&ctx.config, candidate_pgno).with_context(|| {
653-
format!(
654-
"page {candidate_pgno} should be present in VFS cache before cold-ref seed"
655-
)
656-
})?;
652+
let bytes = state
653+
.cached_page(&ctx.config, candidate_pgno)
654+
.with_context(|| {
655+
format!(
656+
"page {candidate_pgno} should be present in VFS cache before cold-ref seed"
657+
)
658+
})?;
657659
Ok(DirtyPage {
658660
pgno: candidate_pgno,
659661
bytes,

engine/packages/depot-client/tests/inline/vfs.rs

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,7 @@ fn vfs_config_wires_optimization_flags() {
6565
config.cache_capacity_pages,
6666
DEFAULT_VFS_PAGE_CACHE_CAPACITY_PAGES / 2
6767
);
68-
assert_eq!(
69-
config.protected_cache_pages,
70-
0
71-
);
68+
assert_eq!(config.protected_cache_pages, 0);
7269
assert_eq!(
7370
config.staging_cache_ttl_ms,
7471
DEFAULT_VFS_STAGING_CACHE_TTL_MS / 2
@@ -425,13 +422,12 @@ fn open_worker_handle_with_vfs(
425422
)
426423
.expect("worker vfs should register"),
427424
);
428-
let db =
429-
crate::database::NativeDatabaseHandle::new_with_metrics(
430-
vfs.clone(),
431-
harness.actor_id.clone(),
432-
metrics,
433-
)
434-
.expect("worker handle should start");
425+
let db = crate::database::NativeDatabaseHandle::new_with_metrics(
426+
vfs.clone(),
427+
harness.actor_id.clone(),
428+
metrics,
429+
)
430+
.expect("worker handle should start");
435431
(vfs, db)
436432
}
437433

@@ -3555,7 +3551,9 @@ fn resolve_pages_sends_known_head_txid_as_read_fence() {
35553551
ctx.resolve_pages(&[2], false)
35563552
.expect("read should fetch from transport");
35573553
let requests = hooks.get_pages_requests();
3558-
let request = requests.last().expect("get_pages request should be recorded");
3554+
let request = requests
3555+
.last()
3556+
.expect("get_pages request should be recorded");
35593557
assert_eq!(request.expected_head_txid, Some(7));
35603558
}
35613559

@@ -3573,7 +3571,10 @@ fn fatal_sqlite_error_reports_first_message_through_worker_boundary() {
35733571
ctx.mark_fatal("second fatal sqlite error".to_string());
35743572

35753573
assert!(ctx.is_dead());
3576-
assert_eq!(ctx.clone_fatal_error().as_deref(), Some("first fatal sqlite error"));
3574+
assert_eq!(
3575+
ctx.clone_fatal_error().as_deref(),
3576+
Some("first fatal sqlite error")
3577+
);
35773578

35783579
let err = runtime
35793580
.block_on(db.exec("SELECT 1;".to_string()))

engine/packages/depot-client/tests/inline/vfs_support.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,9 @@ impl DirectStorage {
351351

352352
let actor_db = self.actor_db(actor_id.to_string()).await;
353353
self.counters.depot_get_pages.fetch_add(1, Ordering::SeqCst);
354-
actor_db.get_pages_with_options(pgnos.to_vec(), options).await
354+
actor_db
355+
.get_pages_with_options(pgnos.to_vec(), options)
356+
.await
355357
}
356358

357359
pub(crate) async fn read_mirror(
@@ -437,7 +439,11 @@ impl SqliteTransport for DirectDepotTransport {
437439
{
438440
Ok(result) => Ok(protocol::SqliteGetPagesResponse::SqliteGetPagesOk(
439441
protocol::SqliteGetPagesOk {
440-
pages: result.pages.into_iter().map(protocol_fetched_page).collect(),
442+
pages: result
443+
.pages
444+
.into_iter()
445+
.map(protocol_fetched_page)
446+
.collect(),
441447
head_txid: Some(result.head_txid),
442448
},
443449
)),
@@ -544,9 +550,7 @@ impl SqliteTransport for DirectMirrorTransport {
544550
.await
545551
{
546552
Ok(()) => Ok(protocol::SqliteCommitResponse::SqliteCommitOk(
547-
protocol::SqliteCommitOk {
548-
head_txid: None,
549-
},
553+
protocol::SqliteCommitOk { head_txid: None },
550554
)),
551555
Err(err) => Ok(protocol::SqliteCommitResponse::SqliteErrorResponse(
552556
sqlite_error_response(&err),

engine/packages/depot/src/conveyer/commit/apply.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,9 @@ impl Db {
4848
db_size_pages: u32,
4949
now_ms: i64,
5050
) -> Result<()> {
51-
self.commit_with_options(
52-
dirty_pages,
53-
db_size_pages,
54-
now_ms,
55-
CommitOptions::default(),
56-
)
57-
.await
58-
.map(|_| ())
51+
self.commit_with_options(dirty_pages, db_size_pages, now_ms, CommitOptions::default())
52+
.await
53+
.map(|_| ())
5954
}
6055

6156
pub async fn commit_with_options(

engine/packages/depot/tests/conveyer_commit.rs

Lines changed: 56 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -319,60 +319,63 @@ async fn commit_head_fence_rejects_stale_writer() -> Result<()> {
319319

320320
#[tokio::test]
321321
async fn get_pages_head_fence_rejects_stale_reader() -> Result<()> {
322-
commit_matrix!("depot-get-pages-head-fence-stale", |ctx, db, database_db| {
323-
let _ = &db;
324-
let first = database_db
325-
.commit_with_options(
326-
vec![page(1, 0x11)],
327-
1,
328-
1_000,
329-
CommitOptions {
330-
expected_head_txid: Some(0),
331-
},
332-
)
333-
.await?;
334-
assert_eq!(first.head_txid, 1);
335-
336-
let read = database_db
337-
.get_pages_with_options(
338-
vec![1],
339-
GetPagesOptions {
340-
expected_head_txid: Some(1),
341-
},
342-
)
343-
.await?;
344-
assert_eq!(read.head_txid, 1);
345-
assert_eq!(read.pages, vec![fetched_page(1, 0x11)]);
346-
347-
let second = database_db
348-
.commit_with_options(
349-
vec![page(1, 0x22)],
350-
1,
351-
1_001,
352-
CommitOptions {
353-
expected_head_txid: Some(1),
354-
},
355-
)
356-
.await?;
357-
assert_eq!(second.head_txid, 2);
358-
359-
let err = database_db
360-
.get_pages_with_options(
361-
vec![1],
362-
GetPagesOptions {
363-
expected_head_txid: Some(1),
364-
},
365-
)
366-
.await
367-
.expect_err("stale reader should be rejected");
368-
assert!(
369-
err.chain()
370-
.any(|source| source.to_string().contains("head fence mismatch")),
371-
"unexpected error: {err:#}"
372-
);
322+
commit_matrix!(
323+
"depot-get-pages-head-fence-stale",
324+
|ctx, db, database_db| {
325+
let _ = &db;
326+
let first = database_db
327+
.commit_with_options(
328+
vec![page(1, 0x11)],
329+
1,
330+
1_000,
331+
CommitOptions {
332+
expected_head_txid: Some(0),
333+
},
334+
)
335+
.await?;
336+
assert_eq!(first.head_txid, 1);
337+
338+
let read = database_db
339+
.get_pages_with_options(
340+
vec![1],
341+
GetPagesOptions {
342+
expected_head_txid: Some(1),
343+
},
344+
)
345+
.await?;
346+
assert_eq!(read.head_txid, 1);
347+
assert_eq!(read.pages, vec![fetched_page(1, 0x11)]);
348+
349+
let second = database_db
350+
.commit_with_options(
351+
vec![page(1, 0x22)],
352+
1,
353+
1_001,
354+
CommitOptions {
355+
expected_head_txid: Some(1),
356+
},
357+
)
358+
.await?;
359+
assert_eq!(second.head_txid, 2);
360+
361+
let err = database_db
362+
.get_pages_with_options(
363+
vec![1],
364+
GetPagesOptions {
365+
expected_head_txid: Some(1),
366+
},
367+
)
368+
.await
369+
.expect_err("stale reader should be rejected");
370+
assert!(
371+
err.chain()
372+
.any(|source| source.to_string().contains("head fence mismatch")),
373+
"unexpected error: {err:#}"
374+
);
373375

374-
Ok(())
375-
})
376+
Ok(())
377+
}
378+
)
376379
}
377380

378381
#[tokio::test]

engine/packages/guard-core/src/errors.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,19 +109,11 @@ pub struct ServiceUnavailable;
109109
pub struct ActorStoppedWhileWaiting;
110110

111111
#[derive(RivetError, Serialize, Deserialize)]
112-
#[error(
113-
"guard",
114-
"tunnel_request_aborted",
115-
"Actor tunnel aborted the request."
116-
)]
112+
#[error("guard", "tunnel_request_aborted", "Actor tunnel aborted the request.")]
117113
pub struct TunnelRequestAborted;
118114

119115
#[derive(RivetError, Serialize, Deserialize)]
120-
#[error(
121-
"guard",
122-
"tunnel_message_timeout",
123-
"Actor tunnel message timed out."
124-
)]
116+
#[error("guard", "tunnel_message_timeout", "Actor tunnel message timed out.")]
125117
pub struct TunnelMessageTimeout;
126118

127119
#[derive(RivetError, Serialize, Deserialize)]

0 commit comments

Comments
 (0)