@@ -15,27 +15,21 @@ use std::{
1515use bytes:: Bytes ;
1616use sha2:: { Digest , Sha256 } ;
1717use tokio:: sync:: Semaphore ;
18- use tokio_util:: io:: ReaderStream ;
1918use uuid:: Uuid ;
2019
2120use crate :: {
22- callisto:: lfs_objects,
23- ceres:: lfs:: {
24- digest:: LfsDigest ,
25- media:: {
26- protocol:: {
27- FinalizeAcceptedResponse , FinalizeTaskResponse , MAX_ENVELOPE_SIZE , ManifestError ,
28- ManifestResponse , MediaManifest ,
29- } ,
30- scope:: { MediaObjectKind , MediaScope , redact_storage_error} ,
31- service:: { MediaError , MediaService , map_store, scope_key, unix_now} ,
21+ ceres:: lfs:: media:: {
22+ protocol:: {
23+ FinalizeAcceptedResponse , FinalizeTaskResponse , ManifestError , ManifestResponse ,
24+ MediaManifest ,
3225 } ,
26+ scope:: MediaScope ,
27+ service:: { MediaError , MediaService , unix_now} ,
3328 } ,
3429 jupiter:: storage:: {
3530 lfs_db_storage:: LfsDbStorage ,
3631 media_paging_storage:: { MediaPagingStorage , TASK_COMPLETE , TASK_FAILED , TASK_PENDING } ,
3732 } ,
38- orbit_api:: object_storage:: { ObjectByteStream , ObjectKey , ObjectMeta , ObjectNamespace } ,
3933} ;
4034
4135/// Persistent finalize concurrency (P-04b / ADR-MF-03).
@@ -396,13 +390,22 @@ async fn run_finalize_body(
396390 p. update ( manifest. media_size , sealed. page_count , "fallback" )
397391 . await ?;
398392 }
399- put_fallback_from_path ( media, lfs_db, & manifest, & tmp_path) . await ?;
400393 check_cancel ( & mut cancel) ?;
401394 if let Some ( p) = progress {
402395 p. update ( manifest. media_size , sealed. page_count , "publish" )
403396 . await ?;
404397 }
405- publish_finalized ( media, scope, manifest_id, & manifest, now, emitter) . await
398+ crate :: ceres:: lfs:: media:: publication:: publish_verified_layout (
399+ media,
400+ lfs_db,
401+ scope,
402+ manifest_id,
403+ & manifest,
404+ & tmp_path,
405+ now,
406+ emitter,
407+ )
408+ . await
406409 }
407410 . await ;
408411
@@ -551,115 +554,6 @@ async fn rebuild_and_verify(
551554 Ok ( ( ) )
552555}
553556
554- async fn put_fallback_from_path (
555- media : & MediaService ,
556- lfs_db : & LfsDbStorage ,
557- manifest : & MediaManifest ,
558- path : & Path ,
559- ) -> Result < ( ) , MediaError > {
560- let key = ObjectKey {
561- namespace : ObjectNamespace :: Lfs ,
562- key : manifest. media_oid . clone ( ) ,
563- } ;
564- let file = tokio:: fs:: File :: open ( path) . await ?;
565- let stream: ObjectByteStream = Box :: pin ( ReaderStream :: new ( file) ) ;
566- let meta = ObjectMeta {
567- size : manifest. media_size as i64 ,
568- ..ObjectMeta :: default ( )
569- } ;
570- media
571- . object_store ( )
572- . inner
573- . put_stream_bounded ( & key, stream, meta)
574- . await
575- . map_err ( map_store) ?;
576-
577- lfs_db
578- . new_lfs_object ( lfs_objects:: Model {
579- oid : manifest. media_oid . clone ( ) ,
580- size : manifest. media_size as i64 ,
581- exist : true ,
582- } )
583- . await
584- . map_err ( map_db) ?;
585-
586- let stored = lfs_db
587- . get_lfs_object ( & manifest. media_oid )
588- . await
589- . map_err ( map_db) ?
590- . ok_or ( MediaError :: NotFound ) ?;
591- if stored. oid != manifest. media_oid
592- || stored. size != manifest. media_size as i64
593- || !stored. exist
594- {
595- return Err ( MediaError :: Conflict (
596- "lfs_objects metadata does not match the published fallback" . to_string ( ) ,
597- ) ) ;
598- }
599- if !media. exists ( & key) . await ? {
600- return Err ( MediaError :: NotFound ) ;
601- }
602- Ok ( ( ) )
603- }
604-
605- async fn publish_finalized (
606- media : & MediaService ,
607- scope : & MediaScope ,
608- manifest_id : & str ,
609- manifest : & MediaManifest ,
610- now : u64 ,
611- emitter : & crate :: jupiter:: service:: storage_event_emitter:: StorageEventEmitter ,
612- ) -> Result < ManifestResponse , MediaError > {
613- let response = ManifestResponse {
614- manifest_id : manifest_id. to_string ( ) ,
615- manifest : manifest. clone ( ) ,
616- } ;
617- let key = scope_key ( scope, MediaObjectKind :: Finalized , & manifest. media_oid ) ?;
618- if media. exists ( & key) . await ? {
619- let existing = media. read_bytes ( & key, MAX_ENVELOPE_SIZE ) . await ?;
620- let parsed: ManifestResponse =
621- serde_json:: from_slice ( & existing) . map_err ( |e| MediaError :: Json ( e. to_string ( ) ) ) ?;
622- if parsed. manifest_id != manifest_id || parsed. manifest . media_oid != manifest. media_oid {
623- return Err ( MediaError :: Conflict (
624- "finalized manifest does not match media oid or scope session" . to_string ( ) ,
625- ) ) ;
626- }
627- return Ok ( parsed) ;
628- }
629- let payload =
630- Bytes :: from ( serde_json:: to_vec ( & response) . map_err ( |e| MediaError :: Json ( e. to_string ( ) ) ) ?) ;
631- if payload. len ( ) > MAX_ENVELOPE_SIZE {
632- return Err ( MediaError :: Invalid (
633- "finalized manifest exceeds size limit" . to_string ( ) ,
634- ) ) ;
635- }
636- media. put_bytes ( & key, payload) . await ?;
637-
638- // WH-06 (plan-20260912 / ADR-WH-04/05): exactly one `lfs.media.finalized`
639- // when THIS finalize actually put the finalized manifest (the exists
640- // no-op above returns before this point; intermediate chunk/fallback
641- // steps never emit). Scope metadata comes from the server-side
642- // MediaScope's canonical repository, never from the request body; the
643- // actor never leaves the process. A repeat cross-process finalize may
644- // still rewrite the fallback and re-notify (no uniqueness lock added).
645- let event = crate :: jupiter:: service:: storage_event:: CommittedEvent {
646- event_id : uuid:: Uuid :: new_v4 ( ) ,
647- event_type : crate :: jupiter:: service:: storage_event:: EventType :: LfsMediaFinalized ,
648- occurred_at : now,
649- source : crate :: jupiter:: service:: storage_event:: EventSource :: Lfs ,
650- scope : crate :: jupiter:: service:: storage_event:: EventScope :: Media {
651- repo_path : scope. repository ( ) . to_owned ( ) ,
652- } ,
653- data : crate :: jupiter:: service:: storage_event:: EventData :: LfsMediaFinalized {
654- oid : manifest. media_oid . clone ( ) ,
655- size : manifest. media_size ,
656- manifest_id : manifest_id. to_owned ( ) ,
657- } ,
658- } ;
659- let _ = emitter. try_emit ( event) ;
660- Ok ( response)
661- }
662-
663557fn map_manifest ( err : ManifestError ) -> MediaError {
664558 match err {
665559 ManifestError :: Invalid ( msg) => MediaError :: Invalid ( msg) ,
@@ -684,11 +578,6 @@ fn map_paging(err: crate::jupiter::storage::media_paging_storage::MediaPagingErr
684578 }
685579}
686580
687- fn map_db ( err : crate :: common:: errors:: MegaError ) -> MediaError {
688- let _ = redact_storage_error ( & err) ;
689- MediaError :: Storage
690- }
691-
692581/// Test helper: put P-01a pages for a prepared manifest and seal.
693582pub async fn put_pages_and_seal (
694583 media : & MediaService ,
@@ -722,10 +611,14 @@ mod tests {
722611
723612 use super :: * ;
724613 use crate :: {
725- ceres:: lfs:: media:: {
726- chunker,
727- protocol:: { ChunkEntry , CreatedBy } ,
728- service:: MediaService ,
614+ ceres:: lfs:: {
615+ digest:: LfsDigest ,
616+ media:: {
617+ chunker,
618+ protocol:: { ChunkEntry , CreatedBy } ,
619+ scope:: MediaObjectKind ,
620+ service:: { MediaService , scope_key} ,
621+ } ,
729622 } ,
730623 jupiter:: {
731624 service:: storage_event_emitter:: StorageEventEmitter ,
@@ -736,7 +629,10 @@ mod tests {
736629 } ,
737630 tests:: test_db_connection,
738631 } ,
739- orbit_api:: factory:: { LocalConfig , ObjectStorageBackend , ObjectStorageConfig } ,
632+ orbit_api:: {
633+ factory:: { LocalConfig , ObjectStorageBackend , ObjectStorageConfig } ,
634+ object_storage:: { ObjectKey , ObjectNamespace } ,
635+ } ,
740636 } ;
741637
742638 /// Recording fake transport (WH-09 seam): exact bodies + call counter.
0 commit comments