offload.rs 98.7 KB
Newer Older
1
// SPDX-FileCopyrightText: Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2
3
// SPDX-License-Identifier: Apache-2.0

4
5
6
7
8
//! # Offload Manager
//! The offload manager is responsible for handling all block transfers between different cache levels.
//!
//! ## Offloading
//! Offloading is the process of moving blocks to a cache level further away from the device.
Ryan Olson's avatar
Ryan Olson committed
9
//! When blocks are registered (via [`ManagedBlockPool::register_blocks`]), they are automatically sent to the offload manager.
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
//! Due to limited bandwidth, the offload manager must prioritize which offloads to perform.
//! This is indicated by the `priority` parameter to [`OffloadManager::offload`].
//! When a offload request is received, the offload manager will enqueue it into a priority queue.
//! This priority queue is keyed by the `priority` parameter, where blocks with lower priority values are processed first.
//! Within the same priority, blocks that were sent to the offload manager earlier are processed first.
//!
//! ## Onboarding
//! Onboarding is the process of moving blocks to a cache level closer to the device.
//! All onboardings are manually triggered through the [`OffloadManager::onboard`] method.
//!
//! ## Transfer Managers
//! The offload manager uses two transfer managers to handle the offloading and onboarding of blocks.
//!
//! The [`CudaTransferManager`] is responsible for transfers between the device and host.
//! The [`DiskTransferManager`] is responsible for transfers from host to disk and disk to device.
//!
//! ## Worker Threads
//! The offload manager uses two kinds of worker threads to handle the offloading and onboarding of blocks.
//!
//! The [`OffloadManager::offload_worker`] is responsible for offloading blocks.
//! The [`OffloadManager::onboard_worker`] is responsible for onboarding blocks.
//!
//! The kind of offloads/onboards they perform is dictated by the source and target arguments
33
//! of the [`OffloadManager::offload_worker`] and [`OffloadManager::onboard_worker`] methods.
34

Ryan Olson's avatar
Ryan Olson committed
35
use super::block::{
36
    BlockError, BlockMetadata, BlockState, ImmutableBlock, MutableBlock,
37
38
    locality::LocalityProvider,
    transfer::{PoolConfig, TransferContext},
Ryan Olson's avatar
Ryan Olson committed
39
40
};
use super::pool::{BlockPool, BlockPoolError};
41
use super::storage::{Cuda, Storage};
42
use super::{DeviceStorage, DiskStorage, KvManagerModelConfig, PinnedStorage};
43
use nixl_sys::Agent as NixlAgent;
44
45
46
47
use std::sync::{
    Arc,
    atomic::{AtomicU64, Ordering},
};
48
49
50
use tokio::runtime::Handle;
use tokio::sync::{
    mpsc::{self, error::TryRecvError},
51
    oneshot,
52
};
53
use tokio_util::sync::CancellationToken;
54
55
56

use anyhow::Result;
use std::any::Any;
57
use std::env;
58
59
60

use std::collections::BTreeSet;

61
pub mod filter;
62
mod pending;
63
pub mod request;
64

65
use filter::OffloadFilter;
Ryan Olson's avatar
Ryan Olson committed
66
use pending::{LocalTransferManager, PendingTransfer, TransferBatcher, TransferManager};
67
use request::{BlockResult, OffloadRequest, OffloadRequestKey, OnboardRequest};
68

69
70
use derive_builder::Builder;
use derive_getters::Getters;
71
72
use dynamo_runtime::utils::task::CriticalTaskExecutionHandle;

73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
const DEFAULT_MAX_CONCURRENT_TRANSFERS: usize = 4;
const DEFAULT_MAX_TRANSFER_BATCH_SIZE: usize = 16;

pub fn max_concurrent_transfers() -> usize {
    read_usize_env(
        "DYN_KVBM_MAX_CONCURRENT_TRANSFERS",
        DEFAULT_MAX_CONCURRENT_TRANSFERS,
    )
}

pub fn max_transfer_batch_size() -> usize {
    read_usize_env(
        "DYN_KVBM_MAX_TRANSFER_BATCH_SIZE",
        DEFAULT_MAX_TRANSFER_BATCH_SIZE,
    )
}

fn read_usize_env(name: &str, default: usize) -> usize {
    match env::var(name) {
        Ok(value) => match value.parse::<usize>() {
            Ok(parsed) if parsed > 0 => parsed,
            Ok(_) => {
                tracing::warn!(
                    env_var = name,
                    value = %value,
                    default,
                    "Environment variable must be > 0; using default"
                );
                default
            }
            Err(err) => {
                tracing::warn!(
                    env_var = name,
                    value = %value,
                    default,
                    error = %err,
                    "Failed to parse environment variable as usize; using default"
                );
                default
            }
        },
        Err(_) => default,
    }
}
117
118
119
120
121
122
123

/// Configuration for creating an OffloadManager
pub struct OffloadManagerConfig {
    pub nixl_agent: Arc<Option<NixlAgent>>,
    pub async_rt_handle: Handle,
    pub cancellation_token: CancellationToken,
    pub model_config: KvManagerModelConfig,
124
125
    /// Optional KVBM-level metrics for tracking offload/onboard operations
    pub kvbm_metrics: Option<crate::block_manager::metrics_kvbm::KvbmMetrics>,
126
127
    /// If true, offload directly from device (G1) to disk (G3), bypassing host (G2)
    pub bypass_cpu_mem: bool,
128
}
129
130

/// The offload manager handles all block transfers between different cache levels.
Ryan Olson's avatar
Ryan Olson committed
131
pub struct OffloadManager<Locality: LocalityProvider, Metadata: BlockMetadata> {
132
    // Handles to the device, host, and disk pools.
Ryan Olson's avatar
Ryan Olson committed
133
134
135
    disk: Option<Arc<dyn BlockPool<DiskStorage, Locality, Metadata>>>,
    host: Option<Arc<dyn BlockPool<PinnedStorage, Locality, Metadata>>>,
    device: Option<Arc<dyn BlockPool<DeviceStorage, Locality, Metadata>>>,
136

137
    /// Queue of offloading requests.
Ryan Olson's avatar
Ryan Olson committed
138
139
    device_offload_tx: mpsc::UnboundedSender<OffloadRequest<DeviceStorage, Locality, Metadata>>,
    host_offload_tx: mpsc::UnboundedSender<OffloadRequest<PinnedStorage, Locality, Metadata>>,
140

141
142
143
144
    /// Queue of device-to-disk direct offloading requests (bypass CPU memory)
    device_to_disk_offload_tx:
        mpsc::UnboundedSender<OffloadRequest<DeviceStorage, Locality, Metadata>>,

145
    /// Queue of pending onboarding requests.
Ryan Olson's avatar
Ryan Olson committed
146
147
148
149
    host_onboard_tx:
        mpsc::UnboundedSender<OnboardRequest<PinnedStorage, DeviceStorage, Locality, Metadata>>,
    disk_onboard_tx:
        mpsc::UnboundedSender<OnboardRequest<DiskStorage, DeviceStorage, Locality, Metadata>>,
150
151

    /// An incrementing counter for offloaded blocks. Within the same priority, blocks with lower tick values are processed first.
152
    tick: Arc<AtomicU64>,
153
154
155

    /// If true, offload directly from device (G1) to disk (G3), bypassing host (G2)
    bypass_cpu_mem: bool,
156
157
}

Ryan Olson's avatar
Ryan Olson committed
158
159
160
impl<Locality: LocalityProvider + 'static, Metadata: BlockMetadata>
    OffloadManager<Locality, Metadata>
{
161
    #[allow(clippy::too_many_arguments)]
162
    pub fn new(
Ryan Olson's avatar
Ryan Olson committed
163
164
165
        disk: Option<Arc<dyn BlockPool<DiskStorage, Locality, Metadata>>>,
        host: Option<Arc<dyn BlockPool<PinnedStorage, Locality, Metadata>>>,
        device: Option<Arc<dyn BlockPool<DeviceStorage, Locality, Metadata>>>,
166
        filters: OffloadFilters,
167
        config: OffloadManagerConfig,
168
    ) -> Result<Arc<Self>> {
169
170
        let (device_offload_tx, device_offload_rx) = mpsc::unbounded_channel();
        let (host_offload_tx, host_offload_rx) = mpsc::unbounded_channel();
171
        let (device_to_disk_offload_tx, device_to_disk_offload_rx) = mpsc::unbounded_channel();
172
173
174

        let (host_onboard_tx, host_onboard_rx) = mpsc::unbounded_channel();
        let (disk_onboard_tx, disk_onboard_rx) = mpsc::unbounded_channel();
175
176

        let this = Arc::new(Self {
177
            disk,
178
            host,
179
180
181
            device,
            device_offload_tx,
            host_offload_tx,
182
            device_to_disk_offload_tx,
183
184
            host_onboard_tx,
            disk_onboard_tx,
185
            tick: Arc::new(AtomicU64::new(0)),
186
            bypass_cpu_mem: config.bypass_cpu_mem,
187
188
        });

189
        let cuda_ctx = Cuda::device_or_create(0)?;
190

191
192
193
194
195
196
197
198
199
        let max_concurrent_transfers = max_concurrent_transfers();
        let max_transfer_batch_size = max_transfer_batch_size();

        tracing::info!(
            max_concurrent_transfers,
            max_transfer_batch_size,
            "Configured offload transfer settings"
        );

200
201
        let pool_config = PoolConfig {
            enable_pool: true,
202
203
            max_concurrent_transfers,
            max_transfer_batch_size,
204
205
206
207
            num_outer_components: config.model_config.outer_dim,
            num_layers: config.model_config.num_layers,
        };

208
        // We want cuda offloads to happen in parallel with host onboards, so we need to use a different stream.
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
        let device_offload_transfer_ctx = Arc::new(
            TransferContext::new(
                config.nixl_agent.clone(),
                cuda_ctx.new_stream()?,
                config.async_rt_handle.clone(),
                Some(pool_config.clone()),
            )
            .map_err(|e| {
                anyhow::anyhow!(
                    "Failed to create device offload transfer context with CUDA memory pool: {}. \
                     This is a critical error - the system cannot operate without CUDA memory pools. \
                     Please ensure sufficient GPU memory is available.",
                    e
                )
            })?,
        );
225

226
        // Device -> Host offload
227
228
229
230
231
        let device_to_host_task = OffloadManager::offload_worker(
            this.device.clone(),
            this.host.clone(),
            device_offload_rx,
            Arc::new(TransferBatcher::new(
Ryan Olson's avatar
Ryan Olson committed
232
                LocalTransferManager::new(
233
                    device_offload_transfer_ctx,
234
                    max_concurrent_transfers,
235
236
                    &config.async_rt_handle,
                    config.cancellation_token.clone(),
237
                )?,
238
                max_transfer_batch_size,
239
240
                &config.async_rt_handle,
                config.cancellation_token.clone(),
241
            )),
242
            filters.device.clone(),
243
244
245
246
            config
                .kvbm_metrics
                .as_ref()
                .map(|m| m.offload_blocks_d2h.clone()),
247
            config.cancellation_token.clone(),
248
249
250
        );
        CriticalTaskExecutionHandle::new_with_runtime(
            |_| device_to_host_task,
251
            config.cancellation_token.clone(),
252
            "Device -> Host offload worker",
253
            &config.async_rt_handle,
254
255
        )?
        .detach();
256

257
258
259
260
261
262
263
264
265
266
267
268
269
270
        let transfer_ctx = Arc::new(
            TransferContext::new(
                config.nixl_agent.clone(),
                cuda_ctx.new_stream()?,
                config.async_rt_handle.clone(),
                Some(pool_config),
            )
            .map_err(|e| {
                anyhow::anyhow!(
                    "Failed to create transfer context for host onboard operations: {}",
                    e
                )
            })?,
        );
271

272
        // Host -> Disk offload
273
274
275
276
277
        let host_to_disk_task = OffloadManager::offload_worker(
            this.host.clone(),
            this.disk.clone(),
            host_offload_rx,
            Arc::new(TransferBatcher::new(
Ryan Olson's avatar
Ryan Olson committed
278
                LocalTransferManager::new(
279
                    transfer_ctx.clone(),
280
                    max_concurrent_transfers,
281
282
                    &config.async_rt_handle,
                    config.cancellation_token.clone(),
283
                )?,
284
                max_transfer_batch_size,
285
286
                &config.async_rt_handle,
                config.cancellation_token.clone(),
287
            )),
288
            filters.host.clone(),
289
290
291
292
            config
                .kvbm_metrics
                .as_ref()
                .map(|m| m.offload_blocks_h2d.clone()),
293
            config.cancellation_token.clone(),
294
295
296
        );
        CriticalTaskExecutionHandle::new_with_runtime(
            |_| host_to_disk_task,
297
            config.cancellation_token.clone(),
298
            "Host -> Disk offload worker",
299
            &config.async_rt_handle,
300
301
        )?
        .detach();
302

303
        // Host -> Device onboarding
304
305
306
307
308
        let host_to_device_task = OffloadManager::onboard_worker(
            this.host.clone(),
            this.device.clone(),
            host_onboard_rx,
            Arc::new(TransferBatcher::new(
Ryan Olson's avatar
Ryan Olson committed
309
                LocalTransferManager::new(
310
                    transfer_ctx.clone(),
311
                    max_concurrent_transfers,
312
313
                    &config.async_rt_handle,
                    config.cancellation_token.clone(),
314
                )?,
315
                max_transfer_batch_size,
316
317
                &config.async_rt_handle,
                config.cancellation_token.clone(),
318
            )),
319
            config.cancellation_token.clone(),
320
321
322
        );
        CriticalTaskExecutionHandle::new_with_runtime(
            |_| host_to_device_task,
323
            config.cancellation_token.clone(),
324
            "Host -> Device onboarding worker",
325
            &config.async_rt_handle,
326
327
        )?
        .detach();
328

329
        // Disk -> Device onboarding
330
331
332
333
334
        let disk_to_device_task = OffloadManager::onboard_worker(
            this.disk.clone(),
            this.device.clone(),
            disk_onboard_rx,
            Arc::new(TransferBatcher::new(
Ryan Olson's avatar
Ryan Olson committed
335
                LocalTransferManager::new(
336
                    transfer_ctx.clone(),
337
                    max_concurrent_transfers,
338
339
                    &config.async_rt_handle,
                    config.cancellation_token.clone(),
340
                )?,
341
                max_transfer_batch_size,
342
343
                &config.async_rt_handle,
                config.cancellation_token.clone(),
344
            )),
345
            config.cancellation_token.clone(),
346
347
348
        );
        CriticalTaskExecutionHandle::new_with_runtime(
            |_| disk_to_device_task,
349
            config.cancellation_token.clone(),
350
            "Disk -> Device onboarding worker",
351
            &config.async_rt_handle,
352
353
        )?
        .detach();
354

355
356
357
358
359
360
361
362
363
364
365
366
367
        // Device -> Disk direct offload (bypass CPU memory)
        if config.bypass_cpu_mem {
            tracing::info!(
                "G1->G3 direct offload enabled: Device will offload directly to Disk, bypassing Host memory (CPU cache disabled)"
            );

            let device_to_disk_task = OffloadManager::offload_worker(
                this.device.clone(),
                this.disk.clone(),
                device_to_disk_offload_rx,
                Arc::new(TransferBatcher::new(
                    LocalTransferManager::new(
                        transfer_ctx.clone(),
368
                        max_concurrent_transfers,
369
370
371
                        &config.async_rt_handle,
                        config.cancellation_token.clone(),
                    )?,
372
                    max_transfer_batch_size,
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
                    &config.async_rt_handle,
                    config.cancellation_token.clone(),
                )),
                filters.device.clone(),
                config
                    .kvbm_metrics
                    .as_ref()
                    .map(|m| m.offload_blocks_d2d.clone()),
                config.cancellation_token.clone(),
            );
            CriticalTaskExecutionHandle::new_with_runtime(
                |_| device_to_disk_task,
                config.cancellation_token.clone(),
                "Device -> Disk direct offload worker (bypass CPU)",
                &config.async_rt_handle,
            )?
            .detach();
        }

392
        Ok(this)
393
    }
394

395
    async fn offload_worker<Source: Storage, Target: Storage>(
Ryan Olson's avatar
Ryan Olson committed
396
397
398
399
        source_pool: Option<Arc<dyn BlockPool<Source, Locality, Metadata>>>,
        target_pool: Option<Arc<dyn BlockPool<Target, Locality, Metadata>>>,
        mut offload_rx: mpsc::UnboundedReceiver<OffloadRequest<Source, Locality, Metadata>>,
        transfer_manager: Arc<dyn TransferManager<Source, Target, Locality, Metadata>>,
400
        offload_filter: Option<Arc<dyn OffloadFilter>>,
401
        offload_metric: Option<prometheus::IntCounter>,
402
        cancellation_token: CancellationToken,
403
    ) -> Result<()> {
404
        if source_pool.is_none() || target_pool.is_none() {
405
406
407
            return Ok(());
        }

408
409
        let source_pool = source_pool.as_ref().unwrap();
        let target_pool = target_pool.as_ref().unwrap();
410

411
        let mut queue = BTreeSet::new();
412
413

        loop {
414
415
416
417
            if cancellation_token.is_cancelled() {
                return Ok(());
            }

418
            // Try to check the offload queue.
419
420
421
422
423
424
425
426
            loop {
                match offload_rx.try_recv() {
                    Ok(request) => {
                        queue.insert(request);
                    }
                    Err(TryRecvError::Empty) => {
                        break;
                    }
427
                    Err(e) => return Err(e.into()),
428
429
                }
            }
430
431

            // If there is a request, process it.
432
            if let Some(request) = queue.pop_first() {
433
434
                // Try to upgrade the block to a strong reference.
                let block = match request.block.upgrade() {
Ryan Olson's avatar
Ryan Olson committed
435
                    Some(block) => Some(ImmutableBlock::new(block)),
436
                    // If unable to upgrade, the block may have been moved to the inactive pool.
437
                    None => source_pool
438
439
                        .match_sequence_hashes(vec![request.sequence_hash].as_slice())
                        .await?
Ryan Olson's avatar
Ryan Olson committed
440
                        .pop(),
441
442
                };

443
                // If we've found the block, offload it.
444
                if let Some(block) = block {
445
446
                    // If the block is already in the target, don't offload it.
                    if let Ok(blocks) = target_pool
Ryan Olson's avatar
Ryan Olson committed
447
448
                        .match_sequence_hashes(vec![request.sequence_hash].as_slice())
                        .await
449
                        && !blocks.is_empty()
450
                    {
451
                        continue;
452
453
                    }

454
455
456
457
458
459
                    if let Some(offload_filter) = offload_filter.as_ref()
                        && !offload_filter.should_offload(request.sequence_hash)
                    {
                        continue;
                    }

460
                    let target_block = 'target_block: {
461
462
463
464
                        if let Ok(blocks) = target_pool.allocate_blocks(1).await
                            && let Some(block) = blocks.into_iter().next()
                        {
                            break 'target_block Some(block);
465
                        }
466

467
468
469
                        tracing::warn!(
                            "Target pool full. Skipping offload. This should only ever happen with very small pool sizes."
                        );
470
                        None
471
472
                    };

473
                    if let Some(target_block) = target_block {
Ryan Olson's avatar
Ryan Olson committed
474
475
476
477
                        tracing::debug!(
                            "Offloading block with sequence hash {} to target pool.",
                            request.sequence_hash
                        );
478
479
480
481
482
483

                        // Track the offload metric if available
                        if let Some(ref metric) = offload_metric {
                            metric.inc();
                        }

484
                        transfer_manager
485
                            .enqueue_transfer(PendingTransfer::new(
486
                                vec![block],
487
                                vec![target_block],
488
                                None,
489
                                target_pool.clone(),
490
491
492
493
494
                            ))
                            .await?;
                    }
                }
            } else {
495
                // Await the next request.
496
497
498
499
500
                tokio::select! {
                    _ = cancellation_token.cancelled() => return Ok(()),
                    Some(request) = offload_rx.recv() => {
                        queue.insert(request);
                    }
501
                }
502
503
504
505
            }
        }
    }

506
    async fn onboard_worker<Source: Storage, Target: Storage>(
Ryan Olson's avatar
Ryan Olson committed
507
508
509
510
        source_pool: Option<Arc<dyn BlockPool<Source, Locality, Metadata>>>,
        target_pool: Option<Arc<dyn BlockPool<Target, Locality, Metadata>>>,
        mut onboard_rx: mpsc::UnboundedReceiver<OnboardRequest<Source, Target, Locality, Metadata>>,
        transfer_manager: Arc<dyn TransferManager<Source, Target, Locality, Metadata>>,
511
        cancellation_token: CancellationToken,
512
    ) -> Result<()> {
513
        if source_pool.is_none() || target_pool.is_none() {
514
515
516
            return Ok(());
        }

517
        let target_pool = target_pool.as_ref().unwrap();
518
519
520
521
        loop {
            tokio::select! {
                _ = cancellation_token.cancelled() => return Ok::<(), anyhow::Error>(()),
                Some(request) = onboard_rx.recv() => {
522

523
                    // Try to allocate blocks on the device.
Ryan Olson's avatar
Ryan Olson committed
524
525
526
527
528
529
530
531
532
                    let target_blocks = if let Some(targets) = request.targets {
                        targets
                    } else {
                            match target_pool.allocate_blocks(request.blocks.len()).await {
                            Ok(blocks) => blocks,
                            Err(err) => {
                                let _ = request.response_tx.send(Err(err));
                                continue;
                            }
533
534
                        }
                    };
535

Ryan Olson's avatar
Ryan Olson committed
536
                    tracing::debug!("Onboarding {} blocks to target pool.", request.blocks.len());
537
538
539

                    transfer_manager
                        .enqueue_transfer(PendingTransfer::new(
Ryan Olson's avatar
Ryan Olson committed
540
                            request.blocks,
541
542
543
544
545
546
547
                            target_blocks,
                            Some(request.response_tx),
                            target_pool.clone(),
                        ))
                        .await?;

                    Ok::<(), anyhow::Error>(())
548
                }
549
            }?;
550
551
552
553
554
        }
    }

    pub async fn offload<S: Storage>(
        &self,
Ryan Olson's avatar
Ryan Olson committed
555
        block: &ImmutableBlock<S, Locality, Metadata>,
556
557
558
        priority: u64,
    ) -> core::result::Result<(), BlockPoolError> {
        match block.state() {
559
            BlockState::Registered(_, _) => {}
560
561
562
563
564
565
            _ => {
                return Err(BlockPoolError::BlockError(BlockError::InvalidState(
                    "Block is not registered.".to_string(),
                )));
            }
        }
566

567
        let tick = self.tick.fetch_add(1, Ordering::Relaxed);
568
569
        let key = OffloadRequestKey {
            priority,
570
            timestamp: tick,
571
572
        };

573
574
575
576
577
578
        // This can get called by all pools, regardless of whether or not they have a place to offload to.
        // Because of this, we need to check the block type here.
        let any_block = block as &dyn Any;

        // TODO: What's the performance penalty of this runtime type-checking?
        if let Some(device_block) =
Ryan Olson's avatar
Ryan Olson committed
579
            any_block.downcast_ref::<ImmutableBlock<DeviceStorage, Locality, Metadata>>()
580
        {
581
582
583
584
585
586
            // Check if we should bypass CPU memory and go directly to disk
            if self.bypass_cpu_mem && self.disk.is_some() {
                // Offload directly from Device (G1) to Disk (G3), bypassing Host (G2)
                if self.device_to_disk_offload_tx.is_closed() {
                    return Ok(());
                }
587

588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
                let request = OffloadRequest {
                    block: Arc::downgrade(device_block.mutable_block()),
                    sequence_hash: device_block.sequence_hash(),
                    key,
                };

                tracing::debug!(
                    "Offloading device block {} directly to disk (bypassing host memory)",
                    device_block.sequence_hash()
                );
                self.device_to_disk_offload_tx.send(request).unwrap();
            } else {
                // Standard path: Device (G1) -> Host (G2)
                if self.device_offload_tx.is_closed() {
                    return Ok(());
                }
604

605
606
607
608
609
610
611
612
                let request = OffloadRequest {
                    block: Arc::downgrade(device_block.mutable_block()),
                    sequence_hash: device_block.sequence_hash(),
                    key,
                };

                self.device_offload_tx.send(request).unwrap();
            }
613
        } else if let Some(host_block) =
Ryan Olson's avatar
Ryan Olson committed
614
            any_block.downcast_ref::<ImmutableBlock<PinnedStorage, Locality, Metadata>>()
615
        {
616
            // Host (G2) -> Disk (G3) offload
617
618
619
620
621
622
            if self.host_offload_tx.is_closed() {
                return Ok(());
            }

            let request = OffloadRequest {
                block: Arc::downgrade(host_block.mutable_block()),
Ryan Olson's avatar
Ryan Olson committed
623
                sequence_hash: host_block.sequence_hash(),
624
625
626
627
                key,
            };

            self.host_offload_tx.send(request).unwrap();
628
629
630
631
632
        }

        Ok(())
    }

Ryan Olson's avatar
Ryan Olson committed
633
    pub fn onboard<S: Storage>(
634
        &self,
Ryan Olson's avatar
Ryan Olson committed
635
636
637
638
        blocks: Vec<ImmutableBlock<S, Locality, Metadata>>,
        targets: Option<Vec<MutableBlock<DeviceStorage, Locality, Metadata>>>,
    ) -> oneshot::Receiver<BlockResult<DeviceStorage, Locality, Metadata>> {
        let (tx, rx) = oneshot::channel();
639
640
        for block in &blocks {
            match block.state() {
641
                BlockState::Registered(_, _) => {}
642
                _ => {
Ryan Olson's avatar
Ryan Olson committed
643
                    tx.send(Err(BlockPoolError::BlockError(BlockError::InvalidState(
644
                        "Block is not registered.".to_string(),
Ryan Olson's avatar
Ryan Olson committed
645
646
647
                    ))))
                    .unwrap();
                    return rx;
648
649
650
651
                }
            }
        }

652
653
654
655
656
657
658
659
        if let Some(targets) = targets.as_ref()
            && targets.len() != blocks.len()
        {
            tx.send(Err(BlockPoolError::BlockError(BlockError::Other(
                anyhow::anyhow!("Number of targets does not match number of blocks."),
            ))))
            .unwrap();
            return rx;
660
661
        }

Ryan Olson's avatar
Ryan Olson committed
662
663
664
665
        if blocks.is_empty() {
            tx.send(Ok(vec![])).unwrap();
            return rx;
        }
666

667
668
669
670
        let any_block = blocks.first().unwrap() as &dyn Any;

        // TODO: This is really ugly.
        if any_block
Ryan Olson's avatar
Ryan Olson committed
671
            .downcast_ref::<ImmutableBlock<PinnedStorage, Locality, Metadata>>()
672
673
674
675
676
677
            .is_some()
        {
            let host_blocks = blocks
                .iter()
                .map(|b| {
                    (b as &dyn Any)
Ryan Olson's avatar
Ryan Olson committed
678
                        .downcast_ref::<ImmutableBlock<PinnedStorage, Locality, Metadata>>()
679
680
681
682
683
                        .unwrap()
                        .clone()
                })
                .collect();

Ryan Olson's avatar
Ryan Olson committed
684
685
686
687
688
689
690
691
            if let Err(e) = self
                .host_onboard_tx
                .send(OnboardRequest::new(host_blocks, tx, targets))
            {
                e.0.response_tx
                    .send(Err(BlockPoolError::ProgressEngineShutdown))
                    .unwrap();
            }
692
        } else if any_block
Ryan Olson's avatar
Ryan Olson committed
693
            .downcast_ref::<ImmutableBlock<DiskStorage, Locality, Metadata>>()
694
695
696
697
698
699
            .is_some()
        {
            let disk_blocks = blocks
                .iter()
                .map(|b| {
                    (b as &dyn Any)
Ryan Olson's avatar
Ryan Olson committed
700
                        .downcast_ref::<ImmutableBlock<DiskStorage, Locality, Metadata>>()
701
702
703
704
705
                        .unwrap()
                        .clone()
                })
                .collect();

Ryan Olson's avatar
Ryan Olson committed
706
707
708
709
710
711
712
713
            if let Err(e) = self
                .disk_onboard_tx
                .send(OnboardRequest::new(disk_blocks, tx, targets))
            {
                e.0.response_tx
                    .send(Err(BlockPoolError::ProgressEngineShutdown))
                    .unwrap();
            }
714
        } else {
Ryan Olson's avatar
Ryan Olson committed
715
            tx.send(Err(BlockPoolError::BlockError(BlockError::Other(
716
                anyhow::anyhow!("Block type not supported for onboarding."),
Ryan Olson's avatar
Ryan Olson committed
717
718
            ))))
            .unwrap();
719
720
        }

Ryan Olson's avatar
Ryan Olson committed
721
        rx
722
723
724
    }
}

725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
#[derive(Debug, Clone, Getters, Builder)]
#[builder(pattern = "owned", build_fn(validate = "Self::validate"))]
pub struct OffloadFilters {
    #[builder(default)]
    device: Option<Arc<dyn OffloadFilter>>,
    #[builder(default)]
    host: Option<Arc<dyn OffloadFilter>>,
    #[builder(default)]
    disk: Option<Arc<dyn OffloadFilter>>,
}

impl OffloadFilters {
    pub fn builder() -> OffloadFiltersBuilder {
        OffloadFiltersBuilder::default()
    }
}

impl OffloadFiltersBuilder {
    pub fn validate(&self) -> Result<(), String> {
        if let Some(disk) = self.disk.as_ref()
            && disk.is_some()
        {
            return Err("Disk offload filter is not supported.".to_string());
        }

        let host_is_none = if let Some(host) = self.host.as_ref() {
            host.is_none()
        } else {
            true
        };

        if host_is_none {
            tracing::warn!(
                "Host to Disk offload filter is not provided. All blocks in host will be offloaded to disk. This may result in excessive disk offloading and accelerated SSD degradation."
            );
        }

        Ok(())
    }
}

766
#[cfg(all(test, feature = "testing-cuda", feature = "testing-nixl"))]
Ryan Olson's avatar
Ryan Olson committed
767
mod tests {
768
769
770
    use super::*;

    use crate::block_manager::{
771
        LayoutConfig, NixlRegisterableStorage,
772
        block::{
773
            BasicMetadata, BlockDataExt, BlockDataProvider, Blocks, MutableBlock, locality::Local,
774
        },
775
        layout::{FullyContiguous, LayerSeparate, LayoutType, nixl::NixlLayout},
Ryan Olson's avatar
Ryan Olson committed
776
        pool::{BlockRegistrationDuplicationSetting, ManagedBlockPool},
777
        storage::{
778
            DeviceAllocator, DeviceStorage, DiskAllocator, DiskStorage, PinnedAllocator,
Ryan Olson's avatar
Ryan Olson committed
779
            PinnedStorage, StorageAllocator, StorageType,
780
781
        },
    };
782
    use crate::tokens::{TokenBlockSequence, Tokens};
783
    use nixl_sys::{MemoryRegion, NixlDescriptor};
784

785
    use aligned_vec::avec;
786
    use cudarc::runtime::sys::{cudaDeviceSynchronize, cudaMemcpy, cudaMemcpyKind, cudaMemset};
Ryan Olson's avatar
Ryan Olson committed
787
    use rstest::*;
788
    use std::fs::File;
789
    use std::io::{Read, Seek, SeekFrom, Write};
790
791
    use std::mem::ManuallyDrop;
    use std::os::unix::io::FromRawFd;
792
793

    const BLOCK_SIZE: usize = 4;
794
    const NUM_LAYERS: usize = 8;
795

Ryan Olson's avatar
Ryan Olson committed
796
797
798
    type DevicePool = Option<Arc<dyn BlockPool<DeviceStorage, Local, BasicMetadata>>>;
    type HostPool = Option<Arc<dyn BlockPool<PinnedStorage, Local, BasicMetadata>>>;
    type DiskPool = Option<Arc<dyn BlockPool<DiskStorage, Local, BasicMetadata>>>;
799
800
801
802
803

    lazy_static::lazy_static! {
        static ref NIXL_AGENT: Arc<Option<NixlAgent>> = {
            let agent = NixlAgent::new("offload-manager").unwrap();
            let (_, ucx_params) = agent.get_plugin_params("UCX").unwrap();
Ryan Olson's avatar
Ryan Olson committed
804
            let (_, gds_mt_params) = agent.get_plugin_params("GDS_MT").unwrap();
805
            let (_, posix_params) = agent.get_plugin_params("POSIX").unwrap();
806
            agent.create_backend("UCX", &ucx_params).unwrap();
Ryan Olson's avatar
Ryan Olson committed
807
            agent.create_backend("GDS_MT", &gds_mt_params).unwrap();
808
            agent.create_backend("POSIX", &posix_params).unwrap();
809
810
811
            Arc::new(Some(agent))
        };
    }
812

Ryan Olson's avatar
Ryan Olson committed
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
    fn build_layout<S: Storage + NixlRegisterableStorage>(
        config: LayoutConfig,
        layout_type: LayoutType,
        agent: &NixlAgent,
        allocator: &dyn StorageAllocator<S>,
        duplication_setting: BlockRegistrationDuplicationSetting,
    ) -> Result<Arc<dyn BlockPool<S, Local, BasicMetadata>>> {
        match layout_type {
            LayoutType::FullyContiguous => {
                let mut pool_layout = FullyContiguous::allocate(config.clone(), allocator)?;
                pool_layout.nixl_register(agent, None)?;
                let blocks = Blocks::new(pool_layout, 42, 0)?.into_blocks()?;
                Ok(Arc::new(
                    ManagedBlockPool::builder()
                        .blocks(blocks)
                        .default_duplication_setting(duplication_setting)
                        .build()?,
                ))
            }
            LayoutType::LayerSeparate { outer_contiguous } => {
                let mut pool_layout =
                    LayerSeparate::allocate(config.clone(), allocator, outer_contiguous)?;
                pool_layout.nixl_register(agent, None)?;
                let blocks = Blocks::new(pool_layout, 42, 0)?.into_blocks()?;
                Ok(Arc::new(
                    ManagedBlockPool::builder()
                        .blocks(blocks)
                        .default_duplication_setting(duplication_setting)
                        .build()?,
                ))
            }
        }
    }

    #[allow(clippy::type_complexity)]
    fn build_pools(
849
850
        device_blocks: usize,
        host_blocks: Option<usize>,
851
        disk_blocks: Option<usize>,
852
        inner_dim: Option<usize>,
853
    ) -> Result<(
Ryan Olson's avatar
Ryan Olson committed
854
855
856
857
858
859
860
861
862
863
864
865
        Arc<OffloadManager<Local, BasicMetadata>>,
        DevicePool,
        HostPool,
        DiskPool,
    )> {
        build_pools_with_layout(
            device_blocks,
            host_blocks,
            disk_blocks,
            inner_dim,
            LayoutType::FullyContiguous,
            BlockRegistrationDuplicationSetting::Disabled,
866
            false,
Ryan Olson's avatar
Ryan Olson committed
867
868
869
870
871
872
873
874
875
876
877
        )
    }

    #[allow(clippy::type_complexity)]
    pub fn build_pools_with_layout(
        device_blocks: usize,
        host_blocks: Option<usize>,
        disk_blocks: Option<usize>,
        inner_dim: Option<usize>,
        layout_type: LayoutType,
        duplication_setting: BlockRegistrationDuplicationSetting,
878
        bypass_cpu_mem: bool,
Ryan Olson's avatar
Ryan Olson committed
879
880
    ) -> Result<(
        Arc<OffloadManager<Local, BasicMetadata>>,
881
882
883
884
        DevicePool,
        HostPool,
        DiskPool,
    )> {
885
886
        let mut config = LayoutConfig {
            num_blocks: device_blocks,
887
            num_layers: NUM_LAYERS,
888
            outer_dim: 1,
889
            page_size: BLOCK_SIZE,
890
            inner_dim: inner_dim.unwrap_or(1024),
891
            alignment: 1,
Ryan Olson's avatar
Ryan Olson committed
892
            dtype_width_bytes: 2,
893
894
        };

895
896
897
        let agent_arc = NIXL_AGENT.clone();
        let agent = agent_arc.as_ref().as_ref().unwrap();

Ryan Olson's avatar
Ryan Olson committed
898
899
900
901
902
903
904
        let device_pool = Some(build_layout(
            config.clone(),
            layout_type,
            agent,
            &DeviceAllocator::default(),
            duplication_setting,
        )?);
905
906
907

        let host_pool = if let Some(host_blocks) = host_blocks {
            config.num_blocks = host_blocks;
Ryan Olson's avatar
Ryan Olson committed
908
909
910
911
912
913
914
            Some(build_layout(
                config.clone(),
                layout_type,
                agent,
                &PinnedAllocator::default(),
                duplication_setting,
            )?)
915
        } else {
916
            None
917
918
        };

919
920
        let disk_pool = if let Some(disk_blocks) = disk_blocks {
            config.num_blocks = disk_blocks;
Ryan Olson's avatar
Ryan Olson committed
921
            Some(build_layout(
922
                config.clone(),
Ryan Olson's avatar
Ryan Olson committed
923
924
                layout_type,
                agent,
925
                &DiskAllocator::from_env()?,
Ryan Olson's avatar
Ryan Olson committed
926
927
                duplication_setting,
            )?)
928
        } else {
929
            None
930
        };
931

932
933
        let async_rt_handle = Handle::current();

934
935
936
937
938
939
940
941
942
943
944
945
946
        let minimal_config = KvManagerModelConfig::builder()
            .num_layers(config.num_layers)
            .outer_dim(config.outer_dim) // K and V
            .page_size(config.page_size) // Minimal page size
            .inner_dim(config.inner_dim) // Small inner dim
            .build()
            .expect("Failed to build minimal config");

        let config = OffloadManagerConfig {
            nixl_agent: agent_arc,
            async_rt_handle,
            cancellation_token: CancellationToken::new(),
            model_config: minimal_config,
947
            kvbm_metrics: None,
948
            bypass_cpu_mem,
949
950
        };

951
952
953
954
        let manager = OffloadManager::new(
            disk_pool.clone(),
            host_pool.clone(),
            device_pool.clone(),
955
            OffloadFilters::builder().build()?,
956
            config,
957
958
959
        )?;

        Ok((manager, device_pool, host_pool, disk_pool))
960
961
962
    }

    /// Create a block in the 'RESET' state.
Ryan Olson's avatar
Ryan Olson committed
963
    #[expect(dead_code)]
964
    async fn get_block<S: Storage, Metadata: BlockMetadata>(
Ryan Olson's avatar
Ryan Olson committed
965
966
967
968
        pool: &Arc<dyn BlockPool<S, Local, Metadata>>,
    ) -> Result<MutableBlock<S, Local, Metadata>> {
        let mut blocks = pool.allocate_blocks(1).await?;
        Ok(blocks.pop().unwrap())
969
970
971
972
    }

    /// Create a block in the 'COMPLETED' state.
    async fn completed_block<S: Storage, Metadata: BlockMetadata>(
Ryan Olson's avatar
Ryan Olson committed
973
        pool: &Arc<dyn BlockPool<S, Local, Metadata>>,
974
        tokens: [u32; BLOCK_SIZE],
Ryan Olson's avatar
Ryan Olson committed
975
976
977
978
979
980
981
982
    ) -> Result<MutableBlock<S, Local, Metadata>> {
        let mut block = pool
            .allocate_blocks(1)
            .await?
            .into_iter()
            .next()
            .ok_or(anyhow::anyhow!("Failed to allocate block"))?;

983
984
985
986
987
988
989
990
        block.init_sequence(42)?;
        for token in tokens {
            block.add_token(token)?;
        }
        block.commit()?;
        Ok(block)
    }

991
    fn populate_block<S: Storage + NixlDescriptor>(
992
        block: &impl BlockDataProvider<StorageType = S>,
Ryan Olson's avatar
Ryan Olson committed
993
        start_value: u8,
994
    ) -> Result<()> {
Ryan Olson's avatar
Ryan Olson committed
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
        let block_data = block.block_data();

        let mut value = start_value;

        for layer_idx in 0..block_data.num_layers() {
            for outer_idx in 0..block_data.num_outer_dims() {
                let layer_view = block_data.layer_view(layer_idx, outer_idx)?;
                match block_data.storage_type() {
                    StorageType::Device(_) | StorageType::Pinned => unsafe {
                        cudaMemset(
                            layer_view.as_ptr() as *mut std::ffi::c_void,
                            value as i32,
                            layer_view.size(),
                        )
                        .result()?;
                    },
                    StorageType::Disk(_) => {
                        let nixl_desc = layer_view.as_nixl_descriptor();
                        let mut file: ManuallyDrop<File>;
                        let data = avec![[4096] | value; layer_view.size()];

                        unsafe {
                            file =
                                ManuallyDrop::new(File::from_raw_fd(nixl_desc.device_id() as i32));
                            file.seek(SeekFrom::Start(nixl_desc.as_ptr() as u64))?;
                        }
                        file.write_all(&data)?;
                        file.sync_all()?;
                        file.flush()?;
                    }
                    _ => panic!(),
1026
1027
                }
            }
Ryan Olson's avatar
Ryan Olson committed
1028
1029

            value += 1;
1030
        }
1031

1032
1033
1034
        Ok(())
    }

1035
1036
    fn get_block_contents<S: Storage + NixlDescriptor>(
        block: &impl BlockDataProvider<StorageType = S>,
Ryan Olson's avatar
Ryan Olson committed
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
    ) -> Result<Vec<Vec<u8>>> {
        let block_data = block.block_data();

        let mut contents: Vec<Vec<u8>> = Vec::new();

        for layer_idx in 0..block_data.num_layers() {
            for outer_idx in 0..block_data.num_outer_dims() {
                let layer_view = block_data.layer_view(layer_idx, outer_idx)?;
                match block_data.storage_type() {
                    StorageType::Device(_) => unsafe {
                        let mut buffer = vec![0_u8; layer_view.size()];

                        cudaMemcpy(
                            buffer.as_mut_ptr() as *mut std::ffi::c_void,
                            layer_view.as_ptr() as *const std::ffi::c_void,
                            layer_view.size(),
                            cudaMemcpyKind::cudaMemcpyDeviceToHost,
                        )
                        .result()?;

                        contents.push(buffer);
                    },
                    StorageType::Pinned => unsafe {
                        contents.push(
                            std::slice::from_raw_parts(layer_view.as_ptr(), layer_view.size())
                                .to_vec(),
                        );
                    },
                    StorageType::Disk(_) => {
                        let nixl_desc = layer_view.as_nixl_descriptor();
                        let mut file: ManuallyDrop<File>;
                        let mut aligned = avec![[4096] | 0; layer_view.size()];

                        unsafe {
                            file =
                                ManuallyDrop::new(File::from_raw_fd(nixl_desc.device_id() as i32));
                            file.seek(SeekFrom::Start(nixl_desc.as_ptr() as u64))?;
                        }
                        file.read_exact(&mut aligned)?;
                        contents.push(aligned.to_vec());
                    }
                    _ => anyhow::bail!("Unsupported storage type."),
1079
1080
                }
            }
1081
1082
        }

Ryan Olson's avatar
Ryan Olson committed
1083
        Ok(contents)
1084
1085
    }

1086
    fn check_block_contents(
1087
1088
        block1: &impl BlockDataProvider<StorageType = impl Storage + NixlDescriptor>,
        block2: &impl BlockDataProvider<StorageType = impl Storage + NixlDescriptor>,
Ryan Olson's avatar
Ryan Olson committed
1089
        start_value: u8,
1090
    ) -> Result<()> {
1091
1092
        let contents1 = get_block_contents(block1)?;
        let contents2 = get_block_contents(block2)?;
1093

Ryan Olson's avatar
Ryan Olson committed
1094
1095
1096
1097
1098
1099
1100
1101
1102
        assert_eq!(contents1.len(), contents2.len());

        let mut value = start_value;

        for (layer1_vec, layer2_vec) in contents1.iter().zip(contents2.iter()) {
            for (c1_value, c2_value) in layer1_vec.iter().zip(layer2_vec.iter()) {
                if c1_value != c2_value || c1_value != &value {
                    panic!("{} != {} != {}", c1_value, c2_value, value);
                }
1103
            }
Ryan Olson's avatar
Ryan Olson committed
1104
            value += 1;
1105
        }
1106
1107
1108
1109
1110
        Ok(())
    }

    #[tokio::test]
    async fn test_offload_invalid_blocks() -> Result<()> {
1111
        let (offload_manager, device_pool, _, _) = build_pools(4, Some(4), None, None)?;
1112

1113
        let device_pool = device_pool.as_ref().unwrap();
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127

        // Check blocks in the 'COMPLETED' state.
        let immutable_block = ImmutableBlock::new(Arc::new(
            completed_block(device_pool, [0; BLOCK_SIZE]).await?,
        ));
        assert!(matches!(
            offload_manager.offload(&immutable_block, 0).await,
            Err(BlockPoolError::BlockError(BlockError::InvalidState(_)))
        ));

        Ok(())
    }

    #[tokio::test]
Ryan Olson's avatar
Ryan Olson committed
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
    #[rstest]
    #[case(LayoutType::FullyContiguous)]
    #[case(LayoutType::LayerSeparate { outer_contiguous: true })]
    #[case(LayoutType::LayerSeparate { outer_contiguous: false })]
    async fn test_offload_registered_blocks(#[case] layout_type: LayoutType) -> Result<()> {
        let (offload_manager, device_pool, host_pool, _) = build_pools_with_layout(
            4,
            Some(4),
            None,
            None,
            layout_type,
            BlockRegistrationDuplicationSetting::Disabled,
1140
            false,
Ryan Olson's avatar
Ryan Olson committed
1141
        )?;
1142

1143
1144
        let device_pool = device_pool.as_ref().unwrap();
        let host_pool = host_pool.as_ref().unwrap();
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155

        // Create a block and register it with the offload manager
        let block = completed_block(device_pool, [0, 1, 2, 3]).await?;

        let immutable_device_block = device_pool
            .register_blocks(vec![block])
            .await?
            .into_iter()
            .next()
            .ok_or(anyhow::anyhow!("Failed to register block"))?;

1156
        populate_block(&immutable_device_block, 42)?;
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167

        // Offloads should only go to G2 (for now)
        offload_manager.offload(&immutable_device_block, 0).await?;

        // Wait for it to be processed.
        // TODO: This is a bit of a hack, and may lead to non-deterministic behavior.
        // In theory, the offload + memcpy should take much less time than this.
        tokio::time::sleep(std::time::Duration::from_millis(100)).await;

        // Check that the block exists in the host pool
        let host_blocks = host_pool
Ryan Olson's avatar
Ryan Olson committed
1168
            .match_sequence_hashes(vec![immutable_device_block.sequence_hash()].as_slice())
1169
1170
1171
1172
            .await?;

        assert_eq!(host_blocks.len(), 1);
        assert_eq!(
Ryan Olson's avatar
Ryan Olson committed
1173
1174
            host_blocks[0].sequence_hash(),
            immutable_device_block.sequence_hash()
1175
1176
        );

1177
        check_block_contents(&immutable_device_block, &host_blocks[0], 42)?;
1178
1179
1180
1181

        Ok(())
    }

1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
    #[tokio::test]
    async fn test_offload_device_to_disk_bypass_cpu() -> Result<()> {
        let (offload_manager, device_pool, host_pool, disk_pool) = build_pools_with_layout(
            4,
            Some(4),
            Some(4),
            None,
            LayoutType::FullyContiguous,
            BlockRegistrationDuplicationSetting::Disabled,
            true,
        )?;

        let device_pool = device_pool.as_ref().unwrap();
        let host_pool = host_pool.as_ref().unwrap();
        let disk_pool = disk_pool.as_ref().unwrap();

        // Create a block and register it with the offload manager
        let block = completed_block(device_pool, [0, 1, 2, 3]).await?;

        let immutable_device_block = device_pool
            .register_blocks(vec![block])
            .await?
            .into_iter()
            .next()
            .ok_or(anyhow::anyhow!("Failed to register block"))?;

        populate_block(&immutable_device_block, 42)?;

        // Synchronize ALL CUDA streams to ensure populate_block completes before offload starts
        // This is critical because cudaMemset uses the default stream, but GDS transfer uses a different stream
        unsafe {
            cudaDeviceSynchronize().result()?;
        }

        // Offloads should only go to G3 directly since bypass_cpu_mem is true in offload_manager config
        offload_manager.offload(&immutable_device_block, 0).await?;

        // Wait for it to be processed.
        // TODO: This is a bit of a hack, and may lead to non-deterministic behavior.
        // In theory, the offload + memcpy should take much less time than this.
        tokio::time::sleep(std::time::Duration::from_millis(1000)).await;

        // Check that the block exists in the host pool
        let disk_blocks = disk_pool
            .match_sequence_hashes(vec![immutable_device_block.sequence_hash()].as_slice())
            .await?;

        assert_eq!(disk_blocks.len(), 1);
        assert_eq!(
            disk_blocks[0].sequence_hash(),
            immutable_device_block.sequence_hash()
        );

        check_block_contents(&immutable_device_block, &disk_blocks[0], 42)?;

        let host_blocks = host_pool
            .match_sequence_hashes(vec![immutable_device_block.sequence_hash()].as_slice())
            .await?;

        // since host is bypassed, there should be no host blocks
        assert_eq!(host_blocks.len(), 0);

        Ok(())
    }

1247
1248
    #[tokio::test]
    async fn test_no_host_blocks_available() -> Result<()> {
1249
        let (offload_manager, device_pool, host_pool, _) = build_pools(4, Some(4), None, None)?;
1250

1251
1252
        let device_pool = device_pool.as_ref().unwrap();
        let host_pool = host_pool.as_ref().unwrap();
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271

        let host_blocks = host_pool.allocate_blocks(4).await?;
        assert_eq!(host_blocks.len(), 4);

        let device_block = completed_block(device_pool, [0, 1, 2, 3]).await?;
        let immutable_device_block = device_pool
            .register_blocks(vec![device_block])
            .await?
            .into_iter()
            .next()
            .unwrap();

        offload_manager.offload(&immutable_device_block, 0).await?;

        // Wait for offload to be processed.
        tokio::time::sleep(std::time::Duration::from_millis(100)).await;

        // The offload should fail gracefuly due to a lack of host blocks
        let matched_host_blocks = host_pool
Ryan Olson's avatar
Ryan Olson committed
1272
            .match_sequence_hashes(vec![immutable_device_block.sequence_hash()].as_slice())
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
            .await?;
        assert_eq!(matched_host_blocks.len(), 0);

        // Wait for blocks to be returned to the pool.
        drop(host_blocks);
        tokio::time::sleep(std::time::Duration::from_millis(100)).await;

        // Try the offload again.
        offload_manager.offload(&immutable_device_block, 0).await?;

        // Wait for offload to be processed.
        tokio::time::sleep(std::time::Duration::from_millis(100)).await;

        // This time, the offload should succeed.
        let matched_host_blocks = host_pool
Ryan Olson's avatar
Ryan Olson committed
1288
            .match_sequence_hashes(vec![immutable_device_block.sequence_hash()].as_slice())
1289
1290
1291
1292
1293
1294
1295
            .await?;
        assert_eq!(matched_host_blocks.len(), 1);

        Ok(())
    }

    #[tokio::test]
Ryan Olson's avatar
Ryan Olson committed
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
    #[rstest]
    #[case(LayoutType::FullyContiguous)]
    #[case(LayoutType::LayerSeparate { outer_contiguous: true })]
    #[case(LayoutType::LayerSeparate { outer_contiguous: false })]
    async fn test_onboard(#[case] layout_type: LayoutType) -> Result<()> {
        let (offload_manager, device_pool, host_pool, _) = build_pools_with_layout(
            4,
            Some(4),
            None,
            None,
            layout_type,
            BlockRegistrationDuplicationSetting::Disabled,
1308
            false,
Ryan Olson's avatar
Ryan Olson committed
1309
        )?;
1310

1311
1312
        let device_pool = device_pool.as_ref().unwrap();
        let host_pool = host_pool.as_ref().unwrap();
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322

        // Allocate and fill a block on the host.
        let host_block = completed_block(host_pool, [0, 1, 2, 3]).await?;
        let immutable_host_block = host_pool
            .register_blocks(vec![host_block])
            .await?
            .into_iter()
            .next()
            .unwrap();

1323
        populate_block(&immutable_host_block, 42)?;
1324
1325
1326

        // Onboard the block.
        let onboarded_blocks = offload_manager
Ryan Olson's avatar
Ryan Olson committed
1327
1328
            .onboard(vec![immutable_host_block.clone()], None)
            .await??;
1329
1330
1331
1332

        assert_eq!(onboarded_blocks.len(), 1);
        // Check that the sequence hash is the same.
        assert_eq!(
Ryan Olson's avatar
Ryan Olson committed
1333
1334
            onboarded_blocks[0].sequence_hash(),
            immutable_host_block.sequence_hash()
1335
1336
1337
1338
        );
        // Check that the block is registered.
        assert!(matches!(
            onboarded_blocks[0].state(),
1339
            BlockState::Registered(_, _)
1340
1341
        ));

1342
        check_block_contents(&immutable_host_block, &onboarded_blocks[0], 42)?;
1343
1344
1345
1346

        // Wait for the new value to show up in the device pool.
        tokio::time::sleep(std::time::Duration::from_millis(100)).await;
        let device_blocks = device_pool
Ryan Olson's avatar
Ryan Olson committed
1347
            .match_sequence_hashes(vec![onboarded_blocks[0].sequence_hash()].as_slice())
1348
1349
1350
            .await?;
        assert_eq!(device_blocks.len(), 1);
        assert_eq!(
Ryan Olson's avatar
Ryan Olson committed
1351
1352
            device_blocks[0].sequence_hash(),
            onboarded_blocks[0].sequence_hash()
1353
1354
1355
        );

        // Check that this is the same block.
1356
        check_block_contents(&immutable_host_block, &device_blocks[0], 42)?;
1357

1358
1359
        tokio::time::sleep(std::time::Duration::from_millis(100)).await;

1360
1361
1362
1363
        Ok(())
    }

    #[tokio::test]
Ryan Olson's avatar
Ryan Olson committed
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
    #[rstest]
    #[case(LayoutType::FullyContiguous)]
    #[case(LayoutType::LayerSeparate { outer_contiguous: true })]
    #[case(LayoutType::LayerSeparate { outer_contiguous: false })]
    async fn test_offload_onboard(#[case] layout_type: LayoutType) -> Result<()> {
        let (offload_manager, device_pool, host_pool, _) = build_pools_with_layout(
            4,
            Some(4),
            None,
            None,
            layout_type,
            BlockRegistrationDuplicationSetting::Disabled,
1376
            false,
Ryan Olson's avatar
Ryan Olson committed
1377
        )?;
1378

1379
1380
        let device_pool = device_pool.as_ref().unwrap();
        let host_pool = host_pool.as_ref().unwrap();
1381
1382
1383
1384
1385
1386
1387
1388
1389

        let device_block = completed_block(device_pool, [0, 1, 2, 3]).await?;
        let immutable_device_block = device_pool
            .register_blocks(vec![device_block])
            .await?
            .into_iter()
            .next()
            .unwrap();

1390
        populate_block(&immutable_device_block, 42)?;
1391
1392
1393
1394
1395
1396
1397
1398
        // Offload the block to the host.
        offload_manager.offload(&immutable_device_block, 0).await?;

        // Wait for the offload to be processed.
        tokio::time::sleep(std::time::Duration::from_millis(100)).await;

        // Check that the block exists in the host pool.
        let immutable_host_block = host_pool
Ryan Olson's avatar
Ryan Olson committed
1399
            .match_sequence_hashes(vec![immutable_device_block.sequence_hash()].as_slice())
1400
1401
1402
1403
1404
            .await?
            .into_iter()
            .next()
            .unwrap();

1405
        check_block_contents(&immutable_device_block, &immutable_host_block, 42)?;
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420

        // Remove the device block from the pool by dropping it and allocating more blocks.
        drop(immutable_device_block);

        // Wait for the block to be returned to the pool.
        tokio::time::sleep(std::time::Duration::from_millis(100)).await;

        let device_blocks = device_pool.allocate_blocks(4).await?;
        assert_eq!(device_blocks.len(), 4);

        drop(device_blocks);
        tokio::time::sleep(std::time::Duration::from_millis(100)).await;

        // Check that the block is not in the device pool.
        let device_blocks = device_pool
Ryan Olson's avatar
Ryan Olson committed
1421
            .match_sequence_hashes(vec![immutable_host_block.sequence_hash()].as_slice())
1422
1423
1424
1425
1426
            .await?;
        assert_eq!(device_blocks.len(), 0);

        // Onboard the block back to the device pool.
        let onboarded_blocks = offload_manager
Ryan Olson's avatar
Ryan Olson committed
1427
1428
            .onboard(vec![immutable_host_block.clone()], None)
            .await??;
1429
1430
        assert_eq!(onboarded_blocks.len(), 1);
        assert_eq!(
Ryan Olson's avatar
Ryan Olson committed
1431
1432
            onboarded_blocks[0].sequence_hash(),
            immutable_host_block.sequence_hash()
1433
1434
1435
        );
        assert!(matches!(
            onboarded_blocks[0].state(),
1436
            BlockState::Registered(_, _)
1437
1438
        ));

1439
        check_block_contents(&immutable_host_block, &onboarded_blocks[0], 42)?;
1440
1441
1442
1443
1444
1445

        Ok(())
    }

    #[tokio::test]
    async fn test_onboard_err_handling() -> Result<()> {
1446
        let (offload_manager, device_pool, host_pool, _) = build_pools(4, Some(4), None, None)?;
1447

1448
1449
        let device_pool = device_pool.as_ref().unwrap();
        let host_pool = host_pool.as_ref().unwrap();
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462

        let host_block = completed_block(host_pool, [0, 1, 2, 3]).await?;
        let immutable_host_block = host_pool
            .register_blocks(vec![host_block])
            .await?
            .into_iter()
            .next()
            .unwrap();

        let device_blocks = device_pool.allocate_blocks(4).await?;
        assert_eq!(device_blocks.len(), 4);

        let res = offload_manager
Ryan Olson's avatar
Ryan Olson committed
1463
1464
            .onboard(vec![immutable_host_block.clone()], None)
            .await?;
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
        assert!(matches!(
            res.err().unwrap(),
            BlockPoolError::NotEnoughBlocksAvailable(_, _)
        ));

        Ok(())
    }

    #[tokio::test]
    async fn test_offload_onboard_no_host_blocks() -> Result<()> {
1475
        let (offload_manager, device_pool, _, _) = build_pools(4, None, None, None)?;
1476

1477
        let device_pool = device_pool.as_ref().unwrap();
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490

        let device_block = completed_block(device_pool, [0, 1, 2, 3]).await?;
        let immutable_device_block = device_pool
            .register_blocks(vec![device_block])
            .await?
            .into_iter()
            .next()
            .unwrap();

        offload_manager.offload(&immutable_device_block, 0).await?;

        Ok(())
    }
1491
1492

    #[tokio::test]
Ryan Olson's avatar
Ryan Olson committed
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
    #[rstest]
    #[case(LayoutType::FullyContiguous)]
    #[case(LayoutType::LayerSeparate { outer_contiguous: true })]
    #[case(LayoutType::LayerSeparate { outer_contiguous: false })]
    async fn test_offload_disk(#[case] layout_type: LayoutType) -> Result<()> {
        let (offload_manager, _, host_pool, disk_pool) = build_pools_with_layout(
            4,
            Some(4),
            Some(4),
            None,
            layout_type,
            BlockRegistrationDuplicationSetting::Disabled,
1505
            false,
Ryan Olson's avatar
Ryan Olson committed
1506
        )?;
1507

1508
1509
        let host_pool = host_pool.as_ref().unwrap();
        let disk_pool = disk_pool.as_ref().unwrap();
1510
1511
1512
1513
1514
1515
1516
1517
1518

        let host_block = completed_block(host_pool, [0, 1, 2, 3]).await?;
        let immutable_host_block = host_pool
            .register_blocks(vec![host_block])
            .await?
            .into_iter()
            .next()
            .unwrap();

1519
        populate_block(&immutable_host_block, 42)?;
1520
1521
1522
1523
1524
1525

        offload_manager.offload(&immutable_host_block, 0).await?;

        tokio::time::sleep(std::time::Duration::from_millis(500)).await;

        let disk_blocks = disk_pool
Ryan Olson's avatar
Ryan Olson committed
1526
            .match_sequence_hashes(vec![immutable_host_block.sequence_hash()].as_slice())
1527
1528
1529
            .await?;
        assert_eq!(disk_blocks.len(), 1);
        assert_eq!(
Ryan Olson's avatar
Ryan Olson committed
1530
1531
            disk_blocks[0].sequence_hash(),
            immutable_host_block.sequence_hash()
1532
1533
        );

1534
        check_block_contents(&immutable_host_block, &disk_blocks[0], 42)?;
1535
1536
1537
1538
1539

        Ok(())
    }

    #[tokio::test]
Ryan Olson's avatar
Ryan Olson committed
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
    #[rstest]
    #[case(LayoutType::FullyContiguous)]
    #[case(LayoutType::LayerSeparate { outer_contiguous: true })]
    #[case(LayoutType::LayerSeparate { outer_contiguous: false })]
    async fn test_onboard_disk(#[case] layout_type: LayoutType) -> Result<()> {
        let (offload_manager, device_pool, _, disk_pool) = build_pools_with_layout(
            4,
            None,
            Some(4),
            None,
            layout_type,
            BlockRegistrationDuplicationSetting::Disabled,
1552
            false,
Ryan Olson's avatar
Ryan Olson committed
1553
        )?;
1554

1555
1556
        let device_pool = device_pool.as_ref().unwrap();
        let disk_pool = disk_pool.as_ref().unwrap();
1557
1558
1559
1560
1561
1562
1563
1564
1565

        let disk_block = completed_block(disk_pool, [0, 1, 2, 3]).await?;
        let immutable_disk_block = disk_pool
            .register_blocks(vec![disk_block])
            .await?
            .into_iter()
            .next()
            .unwrap();

1566
1567
        populate_block(&immutable_disk_block, 42)?;

1568
        let device_block = offload_manager
Ryan Olson's avatar
Ryan Olson committed
1569
1570
            .onboard(vec![immutable_disk_block.clone()], None)
            .await??;
1571

1572
1573
        check_block_contents(&immutable_disk_block, &device_block[0], 42)?;

1574
1575
        assert_eq!(device_block.len(), 1);
        assert_eq!(
Ryan Olson's avatar
Ryan Olson committed
1576
1577
            device_block[0].sequence_hash(),
            immutable_disk_block.sequence_hash()
1578
1579
1580
        );
        assert_eq!(
            device_pool
Ryan Olson's avatar
Ryan Olson committed
1581
                .match_sequence_hashes(vec![immutable_disk_block.sequence_hash()].as_slice())
1582
1583
1584
1585
1586
1587
1588
1589
1590
                .await?
                .len(),
            1
        );

        Ok(())
    }

    #[tokio::test]
Ryan Olson's avatar
Ryan Olson committed
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
    #[rstest]
    #[case(LayoutType::FullyContiguous)]
    #[case(LayoutType::LayerSeparate { outer_contiguous: true })]
    #[case(LayoutType::LayerSeparate { outer_contiguous: false })]
    async fn test_bulk_transfer_disk(#[case] layout_type: LayoutType) -> Result<()> {
        let (offload_manager, device_pool, host_pool, disk_pool) = build_pools_with_layout(
            8,
            Some(8),
            Some(8),
            None,
            layout_type,
            BlockRegistrationDuplicationSetting::Disabled,
1603
            false,
Ryan Olson's avatar
Ryan Olson committed
1604
        )?;
1605

1606
1607
1608
        let disk_pool = disk_pool.as_ref().unwrap();
        let host_pool = host_pool.as_ref().unwrap();
        let device_pool = device_pool.as_ref().unwrap();
1609
1610
1611
1612
1613

        let mut host_blocks = Vec::new();

        for i in 0..8 {
            let block = completed_block(host_pool, [i; 4]).await?;
1614
            populate_block(&block, i as u8)?;
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
            host_blocks.push(block);
        }

        let immutable_host_blocks = host_pool.register_blocks(host_blocks).await?;

        for block in &immutable_host_blocks {
            offload_manager.offload(block, 0).await?;
        }

        tokio::time::sleep(std::time::Duration::from_millis(500)).await;

        let mut disk_blocks = Vec::new();

1628
        for (i, host_block) in immutable_host_blocks.iter().enumerate() {
1629
            let blocks = disk_pool
Ryan Olson's avatar
Ryan Olson committed
1630
                .match_sequence_hashes(vec![host_block.sequence_hash()].as_slice())
1631
1632
                .await?;
            assert_eq!(blocks.len(), 1);
1633
            check_block_contents(host_block, &blocks[0], i as u8)?;
1634
1635
1636
            disk_blocks.push(blocks[0].clone());
        }

Ryan Olson's avatar
Ryan Olson committed
1637
        let device_blocks = offload_manager.onboard(disk_blocks.clone(), None).await??;
1638
1639
        assert_eq!(device_blocks.len(), disk_blocks.len());

1640
        for (i, disk_block) in disk_blocks.iter().enumerate() {
1641
            let blocks = device_pool
Ryan Olson's avatar
Ryan Olson committed
1642
                .match_sequence_hashes(vec![disk_block.sequence_hash()].as_slice())
1643
1644
                .await?;
            assert_eq!(blocks.len(), 1);
1645
            check_block_contents(disk_block, &blocks[0], i as u8)?;
1646
1647
1648
1649
        }

        Ok(())
    }
1650
1651
1652
1653

    #[tokio::test]
    async fn test_transfer_batcher() -> Result<()> {
        let (offload_manager, device_pool, _, disk_pool) = build_pools(
1654
            2 * max_transfer_batch_size() + 1,
1655
            None,
1656
            Some(2 * max_transfer_batch_size() + 1),
1657
            None,
1658
1659
1660
1661
1662
1663
1664
        )?;

        let device_pool = device_pool.as_ref().unwrap();
        let disk_pool = disk_pool.as_ref().unwrap();

        let mut disk_blocks = Vec::new();

1665
        for i in 0..2 * max_transfer_batch_size() + 1 {
1666
1667
1668
            let disk_block = completed_block(disk_pool, [i as u32; 4]).await?;
            populate_block(&disk_block, i as u8)?;
            disk_blocks.push(disk_block);
1669
1670
1671
1672
1673
        }

        let immutable_disk_blocks = disk_pool.register_blocks(disk_blocks).await?;

        let device_blocks = offload_manager
Ryan Olson's avatar
Ryan Olson committed
1674
1675
            .onboard(immutable_disk_blocks.clone(), None)
            .await??;
1676
        assert_eq!(device_blocks.len(), 2 * max_transfer_batch_size() + 1);
1677

1678
        for (i, device_block) in device_blocks.iter().enumerate() {
1679
            let blocks = device_pool
Ryan Olson's avatar
Ryan Olson committed
1680
                .match_sequence_hashes(vec![device_block.sequence_hash()].as_slice())
1681
                .await?;
1682
            check_block_contents(device_block, &blocks[0], i as u8)?;
1683
1684
1685
1686
1687
            assert_eq!(blocks.len(), 1);
        }

        Ok(())
    }
1688

1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
    // ============================================================================
    // IMPROVED DISK TESTS FOR GDS COMPATIBILITY
    // ============================================================================

    mod gds_compatible_disk_tests {
        use super::*;

        /// Test disk storage with proper GDS alignment requirements
        #[tokio::test]
        #[rstest]
        #[case(LayoutType::FullyContiguous)]
        #[case(LayoutType::LayerSeparate { outer_contiguous: true })]
        #[case(LayoutType::LayerSeparate { outer_contiguous: false })]
        async fn test_gds_aligned_disk_operations(#[case] layout_type: LayoutType) -> Result<()> {
            // GDS requires 4KB alignment for optimal performance
            const GDS_ALIGNMENT: usize = 4096;

            let (offload_manager, _, host_pool, disk_pool) = build_pools_with_layout(
                4,
                Some(4),
                Some(4),
                Some(GDS_ALIGNMENT), // Use GDS-friendly alignment
                layout_type,
                BlockRegistrationDuplicationSetting::Disabled,
1713
                false,
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
            )?;

            let host_pool = host_pool.as_ref().unwrap();
            let disk_pool = disk_pool.as_ref().unwrap();

            // Create and populate host block
            let host_block = completed_block(host_pool, [0, 1, 2, 3]).await?;
            let immutable_host_block = host_pool
                .register_blocks(vec![host_block])
                .await?
                .into_iter()
                .next()
                .unwrap();

            populate_block(&immutable_host_block, 0xAB)?;

            // Test Host -> Disk transfer with GDS alignment
            offload_manager.offload(&immutable_host_block, 0).await?;
            tokio::time::sleep(std::time::Duration::from_millis(500)).await;

            // Verify disk block was created and data is correct
            let disk_blocks = disk_pool
                .match_sequence_hashes(vec![immutable_host_block.sequence_hash()].as_slice())
                .await?;
            assert_eq!(disk_blocks.len(), 1);

            // Verify data integrity
            check_block_contents(&immutable_host_block, &disk_blocks[0], 0xAB)?;

            // Test Disk -> Device transfer with layout compatibility verification
            let device_blocks = offload_manager.onboard(disk_blocks.clone(), None).await??;
            assert_eq!(device_blocks.len(), 1);

            // Verify data integrity after onboarding
            check_block_contents(&disk_blocks[0], &device_blocks[0], 0xAB)?;

            Ok(())
        }

        /// Test layout compatibility across different storage types
        #[ignore] // Disabled - requires complex mixed-layout pool implementation
        #[tokio::test]
        async fn test_cross_layout_compatibility_verification() -> Result<()> {
            // Test FullyContiguous host with LayerSeparate device - common scenario
            let (offload_manager, _, host_pool, disk_pool) = build_pools_mixed_layouts(
                4,                                      // blocks
                Some((4, LayoutType::FullyContiguous)), // host: FC
                Some((
                    4,
                    LayoutType::LayerSeparate {
                        outer_contiguous: true,
                    },
                )), // device: LS
                Some((4, LayoutType::FullyContiguous)), // disk: FC
            )?;

            let host_pool = host_pool.as_ref().unwrap();
            let disk_pool = disk_pool.as_ref().unwrap();

            // Create test data with unique patterns for each layer
            let host_block = completed_block(host_pool, [0, 1, 2, 3]).await?;
            let immutable_host_block = host_pool
                .register_blocks(vec![host_block])
                .await?
                .into_iter()
                .next()
                .unwrap();

            // Populate with layer-specific patterns to detect layout issues
            populate_block_with_layer_patterns(&immutable_host_block)?;

            // Test Host (FC) -> Disk (FC) transfer
            offload_manager.offload(&immutable_host_block, 0).await?;
            tokio::time::sleep(std::time::Duration::from_millis(500)).await;

            let disk_blocks = disk_pool
                .match_sequence_hashes(vec![immutable_host_block.sequence_hash()].as_slice())
                .await?;
            assert_eq!(disk_blocks.len(), 1);

            // Verify layer patterns are preserved
            verify_layer_patterns(&immutable_host_block, &disk_blocks[0])?;

            // Test Disk (FC) -> Device (LS) transfer - this is where layout mismatch issues occur
            let device_blocks = offload_manager.onboard(disk_blocks.clone(), None).await??;
            assert_eq!(device_blocks.len(), 1);

            // Critical: Verify layer patterns are correctly mapped across layout types
            verify_layer_patterns(&disk_blocks[0], &device_blocks[0])?;

            Ok(())
        }

        /// Test GDS file registration and unlinking behavior
        #[tokio::test]
        async fn test_gds_file_lifecycle() -> Result<()> {
            use std::fs;
            use std::path::Path;

            let (_, _, _, disk_pool) = build_pools_with_layout(
                2,
                None,
                Some(2), // disk_blocks - this was the bug!
                None,    // inner_dim
                LayoutType::FullyContiguous,
                BlockRegistrationDuplicationSetting::Disabled,
1820
                false,
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
            )?;

            let disk_pool = disk_pool
                .as_ref()
                .ok_or_else(|| anyhow::anyhow!("Disk pool was not created"))?;

            // Create a disk block
            let disk_block = completed_block(disk_pool, [1, 2, 3, 4]).await?;

            // Get the underlying storage to check file properties
            let block_data = disk_block.block_data();
            let storage_type = block_data.storage_type();

            if let StorageType::Disk(fd) = storage_type {
                // Verify file exists and has correct properties
                let file_path = format!("/proc/self/fd/{}", fd);

                // Check that the file is accessible (should be before unlinking)
                if Path::new(&file_path).exists() {
                    let metadata = fs::metadata(&file_path)?;

                    // Verify file size matches expected block size
                    let expected_size = BLOCK_SIZE * NUM_LAYERS * 2 * 13 * 4; // From test constants
                    assert!(
                        metadata.len() >= expected_size as u64,
                        "Disk file size {} is smaller than expected {}",
                        metadata.len(),
                        expected_size
                    );

                    // Verify file is properly aligned for GDS operations
                    assert_eq!(
                        metadata.len() % 4096,
                        0,
                        "Disk file size {} is not 4KB aligned for GDS",
                        metadata.len()
                    );
                }
            }

            // Register the block (this should trigger NIXL registration and unlinking)
            let immutable_disk_block = disk_pool
                .register_blocks(vec![disk_block])
                .await?
                .into_iter()
                .next()
                .unwrap();

            // After registration, the file should still be accessible through the fd
            // but unlinked from the filesystem
            populate_block(&immutable_disk_block, 0xCD)?;

            Ok(())
        }

        /// Debug test to understand disk pool creation failure
        #[tokio::test]
        async fn test_debug_disk_pool_creation() -> Result<()> {
            use dynamo_runtime::logging::init as init_logging;
            init_logging();

            println!("Testing disk pool creation...");

            let result = build_pools_with_layout(
                2,
                None,
                Some(2),
                None,
                LayoutType::FullyContiguous,
                BlockRegistrationDuplicationSetting::Disabled,
1891
                false,
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
            );

            match result {
                Ok((_, _, _, disk_pool)) => {
                    if disk_pool.is_some() {
                        println!("Disk pool created successfully");
                        Ok(())
                    } else {
                        println!("Disk pool is None even though creation succeeded");
                        Err(anyhow::anyhow!("Disk pool is None"))
                    }
                }
                Err(e) => {
                    println!("build_pools_with_layout failed: {:?}", e);
                    Err(e)
                }
            }
        }

        /// Test error handling for GDS-incompatible operations
        #[tokio::test]
        async fn test_gds_error_handling() -> Result<()> {
            // Test with very small alignment that might cause GDS issues
            let result = build_pools_with_layout(
                2,
                None,
                Some(2), // disk_blocks - fixed parameter order
                None,    // inner_dim
                LayoutType::FullyContiguous,
                BlockRegistrationDuplicationSetting::Disabled,
1922
                false,
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
            );

            // This should succeed, but we'll test behavior under constrained conditions
            let (_, _, _, disk_pool) = result?;
            let disk_pool = disk_pool
                .as_ref()
                .ok_or_else(|| anyhow::anyhow!("Disk pool was not created"))?;

            // Try to create a block with minimal size
            let disk_block = completed_block(disk_pool, [1, 1, 1, 1]).await?;
            let immutable_disk_block = disk_pool
                .register_blocks(vec![disk_block])
                .await?
                .into_iter()
                .next()
                .unwrap();

            // This should work even with small alignment
            populate_block(&immutable_disk_block, 0x42)?;

            Ok(())
        }

        /// Test disk operations under memory pressure (constrained host buffer scenario)
        #[ignore] // Disabled - helper functions have memory access issues in test environment
        #[tokio::test]
        async fn test_constrained_host_buffer_disk_operations() -> Result<()> {
            // Simulate constrained host buffer by using minimal host blocks
            let (offload_manager, _, host_pool, disk_pool) = build_pools_with_layout(
                8,          // More blocks than host buffer
                Some(2),    // Very limited host buffer
                Some(8),    // Plenty of disk space
                Some(4096), // GDS-friendly alignment
                LayoutType::FullyContiguous,
                BlockRegistrationDuplicationSetting::Disabled,
1958
                false,
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
            )?;

            let host_pool = host_pool.as_ref().unwrap();
            let disk_pool = disk_pool.as_ref().unwrap();

            // Create multiple blocks that exceed host capacity
            let mut host_blocks = Vec::new();
            for i in 0..2 {
                // Only create as many as host can handle
                let block = completed_block(host_pool, [i as u32; 4]).await?;
                populate_block(&block, i as u8)?;
                host_blocks.push(block);
            }

            let immutable_host_blocks = host_pool.register_blocks(host_blocks).await?;

            // Offload to disk
            for block in &immutable_host_blocks {
                offload_manager.offload(block, 0).await?;
            }

            tokio::time::sleep(std::time::Duration::from_millis(500)).await;

            // Verify all blocks are on disk
            let mut disk_blocks = Vec::new();
            for (i, host_block) in immutable_host_blocks.iter().enumerate() {
                let blocks = disk_pool
                    .match_sequence_hashes(vec![host_block.sequence_hash()].as_slice())
                    .await?;
                assert_eq!(blocks.len(), 1);
                verify_block_data_integrity(&blocks[0], i as u8)?;
                disk_blocks.push(blocks[0].clone());
            }

            // Now test onboarding under constrained conditions
            // This is where garbage data issues typically occur
            let device_blocks = offload_manager.onboard(disk_blocks.clone(), None).await??;

            // Critical verification: ensure no garbage data in responses
            for (i, device_block) in device_blocks.iter().enumerate() {
                verify_block_data_integrity(device_block, i as u8)?;

                // Additional verification: check that all memory regions have expected patterns
                verify_no_garbage_data(device_block, i as u8)?;
            }

            Ok(())
        }

        // Helper functions for improved disk testing

        /// Build pools with mixed layout types for testing compatibility
        fn build_pools_mixed_layouts(
            num_blocks: usize,
            host_config: Option<(usize, LayoutType)>,
            device_config: Option<(usize, LayoutType)>,
            disk_config: Option<(usize, LayoutType)>,
        ) -> Result<(
            Arc<OffloadManager<Local, BasicMetadata>>,
            DevicePool,
            HostPool,
            DiskPool,
        )> {
            // This would need to be implemented to support different layout types per pool
            // For now, fall back to standard build with the most complex layout
            build_pools_with_layout(
                num_blocks,
                host_config.map(|(n, _)| n),
                device_config.map(|(n, _)| n),
                disk_config.map(|(n, _)| n),
                LayoutType::LayerSeparate {
                    outer_contiguous: false,
                }, // Most complex
                BlockRegistrationDuplicationSetting::Disabled,
2033
                false,
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
            )
        }

        /// Populate block with layer-specific patterns to detect layout issues
        fn populate_block_with_layer_patterns<S, L, M>(
            block: &ImmutableBlock<S, L, M>,
        ) -> Result<()>
        where
            S: Storage,
            L: LocalityProvider,
            M: BlockMetadata,
            ImmutableBlock<S, L, M>: BlockDataProvider,
        {
            let block_data = block.block_data();

            for layer_idx in 0..block_data.num_layers() {
                for outer_idx in 0..2 {
                    // Assuming max 2 outer dimensions
                    if let Ok(layer_view) = block_data.layer_view(layer_idx, outer_idx) {
                        let pattern = 0x10 + layer_idx as u8 + outer_idx as u8; // Different pattern per layer/outer

                        unsafe {
                            let slice = std::slice::from_raw_parts_mut(
                                layer_view.as_ptr() as *mut u8,
                                layer_view.size(),
                            );
                            slice.fill(pattern);
                        }
                    }
                }
            }

            Ok(())
        }

        /// Verify layer-specific patterns are preserved across transfers
        fn verify_layer_patterns<S1, L1, M1, S2, L2, M2>(
            source_block: &ImmutableBlock<S1, L1, M1>,
            dest_block: &ImmutableBlock<S2, L2, M2>,
        ) -> Result<()>
        where
            S1: Storage,
            L1: LocalityProvider,
            M1: BlockMetadata,
            S2: Storage,
            L2: LocalityProvider,
            M2: BlockMetadata,
            ImmutableBlock<S1, L1, M1>: BlockDataProvider,
            ImmutableBlock<S2, L2, M2>: BlockDataProvider,
        {
            let src_data = source_block.block_data();
            let dst_data = dest_block.block_data();

            assert_eq!(src_data.num_layers(), dst_data.num_layers());

            for layer_idx in 0..src_data.num_layers() {
                for outer_idx in 0..2 {
                    // Assuming max 2 outer dimensions
                    if let (Ok(src_layer), Ok(dst_layer)) = (
                        src_data.layer_view(layer_idx, outer_idx),
                        dst_data.layer_view(layer_idx, outer_idx),
                    ) {
                        assert_eq!(src_layer.size(), dst_layer.size());

                        let expected_pattern = 0x10 + layer_idx as u8 + outer_idx as u8;

                        unsafe {
                            let src_ptr = src_layer.as_ptr();
                            let dst_ptr = dst_layer.as_ptr();
                            let src_size = src_layer.size();
                            let dst_size = dst_layer.size();

                            // Safety checks
                            if src_ptr.is_null() || dst_ptr.is_null() {
                                return Err(anyhow::anyhow!("Layer view returned null pointer"));
                            }
                            if src_size == 0 || dst_size == 0 {
                                continue; // Skip empty layers
                            }

                            let src_slice = std::slice::from_raw_parts(src_ptr, src_size);
                            let dst_slice = std::slice::from_raw_parts(dst_ptr, dst_size);

                            // Verify source has expected pattern
                            assert!(
                                src_slice.iter().all(|&b| b == expected_pattern),
                                "Source layer {} outer {} has incorrect pattern",
                                layer_idx,
                                outer_idx
                            );

                            // Verify destination matches source
                            assert!(
                                dst_slice.iter().all(|&b| b == expected_pattern),
                                "Destination layer {} outer {} has incorrect pattern",
                                layer_idx,
                                outer_idx
                            );
                        }
                    }
                }
            }

            Ok(())
        }

        /// Verify block data integrity with specific pattern
        fn verify_block_data_integrity<S, L, M>(
            block: &ImmutableBlock<S, L, M>,
            expected_value: u8,
        ) -> Result<()>
        where
            S: Storage,
            L: LocalityProvider,
            M: BlockMetadata,
            ImmutableBlock<S, L, M>: BlockDataProvider,
        {
            let block_data = block.block_data();
            let block_view = block_data.block_view()?;

            unsafe {
                let ptr = block_view.as_ptr();
                let size = block_view.size();

                // Safety checks
                if ptr.is_null() {
                    return Err(anyhow::anyhow!("Block view returned null pointer"));
                }
                if size == 0 {
                    return Ok(()); // Empty block is valid
                }

                let slice = std::slice::from_raw_parts(ptr, size);

                // Check for expected pattern
                let pattern_matches = slice.iter().all(|&b| b == expected_value);
                assert!(
                    pattern_matches,
                    "Block data integrity check failed: expected {}, got mixed values in first 16 bytes: {:?}",
                    expected_value,
                    &slice[0..std::cmp::min(16, slice.len())]
                );
            }

            Ok(())
        }

        /// Verify no garbage data in block (common issue with layout mismatches)
        fn verify_no_garbage_data<S, L, M>(
            block: &ImmutableBlock<S, L, M>,
            expected_value: u8,
        ) -> Result<()>
        where
            S: Storage,
            L: LocalityProvider,
            M: BlockMetadata,
            ImmutableBlock<S, L, M>: BlockDataProvider,
        {
            let block_data = block.block_data();

            // Check each layer separately for layout-specific issues
            for layer_idx in 0..block_data.num_layers() {
                for outer_idx in 0..2 {
                    // Assuming max 2 outer dimensions
                    if let Ok(layer_view) = block_data.layer_view(layer_idx, outer_idx) {
                        unsafe {
                            let slice =
                                std::slice::from_raw_parts(layer_view.as_ptr(), layer_view.size());

                            // In a properly functioning system, we should see mostly expected values
                            let expected_count =
                                slice.iter().filter(|&&b| b == expected_value).count();
                            let total_count = slice.len();
                            let expected_ratio = expected_count as f64 / total_count as f64;

                            assert!(
                                expected_ratio > 0.8,
                                "Layer {} has too much garbage data: only {:.1}% matches expected value {}. \
                         First 32 bytes: {:?}",
                                layer_idx,
                                expected_ratio * 100.0,
                                expected_value,
                                &slice[0..std::cmp::min(32, slice.len())]
                            );

                            // Additional check: no completely zero or completely max regions
                            // which often indicate uninitialized or corrupted memory
                            let zero_regions = count_consecutive_bytes(slice, 0x00);
                            let max_regions = count_consecutive_bytes(slice, 0xFF);

                            assert!(
                                zero_regions < slice.len() / 4,
                                "Layer {} outer {} has large zero regions, indicating potential garbage data",
                                layer_idx,
                                outer_idx
                            );
                            assert!(
                                max_regions < slice.len() / 4,
                                "Layer {} outer {} has large 0xFF regions, indicating potential garbage data",
                                layer_idx,
                                outer_idx
                            );
                        }
                    }
                }
            }

            Ok(())
        }

        /// Count consecutive bytes with a specific value
        fn count_consecutive_bytes(slice: &[u8], value: u8) -> usize {
            let mut max_consecutive = 0;
            let mut current_consecutive = 0;

            for &byte in slice {
                if byte == value {
                    current_consecutive += 1;
                    max_consecutive = max_consecutive.max(current_consecutive);
                } else {
                    current_consecutive = 0;
                }
            }

            max_consecutive
        }
    }

2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
    #[tokio::test]
    async fn test_onboard_unsupported_block_type() -> Result<()> {
        let (offload_manager, device_pool, _, _) = build_pools(1, None, None, None)?;

        let device_pool = device_pool.as_ref().unwrap();

        let block = completed_block(device_pool, [0; 4]).await?;

        let registered_block = device_pool
            .register_blocks(vec![block])
            .await?
            .into_iter()
            .next()
            .unwrap();

Ryan Olson's avatar
Ryan Olson committed
2277
2278
2279
        let onboarded_blocks = offload_manager
            .onboard(vec![registered_block], None)
            .await?;
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
        assert!(matches!(
            onboarded_blocks,
            Err(BlockPoolError::BlockError(BlockError::Other(_)))
        ));

        Ok(())
    }

    #[tokio::test]
    async fn test_offload_transfer_metadata() -> Result<()> {
        let (offload_manager, device_pool, host_pool, _) = build_pools(4, Some(4), None, None)?;

        let device_pool = device_pool.as_ref().unwrap();
        let host_pool = host_pool.as_ref().unwrap();

        let mut device_block = completed_block(device_pool, [0; 4]).await?;

        populate_block(&device_block, 42)?;

        let new_metadata = device_block.metadata().update_priority(1);
        device_block.update_metadata(new_metadata);

        let immutable_device_block = device_pool
            .register_blocks(vec![device_block])
            .await?
            .into_iter()
            .next()
            .unwrap();
        offload_manager.offload(&immutable_device_block, 0).await?;

        tokio::time::sleep(std::time::Duration::from_millis(100)).await;

        let host_blocks = host_pool
Ryan Olson's avatar
Ryan Olson committed
2313
            .match_sequence_hashes(vec![immutable_device_block.sequence_hash()].as_slice())
2314
2315
2316
2317
2318
            .await?;
        assert_eq!(host_blocks.len(), 1);
        check_block_contents(&immutable_device_block, &host_blocks[0], 42)?;
        assert_eq!(host_blocks[0].metadata().priority(), 1);

2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
        Ok(())
    }

    /// Test that metadata (priority) transfers correctly through the full G1→G2→G3 chain.
    #[tokio::test]
    async fn test_offload_transfer_metadata_to_disk() -> Result<()> {
        let (offload_manager, device_pool, host_pool, disk_pool) =
            build_pools(4, Some(4), Some(4), None)?;

        let device_pool = device_pool.as_ref().unwrap();
        let host_pool = host_pool.as_ref().unwrap();
        let disk_pool = disk_pool.as_ref().unwrap();

        // Create device block with non-default priority
        let mut device_block = completed_block(device_pool, [0; 4]).await?;
        populate_block(&device_block, 42)?;

        let new_metadata = device_block.metadata().update_priority(42);
        device_block.update_metadata(new_metadata);

        let immutable_device_block = device_pool
            .register_blocks(vec![device_block])
            .await?
            .into_iter()
            .next()
            .unwrap();

        // Step 1: Offload G1→G2 (device to host)
        offload_manager.offload(&immutable_device_block, 0).await?;
        tokio::time::sleep(std::time::Duration::from_millis(100)).await;

        let host_blocks = host_pool
            .match_sequence_hashes(vec![immutable_device_block.sequence_hash()].as_slice())
            .await?;
        assert_eq!(host_blocks.len(), 1);
        assert_eq!(
            host_blocks[0].metadata().priority(),
            42,
            "G1→G2: Priority should transfer to host block"
        );

        // Step 2: Offload G2→G3 (host to disk)
        offload_manager.offload(&host_blocks[0], 0).await?;
        tokio::time::sleep(std::time::Duration::from_millis(500)).await;

        let disk_blocks = disk_pool
            .match_sequence_hashes(vec![immutable_device_block.sequence_hash()].as_slice())
            .await?;
        assert_eq!(disk_blocks.len(), 1);
        assert_eq!(
            disk_blocks[0].metadata().priority(),
            42,
            "G2→G3: Priority should transfer to disk block"
        );

        Ok(())
    }

    /// Test that metadata (priority) transfers correctly when onboarding from G2→G1.
    #[tokio::test]
    async fn test_onboard_transfer_metadata_from_host() -> Result<()> {
        let (offload_manager, device_pool, host_pool, _) = build_pools(4, Some(4), None, None)?;

        let _device_pool = device_pool.as_ref().unwrap();
        let host_pool = host_pool.as_ref().unwrap();

        // Create host block with non-default priority
        let mut host_block = completed_block(host_pool, [0; 4]).await?;
        populate_block(&host_block, 42)?;

        let new_metadata = host_block.metadata().update_priority(42);
        host_block.update_metadata(new_metadata);

        let immutable_host_block = host_pool
            .register_blocks(vec![host_block])
            .await?
            .into_iter()
            .next()
            .unwrap();

        assert_eq!(
            immutable_host_block.metadata().priority(),
            42,
            "Host block should have priority=42 before onboard"
        );

        // Onboard G2→G1 (host to device)
        let onboarded_blocks = offload_manager
            .onboard(vec![immutable_host_block.clone()], None)
            .await??;

        assert_eq!(onboarded_blocks.len(), 1);
        assert_eq!(
            onboarded_blocks[0].metadata().priority(),
            42,
            "G2→G1: Priority should transfer to device block after onboard"
        );

        Ok(())
    }

    /// Test that metadata is preserved through a full G1→G2→G1 cycle.
    #[tokio::test]
    async fn test_offload_onboard_preserves_metadata() -> Result<()> {
        let (offload_manager, device_pool, host_pool, _) = build_pools(4, Some(4), None, None)?;

        let device_pool = device_pool.as_ref().unwrap();
        let host_pool = host_pool.as_ref().unwrap();

        // Create device block with non-default priority
        let mut device_block = completed_block(device_pool, [0; 4]).await?;
        populate_block(&device_block, 42)?;

        let new_metadata = device_block.metadata().update_priority(42);
        device_block.update_metadata(new_metadata);

        let immutable_device_block = device_pool
            .register_blocks(vec![device_block])
            .await?
            .into_iter()
            .next()
            .unwrap();

        // Step 1: Offload G1→G2
        offload_manager.offload(&immutable_device_block, 0).await?;
        tokio::time::sleep(std::time::Duration::from_millis(100)).await;

        let host_blocks = host_pool
            .match_sequence_hashes(vec![immutable_device_block.sequence_hash()].as_slice())
            .await?;
        assert_eq!(host_blocks.len(), 1);
        assert_eq!(
            host_blocks[0].metadata().priority(),
            42,
            "G1→G2: Priority should transfer to host block"
        );

        // Drop device block and allocate new ones to evict it from device pool
        drop(immutable_device_block);
        tokio::time::sleep(std::time::Duration::from_millis(100)).await;

        let temp_blocks = device_pool.allocate_blocks(4).await?;
        drop(temp_blocks);
        tokio::time::sleep(std::time::Duration::from_millis(100)).await;

        // Step 2: Onboard G2→G1
        let onboarded_blocks = offload_manager
            .onboard(vec![host_blocks[0].clone()], None)
            .await??;

        assert_eq!(onboarded_blocks.len(), 1);
        assert_eq!(
            onboarded_blocks[0].metadata().priority(),
            42,
            "G2→G1: Priority should be preserved through full cycle"
        );

2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
        Ok(())
    }

    #[tokio::test]
    async fn test_onboard_duplicate() -> Result<()> {
        let (offload_manager, device_pool, host_pool, _) = build_pools(4, Some(4), None, None)?;

        let device_pool = device_pool.as_ref().unwrap();
        let host_pool = host_pool.as_ref().unwrap();

        let device_block = completed_block(device_pool, [0; 4]).await?;

        let immutable_device_block = device_pool
            .register_blocks(vec![device_block])
            .await?
            .into_iter()
            .next()
            .unwrap();

        populate_block(&immutable_device_block, 42)?;

        offload_manager.offload(&immutable_device_block, 0).await?;

        tokio::time::sleep(std::time::Duration::from_millis(100)).await;

        let host_blocks = host_pool
Ryan Olson's avatar
Ryan Olson committed
2502
            .match_sequence_hashes(vec![immutable_device_block.sequence_hash()].as_slice())
2503
2504
2505
2506
            .await?;
        assert_eq!(host_blocks.len(), 1);

        let onboarded_blocks = offload_manager
Ryan Olson's avatar
Ryan Olson committed
2507
2508
            .onboard(vec![host_blocks[0].clone()], None)
            .await??;
2509
2510
2511
2512
2513
2514
        assert_eq!(onboarded_blocks.len(), 1);
        check_block_contents(&host_blocks[0], &onboarded_blocks[0], 42)?;

        // This should be the same block that we put on the device.
        // The block that was copied should be discarded by the block pool.
        assert_eq!(
Ryan Olson's avatar
Ryan Olson committed
2515
2516
            onboarded_blocks[0].block_id(),
            immutable_device_block.block_id()
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
        );

        Ok(())
    }

    #[tokio::test]
    async fn test_transfer_big_blocks() -> Result<()> {
        // Try a block size of 32 MB.
        let inner_dim = 2_usize.pow(20) * 32 / NUM_LAYERS / BLOCK_SIZE;
        let (offload_manager, device_pool, host_pool, disk_pool) =
            build_pools(2, Some(2), Some(2), Some(inner_dim))?;

        let device_pool = device_pool.as_ref().unwrap();
        let host_pool = host_pool.as_ref().unwrap();
        let disk_pool = disk_pool.as_ref().unwrap();

        let device_block = completed_block(device_pool, [0; 4]).await?;

        populate_block(&device_block, 42)?;

        let immutable_device_block = device_pool
            .register_blocks(vec![device_block])
            .await?
            .into_iter()
            .next()
            .unwrap();

        // Offload to host.
        offload_manager.offload(&immutable_device_block, 0).await?;

        // Wait for the offload to be processed.
        tokio::time::sleep(std::time::Duration::from_millis(100)).await;

        let host_blocks = host_pool
Ryan Olson's avatar
Ryan Olson committed
2551
            .match_sequence_hashes(vec![immutable_device_block.sequence_hash()].as_slice())
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
            .await?;
        assert_eq!(host_blocks.len(), 1);
        check_block_contents(&immutable_device_block, &host_blocks[0], 42)?;

        // Offload to disk
        offload_manager.offload(&host_blocks[0], 0).await?;

        // Wait for the offload to be processed.
        tokio::time::sleep(std::time::Duration::from_millis(500)).await;

        let disk_blocks = disk_pool
Ryan Olson's avatar
Ryan Olson committed
2563
            .match_sequence_hashes(vec![immutable_device_block.sequence_hash()].as_slice())
2564
2565
2566
2567
2568
            .await?;
        assert_eq!(disk_blocks.len(), 1);
        check_block_contents(&host_blocks[0], &disk_blocks[0], 42)?;

        // Onboard to device.
Ryan Olson's avatar
Ryan Olson committed
2569
        let device_blocks = offload_manager.onboard(disk_blocks.clone(), None).await??;
2570
2571
2572
2573
2574
        assert_eq!(device_blocks.len(), 1);
        check_block_contents(&disk_blocks[0], &device_blocks[0], 42)?;

        Ok(())
    }
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611

    #[tokio::test]
    async fn test_offload_evict_order() -> Result<()> {
        let (offload_manager, device_pool, host_pool, _) = build_pools(4, Some(4), None, None)?;

        let device_pool = device_pool.as_ref().unwrap();
        let host_pool = host_pool.as_ref().unwrap();

        let tokens = vec![0_u32; BLOCK_SIZE * 4];
        let token_blocks = TokenBlockSequence::new(Tokens::from(tokens), 4, None);
        assert_eq!(token_blocks.blocks().len(), 4);

        let mut mutable_blocks = Vec::new();
        let mut sequence_hashes = Vec::new();
        for token_block in token_blocks.blocks() {
            let mut mutable_block = device_pool
                .allocate_blocks(1)
                .await?
                .into_iter()
                .next()
                .unwrap();
            mutable_block.apply_token_block(token_block.clone())?;
            sequence_hashes.push(mutable_block.sequence_hash()?);
            mutable_blocks.push(mutable_block);
        }

        let immutable_blocks = device_pool.register_blocks(mutable_blocks).await?;

        for block in &immutable_blocks {
            offload_manager.offload(block, 0).await?;
        }
        // Wait for offloads.
        tokio::time::sleep(std::time::Duration::from_millis(100)).await;

        // Allocate 2 blocks on the host.
        let _host_blocks = host_pool.allocate_blocks(2).await?;

Ryan Olson's avatar
Ryan Olson committed
2612
2613
        // The first two blocks should've been evicted.
        // The last two blocks should still be on the host.
2614
2615
2616
2617
2618
        assert_eq!(
            host_pool
                .match_sequence_hashes(sequence_hashes.as_slice())
                .await?
                .len(),
Ryan Olson's avatar
Ryan Olson committed
2619
            0
2620
2621
2622
2623
        );

        assert_eq!(
            host_pool
Ryan Olson's avatar
Ryan Olson committed
2624
                .match_sequence_hashes(&sequence_hashes[2..])
2625
2626
                .await?
                .len(),
Ryan Olson's avatar
Ryan Olson committed
2627
            2
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
        );

        Ok(())
    }

    #[tokio::test]
    async fn test_onboard_evict_order() -> Result<()> {
        let (offload_manager, device_pool, host_pool, _) = build_pools(4, Some(4), None, None)?;

        let device_pool = device_pool.as_ref().unwrap();
        let host_pool = host_pool.as_ref().unwrap();

        let tokens = vec![0_u32; BLOCK_SIZE * 4];
        let token_blocks = TokenBlockSequence::new(Tokens::from(tokens), 4, None);
        assert_eq!(token_blocks.blocks().len(), 4);

        let mut mutable_blocks = Vec::new();
        let mut sequence_hashes = Vec::new();
        for token_block in token_blocks.blocks() {
            let mut block = host_pool
                .allocate_blocks(1)
                .await?
                .into_iter()
                .next()
                .unwrap();
            block.apply_token_block(token_block.clone())?;

            sequence_hashes.push(block.sequence_hash()?);
            mutable_blocks.push(block);
        }

        let immutable_blocks = host_pool.register_blocks(mutable_blocks).await?;

Ryan Olson's avatar
Ryan Olson committed
2661
        let _ = offload_manager.onboard(immutable_blocks, None).await?;
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688

        tokio::time::sleep(std::time::Duration::from_millis(100)).await;

        let _device_blocks = device_pool.allocate_blocks(2).await?;

        assert_eq!(
            device_pool
                .match_sequence_hashes(sequence_hashes.as_slice())
                .await?
                .len(),
            2
        );

        tokio::time::sleep(std::time::Duration::from_millis(100)).await;

        let _device_blocks2 = device_pool.allocate_blocks(1).await?;

        assert_eq!(
            device_pool
                .match_sequence_hashes(sequence_hashes.as_slice())
                .await?
                .len(),
            1
        );

        Ok(())
    }
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734

    // ============================================================================
    // ENVIRONMENT CONFIGURATION TESTS
    // ============================================================================
    #[test]
    fn test_config_defaults() {
        temp_env::with_vars(
            vec![
                ("DYN_KVBM_MAX_CONCURRENT_TRANSFERS", None::<&str>),
                ("DYN_KVBM_MAX_TRANSFER_BATCH_SIZE", None::<&str>),
            ],
            || {
                assert_eq!(max_concurrent_transfers(), DEFAULT_MAX_CONCURRENT_TRANSFERS);
                assert_eq!(max_transfer_batch_size(), DEFAULT_MAX_TRANSFER_BATCH_SIZE);
            },
        );
    }

    #[test]
    fn test_config_custom_values() {
        temp_env::with_vars(
            vec![
                ("DYN_KVBM_MAX_CONCURRENT_TRANSFERS", Some("64")),
                ("DYN_KVBM_MAX_TRANSFER_BATCH_SIZE", Some("128")),
            ],
            || {
                assert_eq!(max_concurrent_transfers(), 64);
                assert_eq!(max_transfer_batch_size(), 128);
            },
        );
    }

    #[test]
    fn test_config_invalid_values_fallback() {
        temp_env::with_vars(
            vec![
                ("DYN_KVBM_MAX_CONCURRENT_TRANSFERS", Some("not_a_number")),
                ("DYN_KVBM_MAX_TRANSFER_BATCH_SIZE", Some("0")),
            ],
            || {
                // Should log a tracing::warn and return defaults
                assert_eq!(max_concurrent_transfers(), DEFAULT_MAX_CONCURRENT_TRANSFERS);
                assert_eq!(max_transfer_batch_size(), DEFAULT_MAX_TRANSFER_BATCH_SIZE);
            },
        );
    }
2735
}