Display the error message on failure

Replace the hand-made VecDequeue by a FutureUnordered
2025-11-24 05:26:57 +00:00 · 2025-11-13 10:25:48 +01:00 · 2025-11-12 09:12:37 +01:00
51 changed files with 715 additions and 2578 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -345,6 +345,12 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"

+[[package]]
+name = "allocator-api2"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c583acf993cf4245c4acb0a2cc2ab1f9cc097de73411bb6d3647ff6af2b1013d"
+
 [[package]]
 name = "anes"
 version = "0.1.6"
@@ -584,7 +590,7 @@ source = "git+https://github.com/meilisearch/bbqueue#cbb87cc707b5af415ef203bdaf2

 [[package]]
 name = "benchmarks"
-version = "1.26.0"
+version = "1.25.0"
 dependencies = [
 "anyhow",
 "bumpalo",
@@ -794,7 +800,7 @@ dependencies = [

 [[package]]
 name = "build-info"
-version = "1.26.0"
+version = "1.25.0"
 dependencies = [
 "anyhow",
 "time",
@@ -807,7 +813,7 @@ version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 dependencies = [
- "allocator-api2",
+ "allocator-api2 0.2.21",
 "serde",
 ]

@@ -817,7 +823,7 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ce682bdc86c2e25ef5cd95881d9d6a1902214eddf74cf9ffea88fe1464377e8"
 dependencies = [
- "allocator-api2",
+ "allocator-api2 0.2.21",
 "bitpacking",
 "bumpalo",
 "hashbrown 0.15.5",
@@ -1784,7 +1790,7 @@ dependencies = [

 [[package]]
 name = "dump"
-version = "1.26.0"
+version = "1.25.0"
 dependencies = [
 "anyhow",
 "big_s",
@@ -2027,7 +2033,7 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"

 [[package]]
 name = "file-store"
-version = "1.26.0"
+version = "1.25.0"
 dependencies = [
 "tempfile",
 "thiserror 2.0.16",
@@ -2049,7 +2055,7 @@ dependencies = [

 [[package]]
 name = "filter-parser"
-version = "1.26.0"
+version = "1.25.0"
 dependencies = [
 "insta",
 "levenshtein_automata",
@@ -2077,7 +2083,7 @@ dependencies = [

 [[package]]
 name = "flatten-serde-json"
-version = "1.26.0"
+version = "1.25.0"
 dependencies = [
 "criterion",
 "serde_json",
@@ -2234,7 +2240,7 @@ dependencies = [

 [[package]]
 name = "fuzzers"
-version = "1.26.0"
+version = "1.25.0"
 dependencies = [
 "arbitrary",
 "bumpalo",
@@ -2760,7 +2766,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
 "ahash 0.8.12",
- "allocator-api2",
+ "allocator-api2 0.2.21",
 ]

 [[package]]
@@ -2769,7 +2775,7 @@ version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 dependencies = [
- "allocator-api2",
+ "allocator-api2 0.2.21",
 "equivalent",
 "foldhash",
 "serde",
@@ -3188,7 +3194,7 @@ dependencies = [

 [[package]]
 name = "index-scheduler"
-version = "1.26.0"
+version = "1.25.0"
 dependencies = [
 "anyhow",
 "backoff",
@@ -3206,6 +3212,7 @@ dependencies = [
 "enum-iterator",
 "file-store",
 "flate2",
+ "futures",
 "indexmap",
 "insta",
 "maplit",
@@ -3461,7 +3468,7 @@ dependencies = [

 [[package]]
 name = "json-depth-checker"
-version = "1.26.0"
+version = "1.25.0"
 dependencies = [
 "criterion",
 "serde_json",
@@ -3980,7 +3987,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"

 [[package]]
 name = "meili-snap"
-version = "1.26.0"
+version = "1.25.0"
 dependencies = [
 "insta",
 "md5",
@@ -3991,7 +3998,7 @@ dependencies = [

 [[package]]
 name = "meilisearch"
-version = "1.26.0"
+version = "1.25.0"
 dependencies = [
 "actix-cors",
 "actix-http",
@@ -4088,7 +4095,7 @@ dependencies = [

 [[package]]
 name = "meilisearch-auth"
-version = "1.26.0"
+version = "1.25.0"
 dependencies = [
 "base64 0.22.1",
 "enum-iterator",
@@ -4107,7 +4114,7 @@ dependencies = [

 [[package]]
 name = "meilisearch-types"
-version = "1.26.0"
+version = "1.25.0"
 dependencies = [
 "actix-web",
 "anyhow",
@@ -4142,7 +4149,7 @@ dependencies = [

 [[package]]
 name = "meilitool"
-version = "1.26.0"
+version = "1.25.0"
 dependencies = [
 "anyhow",
 "clap",
@@ -4176,8 +4183,9 @@ dependencies = [

 [[package]]
 name = "milli"
-version = "1.26.0"
+version = "1.25.0"
 dependencies = [
+ "allocator-api2 0.3.1",
 "arroy",
 "bbqueue",
 "big_s",
@@ -4757,7 +4765,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"

 [[package]]
 name = "permissive-json-pointer"
-version = "1.26.0"
+version = "1.25.0"
 dependencies = [
 "big_s",
 "serde_json",
@@ -7879,7 +7887,7 @@ dependencies = [

 [[package]]
 name = "xtask"
-version = "1.26.0"
+version = "1.25.0"
 dependencies = [
 "anyhow",
 "build-info",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ members = [
 ]

 [workspace.package]
-version = "1.26.0"
+version = "1.25.0"
 authors = [
    "Quentin de Quelen <quentin@dequelen.me>",
    "Clément Renault <clement@meilisearch.com>",
--- a/crates/dump/src/lib.rs
+++ b/crates/dump/src/lib.rs
@@ -9,9 +9,8 @@ use meilisearch_types::error::ResponseError;
 use meilisearch_types::keys::Key;
 use meilisearch_types::milli::update::IndexDocumentsMethod;
 use meilisearch_types::settings::Unchecked;
-use meilisearch_types::tasks::enterprise_edition::network::{NetworkTopologyChange, DbTaskNetwork};
 use meilisearch_types::tasks::{
-    Details, ExportIndexSettings, IndexSwap, KindWithContent, Status, Task, TaskId,
+    Details, ExportIndexSettings, IndexSwap, KindWithContent, Status, Task, TaskId, TaskNetwork,
 };
 use meilisearch_types::InstanceUid;
 use roaring::RoaringBitmap;
@@ -96,7 +95,7 @@ pub struct TaskDump {
    )]
    pub finished_at: Option<OffsetDateTime>,
    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub network: Option<DbTaskNetwork>,
+    pub network: Option<TaskNetwork>,
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub custom_metadata: Option<String>,
 }
@@ -164,7 +163,6 @@ pub enum KindDump {
    IndexCompaction {
        index_uid: String,
    },
-    NetworkTopologyChange(NetworkTopologyChange),
 }

 impl From<Task> for TaskDump {
@@ -251,9 +249,6 @@ impl From<KindWithContent> for KindDump {
            KindWithContent::IndexCompaction { index_uid } => {
                KindDump::IndexCompaction { index_uid }
            }
-            KindWithContent::NetworkTopologyChange(network_topology_change) => {
-                KindDump::NetworkTopologyChange(network_topology_change)
-            }
        }
    }
 }
@@ -565,8 +560,7 @@ pub(crate) mod test {
        Network {
            local: Some("myself".to_string()),
            remotes: maplit::btreemap! {"other".to_string() => Remote { url: "http://test".to_string(), search_api_key: Some("apiKey".to_string()), write_api_key: Some("docApiKey".to_string()) }},
-            leader: None,
-            version: Default::default(),
+            sharding: false,
        }
    }

--- a/crates/index-scheduler/Cargo.toml
+++ b/crates/index-scheduler/Cargo.toml
@@ -46,10 +46,11 @@ time = { version = "0.3.41", features = [
 tracing = "0.1.41"
 ureq = "2.12.1"
 uuid = { version = "1.17.0", features = ["serde", "v4"] }
-backoff = "0.4.0"
+backoff = { version = "0.4.0", features = ["tokio"] }
 reqwest = { version = "0.12.23", features = ["rustls-tls", "http2"], default-features = false }
 rusty-s3 = "0.8.1"
 tokio = { version = "1.47.1", features = ["full"] }
+futures = "0.3.31"

 [dev-dependencies]
 big_s = "1.0.2"
--- a/crates/index-scheduler/src/dump.rs
+++ b/crates/index-scheduler/src/dump.rs
@@ -238,9 +238,6 @@ impl<'a> Dump<'a> {
                KindDump::IndexCompaction { index_uid } => {
                    KindWithContent::IndexCompaction { index_uid }
                }
-                KindDump::NetworkTopologyChange(network_topology_change) => {
-                    KindWithContent::NetworkTopologyChange(network_topology_change)
-                }
            },
        };

--- a/crates/index-scheduler/src/error.rs
+++ b/crates/index-scheduler/src/error.rs
@@ -3,13 +3,10 @@ use std::fmt::Display;
 use meilisearch_types::batches::BatchId;
 use meilisearch_types::error::{Code, ErrorCode};
 use meilisearch_types::milli::index::RollbackOutcome;
-use meilisearch_types::milli::DocumentId;
-use meilisearch_types::tasks::enterprise_edition::network::ReceiveTaskError;
 use meilisearch_types::tasks::{Kind, Status};
 use meilisearch_types::{heed, milli};
 use reqwest::StatusCode;
 use thiserror::Error;
-use uuid::Uuid;

 use crate::TaskId;

@@ -194,15 +191,6 @@ pub enum Error {
    #[error(transparent)]
    HeedTransaction(heed::Error),

-    #[error("No network topology change task is currently enqueued or processing")]
-    ImportTaskWithoutNetworkTask,
-    #[error("The network task version (`{network_task}`) does not match the import task version (`{import_task}`)")]
-    NetworkVersionMismatch { network_task: Uuid, import_task: Uuid },
-    #[error("The import task emanates from an unknown remote `{0}`")]
-    ImportTaskUnknownRemote(String),
-    #[error("The import task with key `{0}` was already received")]
-    ImportTaskAlreadyReceived(DocumentId),
-
    #[cfg(test)]
    #[error("Planned failure for tests.")]
    PlannedFailure,
@@ -260,10 +248,6 @@ impl Error {
            | Error::Persist(_)
            | Error::FeatureNotEnabled(_)
            | Error::Export(_)
-            | Error::ImportTaskWithoutNetworkTask
-            | Error::NetworkVersionMismatch { .. }
-            | Error::ImportTaskAlreadyReceived(_)
-            | Error::ImportTaskUnknownRemote(_)
            | Error::Anyhow(_) => true,
            Error::CreateBatch(_)
            | Error::CorruptedTaskQueue
@@ -323,10 +307,6 @@ impl ErrorCode for Error {
            Error::TaskDeletionWithEmptyQuery => Code::MissingTaskFilters,
            Error::TaskCancelationWithEmptyQuery => Code::MissingTaskFilters,
            Error::NoSpaceLeftInTaskQueue => Code::NoSpaceLeftOnDevice,
-            Error::ImportTaskWithoutNetworkTask => Code::ImportTaskWithoutNetworkTask,
-            Error::NetworkVersionMismatch { .. } => Code::NetworkVersionMismatch,
-            Error::ImportTaskAlreadyReceived(_) => Code::ImportTaskAlreadyReceived,
-            Error::ImportTaskUnknownRemote(_) => Code::ImportTaskUnknownRemote,
            Error::S3Error { status, .. } if status.is_client_error() => {
                Code::InvalidS3SnapshotRequest
            }
@@ -365,12 +345,3 @@ impl ErrorCode for Error {
        }
    }
 }
-
-impl From<ReceiveTaskError> for Error {
-    fn from(value: ReceiveTaskError) -> Self {
-        match value {
-            ReceiveTaskError::UnknownRemote(unknown) => Error::ImportTaskUnknownRemote(unknown),
-            ReceiveTaskError::DuplicateTask(dup) => Error::ImportTaskAlreadyReceived(dup),
-        }
-    }
-}
--- a/crates/index-scheduler/src/index_mapper/mod.rs
+++ b/crates/index-scheduler/src/index_mapper/mod.rs
@@ -361,11 +361,6 @@ impl IndexMapper {
        Ok(())
    }

-    /// The number of indexes in the database
-    pub fn index_count(&self, rtxn: &RoTxn) -> Result<u64> {
-        Ok(self.index_mapping.len(rtxn)?)
-    }
-
    /// Return an index, may open it if it wasn't already opened.
    pub fn index(&self, rtxn: &RoTxn, name: &str) -> Result<Index> {
        if let Some((current_name, current_index)) =
--- a/crates/index-scheduler/src/insta_snapshot.rs
+++ b/crates/index-scheduler/src/insta_snapshot.rs
@@ -21,7 +21,7 @@ pub fn snapshot_index_scheduler(scheduler: &IndexScheduler) -> String {
    let IndexScheduler {
        cleanup_enabled: _,
        experimental_no_edition_2024_for_dumps: _,
-        runtime_tasks,
+        processing_tasks,
        env,
        version,
        queue,
@@ -50,7 +50,7 @@ pub fn snapshot_index_scheduler(scheduler: &IndexScheduler) -> String {
        snap.push_str(&format!("index scheduler running on version {indx_sched_version:?}\n"));
    }

-    let processing = runtime_tasks.read().unwrap().processing.clone();
+    let processing = processing_tasks.read().unwrap().clone();
    snap.push_str(&format!("### Autobatching Enabled = {}\n", scheduler.autobatching_enabled));
    snap.push_str(&format!(
        "### Processing batch {:?}:\n",
@@ -325,9 +325,6 @@ fn snapshot_details(d: &Details) -> String {
        Details::IndexCompaction { index_uid, pre_compaction_size, post_compaction_size } => {
            format!("{{ index_uid: {index_uid:?}, pre_compaction_size: {pre_compaction_size:?}, post_compaction_size: {post_compaction_size:?} }}")
        }
-        Details::NetworkTopologyChange { moved_documents, received_documents, message } => {
-            format!("{{ moved_documents: {moved_documents:?}, received_documents: {received_documents:?}, message: {message:?}")
-        }
    }
 }

--- a/crates/index-scheduler/src/lib.rs
+++ b/crates/index-scheduler/src/lib.rs
@@ -68,10 +68,10 @@ use meilisearch_types::milli::vector::{
 };
 use meilisearch_types::milli::{self, Index};
 use meilisearch_types::task_view::TaskView;
-use meilisearch_types::tasks::enterprise_edition::network::{DbTaskNetwork, TaskNetwork};
-use meilisearch_types::tasks::{KindWithContent, Task};
+use meilisearch_types::tasks::{KindWithContent, Task, TaskNetwork};
 use meilisearch_types::webhooks::{Webhook, WebhooksDumpView, WebhooksView};
 use milli::vector::db::IndexEmbeddingConfig;
+use processing::ProcessingTasks;
 pub use queue::Query;
 use queue::Queue;
 use roaring::RoaringBitmap;
@@ -82,7 +82,6 @@ use uuid::Uuid;
 use versioning::Versioning;

 use crate::index_mapper::IndexMapper;
-use crate::processing::RuntimeTasks;
 use crate::utils::clamp_to_page_size;

 pub(crate) type BEI128 = I128<BE>;
@@ -164,7 +163,7 @@ pub struct IndexScheduler {
    pub(crate) env: Env<WithoutTls>,

    /// The list of tasks currently processing
-    pub(crate) runtime_tasks: Arc<RwLock<RuntimeTasks>>,
+    pub(crate) processing_tasks: Arc<RwLock<ProcessingTasks>>,

    /// A database containing only the version of the index-scheduler
    pub version: versioning::Versioning,
@@ -226,7 +225,7 @@ impl IndexScheduler {
    fn private_clone(&self) -> IndexScheduler {
        IndexScheduler {
            env: self.env.clone(),
-            runtime_tasks: self.runtime_tasks.clone(),
+            processing_tasks: self.processing_tasks.clone(),
            version: self.version.clone(),
            queue: self.queue.private_clone(),
            scheduler: self.scheduler.private_clone(),
@@ -332,7 +331,7 @@ impl IndexScheduler {
        wtxn.commit()?;

        Ok(Self {
-            runtime_tasks: Arc::new(RwLock::new(RuntimeTasks::new())),
+            processing_tasks: Arc::new(RwLock::new(ProcessingTasks::new())),
            version,
            queue,
            scheduler: Scheduler::new(&options, auth_env),
@@ -640,19 +639,19 @@ impl IndexScheduler {
    /// 3. The number of times the properties appeared.
    pub fn get_stats(&self) -> Result<BTreeMap<String, BTreeMap<String, u64>>> {
        let rtxn = self.read_txn()?;
-        self.queue.get_stats(&rtxn, &self.runtime_tasks.read().unwrap().processing)
+        self.queue.get_stats(&rtxn, &self.processing_tasks.read().unwrap())
    }

    // Return true if there is at least one task that is processing.
    pub fn is_task_processing(&self) -> Result<bool> {
-        Ok(!self.runtime_tasks.read().unwrap().processing.processing.is_empty())
+        Ok(!self.processing_tasks.read().unwrap().processing.is_empty())
    }

    /// Return true iff there is at least one task associated with this index
    /// that is processing.
    pub fn is_index_processing(&self, index: &str) -> Result<bool> {
        let rtxn = self.env.read_txn()?;
-        let processing_tasks = self.runtime_tasks.read().unwrap().processing.processing.clone();
+        let processing_tasks = self.processing_tasks.read().unwrap().processing.clone();
        let index_tasks = self.queue.tasks.index_tasks(&rtxn, index)?;
        let nbr_index_processing_tasks = processing_tasks.intersection_len(&index_tasks);
        Ok(nbr_index_processing_tasks > 0)
@@ -678,8 +677,8 @@ impl IndexScheduler {
        filters: &meilisearch_auth::AuthFilter,
    ) -> Result<(Vec<Task>, u64)> {
        let rtxn = self.read_txn()?;
-        let processing = &self.runtime_tasks.read().unwrap().processing;
-        self.queue.get_tasks_from_authorized_indexes(&rtxn, query, filters, processing)
+        let processing = self.processing_tasks.read().unwrap();
+        self.queue.get_tasks_from_authorized_indexes(&rtxn, query, filters, &processing)
    }

    /// Return the task ids matching the query along with the total number of tasks
@@ -697,18 +696,18 @@ impl IndexScheduler {
        filters: &meilisearch_auth::AuthFilter,
    ) -> Result<(RoaringBitmap, u64)> {
        let rtxn = self.read_txn()?;
-        let processing = &self.runtime_tasks.read().unwrap().processing;
-        self.queue.get_task_ids_from_authorized_indexes(&rtxn, query, filters, processing)
+        let processing = self.processing_tasks.read().unwrap();
+        self.queue.get_task_ids_from_authorized_indexes(&rtxn, query, filters, &processing)
    }

-    pub fn set_task_network(&self, task_id: TaskId, network: DbTaskNetwork) -> Result<Task> {
+    pub fn set_task_network(&self, task_id: TaskId, network: TaskNetwork) -> Result<()> {
        let mut wtxn = self.env.write_txn()?;
        let mut task =
            self.queue.tasks.get_task(&wtxn, task_id)?.ok_or(Error::TaskNotFound(task_id))?;
        task.network = Some(network);
        self.queue.tasks.all_tasks.put(&mut wtxn, &task_id, &task)?;
        wtxn.commit()?;
-        Ok(task)
+        Ok(())
    }

    /// Return the batches matching the query from the user's point of view along
@@ -726,8 +725,8 @@ impl IndexScheduler {
        filters: &meilisearch_auth::AuthFilter,
    ) -> Result<(Vec<Batch>, u64)> {
        let rtxn = self.read_txn()?;
-        let processing = &self.runtime_tasks.read().unwrap().processing;
-        self.queue.get_batches_from_authorized_indexes(&rtxn, query, filters, processing)
+        let processing = self.processing_tasks.read().unwrap();
+        self.queue.get_batches_from_authorized_indexes(&rtxn, query, filters, &processing)
    }

    /// Return the batch ids matching the query along with the total number of batches
@@ -745,8 +744,8 @@ impl IndexScheduler {
        filters: &meilisearch_auth::AuthFilter,
    ) -> Result<(RoaringBitmap, u64)> {
        let rtxn = self.read_txn()?;
-        let processing = &self.runtime_tasks.read().unwrap().processing;
-        self.queue.get_batch_ids_from_authorized_indexes(&rtxn, query, filters, processing)
+        let processing = self.processing_tasks.read().unwrap();
+        self.queue.get_batch_ids_from_authorized_indexes(&rtxn, query, filters, &processing)
    }

    /// Register a new task in the scheduler.
@@ -758,30 +757,18 @@ impl IndexScheduler {
        task_id: Option<TaskId>,
        dry_run: bool,
    ) -> Result<Task> {
-        self.register_with_custom_metadata(kind, task_id, None, dry_run, None)
+        self.register_with_custom_metadata(kind, task_id, None, dry_run)
    }

    /// Register a new task in the scheduler, with metadata.
    ///
    /// If it fails and data was associated with the task, it tries to delete the associated data.
-    ///
-    /// # Parameters
-    ///
-    /// - task_network: network of the task to check.
-    ///
-    /// If the task is an import task, only accept it if:
-    ///
-    /// 1. There is an ongoing network topology change task
-    /// 2. The task to register matches the network version of the network topology change task
-    ///
-    /// Always accept the task if it is not an import task.
    pub fn register_with_custom_metadata(
        &self,
        kind: KindWithContent,
        task_id: Option<TaskId>,
        custom_metadata: Option<String>,
        dry_run: bool,
-        task_network: Option<TaskNetwork>,
    ) -> Result<Task> {
        // if the task doesn't delete or cancel anything and 40% of the task queue is full, we must refuse to enqueue the incoming task
        if !matches!(&kind, KindWithContent::TaskDeletion { tasks, .. } | KindWithContent::TaskCancelation { tasks, .. } if !tasks.is_empty())
@@ -792,86 +779,13 @@ impl IndexScheduler {
        }

        let mut wtxn = self.env.write_txn()?;
-
-        if let Some(TaskNetwork::Import { import_from, network_change, metadata }) = &task_network {
-            let mut network_tasks = self
-                .queue
-                .tasks
-                .get_kind(&wtxn, meilisearch_types::tasks::Kind::NetworkTopologyChange)?;
-            if network_tasks.is_empty() {
-                return Err(Error::ImportTaskWithoutNetworkTask);
-            }
-
-            let network_task = {
-                let processing = self.runtime_tasks.read().unwrap().processing.processing.clone();
-                if processing.is_disjoint(&network_tasks) {
-                    let enqueued = self
-                        .queue
-                        .tasks
-                        .get_status(&wtxn, meilisearch_types::tasks::Status::Enqueued)?;
-
-                    network_tasks &= enqueued;
-                    if let Some(network_task) = network_tasks.into_iter().next() {
-                        network_task
-                    } else {
-                        return Err(Error::ImportTaskWithoutNetworkTask);
-                    }
-                } else {
-                    network_tasks &= &*processing;
-                    network_tasks.into_iter().next().unwrap()
-                }
-            };
-
-            let mut network_task = self.queue.tasks.get_task(&wtxn, network_task)?.unwrap();
-            let network_task_version = network_task
-                .network
-                .as_ref()
-                .map(|network| network.network_version())
-                .unwrap_or_default();
-            if network_task_version != network_change.network_version {
-                return Err(Error::NetworkVersionMismatch {
-                    network_task: network_task_version,
-                    import_task: network_change.network_version,
-                });
-            }
-
-            let KindWithContent::NetworkTopologyChange(network_topology_change) =
-                &mut network_task.kind
-            else {
-                return Err(Error::CorruptedTaskQueue);
-            };
-
-            network_topology_change.receive_remote_task(
-                &import_from.remote_name,
-                &import_from.index_name,
-                metadata.task_key,
-                import_from.document_count,
-                metadata.index_count,
-                metadata.total_index_documents,
-            )?;
-
-            self.queue.tasks.update_task(&mut wtxn, &mut network_task)?;
-        }
-
-        let task = self.queue.register(
-            &mut wtxn,
-            &kind,
-            task_id,
-            custom_metadata,
-            dry_run,
-            task_network.map(DbTaskNetwork::from),
-        )?;
+        let task = self.queue.register(&mut wtxn, &kind, task_id, custom_metadata, dry_run)?;

        // If the registered task is a task cancelation
        // we inform the processing tasks to stop (if necessary).
        if let KindWithContent::TaskCancelation { tasks, .. } = kind {
            let tasks_to_cancel = RoaringBitmap::from_iter(tasks);
-            if self
-                .runtime_tasks
-                .read()
-                .unwrap()
-                .processing
-                .must_cancel_processing_tasks(&tasks_to_cancel)
+            if self.processing_tasks.read().unwrap().must_cancel_processing_tasks(&tasks_to_cancel)
            {
                self.scheduler.must_stop_processing.must_stop();
            }
--- a/crates/index-scheduler/src/processing.rs
+++ b/crates/index-scheduler/src/processing.rs
@@ -6,28 +6,6 @@ use roaring::RoaringBitmap;

 use crate::utils::ProcessingBatch;

-pub struct RuntimeTasks {
-    pub processing: ProcessingTasks,
-    pub enqueued_network: EnqueuedNetworkTasks,
-}
-impl RuntimeTasks {
-    pub(crate) fn new() -> Self {
-        Self { processing: ProcessingTasks::new(), enqueued_network: Default::default() }
-    }
-}
-
-#[derive(Default)]
-pub struct EnqueuedNetworkTasks {
-    tasks: RoaringBitmap,
-}
-
-impl EnqueuedNetworkTasks {
-    pub fn swap(&mut self, mut new: RoaringBitmap) -> RoaringBitmap {
-        std::mem::swap(&mut self.tasks, &mut new);
-        new
-    }
-}
-
 #[derive(Clone, Default)]
 pub struct ProcessingTasks {
    pub batch: Option<Arc<ProcessingBatch>>,
--- a/crates/index-scheduler/src/queue/batches_test.rs
+++ b/crates/index-scheduler/src/queue/batches_test.rs
@@ -26,7 +26,7 @@ fn query_batches_from_and_limit() {
    handle.advance_n_successful_batches(3);
    snapshot!(snapshot_index_scheduler(&index_scheduler), name: "processed_all_tasks");

-    let proc = index_scheduler.runtime_tasks.read().unwrap().processing.clone();
+    let proc = index_scheduler.processing_tasks.read().unwrap().clone();
    let rtxn = index_scheduler.env.read_txn().unwrap();
    let query = Query { limit: Some(0), ..Default::default() };
    let (batches, _) = index_scheduler
@@ -359,7 +359,7 @@ fn query_batches_special_rules() {
    handle.advance_till([Start, BatchCreated]);

    let rtxn = index_scheduler.env.read_txn().unwrap();
-    let proc = index_scheduler.runtime_tasks.read().unwrap().processing.clone();
+    let proc = index_scheduler.processing_tasks.read().unwrap().clone();

    let query = Query { index_uids: Some(vec!["catto".to_owned()]), ..Default::default() };
    let (batches, _) = index_scheduler
--- a/crates/index-scheduler/src/queue/mod.rs
+++ b/crates/index-scheduler/src/queue/mod.rs
@@ -15,7 +15,6 @@ use file_store::FileStore;
 use meilisearch_types::batches::BatchId;
 use meilisearch_types::heed::{Database, Env, RoTxn, RwTxn, WithoutTls};
 use meilisearch_types::milli::{CboRoaringBitmapCodec, BEU32};
-use meilisearch_types::tasks::enterprise_edition::network::DbTaskNetwork;
 use meilisearch_types::tasks::{Kind, KindWithContent, Status, Task};
 use roaring::RoaringBitmap;
 use time::format_description::well_known::Rfc3339;
@@ -260,7 +259,6 @@ impl Queue {
        task_id: Option<TaskId>,
        custom_metadata: Option<String>,
        dry_run: bool,
-        network: Option<DbTaskNetwork>,
    ) -> Result<Task> {
        let next_task_id = self.tasks.next_task_id(wtxn)?;

@@ -282,7 +280,7 @@ impl Queue {
            details: kind.default_details(),
            status: Status::Enqueued,
            kind: kind.clone(),
-            network,
+            network: None,
            custom_metadata,
        };
        // For deletion and cancelation tasks, we want to make extra sure that they
@@ -350,7 +348,6 @@ impl Queue {
            None,
            None,
            false,
-            None,
        )?;

        Ok(())
--- a/crates/index-scheduler/src/queue/tasks_test.rs
+++ b/crates/index-scheduler/src/queue/tasks_test.rs
@@ -27,7 +27,7 @@ fn query_tasks_from_and_limit() {
    snapshot!(snapshot_index_scheduler(&index_scheduler), name: "processed_all_tasks");

    let rtxn = index_scheduler.env.read_txn().unwrap();
-    let processing = &index_scheduler.runtime_tasks.read().unwrap().processing;
+    let processing = index_scheduler.processing_tasks.read().unwrap();
    let query = Query { limit: Some(0), ..Default::default() };
    let (tasks, _) = index_scheduler
        .queue
@@ -317,7 +317,7 @@ fn query_tasks_special_rules() {
    handle.advance_till([Start, BatchCreated]);

    let rtxn = index_scheduler.env.read_txn().unwrap();
-    let proc = &index_scheduler.runtime_tasks.read().unwrap().processing;
+    let proc = index_scheduler.processing_tasks.read().unwrap();

    let query = Query { index_uids: Some(vec!["catto".to_owned()]), ..Default::default() };
    let (tasks, _) = index_scheduler
@@ -414,7 +414,7 @@ fn query_tasks_canceled_by() {
    snapshot!(snapshot_index_scheduler(&index_scheduler), name: "start");

    let rtxn = index_scheduler.read_txn().unwrap();
-    let proc = &index_scheduler.runtime_tasks.read().unwrap().processing;
+    let proc = index_scheduler.processing_tasks.read().unwrap();
    let query = Query { canceled_by: Some(vec![task_cancelation.uid]), ..Query::default() };
    let (tasks, _) = index_scheduler
        .queue
--- a/crates/index-scheduler/src/queue/test.rs
+++ b/crates/index-scheduler/src/queue/test.rs
@@ -203,30 +203,26 @@ fn test_disable_auto_deletion_of_tasks() {
        )
        .unwrap();

-    {
-        let rtxn = index_scheduler.env.read_txn().unwrap();
-        let proc = &index_scheduler.runtime_tasks.read().unwrap().processing;
-        let tasks = index_scheduler
-            .queue
-            .get_task_ids(&rtxn, &Query { ..Default::default() }, &proc)
-            .unwrap();
-        let tasks = index_scheduler.queue.tasks.get_existing_tasks(&rtxn, tasks).unwrap();
-        snapshot!(json_string!(tasks, { "[].enqueuedAt" => "[date]", "[].startedAt" => "[date]", "[].finishedAt" => "[date]" }), name: "task_queue_is_full");
-    }
+    let rtxn = index_scheduler.env.read_txn().unwrap();
+    let proc = index_scheduler.processing_tasks.read().unwrap();
+    let tasks =
+        index_scheduler.queue.get_task_ids(&rtxn, &Query { ..Default::default() }, &proc).unwrap();
+    let tasks = index_scheduler.queue.tasks.get_existing_tasks(&rtxn, tasks).unwrap();
+    snapshot!(json_string!(tasks, { "[].enqueuedAt" => "[date]", "[].startedAt" => "[date]", "[].finishedAt" => "[date]" }), name: "task_queue_is_full");
+    drop(rtxn);
+    drop(proc);

    // now we're above the max number of tasks
    // and if we try to advance in the tick function no new task deletion should be enqueued
    handle.advance_till([Start, BatchCreated]);
-    {
-        let rtxn = index_scheduler.env.read_txn().unwrap();
-        let proc = &index_scheduler.runtime_tasks.read().unwrap().processing;
-        let tasks = index_scheduler
-            .queue
-            .get_task_ids(&rtxn, &Query { ..Default::default() }, &proc)
-            .unwrap();
-        let tasks = index_scheduler.queue.tasks.get_existing_tasks(&rtxn, tasks).unwrap();
-        snapshot!(json_string!(tasks, { "[].enqueuedAt" => "[date]", "[].startedAt" => "[date]", "[].finishedAt" => "[date]", ".**.original_filter" => "[filter]", ".**.query" => "[query]" }), name: "task_deletion_have_not_been_enqueued");
-    }
+    let rtxn = index_scheduler.env.read_txn().unwrap();
+    let proc = index_scheduler.processing_tasks.read().unwrap();
+    let tasks =
+        index_scheduler.queue.get_task_ids(&rtxn, &Query { ..Default::default() }, &proc).unwrap();
+    let tasks = index_scheduler.queue.tasks.get_existing_tasks(&rtxn, tasks).unwrap();
+    snapshot!(json_string!(tasks, { "[].enqueuedAt" => "[date]", "[].startedAt" => "[date]", "[].finishedAt" => "[date]", ".**.original_filter" => "[filter]", ".**.query" => "[query]" }), name: "task_deletion_have_not_been_enqueued");
+    drop(rtxn);
+    drop(proc);
 }

 #[test]
@@ -271,69 +267,59 @@ fn test_auto_deletion_of_tasks() {
        )
        .unwrap();

-    {
-        let rtxn = index_scheduler.env.read_txn().unwrap();
-        let proc = &index_scheduler.runtime_tasks.read().unwrap().processing;
-        let tasks = index_scheduler
-            .queue
-            .get_task_ids(&rtxn, &Query { ..Default::default() }, &proc)
-            .unwrap();
-        let tasks = index_scheduler.queue.tasks.get_existing_tasks(&rtxn, tasks).unwrap();
-        snapshot!(json_string!(tasks, { "[].enqueuedAt" => "[date]", "[].startedAt" => "[date]", "[].finishedAt" => "[date]" }), name: "task_queue_is_full");
-    }
+    let rtxn = index_scheduler.env.read_txn().unwrap();
+    let proc = index_scheduler.processing_tasks.read().unwrap();
+    let tasks =
+        index_scheduler.queue.get_task_ids(&rtxn, &Query { ..Default::default() }, &proc).unwrap();
+    let tasks = index_scheduler.queue.tasks.get_existing_tasks(&rtxn, tasks).unwrap();
+    snapshot!(json_string!(tasks, { "[].enqueuedAt" => "[date]", "[].startedAt" => "[date]", "[].finishedAt" => "[date]" }), name: "task_queue_is_full");
+    drop(rtxn);
+    drop(proc);

-    {
-        // now we're above the max number of tasks
-        // and if we try to advance in the tick function a new task deletion should be enqueued
-        handle.advance_till([Start, BatchCreated]);
-        let rtxn = index_scheduler.env.read_txn().unwrap();
-        let proc = &index_scheduler.runtime_tasks.read().unwrap().processing;
-        let tasks = index_scheduler
-            .queue
-            .get_task_ids(&rtxn, &Query { ..Default::default() }, &proc)
-            .unwrap();
-        let tasks = index_scheduler.queue.tasks.get_existing_tasks(&rtxn, tasks).unwrap();
-        snapshot!(json_string!(tasks, { "[].enqueuedAt" => "[date]", "[].startedAt" => "[date]", "[].finishedAt" => "[date]", ".**.original_filter" => "[filter]", ".**.query" => "[query]" }), name: "task_deletion_have_been_enqueued");
-    }
+    // now we're above the max number of tasks
+    // and if we try to advance in the tick function a new task deletion should be enqueued
+    handle.advance_till([Start, BatchCreated]);
+    let rtxn = index_scheduler.env.read_txn().unwrap();
+    let proc = index_scheduler.processing_tasks.read().unwrap();
+    let tasks =
+        index_scheduler.queue.get_task_ids(&rtxn, &Query { ..Default::default() }, &proc).unwrap();
+    let tasks = index_scheduler.queue.tasks.get_existing_tasks(&rtxn, tasks).unwrap();
+    snapshot!(json_string!(tasks, { "[].enqueuedAt" => "[date]", "[].startedAt" => "[date]", "[].finishedAt" => "[date]", ".**.original_filter" => "[filter]", ".**.query" => "[query]" }), name: "task_deletion_have_been_enqueued");
+    drop(rtxn);
+    drop(proc);

-    {
-        handle.advance_till([InsideProcessBatch, ProcessBatchSucceeded, AfterProcessing]);
-        let rtxn = index_scheduler.env.read_txn().unwrap();
-        let proc = &index_scheduler.runtime_tasks.read().unwrap().processing;
-        let tasks = index_scheduler
-            .queue
-            .get_task_ids(&rtxn, &Query { ..Default::default() }, &proc)
-            .unwrap();
-        let tasks = index_scheduler.queue.tasks.get_existing_tasks(&rtxn, tasks).unwrap();
-        snapshot!(json_string!(tasks, { "[].enqueuedAt" => "[date]", "[].startedAt" => "[date]", "[].finishedAt" => "[date]", ".**.original_filter" => "[filter]", ".**.query" => "[query]" }), name: "task_deletion_have_been_processed");
-    }
+    handle.advance_till([InsideProcessBatch, ProcessBatchSucceeded, AfterProcessing]);
+    let rtxn = index_scheduler.env.read_txn().unwrap();
+    let proc = index_scheduler.processing_tasks.read().unwrap();
+    let tasks =
+        index_scheduler.queue.get_task_ids(&rtxn, &Query { ..Default::default() }, &proc).unwrap();
+    let tasks = index_scheduler.queue.tasks.get_existing_tasks(&rtxn, tasks).unwrap();
+    snapshot!(json_string!(tasks, { "[].enqueuedAt" => "[date]", "[].startedAt" => "[date]", "[].finishedAt" => "[date]", ".**.original_filter" => "[filter]", ".**.query" => "[query]" }), name: "task_deletion_have_been_processed");
+    drop(rtxn);
+    drop(proc);

    handle.advance_one_failed_batch();
    // a new task deletion has been enqueued
    handle.advance_one_successful_batch();
-    {
-        let rtxn = index_scheduler.env.read_txn().unwrap();
-        let proc = &index_scheduler.runtime_tasks.read().unwrap().processing;
-        let tasks = index_scheduler
-            .queue
-            .get_task_ids(&rtxn, &Query { ..Default::default() }, &proc)
-            .unwrap();
-        let tasks = index_scheduler.queue.tasks.get_existing_tasks(&rtxn, tasks).unwrap();
-        snapshot!(json_string!(tasks, { "[].enqueuedAt" => "[date]", "[].startedAt" => "[date]", "[].finishedAt" => "[date]", ".**.original_filter" => "[filter]", ".**.query" => "[query]" }), name: "after_the_second_task_deletion");
-    }
+    let rtxn = index_scheduler.env.read_txn().unwrap();
+    let proc = index_scheduler.processing_tasks.read().unwrap();
+    let tasks =
+        index_scheduler.queue.get_task_ids(&rtxn, &Query { ..Default::default() }, &proc).unwrap();
+    let tasks = index_scheduler.queue.tasks.get_existing_tasks(&rtxn, tasks).unwrap();
+    snapshot!(json_string!(tasks, { "[].enqueuedAt" => "[date]", "[].startedAt" => "[date]", "[].finishedAt" => "[date]", ".**.original_filter" => "[filter]", ".**.query" => "[query]" }), name: "after_the_second_task_deletion");
+    drop(rtxn);
+    drop(proc);

    handle.advance_one_failed_batch();
    handle.advance_one_successful_batch();
-    {
-        let rtxn = index_scheduler.env.read_txn().unwrap();
-        let proc = &index_scheduler.runtime_tasks.read().unwrap().processing;
-        let tasks = index_scheduler
-            .queue
-            .get_task_ids(&rtxn, &Query { ..Default::default() }, &proc)
-            .unwrap();
-        let tasks = index_scheduler.queue.tasks.get_existing_tasks(&rtxn, tasks).unwrap();
-        snapshot!(json_string!(tasks, { "[].enqueuedAt" => "[date]", "[].startedAt" => "[date]", "[].finishedAt" => "[date]", ".**.original_filter" => "[filter]", ".**.query" => "[query]" }), name: "everything_has_been_processed");
-    }
+    let rtxn = index_scheduler.env.read_txn().unwrap();
+    let proc = index_scheduler.processing_tasks.read().unwrap();
+    let tasks =
+        index_scheduler.queue.get_task_ids(&rtxn, &Query { ..Default::default() }, &proc).unwrap();
+    let tasks = index_scheduler.queue.tasks.get_existing_tasks(&rtxn, tasks).unwrap();
+    snapshot!(json_string!(tasks, { "[].enqueuedAt" => "[date]", "[].startedAt" => "[date]", "[].finishedAt" => "[date]", ".**.original_filter" => "[filter]", ".**.query" => "[query]" }), name: "everything_has_been_processed");
+    drop(rtxn);
+    drop(proc);
 }

 #[test]
--- a/crates/index-scheduler/src/scheduler/autobatcher.rs
+++ b/crates/index-scheduler/src/scheduler/autobatcher.rs
@@ -74,7 +74,6 @@ impl From<KindWithContent> for AutobatchKind {
            | KindWithContent::DumpCreation { .. }
            | KindWithContent::Export { .. }
            | KindWithContent::UpgradeDatabase { .. }
-            | KindWithContent::NetworkTopologyChange(_)
            | KindWithContent::SnapshotCreation => {
                panic!("The autobatcher should never be called with tasks with special priority or that don't apply to an index.")
            }
--- a/crates/index-scheduler/src/scheduler/create_batch.rs
+++ b/crates/index-scheduler/src/scheduler/create_batch.rs
@@ -4,7 +4,6 @@ use std::io::ErrorKind;
 use meilisearch_types::heed::RoTxn;
 use meilisearch_types::milli::update::IndexDocumentsMethod;
 use meilisearch_types::settings::{Settings, Unchecked};
-use meilisearch_types::tasks::enterprise_edition::network::NetworkTopologyState;
 use meilisearch_types::tasks::{BatchStopReason, Kind, KindWithContent, Status, Task};
 use roaring::RoaringBitmap;
 use uuid::Uuid;
@@ -60,13 +59,6 @@ pub(crate) enum Batch {
        index_uid: String,
        task: Task,
    },
-    NetworkIndexBatch {
-        network_task: Task,
-        inner_batch: Box<Batch>,
-    },
-    NetworkWait {
-        task: Task,
-    },
 }

 #[derive(Debug)]
@@ -148,14 +140,9 @@ impl Batch {
                    ..
                } => RoaringBitmap::from_iter(tasks.iter().chain(other).map(|task| task.uid)),
            },
-            Batch::IndexSwap { task } | Batch::NetworkWait { task } => {
+            Batch::IndexSwap { task } => {
                RoaringBitmap::from_sorted_iter(std::iter::once(task.uid)).unwrap()
            }
-            Batch::NetworkIndexBatch { network_task, inner_batch } => {
-                let mut tasks = inner_batch.ids();
-                tasks.insert(network_task.uid);
-                tasks
-            }
        }
    }

@@ -169,14 +156,12 @@ impl Batch {
            | Dump(_)
            | Export { .. }
            | UpgradeDatabase { .. }
-            | NetworkWait { .. }
            | IndexSwap { .. } => None,
            IndexOperation { op, .. } => Some(op.index_uid()),
            IndexCreation { index_uid, .. }
            | IndexUpdate { index_uid, .. }
            | IndexDeletion { index_uid, .. }
            | IndexCompaction { index_uid, .. } => Some(index_uid),
-            NetworkIndexBatch { network_task: _, inner_batch } => inner_batch.index_uid(),
        }
    }
 }
@@ -199,8 +184,6 @@ impl fmt::Display for Batch {
            Batch::IndexCompaction { .. } => f.write_str("IndexCompaction")?,
            Batch::Export { .. } => f.write_str("Export")?,
            Batch::UpgradeDatabase { .. } => f.write_str("UpgradeDatabase")?,
-            Batch::NetworkIndexBatch { .. } => f.write_str("NetworkTopologyChange")?,
-            Batch::NetworkWait { .. } => f.write_str("NetworkTopologyChange")?,
        };
        match index_uid {
            Some(name) => f.write_fmt(format_args!(" on {name:?} from tasks: {tasks:?}")),
@@ -477,6 +460,7 @@ impl IndexScheduler {
        let mut current_batch = ProcessingBatch::new(batch_id);

        let enqueued = &self.queue.tasks.get_status(rtxn, Status::Enqueued)?;
+        let count_total_enqueued = enqueued.len();
        let failed = &self.queue.tasks.get_status(rtxn, Status::Failed)?;

        // 0. we get the last task to cancel.
@@ -535,15 +519,7 @@ impl IndexScheduler {
            return Ok(Some((Batch::TaskDeletions(tasks), current_batch)));
        }

-        // 3. Check for enqueued network topology changes
-        let network_changes =
-            self.queue.tasks.get_kind(rtxn, Kind::NetworkTopologyChange)? & enqueued;
-        if let Some(task_id) = network_changes.iter().next() {
-            let task = self.queue.tasks.get_task(rtxn, task_id)?.unwrap();
-            return self.start_processing_network(rtxn, task, enqueued, current_batch);
-        }
-
-        // 4. we get the next task to compact
+        // 3. we get the next task to compact
        let to_compact = self.queue.tasks.get_kind(rtxn, Kind::IndexCompaction)? & enqueued;
        if let Some(task_id) = to_compact.min() {
            let mut task =
@@ -558,7 +534,7 @@ impl IndexScheduler {
            return Ok(Some((Batch::IndexCompaction { index_uid, task }, current_batch)));
        }

-        // 5. we batch the export.
+        // 4. we batch the export.
        let to_export = self.queue.tasks.get_kind(rtxn, Kind::Export)? & enqueued;
        if !to_export.is_empty() {
            let task_id = to_export.iter().next().expect("There must be at least one export task");
@@ -569,7 +545,7 @@ impl IndexScheduler {
            return Ok(Some((Batch::Export { task }, current_batch)));
        }

-        // 6. we batch the snapshot.
+        // 5. we batch the snapshot.
        let to_snapshot = self.queue.tasks.get_kind(rtxn, Kind::SnapshotCreation)? & enqueued;
        if !to_snapshot.is_empty() {
            let mut tasks = self.queue.tasks.get_existing_tasks(rtxn, to_snapshot)?;
@@ -579,7 +555,7 @@ impl IndexScheduler {
            return Ok(Some((Batch::SnapshotCreation(tasks), current_batch)));
        }

-        // 7. we batch the dumps.
+        // 6. we batch the dumps.
        let to_dump = self.queue.tasks.get_kind(rtxn, Kind::DumpCreation)? & enqueued;
        if let Some(to_dump) = to_dump.min() {
            let mut task =
@@ -592,25 +568,8 @@ impl IndexScheduler {
            return Ok(Some((Batch::Dump(task), current_batch)));
        }

-        // 8. We make a batch from the unprioritised tasks. Start by taking the next enqueued task.
-        let (batch, current_batch) =
-            self.create_next_batch_unprioritized(rtxn, &enqueued, current_batch)?;
-        Ok(batch.map(|batch| (batch, current_batch)))
-    }
-
-    fn create_next_batch_unprioritized(
-        &self,
-        rtxn: &RoTxn,
-        enqueued: &RoaringBitmap,
-        mut current_batch: ProcessingBatch,
-    ) -> Result<(Option<Batch>, ProcessingBatch)> {
-        let count_total_enqueued = enqueued.len();
-
-        let task_id = if let Some(task_id) = enqueued.min() {
-            task_id
-        } else {
-            return Ok((None, current_batch));
-        };
+        // 7. We make a batch from the unprioritised tasks. Start by taking the next enqueued task.
+        let task_id = if let Some(task_id) = enqueued.min() { task_id } else { return Ok(None) };
        let mut task =
            self.queue.tasks.get_task(rtxn, task_id)?.ok_or(Error::CorruptedTaskQueue)?;

@@ -627,7 +586,7 @@ impl IndexScheduler {
                kind: Kind::IndexSwap,
                id: task.uid,
            });
-            return Ok((Some(Batch::IndexSwap { task }), current_batch));
+            return Ok(Some((Batch::IndexSwap { task }, current_batch)));
        };

        let index_already_exists = self.index_mapper.exists(rtxn, index_name)?;
@@ -692,7 +651,7 @@ impl IndexScheduler {
            autobatcher::autobatch(enqueued, index_already_exists, primary_key.as_deref())
        {
            current_batch.reason(autobatch_stop_reason.unwrap_or(stop_reason));
-            let batch = self
+            return Ok(self
                .create_next_batch_index(
                    rtxn,
                    index_name.to_string(),
@@ -700,127 +659,11 @@ impl IndexScheduler {
                    &mut current_batch,
                    create_index,
                )?
-                .map(|batch| batch);
-            return Ok((batch, current_batch));
+                .map(|batch| (batch, current_batch)));
        }

        // If we found no tasks then we were notified for something that got autobatched
        // somehow and there is nothing to do.
-        Ok((None, current_batch))
-    }
-
-    fn start_processing_network(
-        &self,
-        rtxn: &RoTxn,
-        mut task: Task,
-        enqueued: &RoaringBitmap,
-        current_batch: ProcessingBatch,
-    ) -> Result<Option<(Batch, ProcessingBatch)>> {
-        let change_version =
-            task.network.as_ref().map(|network| network.network_version()).unwrap_or_default();
-        let KindWithContent::NetworkTopologyChange(network_topology_change) = &task.kind else {
-            panic!("inconsistent kind with content")
-        };
-        match network_topology_change.state() {
-            NetworkTopologyState::WaitingForOlderTasks => {
-                let mut old_tasks = RoaringBitmap::new();
-                for task_id in enqueued {
-                    let task = self
-                        .queue
-                        .tasks
-                        .get_task(rtxn, task_id)?
-                        .ok_or(Error::CorruptedTaskQueue)?;
-
-                    let has_index = task.index_uid().is_some();
-
-                    if !has_index {
-                        continue;
-                    }
-
-                    let has_older_network_version = task
-                        .network
-                        .map(|network| network.network_version() <= change_version)
-                        // if there is no version, we never retain the task
-                        .unwrap_or_default();
-
-                    if has_older_network_version {
-                        old_tasks.push(task_id);
-                    }
-                }
-
-                let res = self.create_next_batch_unprioritized(rtxn, &old_tasks, current_batch);
-                self.runtime_tasks.write().unwrap().enqueued_network.swap(old_tasks);
-
-                let (batch, mut current_batch) = res?;
-
-                current_batch.processing(Some(&mut task));
-
-                let batch = match batch {
-                    Some(batch) => {
-                        let inner_batch = Box::new(batch);
-
-                        Batch::NetworkIndexBatch { network_task: task, inner_batch }
-                    }
-                    None => Batch::NetworkWait { task },
-                };
-
-                Ok(Some((batch, current_batch)))
-            }
-            NetworkTopologyState::ImportingDocuments => {
-                let mut import_tasks = RoaringBitmap::new();
-                for task_id in enqueued {
-                    let task = self
-                        .queue
-                        .tasks
-                        .get_task(rtxn, task_id)?
-                        .ok_or(Error::CorruptedTaskQueue)?;
-
-                    let has_index = task.index_uid().is_some();
-
-                    if !has_index {
-                        continue;
-                    }
-
-                    let is_import_task = task
-                        .network
-                        .map(|network| {
-                            network.network_version() == change_version
-                                && network.import_data().is_some()
-                        })
-                        // if there is no version, we never retain the task
-                        .unwrap_or_default();
-
-                    if is_import_task {
-                        import_tasks.push(task_id);
-                    }
-                }
-
-                let res = self.create_next_batch_unprioritized(rtxn, &import_tasks, current_batch);
-                self.runtime_tasks.write().unwrap().enqueued_network.swap(import_tasks);
-
-                let (batch, mut current_batch) = res?;
-
-                current_batch.processing(Some(&mut task));
-
-                let batch = match batch {
-                    Some(batch) => {
-                        let inner_batch = Box::new(batch);
-
-                        Batch::NetworkIndexBatch { network_task: task, inner_batch }
-                    }
-                    None => Batch::NetworkWait { task },
-                };
-
-                Ok(Some((batch, current_batch)))
-            }
-            NetworkTopologyState::ExportingDocuments | NetworkTopologyState::Finished => {
-                Ok(Some((Batch::NetworkWait { task }, current_batch)))
-            }
-        }
+        Ok(None)
    }
 }
-
-pub enum BatchOutcome {
-    NoTaskToProcess,
-    Batch { batch: Batch, processing: ProcessingBatch },
-}
--- a/crates/index-scheduler/src/scheduler/mod.rs
+++ b/crates/index-scheduler/src/scheduler/mod.rs
@@ -200,10 +200,9 @@ impl IndexScheduler {
        // We reset the must_stop flag to be sure that we don't stop processing tasks
        self.scheduler.must_stop_processing.reset();
        let progress = self
-            .runtime_tasks
+            .processing_tasks
            .write()
            .unwrap()
-            .processing
            // We can clone the processing batch here because we don't want its modification to affect the view of the processing batches
            .start_processing(processing_batch.clone(), ids.clone());

@@ -454,7 +453,7 @@ impl IndexScheduler {

        // We should stop processing AFTER everything is processed and written to disk otherwise, a batch (which only lives in RAM) may appear in the processing task
        // and then become « not found » for some time until the commit everything is written and the final commit is made.
-        self.runtime_tasks.write().unwrap().processing.stop_processing();
+        self.processing_tasks.write().unwrap().stop_processing();

        // Once the tasks are committed, we should delete all the update files associated ASAP to avoid leaking files in case of a restart
        tracing::debug!("Deleting the update files");
--- a/crates/index-scheduler/src/scheduler/process_batch.rs
+++ b/crates/index-scheduler/src/scheduler/process_batch.rs
@@ -1,22 +1,15 @@
-use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
+use std::collections::{BTreeSet, HashMap, HashSet};
 use std::fs::{remove_file, File};
 use std::io::{ErrorKind, Seek, SeekFrom};
 use std::panic::{catch_unwind, AssertUnwindSafe};
 use std::sync::atomic::Ordering;
-use std::time::Duration;

-use bumpalo::Bump;
 use byte_unit::Byte;
 use meilisearch_types::batches::{BatchEnqueuedAt, BatchId};
-use meilisearch_types::enterprise_edition::network::Remote;
 use meilisearch_types::heed::{RoTxn, RwTxn};
-use meilisearch_types::milli::documents::PrimaryKey;
 use meilisearch_types::milli::heed::CompactionOption;
-use meilisearch_types::milli::progress::{EmbedderStats, Progress, VariableNameStep};
-use meilisearch_types::milli::update::new::indexer;
-use meilisearch_types::milli::update::new::indexer::enterprise_edition::sharding::Shards;
+use meilisearch_types::milli::progress::{Progress, VariableNameStep};
 use meilisearch_types::milli::{self, ChannelCongestion};
-use meilisearch_types::tasks::enterprise_edition::network::{NetworkTopologyState, Origin};
 use meilisearch_types::tasks::{Details, IndexSwap, Kind, KindWithContent, Status, Task};
 use meilisearch_types::versioning::{VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH};
 use milli::update::Settings as MilliSettings;
@@ -30,7 +23,6 @@ use crate::processing::{
    IndexCompaction, InnerSwappingTwoIndexes, SwappingTheIndexes, TaskCancelationProgress,
    TaskDeletionProgress, UpdateIndexProgress,
 };
-use crate::scheduler::process_export::{ExportContext, ExportOptions, TargetInstance};
 use crate::utils::{
    self, remove_n_tasks_datetime_earlier_than, remove_task_datetime, swap_index_uid_in_task,
    ProcessingBatch,
@@ -547,209 +539,9 @@ impl IndexScheduler {

                Ok((tasks, ProcessBatchInfo::default()))
            }
-            Batch::NetworkIndexBatch { mut network_task, inner_batch } => {
-                let (mut tasks, info) =
-                    self.process_batch(*inner_batch, current_batch, progress)?;
-                let KindWithContent::NetworkTopologyChange(network_topology_change) =
-                    &mut network_task.kind
-                else {
-                    return Err(Error::CorruptedTaskQueue);
-                };
-                for task in &tasks {
-                    let Some(network) = task.network.as_ref() else {
-                        continue;
-                    };
-                    let Some(import) = network.import_data() else {
-                        continue;
-                    };
-                    network_topology_change.process_remote_tasks(
-                        &import.remote_name,
-                        &import.index_name,
-                        import.document_count,
-                    );
-                }
-                tasks.push(network_task);
-                Ok((tasks, info))
-            }
-            Batch::NetworkWait { mut task } => {
-                let KindWithContent::NetworkTopologyChange(network_topology_change) =
-                    &mut task.kind
-                else {
-                    tracing::error!("network topology change task has the wrong kind with content");
-                    return Err(Error::CorruptedTaskQueue);
-                };
-
-                let Some(task_network) = &task.network else {
-                    tracing::error!("network topology change task has no network");
-                    return Err(Error::CorruptedTaskQueue);
-                };
-
-                let origin;
-                let origin = match task_network.origin() {
-                    Some(origin) => origin,
-                    None => {
-                        let myself =
-                            network_topology_change.in_name().expect("origin is not the leader");
-                        origin = Origin {
-                            remote_name: myself.to_string(),
-                            task_uid: task.uid,
-                            network_version: task_network.network_version(),
-                        };
-                        &origin
-                    }
-                };
-
-                if let Some((remotes, out_name)) = network_topology_change.export_to_process() {
-                    self.balance_documents(
-                        remotes,
-                        out_name,
-                        network_topology_change.in_name(),
-                        origin,
-                        &progress,
-                        &self.scheduler.must_stop_processing,
-                    )?;
-                }
-                network_topology_change.update_state();
-                if network_topology_change.state() == NetworkTopologyState::Finished {
-                    task.status = Status::Succeeded;
-                }
-                Ok((vec![task], Default::default()))
-            }
        }
    }

-    fn balance_documents(
-        &self,
-        remotes: &BTreeMap<String, Remote>,
-        out_name: &str,
-        in_name: Option<&str>,
-        network_change_origin: &Origin,
-        progress: &Progress,
-        must_stop_processing: &crate::scheduler::MustStopProcessing,
-    ) -> crate::Result<()> {
-        let new_shards = Shards::from_remotes_local(remotes.keys().map(String::as_str), in_name);
-
-        // TECHDEBT: this spawns a `ureq` agent additionally to `reqwest`. We probably want to harmonize all of this.
-        let agent = ureq::AgentBuilder::new().timeout(Duration::from_secs(5)).build();
-
-        let mut indexer_alloc = Bump::new();
-
-        let scheduler_rtxn = self.env.read_txn()?;
-
-        let index_count = self.index_mapper.index_count(&scheduler_rtxn)?;
-
-        // process by batches of 20MiB. Allow for compression? Don't forget about embeddings
-        let _: Vec<()> = self.index_mapper.try_for_each_index(
-            &scheduler_rtxn,
-            |index_uid, index| -> crate::Result<()> {
-                indexer_alloc.reset();
-                let err = |err| Error::from_milli(err, Some(index_uid.to_string()));
-                let index_rtxn = index.read_txn()?;
-                let all_docids = index.external_documents_ids();
-                let mut documents_to_move_to: HashMap<String, RoaringBitmap> = HashMap::new();
-                let mut documents_to_delete = RoaringBitmap::new();
-
-                for res in all_docids.iter(&index_rtxn)? {
-                    let (external_docid, docid) = res?;
-                    match new_shards.processing_shard(external_docid) {
-                        Some(shard) if shard.is_own => continue,
-                        Some(shard) => {
-                            documents_to_move_to
-                                .entry(shard.name.clone())
-                                .or_default()
-                                .insert(docid);
-                        }
-                        None => {
-                            documents_to_delete.insert(docid);
-                        }
-                    }
-                }
-
-                let fields_ids_map = index.fields_ids_map(&index_rtxn)?;
-
-                for (remote, documents_to_move) in documents_to_move_to {
-                    /// TODO: justify the unwrap
-                    let remote = remotes.get(&remote).unwrap();
-
-                    let target = TargetInstance {
-                        base_url: &remote.url,
-                        api_key: remote.write_api_key.as_deref(),
-                    };
-                    let options = ExportOptions {
-                        index_uid,
-                        payload_size: None,
-                        override_settings: false,
-                        export_mode: super::process_export::ExportMode::NetworkBalancing {
-                            index_count,
-                            export_old_remote_name: out_name,
-                            network_change_origin,
-                        },
-                    };
-                    let ctx = ExportContext {
-                        index,
-                        index_rtxn: &index_rtxn,
-                        universe: &documents_to_move,
-                        progress,
-                        agent: &agent,
-                        must_stop_processing,
-                    };
-
-                    self.export_one_index(target, options, ctx)?;
-
-                    documents_to_delete |= documents_to_move;
-                }
-
-                if documents_to_delete.is_empty() {
-                    return Ok(());
-                }
-
-                let mut new_fields_ids_map = fields_ids_map.clone();
-
-                // candidates not empty => index not empty => a primary key is set
-                let primary_key = index.primary_key(&index_rtxn)?.unwrap();
-
-                let primary_key = PrimaryKey::new_or_insert(primary_key, &mut new_fields_ids_map)
-                    .map_err(milli::Error::from)
-                    .map_err(err)?;
-
-                let mut index_wtxn = index.write_txn()?;
-
-                let mut indexer = indexer::DocumentDeletion::new();
-                indexer.delete_documents_by_docids(documents_to_delete);
-                let document_changes = indexer.into_changes(&indexer_alloc, primary_key);
-                let embedders = index
-                    .embedding_configs()
-                    .embedding_configs(&index_wtxn)
-                    .map_err(milli::Error::from)
-                    .map_err(err)?;
-                let embedders = self.embedders(index_uid.to_string(), embedders)?;
-                let indexer_config = self.index_mapper.indexer_config();
-                let pool = &indexer_config.thread_pool;
-
-                indexer::index(
-                    &mut index_wtxn,
-                    index,
-                    pool,
-                    indexer_config.grenad_parameters(),
-                    &fields_ids_map,
-                    new_fields_ids_map,
-                    None, // document deletion never changes primary key
-                    &document_changes,
-                    embedders,
-                    &|| must_stop_processing.get(),
-                    &progress,
-                    &EmbedderStats::default(),
-                )
-                .map_err(err)?;
-
-                index_wtxn.commit()?;
-
-                Ok(())
-            },
-        )?;
-        Ok(())
-    }
-
    fn apply_compaction(
        &self,
        rtxn: &RoTxn,
@@ -919,7 +711,7 @@ impl IndexScheduler {

        // 1. Remove from this list the tasks that we are not allowed to delete
        let enqueued_tasks = self.queue.tasks.get_status(wtxn, Status::Enqueued)?;
-        let processing_tasks = &self.runtime_tasks.read().unwrap().processing.processing.clone();
+        let processing_tasks = &self.processing_tasks.read().unwrap().processing.clone();

        let all_task_ids = self.queue.tasks.all_task_ids(wtxn)?;
        let mut to_delete_tasks = all_task_ids & matched_tasks;
--- a/crates/index-scheduler/src/scheduler/process_export.rs
+++ b/crates/index-scheduler/src/scheduler/process_export.rs
@@ -7,7 +7,6 @@ use backoff::ExponentialBackoff;
 use byte_unit::Byte;
 use flate2::write::GzEncoder;
 use flate2::Compression;
-use meilisearch_types::error::Code;
 use meilisearch_types::index_uid_pattern::IndexUidPattern;
 use meilisearch_types::milli::constants::RESERVED_VECTORS_FIELD_NAME;
 use meilisearch_types::milli::index::EmbeddingsWithMetadata;
@@ -16,11 +15,7 @@ use meilisearch_types::milli::update::{request_threads, Setting};
 use meilisearch_types::milli::vector::parsed_vectors::{ExplicitVectors, VectorOrArrayOfVectors};
 use meilisearch_types::milli::{self, obkv_to_json, Filter, InternalError};
 use meilisearch_types::settings::{self, SecretPolicy};
-use meilisearch_types::tasks::enterprise_edition::network::{
-    headers, ImportData, ImportMetadata, Origin,
-};
 use meilisearch_types::tasks::{DetailsExportIndexSettings, ExportIndexSettings};
-use roaring::RoaringBitmap;
 use serde::Deserialize;
 use ureq::{json, Response};

@@ -55,7 +50,6 @@ impl IndexScheduler {
        let agent = ureq::AgentBuilder::new().timeout(Duration::from_secs(5)).build();
        let must_stop_processing = self.scheduler.must_stop_processing.clone();
        for (i, (_pattern, uid, export_settings)) in indexes.iter().enumerate() {
-            let err = |err| Error::from_milli(err, Some(uid.to_string()));
            if must_stop_processing.get() {
                return Err(Error::AbortedTask);
            }
@@ -67,31 +61,104 @@ impl IndexScheduler {
            ));

            let ExportIndexSettings { filter, override_settings } = export_settings;
-
            let index = self.index(uid)?;
            let index_rtxn = index.read_txn()?;
-            let filter = filter.as_ref().map(Filter::from_json).transpose().map_err(err)?.flatten();
-            let filter_universe =
-                filter.map(|f| f.evaluate(&index_rtxn, &index)).transpose().map_err(err)?;
-            let whole_universe =
-                index.documents_ids(&index_rtxn).map_err(milli::Error::from).map_err(err)?;
+            let bearer = api_key.map(|api_key| format!("Bearer {api_key}"));
+
+            // First, check if the index already exists
+            let url = format!("{base_url}/indexes/{uid}");
+            let response = retry(&must_stop_processing, || {
+                let mut request = agent.get(&url);
+                if let Some(bearer) = &bearer {
+                    request = request.set("Authorization", bearer);
+                }
+
+                request.send_bytes(Default::default()).map_err(into_backoff_error)
+            });
+            let index_exists = match response {
+                Ok(response) => response.status() == 200,
+                Err(Error::FromRemoteWhenExporting { code, .. }) if code == "index_not_found" => {
+                    false
+                }
+                Err(e) => return Err(e),
+            };
+
+            let primary_key = index
+                .primary_key(&index_rtxn)
+                .map_err(|e| Error::from_milli(e.into(), Some(uid.to_string())))?;
+
+            // Create the index
+            if !index_exists {
+                let url = format!("{base_url}/indexes");
+                retry(&must_stop_processing, || {
+                    let mut request = agent.post(&url);
+                    if let Some(bearer) = &bearer {
+                        request = request.set("Authorization", bearer);
+                    }
+                    let index_param = json!({ "uid": uid, "primaryKey": primary_key });
+                    request.send_json(&index_param).map_err(into_backoff_error)
+                })?;
+            }
+
+            // Patch the index primary key
+            if index_exists && *override_settings {
+                let url = format!("{base_url}/indexes/{uid}");
+                retry(&must_stop_processing, || {
+                    let mut request = agent.patch(&url);
+                    if let Some(bearer) = &bearer {
+                        request = request.set("Authorization", bearer);
+                    }
+                    let index_param = json!({ "primaryKey": primary_key });
+                    request.send_json(&index_param).map_err(into_backoff_error)
+                })?;
+            }
+
+            // Send the index settings
+            if !index_exists || *override_settings {
+                let mut settings =
+                    settings::settings(&index, &index_rtxn, SecretPolicy::RevealSecrets)
+                        .map_err(|e| Error::from_milli(e, Some(uid.to_string())))?;
+                // Remove the experimental chat setting if not enabled
+                if self.features().check_chat_completions("exporting chat settings").is_err() {
+                    settings.chat = Setting::NotSet;
+                }
+                // Retry logic for sending settings
+                let url = format!("{base_url}/indexes/{uid}/settings");
+                retry(&must_stop_processing, || {
+                    let mut request = agent.patch(&url);
+                    if let Some(bearer) = bearer.as_ref() {
+                        request = request.set("Authorization", bearer);
+                    }
+                    request.send_json(settings.clone()).map_err(into_backoff_error)
+                })?;
+            }
+
+            let filter = filter
+                .as_ref()
+                .map(Filter::from_json)
+                .transpose()
+                .map_err(|e| Error::from_milli(e, Some(uid.to_string())))?
+                .flatten();
+
+            let filter_universe = filter
+                .map(|f| f.evaluate(&index_rtxn, &index))
+                .transpose()
+                .map_err(|e| Error::from_milli(e, Some(uid.to_string())))?;
+            let whole_universe = index
+                .documents_ids(&index_rtxn)
+                .map_err(|e| Error::from_milli(e.into(), Some(uid.to_string())))?;
            let universe = filter_universe.unwrap_or(whole_universe);
-            let target = TargetInstance { base_url, api_key };
-            let ctx = ExportContext {
-                index: &index,
-                index_rtxn: &index_rtxn,
-                universe: &universe,
-                progress: &progress,
-                agent: &agent,
-                must_stop_processing: &must_stop_processing,
-            };
-            let options = ExportOptions {
-                index_uid: uid,
-                payload_size,
-                override_settings: *override_settings,
-                export_mode: ExportMode::ExportRoute,
-            };
-            let total_documents = self.export_one_index(target, options, ctx)?;
+
+            let fields_ids_map = index.fields_ids_map(&index_rtxn)?;
+            let all_fields: Vec<_> = fields_ids_map.iter().map(|(id, _)| id).collect();
+
+            // We don't need to keep this one alive as we will
+            // spawn many threads to process the documents
+            drop(index_rtxn);
+
+            let total_documents = universe.len() as u32;
+            let (step, progress_step) = AtomicDocumentStep::new(total_documents);
+            progress.update_progress(progress_step);

            output.insert(
                IndexUidPattern::new_unchecked(uid.clone()),
@@ -100,307 +167,155 @@ impl IndexScheduler {
                    matched_documents: Some(total_documents as u64),
                },
            );
+
+            let limit = payload_size.map(|ps| ps.as_u64() as usize).unwrap_or(20 * 1024 * 1024); // defaults to 20 MiB
+            let documents_url = format!("{base_url}/indexes/{uid}/documents");
+
+            let results = request_threads()
+                .broadcast(|ctx| {
+                    let index_rtxn = index
+                        .read_txn()
+                        .map_err(|e| Error::from_milli(e.into(), Some(uid.to_string())))?;
+
+                    let mut buffer = Vec::new();
+                    let mut tmp_buffer = Vec::new();
+                    let mut compressed_buffer = Vec::new();
+                    for (i, docid) in universe.iter().enumerate() {
+                        if i % ctx.num_threads() != ctx.index() {
+                            continue;
+                        }
+
+                        let document = index
+                            .document(&index_rtxn, docid)
+                            .map_err(|e| Error::from_milli(e, Some(uid.to_string())))?;
+
+                        let mut document = obkv_to_json(&all_fields, &fields_ids_map, document)
+                            .map_err(|e| Error::from_milli(e, Some(uid.to_string())))?;
+
+                        // TODO definitely factorize this code
+                        'inject_vectors: {
+                            let embeddings = index
+                                .embeddings(&index_rtxn, docid)
+                                .map_err(|e| Error::from_milli(e, Some(uid.to_string())))?;
+
+                            if embeddings.is_empty() {
+                                break 'inject_vectors;
+                            }
+
+                            let vectors = document
+                                .entry(RESERVED_VECTORS_FIELD_NAME)
+                                .or_insert(serde_json::Value::Object(Default::default()));
+
+                            let serde_json::Value::Object(vectors) = vectors else {
+                                return Err(Error::from_milli(
+                                    milli::Error::UserError(
+                                        milli::UserError::InvalidVectorsMapType {
+                                            document_id: {
+                                                if let Ok(Some(Ok(index))) = index
+                                                    .external_id_of(
+                                                        &index_rtxn,
+                                                        std::iter::once(docid),
+                                                    )
+                                                    .map(|it| it.into_iter().next())
+                                                {
+                                                    index
+                                                } else {
+                                                    format!("internal docid={docid}")
+                                                }
+                                            },
+                                            value: vectors.clone(),
+                                        },
+                                    ),
+                                    Some(uid.to_string()),
+                                ));
+                            };
+
+                            for (
+                                embedder_name,
+                                EmbeddingsWithMetadata { embeddings, regenerate, has_fragments },
+                            ) in embeddings
+                            {
+                                let embeddings = ExplicitVectors {
+                                    embeddings: Some(
+                                        VectorOrArrayOfVectors::from_array_of_vectors(embeddings),
+                                    ),
+                                    regenerate: regenerate &&
+                                    // Meilisearch does not handle well dumps with fragments, because as the fragments
+                                    // are marked as user-provided,
+                                    // all embeddings would be regenerated on any settings change or document update.
+                                    // To prevent this, we mark embeddings has non regenerate in this case.
+                                    !has_fragments,
+                                };
+                                vectors.insert(
+                                    embedder_name,
+                                    serde_json::to_value(embeddings).unwrap(),
+                                );
+                            }
+                        }
+
+                        tmp_buffer.clear();
+                        serde_json::to_writer(&mut tmp_buffer, &document)
+                            .map_err(milli::InternalError::from)
+                            .map_err(|e| Error::from_milli(e.into(), Some(uid.to_string())))?;
+
+                        // Make sure we put at least one document in the buffer even
+                        // though we might go above the buffer limit before sending
+                        if !buffer.is_empty() && buffer.len() + tmp_buffer.len() > limit {
+                            // We compress the documents before sending them
+                            let mut encoder =
+                                GzEncoder::new(&mut compressed_buffer, Compression::default());
+                            encoder
+                                .write_all(&buffer)
+                                .map_err(|e| Error::from_milli(e.into(), Some(uid.clone())))?;
+                            encoder
+                                .finish()
+                                .map_err(|e| Error::from_milli(e.into(), Some(uid.clone())))?;
+
+                            retry(&must_stop_processing, || {
+                                let mut request = agent.post(&documents_url);
+                                request = request.set("Content-Type", "application/x-ndjson");
+                                request = request.set("Content-Encoding", "gzip");
+                                if let Some(bearer) = &bearer {
+                                    request = request.set("Authorization", bearer);
+                                }
+                                request.send_bytes(&compressed_buffer).map_err(into_backoff_error)
+                            })?;
+                            buffer.clear();
+                            compressed_buffer.clear();
+                        }
+                        buffer.extend_from_slice(&tmp_buffer);
+
+                        if i > 0 && i % 100 == 0 {
+                            step.fetch_add(100, atomic::Ordering::Relaxed);
+                        }
+                    }
+
+                    retry(&must_stop_processing, || {
+                        let mut request = agent.post(&documents_url);
+                        request = request.set("Content-Type", "application/x-ndjson");
+                        if let Some(bearer) = &bearer {
+                            request = request.set("Authorization", bearer);
+                        }
+                        request.send_bytes(&buffer).map_err(into_backoff_error)
+                    })?;
+
+                    Ok(())
+                })
+                .map_err(|e| {
+                    Error::from_milli(
+                        milli::Error::InternalError(InternalError::PanicInThreadPool(e)),
+                        Some(uid.to_string()),
+                    )
+                })?;
+            for result in results {
+                result?;
+            }
+
+            step.store(total_documents, atomic::Ordering::Relaxed);
        }

        Ok(output)
    }
-
-    pub(super) fn export_one_index(
-        &self,
-        target: TargetInstance<'_>,
-        options: ExportOptions<'_>,
-        ctx: ExportContext<'_>,
-    ) -> Result<u64, Error> {
-        let err = |err| Error::from_milli(err, Some(options.index_uid.to_string()));
-
-        let bearer = target.api_key.map(|api_key| format!("Bearer {api_key}"));
-        let url = format!(
-            "{base_url}/indexes/{index_uid}",
-            base_url = target.base_url,
-            index_uid = options.index_uid
-        );
-        let response = retry(ctx.must_stop_processing, || {
-            let mut request = ctx.agent.get(&url);
-            if let Some(bearer) = &bearer {
-                request = request.set("Authorization", bearer);
-            }
-
-            request.send_bytes(Default::default()).map_err(into_backoff_error)
-        });
-        let index_exists = match response {
-            Ok(response) => response.status() == 200,
-            Err(Error::FromRemoteWhenExporting { code, .. })
-                if code == Code::IndexNotFound.name() =>
-            {
-                false
-            }
-            Err(e) => return Err(e),
-        };
-        let primary_key =
-            ctx.index.primary_key(&ctx.index_rtxn).map_err(milli::Error::from).map_err(err)?;
-        if !index_exists {
-            let url = format!("{base_url}/indexes", base_url = target.base_url);
-            retry(ctx.must_stop_processing, || {
-                let mut request = ctx.agent.post(&url);
-                if let Some(bearer) = &bearer {
-                    request = request.set("Authorization", bearer);
-                }
-                let index_param = json!({ "uid": options.index_uid, "primaryKey": primary_key });
-                request.send_json(&index_param).map_err(into_backoff_error)
-            })?;
-        }
-        if index_exists && options.override_settings {
-            retry(ctx.must_stop_processing, || {
-                let mut request = ctx.agent.patch(&url);
-                if let Some(bearer) = &bearer {
-                    request = request.set("Authorization", bearer);
-                }
-                let index_param = json!({ "primaryKey": primary_key });
-                request.send_json(&index_param).map_err(into_backoff_error)
-            })?;
-        }
-        if !index_exists || options.override_settings {
-            let mut settings =
-                settings::settings(&ctx.index, &ctx.index_rtxn, SecretPolicy::RevealSecrets)
-                    .map_err(err)?;
-            // Remove the experimental chat setting if not enabled
-            if self.features().check_chat_completions("exporting chat settings").is_err() {
-                settings.chat = Setting::NotSet;
-            }
-            // Retry logic for sending settings
-            let url = format!(
-                "{base_url}/indexes/{index_uid}/settings",
-                base_url = target.base_url,
-                index_uid = options.index_uid
-            );
-            retry(ctx.must_stop_processing, || {
-                let mut request = ctx.agent.patch(&url);
-                if let Some(bearer) = bearer.as_ref() {
-                    request = request.set("Authorization", bearer);
-                }
-                request.send_json(settings.clone()).map_err(into_backoff_error)
-            })?;
-        }
-
-        let fields_ids_map = ctx.index.fields_ids_map(&ctx.index_rtxn)?;
-        let all_fields: Vec<_> = fields_ids_map.iter().map(|(id, _)| id).collect();
-        let total_documents = ctx.universe.len() as u32;
-        let (step, progress_step) = AtomicDocumentStep::new(total_documents);
-        ctx.progress.update_progress(progress_step);
-
-        let limit = options.payload_size.map(|ps| ps.as_u64() as usize).unwrap_or(20 * 1024 * 1024);
-        let documents_url = format!(
-            "{base_url}/indexes/{index_uid}/documents",
-            base_url = target.base_url,
-            index_uid = options.index_uid
-        );
-        let results = request_threads()
-            .broadcast(|broadcast| {
-                let mut task_network = if let ExportMode::NetworkBalancing {
-                    index_count,
-                    export_old_remote_name,
-                    network_change_origin,
-                } = options.export_mode
-                {
-                    Some((
-                        ImportData {
-                            remote_name: export_old_remote_name.to_string(),
-                            index_name: options.index_uid.to_string(),
-                            document_count: 0,
-                        },
-                        network_change_origin.clone(),
-                        ImportMetadata {
-                            index_count,
-                            task_key: 0,
-                            total_index_documents: ctx.universe.len(),
-                        },
-                    ))
-                } else {
-                    None
-                };
-
-                let index_rtxn = ctx.index.read_txn().map_err(milli::Error::from).map_err(err)?;
-
-                let mut buffer = Vec::new();
-                let mut tmp_buffer = Vec::new();
-                let mut compressed_buffer = Vec::new();
-                for (i, docid) in ctx.universe.iter().enumerate() {
-                    if i % broadcast.num_threads() != broadcast.index() {
-                        continue;
-                    }
-                    if let Some((import_data, _, metadata)) = &mut task_network {
-                        import_data.document_count += 1;
-                        metadata.task_key = docid;
-                    }
-
-                    let document = ctx.index.document(&index_rtxn, docid).map_err(err)?;
-
-                    let mut document =
-                        obkv_to_json(&all_fields, &fields_ids_map, document).map_err(err)?;
-
-                    // TODO definitely factorize this code
-                    'inject_vectors: {
-                        let embeddings = ctx.index.embeddings(&index_rtxn, docid).map_err(err)?;
-
-                        if embeddings.is_empty() {
-                            break 'inject_vectors;
-                        }
-
-                        let vectors = document
-                            .entry(RESERVED_VECTORS_FIELD_NAME)
-                            .or_insert(serde_json::Value::Object(Default::default()));
-
-                        let serde_json::Value::Object(vectors) = vectors else {
-                            return Err(err(milli::Error::UserError(
-                                milli::UserError::InvalidVectorsMapType {
-                                    document_id: {
-                                        if let Ok(Some(Ok(index))) = ctx
-                                            .index
-                                            .external_id_of(&index_rtxn, std::iter::once(docid))
-                                            .map(|it| it.into_iter().next())
-                                        {
-                                            index
-                                        } else {
-                                            format!("internal docid={docid}")
-                                        }
-                                    },
-                                    value: vectors.clone(),
-                                },
-                            )));
-                        };
-
-                        for (
-                            embedder_name,
-                            EmbeddingsWithMetadata { embeddings, regenerate, has_fragments },
-                        ) in embeddings
-                        {
-                            let embeddings = ExplicitVectors {
-                                embeddings: Some(VectorOrArrayOfVectors::from_array_of_vectors(
-                                    embeddings,
-                                )),
-                                regenerate: regenerate &&
-                                // Meilisearch does not handle well dumps with fragments, because as the fragments
-                                // are marked as user-provided,
-                                // all embeddings would be regenerated on any settings change or document update.
-                                // To prevent this, we mark embeddings has non regenerate in this case.
-                                !has_fragments,
-                            };
-                            vectors
-                                .insert(embedder_name, serde_json::to_value(embeddings).unwrap());
-                        }
-                    }
-
-                    tmp_buffer.clear();
-                    serde_json::to_writer(&mut tmp_buffer, &document)
-                        .map_err(milli::InternalError::from)
-                        .map_err(milli::Error::from)
-                        .map_err(err)?;
-
-                    // Make sure we put at least one document in the buffer even
-                    // though we might go above the buffer limit before sending
-                    if !buffer.is_empty() && buffer.len() + tmp_buffer.len() > limit {
-                        // We compress the documents before sending them
-                        let mut encoder =
-                            GzEncoder::new(&mut compressed_buffer, Compression::default());
-                        encoder.write_all(&buffer).map_err(milli::Error::from).map_err(err)?;
-                        encoder.finish().map_err(milli::Error::from).map_err(err)?;
-
-                        match retry(ctx.must_stop_processing, || {
-                            let mut request = ctx.agent.post(&documents_url);
-                            request = request.set("Content-Type", "application/x-ndjson");
-                            request = request.set("Content-Encoding", "gzip");
-                            if let Some(bearer) = &bearer {
-                                request = request.set("Authorization", bearer);
-                            }
-                            if let Some((import_data, origin, metadata)) = &task_network {
-                                request = set_network_ureq_headers(
-                                    request,
-                                    import_data,
-                                    origin,
-                                    metadata,
-                                );
-                            }
-                            request.send_bytes(&compressed_buffer).map_err(into_backoff_error)
-                        }) {
-                            Ok(_response) => {}
-                            Err(Error::FromRemoteWhenExporting { code, .. })
-                                if code == Code::ImportTaskAlreadyReceived.name() =>
-                            {
-                                continue;
-                            }
-                            Err(Error::FromRemoteWhenExporting { code, message, .. })
-                                if code == Code::ImportTaskUnknownRemote.name() =>
-                            {
-                                tracing::warn!("remote answered with: {message}");
-                                break;
-                            }
-                            Err(Error::FromRemoteWhenExporting { code, message, .. })
-                                if code == Code::ImportTaskWithoutNetworkTask.name() =>
-                            {
-                                tracing::warn!("remote answered with: {message}");
-                                break;
-                            }
-                            Err(e) => return Err(e),
-                        }
-                        buffer.clear();
-                        compressed_buffer.clear();
-                        if let Some((import_data, _, metadata)) = &mut task_network {
-                            import_data.document_count = 0;
-                            metadata.task_key = 0;
-                        }
-                    }
-                    buffer.extend_from_slice(&tmp_buffer);
-
-                    if i > 0 && i % 100 == 0 {
-                        step.fetch_add(100, atomic::Ordering::Relaxed);
-                    }
-                }
-
-                retry(ctx.must_stop_processing, || {
-                    let mut request = ctx.agent.post(&documents_url);
-                    request = request.set("Content-Type", "application/x-ndjson");
-                    if let Some((import_data, origin, metadata)) = &task_network {
-                        request = set_network_ureq_headers(request, import_data, origin, metadata);
-                    }
-                    if let Some(bearer) = &bearer {
-                        request = request.set("Authorization", bearer);
-                    }
-                    request.send_bytes(&buffer).map_err(into_backoff_error)
-                })?;
-
-                Ok(())
-            })
-            .map_err(|e| err(milli::Error::InternalError(InternalError::PanicInThreadPool(e))))?;
-        for result in results {
-            result?;
-        }
-        step.store(total_documents, atomic::Ordering::Relaxed);
-        Ok(total_documents as u64)
-    }
-}
-
-fn set_network_ureq_headers(
-    request: ureq::Request,
-    import_data: &ImportData,
-    origin: &Origin,
-    metadata: &ImportMetadata,
-) -> ureq::Request {
-    request
-        .set(headers::PROXY_ORIGIN_REMOTE_HEADER, &origin.remote_name)
-        .set(headers::PROXY_ORIGIN_TASK_UID_HEADER, &origin.task_uid.to_string())
-        .set(
-            headers::PROXY_ORIGIN_NETWORK_VERSION_HEADER,
-            &origin.network_version.to_u128_le().to_string(),
-        )
-        .set(headers::PROXY_IMPORT_REMOTE_HEADER, &import_data.remote_name)
-        .set(headers::PROXY_IMPORT_INDEX_HEADER, &import_data.index_name)
-        .set(headers::PROXY_IMPORT_TASK_KEY_HEADER, &metadata.task_key.to_string())
-        .set(headers::PROXY_IMPORT_DOCS_HEADER, &import_data.document_count.to_string())
-        .set(headers::PROXY_IMPORT_INDEX_COUNT_HEADER, &metadata.index_count.to_string())
-        .set(
-            headers::PROXY_IMPORT_TOTAL_INDEX_DOCS_HEADER,
-            &metadata.total_index_documents.to_string(),
-        )
 }

 fn retry<F>(must_stop_processing: &MustStopProcessing, send_request: F) -> Result<ureq::Response>
@@ -459,37 +374,4 @@ fn ureq_error_into_error(error: ureq::Error) -> Error {
    }
 }

-// export_one_index arguments
-pub(super) struct TargetInstance<'a> {
-    pub(super) base_url: &'a str,
-    pub(super) api_key: Option<&'a str>,
-}
-
-pub(super) struct ExportOptions<'a> {
-    pub(super) index_uid: &'a str,
-    pub(super) payload_size: Option<&'a Byte>,
-    pub(super) override_settings: bool,
-    pub(super) export_mode: ExportMode<'a>,
-}
-
-pub(super) struct ExportContext<'a> {
-    pub(super) index: &'a meilisearch_types::milli::Index,
-    pub(super) index_rtxn: &'a milli::heed::RoTxn<'a>,
-    pub(super) universe: &'a RoaringBitmap,
-    pub(super) progress: &'a Progress,
-    pub(super) agent: &'a ureq::Agent,
-    pub(super) must_stop_processing: &'a MustStopProcessing,
-}
-
-pub(super) enum ExportMode<'a> {
-    ExportRoute,
-    NetworkBalancing {
-        index_count: u64,
-
-        export_old_remote_name: &'a str,
-        network_change_origin: &'a Origin,
-    },
-}
-
-// progress related
 enum ExportIndex {}
--- a/crates/index-scheduler/src/scheduler/process_snapshot_creation.rs
+++ b/crates/index-scheduler/src/scheduler/process_snapshot_creation.rs
@@ -438,13 +438,14 @@ async fn multipart_stream_to_s3(
    db_name: String,
    reader: std::io::PipeReader,
 ) -> Result<(), Error> {
-    use std::{collections::VecDeque, os::fd::OwnedFd, path::PathBuf};
+    use std::io;
+    use std::{os::fd::OwnedFd, path::PathBuf};

-    use bytes::{Bytes, BytesMut};
-    use reqwest::{Client, Response};
+    use bytes::BytesMut;
+    use futures::stream::{FuturesUnordered, StreamExt};
+    use reqwest::Client;
    use rusty_s3::S3Action as _;
    use rusty_s3::{actions::CreateMultipartUpload, Bucket, BucketError, Credentials, UrlStyle};
-    use tokio::task::JoinHandle;

    let reader = OwnedFd::from(reader);
    let reader = tokio::net::unix::pipe::Receiver::from_owned_fd(reader)?;
@@ -482,9 +483,7 @@ async fn multipart_stream_to_s3(
    // We use this bumpalo for etags strings.
    let bump = bumpalo::Bump::new();
    let mut etags = Vec::<&str>::new();
-    let mut in_flight = VecDeque::<(JoinHandle<reqwest::Result<Response>>, Bytes)>::with_capacity(
-        s3_max_in_flight_parts.get(),
-    );
+    let mut in_flight = FuturesUnordered::new();

    // Part numbers start at 1 and cannot be larger than 10k
    for part_number in 1u16.. {
@@ -498,8 +497,21 @@ async fn multipart_stream_to_s3(

        // Wait for a buffer to be ready if there are in-flight parts that landed
        let mut buffer = if in_flight.len() >= s3_max_in_flight_parts.get() {
-            let (handle, buffer) = in_flight.pop_front().expect("At least one in flight request");
-            let resp = join_and_map_error(handle).await?;
+            let (join_result, buffer): (
+                Result<reqwest::Result<reqwest::Response>, tokio::task::JoinError>,
+                bytes::Bytes,
+            ) = in_flight.next().await.expect("At least one in flight request");
+            // safety: Panic happens if the task (JoinHandle) was aborted, cancelled, or panicked
+            let resp = join_result.unwrap().map_err(Error::S3HttpError)?;
+            let resp = match resp.error_for_status_ref() {
+                Ok(_) => resp,
+                Err(_) => {
+                    return Err(Error::S3Error {
+                        status: resp.status(),
+                        body: resp.text().await.unwrap_or_default(),
+                    })
+                }
+            };
            extract_and_append_etag(&bump, &mut etags, resp.headers())?;

            let mut buffer = match buffer.try_into_mut() {
@@ -516,8 +528,6 @@ async fn multipart_stream_to_s3(
        // we can continue and send the buffer/part
        while buffer.len() < (s3_multipart_part_size as usize / 2) {
            // Wait for the pipe to be readable
-
-            use std::io;
            reader.readable().await?;

            match reader.try_read_buf(&mut buffer) {
@@ -556,11 +566,24 @@ async fn multipart_stream_to_s3(
                }
            })
        });
-        in_flight.push_back((task, body));
+
+        // Wrap the task to return both the result and the buffer
+        let task_with_buffer = async move { (task.await, body) };
+        in_flight.push(task_with_buffer);
    }

-    for (handle, _buffer) in in_flight {
-        let resp = join_and_map_error(handle).await?;
+    while let Some((join_result, _buffer)) = in_flight.next().await {
+        // safety: Panic happens if the task (JoinHandle) was aborted, cancelled, or panicked
+        let resp = join_result.unwrap().map_err(Error::S3HttpError)?;
+        let resp = match resp.error_for_status_ref() {
+            Ok(_) => resp,
+            Err(_) => {
+                return Err(Error::S3Error {
+                    status: resp.status(),
+                    body: resp.text().await.unwrap_or_default(),
+                })
+            }
+        };
        extract_and_append_etag(&bump, &mut etags, resp.headers())?;
    }

@@ -580,16 +603,19 @@ async fn multipart_stream_to_s3(
        let body = body.clone();
        async move {
            match client.post(url).body(body).send().await {
-                Ok(resp) if resp.status().is_client_error() => {
-                    resp.error_for_status().map_err(backoff::Error::Permanent)
-                }
+                Ok(resp) if resp.status().is_client_error() => match resp.error_for_status_ref() {
+                    Ok(_) => Ok(resp),
+                    Err(_) => Err(backoff::Error::Permanent(Error::S3Error {
+                        status: resp.status(),
+                        body: resp.text().await.unwrap_or_default(),
+                    })),
+                },
                Ok(resp) => Ok(resp),
-                Err(e) => Err(backoff::Error::transient(e)),
+                Err(e) => Err(backoff::Error::transient(Error::S3HttpError(e))),
            }
        }
    })
-    .await
-    .map_err(Error::S3HttpError)?;
+    .await?;

    let status = resp.status();
    let body = resp.text().await.map_err(|e| Error::S3Error { status, body: e.to_string() })?;
@@ -600,22 +626,6 @@ async fn multipart_stream_to_s3(
    }
 }

-#[cfg(unix)]
-async fn join_and_map_error(
-    join_handle: tokio::task::JoinHandle<Result<reqwest::Response, reqwest::Error>>,
-) -> Result<reqwest::Response> {
-    // safety: Panic happens if the task (JoinHandle) was aborted, cancelled, or panicked
-    let request = join_handle.await.unwrap();
-    let resp = request.map_err(Error::S3HttpError)?;
-    match resp.error_for_status_ref() {
-        Ok(_) => Ok(resp),
-        Err(_) => Err(Error::S3Error {
-            status: resp.status(),
-            body: resp.text().await.unwrap_or_default(),
-        }),
-    }
-}
-
 #[cfg(unix)]
 fn extract_and_append_etag<'b>(
    bump: &'b bumpalo::Bump,
--- a/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/after_processing_everything.snap
+++ b/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/after_processing_everything.snap
@@ -6,7 +6,7 @@ source: crates/index-scheduler/src/scheduler/test_failure.rs
 []
 ----------------------------------------------------------------------
 ### All Tasks:
-0 {uid: 0, batch_uid: 0, status: succeeded, details: { from: (1, 12, 0), to: (1, 26, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
+0 {uid: 0, batch_uid: 0, status: succeeded, details: { from: (1, 12, 0), to: (1, 25, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
 1 {uid: 1, batch_uid: 1, status: succeeded, details: { primary_key: Some("mouse"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "catto", primary_key: Some("mouse") }}
 2 {uid: 2, batch_uid: 2, status: succeeded, details: { primary_key: Some("bone"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "doggo", primary_key: Some("bone") }}
 3 {uid: 3, batch_uid: 3, status: failed, error: ResponseError { code: 200, message: "Index `doggo` already exists.", error_code: "index_already_exists", error_type: "invalid_request", error_link: "https://docs.meilisearch.com/errors#index_already_exists" }, details: { primary_key: Some("bone"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "doggo", primary_key: Some("bone") }}
@@ -57,7 +57,7 @@ girafo: { number_of_documents: 0, field_distribution: {} }
 [timestamp] [4,]
 ----------------------------------------------------------------------
 ### All Batches:
-0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.26.0"}, stats: {"totalNbTasks":1,"status":{"succeeded":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", }
+0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.25.0"}, stats: {"totalNbTasks":1,"status":{"succeeded":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", }
 1 {uid: 1, details: {"primaryKey":"mouse"}, stats: {"totalNbTasks":1,"status":{"succeeded":1},"types":{"indexCreation":1},"indexUids":{"catto":1}}, stop reason: "created batch containing only task with id 1 of type `indexCreation` that cannot be batched with any other task.", }
 2 {uid: 2, details: {"primaryKey":"bone"}, stats: {"totalNbTasks":1,"status":{"succeeded":1},"types":{"indexCreation":1},"indexUids":{"doggo":1}}, stop reason: "created batch containing only task with id 2 of type `indexCreation` that cannot be batched with any other task.", }
 3 {uid: 3, details: {"primaryKey":"bone"}, stats: {"totalNbTasks":1,"status":{"failed":1},"types":{"indexCreation":1},"indexUids":{"doggo":1}}, stop reason: "created batch containing only task with id 3 of type `indexCreation` that cannot be batched with any other task.", }
--- a/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/register_automatic_upgrade_task.snap
+++ b/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/register_automatic_upgrade_task.snap
@@ -6,7 +6,7 @@ source: crates/index-scheduler/src/scheduler/test_failure.rs
 []
 ----------------------------------------------------------------------
 ### All Tasks:
-0 {uid: 0, status: enqueued, details: { from: (1, 12, 0), to: (1, 26, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
+0 {uid: 0, status: enqueued, details: { from: (1, 12, 0), to: (1, 25, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
 ----------------------------------------------------------------------
 ### Status:
 enqueued [0,]
--- a/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/registered_a_task_while_the_upgrade_task_is_enqueued.snap
+++ b/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/registered_a_task_while_the_upgrade_task_is_enqueued.snap
@@ -6,7 +6,7 @@ source: crates/index-scheduler/src/scheduler/test_failure.rs
 []
 ----------------------------------------------------------------------
 ### All Tasks:
-0 {uid: 0, status: enqueued, details: { from: (1, 12, 0), to: (1, 26, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
+0 {uid: 0, status: enqueued, details: { from: (1, 12, 0), to: (1, 25, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
 1 {uid: 1, status: enqueued, details: { primary_key: Some("mouse"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "catto", primary_key: Some("mouse") }}
 ----------------------------------------------------------------------
 ### Status:
--- a/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/upgrade_task_failed.snap
+++ b/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/upgrade_task_failed.snap
@@ -6,7 +6,7 @@ source: crates/index-scheduler/src/scheduler/test_failure.rs
 []
 ----------------------------------------------------------------------
 ### All Tasks:
-0 {uid: 0, batch_uid: 0, status: failed, error: ResponseError { code: 200, message: "Planned failure for tests.", error_code: "internal", error_type: "internal", error_link: "https://docs.meilisearch.com/errors#internal" }, details: { from: (1, 12, 0), to: (1, 26, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
+0 {uid: 0, batch_uid: 0, status: failed, error: ResponseError { code: 200, message: "Planned failure for tests.", error_code: "internal", error_type: "internal", error_link: "https://docs.meilisearch.com/errors#internal" }, details: { from: (1, 12, 0), to: (1, 25, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
 1 {uid: 1, status: enqueued, details: { primary_key: Some("mouse"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "catto", primary_key: Some("mouse") }}
 ----------------------------------------------------------------------
 ### Status:
@@ -37,7 +37,7 @@ catto [1,]
 [timestamp] [0,]
 ----------------------------------------------------------------------
 ### All Batches:
-0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.26.0"}, stats: {"totalNbTasks":1,"status":{"failed":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", }
+0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.25.0"}, stats: {"totalNbTasks":1,"status":{"failed":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", }
 ----------------------------------------------------------------------
 ### Batch to tasks mapping:
 0 [0,]
--- a/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/upgrade_task_failed_again.snap
+++ b/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/upgrade_task_failed_again.snap
@@ -6,7 +6,7 @@ source: crates/index-scheduler/src/scheduler/test_failure.rs
 []
 ----------------------------------------------------------------------
 ### All Tasks:
-0 {uid: 0, batch_uid: 0, status: failed, error: ResponseError { code: 200, message: "Planned failure for tests.", error_code: "internal", error_type: "internal", error_link: "https://docs.meilisearch.com/errors#internal" }, details: { from: (1, 12, 0), to: (1, 26, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
+0 {uid: 0, batch_uid: 0, status: failed, error: ResponseError { code: 200, message: "Planned failure for tests.", error_code: "internal", error_type: "internal", error_link: "https://docs.meilisearch.com/errors#internal" }, details: { from: (1, 12, 0), to: (1, 25, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
 1 {uid: 1, status: enqueued, details: { primary_key: Some("mouse"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "catto", primary_key: Some("mouse") }}
 2 {uid: 2, status: enqueued, details: { primary_key: Some("bone"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "doggo", primary_key: Some("bone") }}
 ----------------------------------------------------------------------
@@ -40,7 +40,7 @@ doggo [2,]
 [timestamp] [0,]
 ----------------------------------------------------------------------
 ### All Batches:
-0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.26.0"}, stats: {"totalNbTasks":1,"status":{"failed":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", }
+0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.25.0"}, stats: {"totalNbTasks":1,"status":{"failed":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", }
 ----------------------------------------------------------------------
 ### Batch to tasks mapping:
 0 [0,]
--- a/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/upgrade_task_succeeded.snap
+++ b/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/upgrade_task_succeeded.snap
@@ -6,7 +6,7 @@ source: crates/index-scheduler/src/scheduler/test_failure.rs
 []
 ----------------------------------------------------------------------
 ### All Tasks:
-0 {uid: 0, batch_uid: 0, status: succeeded, details: { from: (1, 12, 0), to: (1, 26, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
+0 {uid: 0, batch_uid: 0, status: succeeded, details: { from: (1, 12, 0), to: (1, 25, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
 1 {uid: 1, status: enqueued, details: { primary_key: Some("mouse"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "catto", primary_key: Some("mouse") }}
 2 {uid: 2, status: enqueued, details: { primary_key: Some("bone"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "doggo", primary_key: Some("bone") }}
 3 {uid: 3, status: enqueued, details: { primary_key: Some("bone"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "doggo", primary_key: Some("bone") }}
@@ -43,7 +43,7 @@ doggo [2,3,]
 [timestamp] [0,]
 ----------------------------------------------------------------------
 ### All Batches:
-0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.26.0"}, stats: {"totalNbTasks":1,"status":{"succeeded":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", }
+0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.25.0"}, stats: {"totalNbTasks":1,"status":{"succeeded":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", }
 ----------------------------------------------------------------------
 ### Batch to tasks mapping:
 0 [0,]
--- a/crates/index-scheduler/src/upgrade/mod.rs
+++ b/crates/index-scheduler/src/upgrade/mod.rs
@@ -48,8 +48,6 @@ pub fn upgrade_index_scheduler(
        (1, 22, _) => 0,
        (1, 23, _) => 0,
        (1, 24, _) => 0,
-        (1, 25, _) => 0,
-        (1, 26, _) => 0,
        (major, minor, patch) => {
            if major > current_major
                || (major == current_major && minor > current_minor)
--- a/crates/index-scheduler/src/utils.rs
+++ b/crates/index-scheduler/src/utils.rs
@@ -286,7 +286,6 @@ pub fn swap_index_uid_in_task(task: &mut Task, swap: (&str, &str)) {
        | K::DumpCreation { .. }
        | K::Export { .. }
        | K::UpgradeDatabase { .. }
-        | K::NetworkTopologyChange(_)
        | K::SnapshotCreation => (),
    };
    if let Some(Details::IndexSwap { swaps }) = &mut task.details {
@@ -628,13 +627,6 @@ impl crate::IndexScheduler {
                    } => {
                        assert_eq!(kind.as_kind(), Kind::IndexCompaction);
                    }
-                    Details::NetworkTopologyChange {
-                        moved_documents: _,
-                        received_documents: _,
-                        message: _,
-                    } => {
-                        assert_eq!(kind.as_kind(), Kind::NetworkTopologyChange);
-                    }
                }
            }

--- a/crates/meilisearch-types/src/enterprise_edition/network.rs
+++ b/crates/meilisearch-types/src/enterprise_edition/network.rs
@@ -7,7 +7,6 @@ use std::collections::BTreeMap;

 use milli::update::new::indexer::enterprise_edition::sharding::Shards;
 use serde::{Deserialize, Serialize};
-use uuid::Uuid;

 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Default)]
 #[serde(rename_all = "camelCase")]
@@ -17,18 +16,20 @@ pub struct Network {
    #[serde(default)]
    pub remotes: BTreeMap<String, Remote>,
    #[serde(default)]
-    pub leader: Option<String>,
-    #[serde(default)]
-    pub version: Uuid,
+    pub sharding: bool,
 }

 impl Network {
    pub fn shards(&self) -> Option<Shards> {
-        if self.leader.is_some() {
-            Some(Shards::from_remotes_local(
-                self.remotes.keys().map(String::as_str),
-                self.local.as_deref(),
-            ))
+        if self.sharding {
+            let this = self.local.as_deref().expect("Inconsistent `sharding` and `self`");
+            let others = self
+                .remotes
+                .keys()
+                .filter(|name| name.as_str() != this)
+                .map(|name| name.to_owned())
+                .collect();
+            Some(Shards { own: vec![this.to_owned()], others })
        } else {
            None
        }
--- a/crates/meilisearch-types/src/error.rs
+++ b/crates/meilisearch-types/src/error.rs
@@ -156,7 +156,7 @@ macro_rules! make_error_codes {
            }

            /// return error name, used as error code
-            pub fn name(&self) -> String {
+            fn name(&self) -> String {
                match self {
                    $(
                        Code::$code_ident => stringify!($code_ident).to_case(convert_case::Case::Snake)
@@ -214,9 +214,6 @@ ImmutableApiKeyUid                             , InvalidRequest       , BAD_REQU
 ImmutableApiKeyUpdatedAt                       , InvalidRequest       , BAD_REQUEST;
 ImmutableIndexCreatedAt                        , InvalidRequest       , BAD_REQUEST;
 ImmutableIndexUpdatedAt                        , InvalidRequest       , BAD_REQUEST;
-ImportTaskAlreadyReceived                      , InvalidRequest       , PRECONDITION_FAILED;
-ImportTaskUnknownRemote                        , InvalidRequest       , PRECONDITION_FAILED;
-ImportTaskWithoutNetworkTask                   , InvalidRequest       , SERVICE_UNAVAILABLE;
 IndexAlreadyExists                             , InvalidRequest       , CONFLICT ;
 IndexCreationFailed                            , Internal             , INTERNAL_SERVER_ERROR;
 IndexNotFound                                  , InvalidRequest       , NOT_FOUND;
@@ -273,9 +270,9 @@ InvalidMultiSearchQueryRankingRules            , InvalidRequest       , BAD_REQU
 InvalidMultiSearchQueryPosition                , InvalidRequest       , BAD_REQUEST ;
 InvalidMultiSearchRemote                       , InvalidRequest       , BAD_REQUEST ;
 InvalidMultiSearchWeight                       , InvalidRequest       , BAD_REQUEST ;
-InvalidNetworkLeader                           , InvalidRequest       , BAD_REQUEST ;
 InvalidNetworkRemotes                          , InvalidRequest       , BAD_REQUEST ;
 InvalidNetworkSelf                             , InvalidRequest       , BAD_REQUEST ;
+InvalidNetworkSharding                         , InvalidRequest       , BAD_REQUEST ;
 InvalidNetworkSearchApiKey                     , InvalidRequest       , BAD_REQUEST ;
 InvalidNetworkWriteApiKey                      , InvalidRequest       , BAD_REQUEST ;
 InvalidNetworkUrl                              , InvalidRequest       , BAD_REQUEST ;
@@ -380,9 +377,7 @@ MissingPayload                                 , InvalidRequest       , BAD_REQU
 MissingSearchHybrid                            , InvalidRequest       , BAD_REQUEST ;
 MissingSwapIndexes                             , InvalidRequest       , BAD_REQUEST ;
 MissingTaskFilters                             , InvalidRequest       , BAD_REQUEST ;
-NetworkVersionMismatch                         , InvalidRequest       , PRECONDITION_FAILED ;
 NoSpaceLeftOnDevice                            , System               , UNPROCESSABLE_ENTITY;
-NotLeader                                      , InvalidRequest       , BAD_REQUEST ;
 PayloadTooLarge                                , InvalidRequest       , PAYLOAD_TOO_LARGE ;
 RemoteBadResponse                              , System               , BAD_GATEWAY ;
 RemoteBadRequest                               , InvalidRequest       , BAD_REQUEST ;
@@ -396,7 +391,6 @@ TaskFileNotFound                               , InvalidRequest       , NOT_FOUN
 BatchNotFound                                  , InvalidRequest       , NOT_FOUND ;
 TooManyOpenFiles                               , System               , UNPROCESSABLE_ENTITY ;
 TooManyVectors                                 , InvalidRequest       , BAD_REQUEST ;
-UnexpectedNetworkPreviousRemotes               , InvalidRequest       , BAD_REQUEST ;
 UnretrievableDocument                          , Internal             , BAD_REQUEST ;
 UnretrievableErrorCode                         , InvalidRequest       , BAD_REQUEST ;
 UnsupportedMediaType                           , InvalidRequest       , UNSUPPORTED_MEDIA_TYPE ;
--- a/crates/meilisearch-types/src/task_view.rs
+++ b/crates/meilisearch-types/src/task_view.rs
@@ -9,9 +9,9 @@ use utoipa::ToSchema;
 use crate::batches::BatchId;
 use crate::error::ResponseError;
 use crate::settings::{Settings, Unchecked};
-use crate::tasks::enterprise_edition::network::DbTaskNetwork;
 use crate::tasks::{
    serialize_duration, Details, DetailsExportIndexSettings, IndexSwap, Kind, Status, Task, TaskId,
+    TaskNetwork,
 };

 #[derive(Debug, Clone, PartialEq, Serialize, ToSchema)]
@@ -54,7 +54,7 @@ pub struct TaskView {
    pub finished_at: Option<OffsetDateTime>,

    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub network: Option<DbTaskNetwork>,
+    pub network: Option<TaskNetwork>,

    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub custom_metadata: Option<String>,
@@ -151,11 +151,6 @@ pub struct DetailsView {
    pub pre_compaction_size: Option<String>,
    #[serde(skip_serializing_if = "Option::is_none")]
    pub post_compaction_size: Option<String>,
-    // network topology change
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub moved_documents: Option<u64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub message: Option<String>,
 }

 impl DetailsView {
@@ -166,17 +161,6 @@ impl DetailsView {
                (None, Some(doc)) | (Some(doc), None) => Some(doc),
                (Some(left), Some(right)) => Some(left + right),
            },
-            moved_documents: match (self.moved_documents, other.moved_documents) {
-                (None, None) => None,
-                (None, Some(doc)) | (Some(doc), None) => Some(doc),
-                (Some(left), Some(right)) => Some(left + right),
-            },
-            message: match (&mut self.message, &other.message) {
-                (None, None) => None,
-                (None, Some(message)) => Some(message.clone()),
-                (Some(message), None) => Some(std::mem::take(message)),
-                (Some(message), Some(_)) => Some(std::mem::take(message)),
-            },
            indexed_documents: match (self.indexed_documents, other.indexed_documents) {
                (None, None) => None,
                (None, Some(None)) | (Some(None), None) | (Some(None), Some(None)) => Some(None),
@@ -467,14 +451,6 @@ impl From<Details> for DetailsView {
                    ..Default::default()
                }
            }
-            Details::NetworkTopologyChange { moved_documents, received_documents, message } => {
-                DetailsView {
-                    moved_documents: Some(moved_documents),
-                    received_documents: Some(received_documents),
-                    message: Some(message),
-                    ..Default::default()
-                }
-            }
        }
    }
 }
--- a/crates/meilisearch-types/src/tasks/mod.rs
+++ b/crates/meilisearch-types/src/tasks/mod.rs
@@ -23,8 +23,6 @@ use crate::{versioning, InstanceUid};

 pub type TaskId = u32;

-pub mod enterprise_edition;
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Task {
@@ -46,7 +44,7 @@ pub struct Task {
    pub kind: KindWithContent,

    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub network: Option<enterprise_edition::network::DbTaskNetwork>,
+    pub network: Option<TaskNetwork>,

    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub custom_metadata: Option<String>,
@@ -63,7 +61,6 @@ impl Task {
            | TaskDeletion { .. }
            | Export { .. }
            | UpgradeDatabase { .. }
-            | NetworkTopologyChange { .. }
            | IndexSwap { .. } => None,
            DocumentAdditionOrUpdate { index_uid, .. }
            | DocumentEdition { index_uid, .. }
@@ -102,7 +99,6 @@ impl Task {
            | KindWithContent::SnapshotCreation
            | KindWithContent::Export { .. }
            | KindWithContent::UpgradeDatabase { .. }
-            | KindWithContent::NetworkTopologyChange { .. }
            | KindWithContent::IndexCompaction { .. } => None,
        }
    }
@@ -182,7 +178,6 @@ pub enum KindWithContent {
    IndexCompaction {
        index_uid: String,
    },
-    NetworkTopologyChange(enterprise_edition::network::NetworkTopologyChange),
 }

 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, ToSchema)]
@@ -220,7 +215,6 @@ impl KindWithContent {
            KindWithContent::Export { .. } => Kind::Export,
            KindWithContent::UpgradeDatabase { .. } => Kind::UpgradeDatabase,
            KindWithContent::IndexCompaction { .. } => Kind::IndexCompaction,
-            KindWithContent::NetworkTopologyChange { .. } => Kind::NetworkTopologyChange,
        }
    }

@@ -233,7 +227,6 @@ impl KindWithContent {
            | TaskCancelation { .. }
            | TaskDeletion { .. }
            | Export { .. }
-            | NetworkTopologyChange { .. }
            | UpgradeDatabase { .. } => vec![],
            DocumentAdditionOrUpdate { index_uid, .. }
            | DocumentEdition { index_uid, .. }
@@ -347,11 +340,6 @@ impl KindWithContent {
                pre_compaction_size: None,
                post_compaction_size: None,
            }),
-            KindWithContent::NetworkTopologyChange { .. } => Some(Details::NetworkTopologyChange {
-                moved_documents: 0,
-                received_documents: 0,
-                message: "processing tasks for previous network versions".into(),
-            }),
        }
    }

@@ -404,7 +392,7 @@ impl KindWithContent {
                })
            }
            KindWithContent::IndexSwap { .. } => {
-                unimplemented!("do not call `default_finished_details` for `IndexSwap` tasks")
+                todo!()
            }
            KindWithContent::TaskCancelation { query, tasks } => Some(Details::TaskCancelation {
                matched_tasks: tasks.len(),
@@ -439,9 +427,6 @@ impl KindWithContent {
                pre_compaction_size: None,
                post_compaction_size: None,
            }),
-            KindWithContent::NetworkTopologyChange(network_topology_change) => {
-                Some(network_topology_change.to_details())
-            }
        }
    }
 }
@@ -509,9 +494,6 @@ impl From<&KindWithContent> for Option<Details> {
                pre_compaction_size: None,
                post_compaction_size: None,
            }),
-            KindWithContent::NetworkTopologyChange(network_topology_change) => {
-                Some(network_topology_change.to_details())
-            }
        }
    }
 }
@@ -623,7 +605,6 @@ pub enum Kind {
    Export,
    UpgradeDatabase,
    IndexCompaction,
-    NetworkTopologyChange,
 }

 impl Kind {
@@ -643,7 +624,6 @@ impl Kind {
            | Kind::DumpCreation
            | Kind::Export
            | Kind::UpgradeDatabase
-            | Kind::NetworkTopologyChange
            | Kind::SnapshotCreation => false,
        }
    }
@@ -666,7 +646,6 @@ impl Display for Kind {
            Kind::Export => write!(f, "export"),
            Kind::UpgradeDatabase => write!(f, "upgradeDatabase"),
            Kind::IndexCompaction => write!(f, "indexCompaction"),
-            Kind::NetworkTopologyChange => write!(f, "networkTopologyChange"),
        }
    }
 }
@@ -704,8 +683,6 @@ impl FromStr for Kind {
            Ok(Kind::UpgradeDatabase)
        } else if kind.eq_ignore_ascii_case("indexCompaction") {
            Ok(Kind::IndexCompaction)
-        } else if kind.eq_ignore_ascii_case("networkTopologyChange") {
-            Ok(Kind::NetworkTopologyChange)
        } else {
            Err(ParseTaskKindError(kind.to_owned()))
        }
@@ -796,11 +773,36 @@ pub enum Details {
        pre_compaction_size: Option<Byte>,
        post_compaction_size: Option<Byte>,
    },
-    NetworkTopologyChange {
-        moved_documents: u64,
-        received_documents: u64,
-        message: String,
-    },
+}
+
+#[derive(Debug, PartialEq, Clone, Serialize, Deserialize, ToSchema)]
+#[serde(untagged, rename_all = "camelCase")]
+pub enum TaskNetwork {
+    Origin { origin: Origin },
+    Remotes { remote_tasks: BTreeMap<String, RemoteTask> },
+}
+#[derive(Debug, PartialEq, Clone, Serialize, Deserialize, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct Origin {
+    pub remote_name: String,
+    pub task_uid: usize,
+}
+
+#[derive(Debug, PartialEq, Clone, Serialize, Deserialize, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct RemoteTask {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    task_uid: Option<TaskId>,
+    error: Option<ResponseError>,
+}
+
+impl From<Result<TaskId, ResponseError>> for RemoteTask {
+    fn from(res: Result<TaskId, ResponseError>) -> RemoteTask {
+        match res {
+            Ok(task_uid) => RemoteTask { task_uid: Some(task_uid), error: None },
+            Err(err) => RemoteTask { task_uid: None, error: Some(err) },
+        }
+    }
 }

 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize, ToSchema)]
@@ -843,9 +845,6 @@ impl Details {
            | Self::Export { .. }
            | Self::UpgradeDatabase { .. }
            | Self::IndexSwap { .. } => (),
-            Self::NetworkTopologyChange { moved_documents: _, received_documents: _, message } => {
-                *message = format!("Failed. Previous status: {}", message);
-            }
        }

        details
--- a/crates/meilisearch-types/src/tasks/enterprise_edition/mod.rs
+++ b/crates/meilisearch-types/src/tasks/enterprise_edition/mod.rs
@@ -1,6 +0,0 @@
-// Copyright © 2025 Meilisearch Some Rights Reserved
-// This file is part of Meilisearch Enterprise Edition (EE).
-// Use of this source code is governed by the Business Source License 1.1,
-// as found in the LICENSE-EE file or at <https://mariadb.com/bsl11>
-
-pub mod network;
--- a/crates/meilisearch-types/src/tasks/enterprise_edition/network.rs
+++ b/crates/meilisearch-types/src/tasks/enterprise_edition/network.rs
@@ -1,564 +0,0 @@
-// Copyright © 2025 Meilisearch Some Rights Reserved
-// This file is part of Meilisearch Enterprise Edition (EE).
-// Use of this source code is governed by the Business Source License 1.1,
-// as found in the LICENSE-EE file or at <https://mariadb.com/bsl11>
-
-use std::collections::BTreeMap;
-
-use milli::DocumentId;
-use serde::{Deserialize, Serialize};
-use utoipa::ToSchema;
-use uuid::Uuid;
-
-use crate::enterprise_edition::network::{Network, Remote};
-use crate::error::ResponseError;
-use crate::tasks::{Details, TaskId};
-
-#[derive(Debug, PartialEq, Clone, Serialize, Deserialize, ToSchema)]
-#[serde(untagged, rename_all = "camelCase")]
-// This type is used in the database, care should be taken when modifying it.
-pub enum DbTaskNetwork {
-    /// Tasks that were duplicated from `origin`
-    Origin { origin: Origin },
-    /// Tasks that were duplicated as `remote_tasks`
-    Remotes {
-        remote_tasks: BTreeMap<String, RemoteTask>,
-        #[serde(default)]
-        network_version: Uuid,
-    },
-    /// Document import tasks sent in the context of `network_change`
-    Import { import_from: ImportData, network_change: Origin },
-}
-
-impl DbTaskNetwork {
-    pub fn network_version(&self) -> Uuid {
-        match self {
-            DbTaskNetwork::Origin { origin } => origin.network_version,
-            DbTaskNetwork::Remotes { remote_tasks: _, network_version } => *network_version,
-            DbTaskNetwork::Import { import_from: _, network_change } => {
-                network_change.network_version
-            }
-        }
-    }
-
-    pub fn import_data(&self) -> Option<&ImportData> {
-        match self {
-            DbTaskNetwork::Origin { .. } | DbTaskNetwork::Remotes { .. } => None,
-            DbTaskNetwork::Import { import_from, .. } => Some(import_from),
-        }
-    }
-
-    pub fn origin(&self) -> Option<&Origin> {
-        match self {
-            DbTaskNetwork::Origin { origin } => Some(origin),
-            DbTaskNetwork::Remotes { .. } => None,
-            DbTaskNetwork::Import { network_change, .. } => Some(network_change),
-        }
-    }
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub enum TaskNetwork {
-    /// Tasks that were duplicated from `origin`
-    Origin { origin: Origin },
-    /// Tasks that were duplicated as `remote_tasks`
-    Remotes { remote_tasks: BTreeMap<String, RemoteTask>, network_version: Uuid },
-    /// Document import tasks sent in the context of `network_change`
-    Import { import_from: ImportData, network_change: Origin, metadata: ImportMetadata },
-}
-
-impl From<TaskNetwork> for DbTaskNetwork {
-    fn from(value: TaskNetwork) -> Self {
-        match value {
-            TaskNetwork::Origin { origin } => DbTaskNetwork::Origin { origin },
-            TaskNetwork::Remotes { remote_tasks, network_version } => {
-                DbTaskNetwork::Remotes { remote_tasks, network_version }
-            }
-            TaskNetwork::Import { import_from, network_change, metadata: _ } => {
-                DbTaskNetwork::Import { import_from, network_change }
-            }
-        }
-    }
-}
-
-#[derive(Debug, PartialEq, Clone, Serialize, Deserialize, ToSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct Origin {
-    pub remote_name: String,
-    pub task_uid: u32,
-    pub network_version: Uuid,
-}
-
-/// Import data stored in a task
-#[derive(Debug, PartialEq, Clone, Serialize, Deserialize, ToSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct ImportData {
-    pub remote_name: String,
-    pub index_name: String,
-    pub document_count: u64,
-}
-
-/// Import metadata associated with a task but not stored in the task
-#[derive(Debug, PartialEq, Clone)]
-pub struct ImportMetadata {
-    /// Total number of indexes to import from this host
-    pub index_count: u64,
-    /// Key unique to this (network_change, index, host, key).
-    ///
-    /// In practice, an internal document id of one of the documents to import.
-    pub task_key: DocumentId,
-    /// Total number of documents to import for this index from this host.
-    pub total_index_documents: u64,
-}
-
-#[derive(Debug, PartialEq, Clone, Serialize, Deserialize, ToSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct RemoteTask {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    task_uid: Option<TaskId>,
-    error: Option<ResponseError>,
-}
-
-impl From<Result<TaskId, ResponseError>> for RemoteTask {
-    fn from(res: Result<TaskId, ResponseError>) -> RemoteTask {
-        match res {
-            Ok(task_uid) => RemoteTask { task_uid: Some(task_uid), error: None },
-            Err(err) => RemoteTask { task_uid: None, error: Some(err) },
-        }
-    }
-}
-
-/// Contains the full state of a network topology change.
-///
-/// A network topology change task is unique in that it can be processed in multiple different batches, as its resolution
-/// depends on various document additions tasks being processed.
-///
-/// A network topology task has 4 states:
-///
-/// 1. Processing any task that was meant for an earlier version of the network. This is necessary to know that we have the right version of
-/// documents.
-/// 2. Sending all documents that must be moved to other remotes.
-/// 3. Processing any task coming from the remotes.
-/// 4. Finished.
-///
-/// Furthermore, it maintains some stats
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct NetworkTopologyChange {
-    state: NetworkTopologyState,
-    // in name, `None` if the node is no longer part of the network
-    #[serde(skip_serializing_if = "Option::is_none")]
-    in_name: Option<String>,
-    // out name, `None` if the node is new to the network
-    #[serde(skip_serializing_if = "Option::is_none")]
-    out_name: Option<String>,
-    out_remotes: BTreeMap<String, Remote>,
-    in_remotes: BTreeMap<String, InRemote>,
-    stats: NetworkTopologyStats,
-}
-
-impl NetworkTopologyChange {
-    pub fn new(old_network: Network, new_network: Network) -> Self {
-        // we use our old name as export name
-        let out_name = old_network.local;
-        // we use our new name as import name
-        let in_name = new_network.local;
-        // we export to the new network
-        let mut out_remotes = new_network.remotes;
-        // don't export to ourselves
-        if let Some(in_name) = &in_name {
-            out_remotes.remove(in_name);
-        }
-        /// FIXME: doesn't work if the old network is not the same for old nodes
-        let in_remotes = old_network
-            .remotes
-            .into_keys()
-            // don't await imports from ourselves
-            .filter(|name| Some(name.as_str()) != out_name.as_deref())
-            .map(|name| (name, InRemote::new()))
-            .collect();
-        Self {
-            state: NetworkTopologyState::WaitingForOlderTasks,
-            in_name,
-            out_name,
-            out_remotes,
-            in_remotes,
-            stats: NetworkTopologyStats { received_documents: 0, moved_documents: 0 },
-        }
-    }
-
-    pub fn state(&self) -> NetworkTopologyState {
-        self.state
-    }
-
-    pub fn out_name(&self) -> Option<&str> {
-        // unwrap: one of out name or in_name must be defined
-        self.out_name.as_deref()
-    }
-
-    pub fn in_name(&self) -> Option<&str> {
-        self.in_name.as_deref()
-    }
-
-    pub fn export_to_process(&self) -> Option<(&BTreeMap<String, Remote>, &str)> {
-        if self.state != NetworkTopologyState::ExportingDocuments {
-            return None;
-        }
-
-        if self.out_remotes.is_empty() {
-            return None;
-        }
-
-        let out_name = self.out_name()?;
-        Some((&self.out_remotes, out_name))
-    }
-
-    /// Compute the next state from the current state of the task.
-    pub fn update_state(&mut self) {
-        self.state = match self.state {
-            NetworkTopologyState::WaitingForOlderTasks => {
-                // no more older tasks, so finished waiting
-                NetworkTopologyState::ExportingDocuments
-            }
-            NetworkTopologyState::ExportingDocuments => {
-                // processed all exported documents
-                NetworkTopologyState::ImportingDocuments
-            }
-            NetworkTopologyState::ImportingDocuments => {
-                if self.is_import_finished() {
-                    NetworkTopologyState::Finished
-                } else {
-                    NetworkTopologyState::ImportingDocuments
-                }
-            }
-            NetworkTopologyState::Finished => NetworkTopologyState::Finished,
-        };
-    }
-
-    pub fn receive_remote_task(
-        &mut self,
-        remote_name: &str,
-        index_name: &str,
-        task_key: DocumentId,
-        document_count: u64,
-        total_indexes: u64,
-        total_index_documents: u64,
-    ) -> Result<(), ReceiveTaskError> {
-        let remote = self
-            .in_remotes
-            .get_mut(remote_name)
-            .ok_or_else(|| ReceiveTaskError::UnknownRemote(remote_name.to_string()))?;
-        remote.import_state = match std::mem::take(&mut remote.import_state) {
-            ImportState::WaitingForInitialTask => {
-                let mut import_index_state = BTreeMap::new();
-                import_index_state.insert(
-                    index_name.to_owned(),
-                    ImportIndexState::Ongoing {
-                        total_documents: total_index_documents,
-                        received_documents: document_count,
-                        task_keys: vec![task_key],
-                        processed_documents: 0,
-                    },
-                );
-                ImportState::Ongoing { import_index_state, total_indexes }
-            }
-            ImportState::Ongoing { mut import_index_state, total_indexes } => {
-                if let Some((index_name, mut index_state)) =
-                    import_index_state.remove_entry(index_name)
-                {
-                    index_state = match index_state {
-                        ImportIndexState::Ongoing {
-                            total_documents,
-                            received_documents: previously_received,
-                            processed_documents,
-                            mut task_keys,
-                        } => {
-                            if task_keys.contains(&task_key) {
-                                return Err(ReceiveTaskError::DuplicateTask(task_key));
-                            }
-                            task_keys.push(task_key);
-                            ImportIndexState::Ongoing {
-                                total_documents,
-                                received_documents: previously_received + document_count,
-                                processed_documents,
-                                task_keys,
-                            }
-                        }
-                        ImportIndexState::Finished { total_documents } => {
-                            ImportIndexState::Finished { total_documents }
-                        }
-                    };
-                    import_index_state.insert(index_name, index_state);
-                } else {
-                    let state = ImportIndexState::Ongoing {
-                        total_documents: total_index_documents,
-                        received_documents: document_count,
-                        processed_documents: 0,
-                        task_keys: vec![task_key],
-                    };
-                    import_index_state.insert(index_name.to_string(), state);
-                }
-                ImportState::Ongoing { import_index_state, total_indexes: total_indexes }
-            }
-            ImportState::Finished { total_indexes, total_documents } => {
-                ImportState::Finished { total_indexes, total_documents }
-            }
-        };
-        Ok(())
-    }
-
-    pub fn process_remote_tasks(
-        &mut self,
-        remote_name: &str,
-        index_name: &str,
-        document_count: u64,
-    ) {
-        /// FIXME: unwraps and panics
-        let remote = self.in_remotes.get_mut(remote_name).unwrap();
-        remote.import_state = match std::mem::take(&mut remote.import_state) {
-            ImportState::WaitingForInitialTask => panic!("no task received yet one processed"),
-            ImportState::Ongoing { mut import_index_state, total_indexes } => {
-                let (index_name, mut index_state) =
-                    import_index_state.remove_entry(index_name).unwrap();
-                index_state = match index_state {
-                    ImportIndexState::Ongoing {
-                        total_documents,
-                        received_documents,
-                        processed_documents: previously_processed,
-                        task_keys,
-                    } => {
-                        let newly_processed_documents = previously_processed + document_count;
-                        if newly_processed_documents >= total_documents {
-                            ImportIndexState::Finished { total_documents }
-                        } else {
-                            ImportIndexState::Ongoing {
-                                total_documents,
-                                received_documents,
-                                processed_documents: newly_processed_documents,
-                                task_keys,
-                            }
-                        }
-                    }
-                    ImportIndexState::Finished { total_documents } => {
-                        ImportIndexState::Finished { total_documents }
-                    }
-                };
-                import_index_state.insert(index_name, index_state);
-                if import_index_state.len() as u64 == total_indexes
-                    && import_index_state.values().all(|index| index.is_finished())
-                {
-                    let total_documents =
-                        import_index_state.values().map(|index| index.total_documents()).sum();
-                    ImportState::Finished { total_indexes, total_documents }
-                } else {
-                    ImportState::Ongoing { import_index_state, total_indexes }
-                }
-            }
-            ImportState::Finished { total_indexes, total_documents } => {
-                ImportState::Finished { total_indexes, total_documents }
-            }
-        }
-    }
-
-    pub fn to_details(&self) -> Details {
-        let message = match self.state {
-            NetworkTopologyState::WaitingForOlderTasks => {
-                "Waiting for tasks enqueued before the network change to finish processing".into()
-            }
-            NetworkTopologyState::ExportingDocuments => "Exporting documents".into(),
-            NetworkTopologyState::ImportingDocuments => {
-                let mut finished_count = 0;
-                let mut first_ongoing = None;
-                let mut ongoing_total_indexes = 0;
-                let mut ongoing_processed_documents = 0;
-                let mut ongoing_missing_documents = 0;
-                let mut ongoing_total_documents = 0;
-                let mut other_ongoing_count = 0;
-                let mut first_waiting = None;
-                let mut other_waiting_count = 0;
-                for (remote_name, in_remote) in &self.in_remotes {
-                    match &in_remote.import_state {
-                        ImportState::WaitingForInitialTask => {
-                            first_waiting = match first_waiting {
-                                None => Some(remote_name),
-                                first_waiting => {
-                                    other_waiting_count += 1;
-                                    first_waiting
-                                }
-                            };
-                        }
-                        ImportState::Ongoing { import_index_state, total_indexes } => {
-                            first_ongoing = match first_ongoing {
-                                None => {
-                                    ongoing_total_indexes = *total_indexes;
-                                    Some(remote_name)
-                                }
-                                first_ongoing => {
-                                    other_ongoing_count += 1;
-                                    first_ongoing
-                                }
-                            };
-                            for import_state in import_index_state.values() {
-                                match import_state {
-                                    ImportIndexState::Ongoing {
-                                        total_documents,
-                                        processed_documents,
-                                        received_documents,
-                                        task_keys: _,
-                                    } => {
-                                        ongoing_total_documents += total_documents;
-                                        ongoing_processed_documents += processed_documents;
-                                        ongoing_missing_documents +=
-                                            total_documents.saturating_sub(*received_documents);
-                                    }
-                                    ImportIndexState::Finished { total_documents } => {
-                                        ongoing_total_documents += total_documents;
-                                        ongoing_processed_documents += total_documents;
-                                    }
-                                }
-                            }
-                        }
-                        ImportState::Finished { total_indexes, total_documents } => {
-                            finished_count += 1;
-                            ongoing_total_indexes = *total_indexes;
-                            ongoing_total_documents += *total_documents;
-                            ongoing_processed_documents += *total_documents;
-                        }
-                    }
-                }
-                format!(
-                    "Importing documents from {total} remotes{waiting}{ongoing}{finished}",
-                    total = self.in_remotes.len(),
-                    waiting = if let Some(first_waiting) = first_waiting {
-                        &format!(
-                            ", waiting on first task from `{}`{others}",
-                            first_waiting,
-                            others = if other_waiting_count > 0 {
-                                &format!(" and {other_waiting_count} other remotes")
-                            } else {
-                                ""
-                            }
-                        )
-                    } else {
-                        ""
-                    },
-                    ongoing = if let Some(first_ongoing) = first_ongoing {
-                        &format!(", awaiting {ongoing_missing_documents} and processed {ongoing_processed_documents} out of {ongoing_total_documents} documents in {ongoing_total_indexes} indexes from `{first_ongoing}`{others}",
-                others=if other_ongoing_count > 0 {&format!(" and {other_ongoing_count} other remotes")} else {""})
-                    } else {
-                        ""
-                    },
-                    finished = if finished_count >= 0 {
-                        &format!(", {finished_count} remotes finished processing")
-                    } else {
-                        ""
-                    }
-                )
-            }
-            NetworkTopologyState::Finished => "Finished".into(),
-        };
-        Details::NetworkTopologyChange {
-            moved_documents: self.stats.moved_documents,
-            received_documents: self.stats.received_documents,
-            message,
-        }
-    }
-
-    fn is_import_finished(&self) -> bool {
-        self.in_remotes.values().all(|remote| remote.is_finished())
-    }
-}
-
-pub enum ReceiveTaskError {
-    UnknownRemote(String),
-    DuplicateTask(DocumentId),
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum NetworkTopologyState {
-    WaitingForOlderTasks,
-    ExportingDocuments,
-    ImportingDocuments,
-    Finished,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct NetworkTopologyStats {
-    pub received_documents: u64,
-    pub moved_documents: u64,
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct InRemote {
-    import_state: ImportState,
-}
-
-impl InRemote {
-    pub fn new() -> Self {
-        Self { import_state: ImportState::WaitingForInitialTask }
-    }
-
-    pub fn is_finished(&self) -> bool {
-        matches!(self.import_state, ImportState::Finished { .. })
-    }
-}
-
-#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-enum ImportState {
-    /// Initially Meilisearch doesn't know how many documents it should expect from a remote.
-    /// The first task for each remote contains the information of how many indexes will be imported,
-    /// and the first task for each index contains the number of documents to import for that index.
-    #[default]
-    WaitingForInitialTask,
-    Ongoing {
-        import_index_state: BTreeMap<String, ImportIndexState>,
-        total_indexes: u64,
-    },
-    Finished {
-        total_indexes: u64,
-        total_documents: u64,
-    },
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-enum ImportIndexState {
-    Ongoing {
-        total_documents: u64,
-        received_documents: u64,
-        processed_documents: u64,
-        task_keys: Vec<DocumentId>,
-    },
-    Finished {
-        total_documents: u64,
-    },
-}
-
-impl ImportIndexState {
-    pub fn is_finished(&self) -> bool {
-        matches!(self, ImportIndexState::Finished { .. })
-    }
-
-    fn total_documents(&self) -> u64 {
-        match *self {
-            ImportIndexState::Ongoing { total_documents, .. }
-            | ImportIndexState::Finished { total_documents } => total_documents,
-        }
-    }
-}
-
-pub mod headers {
-    pub const PROXY_ORIGIN_REMOTE_HEADER: &str = "Meili-Proxy-Origin-Remote";
-    pub const PROXY_ORIGIN_TASK_UID_HEADER: &str = "Meili-Proxy-Origin-TaskUid";
-    pub const PROXY_ORIGIN_NETWORK_VERSION_HEADER: &str = "Meili-Proxy-Origin-Network-Version";
-    pub const PROXY_IMPORT_REMOTE_HEADER: &str = "Meili-Proxy-Import-Remote";
-    pub const PROXY_IMPORT_INDEX_COUNT_HEADER: &str = "Meili-Proxy-Import-Index-Count";
-    pub const PROXY_IMPORT_INDEX_HEADER: &str = "Meili-Proxy-Import-Index";
-    pub const PROXY_IMPORT_TASK_KEY_HEADER: &str = "Meili-Proxy-Import-Task-Key";
-    pub const PROXY_IMPORT_DOCS_HEADER: &str = "Meili-Proxy-Import-Docs";
-    pub const PROXY_IMPORT_TOTAL_INDEX_DOCS_HEADER: &str = "Meili-Proxy-Import-Total-Index-Docs";
-}
--- a/crates/meilisearch/src/error.rs
+++ b/crates/meilisearch/src/error.rs
@@ -6,10 +6,6 @@ use meilisearch_types::error::{Code, ErrorCode, ResponseError};
 use meilisearch_types::index_uid::{IndexUid, IndexUidFormatError};
 use meilisearch_types::milli;
 use meilisearch_types::milli::OrderBy;
-use meilisearch_types::tasks::enterprise_edition::network::headers::{
-    PROXY_IMPORT_DOCS_HEADER, PROXY_IMPORT_INDEX_COUNT_HEADER, PROXY_IMPORT_INDEX_HEADER,
-    PROXY_IMPORT_REMOTE_HEADER, PROXY_IMPORT_TASK_KEY_HEADER, PROXY_IMPORT_TOTAL_INDEX_DOCS_HEADER,
-};
 use serde_json::Value;
 use tokio::task::JoinError;

@@ -97,49 +93,8 @@ pub enum MeilisearchHttpError {
    } else { PROXY_ORIGIN_TASK_UID_HEADER }
 )]
    InconsistentOriginHeaders { is_remote_missing: bool },
-    #[error("Inconsistent `Import` headers: {remote}: {remote_status}, {index}: {index_status}, {docs}: {docs_status}.\n - Hint: either all three headers should be provided, or none of them",
-        remote = PROXY_IMPORT_REMOTE_HEADER,
-        remote_status = if *is_remote_missing { "missing" } else{ "provided" },
-        index = PROXY_IMPORT_INDEX_HEADER,
-        index_status = if *is_index_missing { "missing" } else { "provided" },
-        docs = PROXY_IMPORT_DOCS_HEADER,
-        docs_status = if *is_docs_missing { "missing" } else { "provided" }
-    )]
-    InconsistentImportHeaders {
-        is_remote_missing: bool,
-        is_index_missing: bool,
-        is_docs_missing: bool,
-    },
-    #[error("Inconsistent `Import-Metadata` headers: {index_count}: {index_count_status}, {task_key}: {task_key_status}, {total_index_documents}: {total_index_documents_status}.\n - Hint: either all three headers should be provided, or none of them",
-        index_count = PROXY_IMPORT_INDEX_COUNT_HEADER,
-        index_count_status = if *is_index_count_missing { "missing" } else { "provided"},
-        task_key = PROXY_IMPORT_TASK_KEY_HEADER,
-        task_key_status = if *is_task_key_missing { "missing" } else { "provided"},
-        total_index_documents = PROXY_IMPORT_TOTAL_INDEX_DOCS_HEADER,
-        total_index_documents_status = if *is_total_index_documents_missing { "missing" } else { "provided"},
-    )]
-    InconsistentImportMetadataHeaders {
-        is_index_count_missing: bool,
-        is_task_key_missing: bool,
-        is_total_index_documents_missing: bool,
-    },
-
-    #[error(
-        "Inconsistent task network headers: origin headers: {origin_status}, import headers: {import_status}, import metadata: {import_metadata_status}",
-        origin_status =  if *is_missing_origin { "missing"} else { "present" },
-        import_status =  if *is_missing_import { "missing"} else { "present" },
-        import_metadata_status =  if *is_missing_import_metadata { "missing"} else { "present" })]
-    InconsistentTaskNetworkHeaders {
-        is_missing_origin: bool,
-        is_missing_import: bool,
-        is_missing_import_metadata: bool,
-    },
    #[error("Invalid value for header {header_name}: {msg}")]
    InvalidHeaderValue { header_name: &'static str, msg: String },
-    #[error("This remote is not the leader of the network.\n  - Note: only the leader `{leader}` can receive new tasks.")]
-    NotLeader { leader: String },
-    #[error("Unexpected `previousRemotes` in network call.\n  - Note: `previousRemote` is reserved for internal use.")]
-    UnexpectedNetworkPreviousRemotes,
 }

 impl MeilisearchHttpError {
@@ -187,17 +142,10 @@ impl ErrorCode for MeilisearchHttpError {
            MeilisearchHttpError::PersonalizationInFederatedQuery(_) => {
                Code::InvalidMultiSearchQueryPersonalization
            }
-            MeilisearchHttpError::InconsistentOriginHeaders { .. }
-            | MeilisearchHttpError::InconsistentImportHeaders { .. }
-            | MeilisearchHttpError::InconsistentImportMetadataHeaders { .. }
-            | MeilisearchHttpError::InconsistentTaskNetworkHeaders { .. } => {
+            MeilisearchHttpError::InconsistentOriginHeaders { .. } => {
                Code::InconsistentDocumentChangeHeaders
            }
            MeilisearchHttpError::InvalidHeaderValue { .. } => Code::InvalidHeaderValue,
-            MeilisearchHttpError::NotLeader { .. } => Code::NotLeader,
-            MeilisearchHttpError::UnexpectedNetworkPreviousRemotes => {
-                Code::UnexpectedNetworkPreviousRemotes
-            }
        }
    }
 }
--- a/crates/meilisearch/src/routes/indexes/documents.rs
+++ b/crates/meilisearch/src/routes/indexes/documents.rs
@@ -45,9 +45,7 @@ use crate::extractors::authentication::policies::*;
 use crate::extractors::authentication::GuardedData;
 use crate::extractors::payload::Payload;
 use crate::extractors::sequential_extractor::SeqHandler;
-use crate::routes::indexes::enterprise_edition::proxy::{
-    proxy, task_network_and_check_leader, Body,
-};
+use crate::routes::indexes::enterprise_edition::proxy::{proxy, Body};
 use crate::routes::indexes::search::fix_sort_query_parameters;
 use crate::routes::{
    get_task_id, is_dry_run, PaginationView, SummarizedTaskView, PAGINATION_DEFAULT_LIMIT,
@@ -344,7 +342,6 @@ pub async fn delete_document(
    let DocumentParam { index_uid, document_id } = path.into_inner();
    let index_uid = IndexUid::try_from(index_uid)?;
    let network = index_scheduler.network();
-    let task_network = task_network_and_check_leader(&req, &network)?;

    analytics.publish(
        DocumentsDeletionAggregator {
@@ -362,23 +359,16 @@ pub async fn delete_document(
    };
    let uid = get_task_id(&req, &opt)?;
    let dry_run = is_dry_run(&req, &opt)?;
-    let mut task = {
+    let task = {
        let index_scheduler = index_scheduler.clone();
        tokio::task::spawn_blocking(move || {
-            index_scheduler.register_with_custom_metadata(
-                task,
-                uid,
-                custom_metadata,
-                dry_run,
-                task_network,
-            )
+            index_scheduler.register_with_custom_metadata(task, uid, custom_metadata, dry_run)
        })
        .await??
    };

-    if let Some(task_network) = task.network.take() {
-        proxy(&index_scheduler, Some(&index_uid), &req, task_network, network, Body::none(), &task)
-            .await?;
+    if network.sharding && !dry_run {
+        proxy(&index_scheduler, &index_uid, &req, network, Body::none(), &task).await?;
    }

    let task: SummarizedTaskView = task.into();
@@ -977,7 +967,6 @@ async fn document_addition(
 ) -> Result<SummarizedTaskView, MeilisearchHttpError> {
    let mime_type = extract_mime_type(req)?;
    let network = index_scheduler.network();
-    let task_network = task_network_and_check_leader(&req, &network)?;

    let format = match (
        mime_type.as_ref().map(|m| (m.type_().as_str(), m.subtype().as_str())),
@@ -1096,16 +1085,9 @@ async fn document_addition(
        index_uid: index_uid.to_string(),
    };

-    /// FIXME: not new to this PR, but _any_ error here will cause the payload to unduly persist
    let scheduler = index_scheduler.clone();
-    let mut task = match tokio::task::spawn_blocking(move || {
-        scheduler.register_with_custom_metadata(
-            task,
-            task_id,
-            custom_metadata,
-            dry_run,
-            task_network,
-        )
+    let task = match tokio::task::spawn_blocking(move || {
+        scheduler.register_with_custom_metadata(task, task_id, custom_metadata, dry_run)
    })
    .await?
    {
@@ -1116,13 +1098,12 @@ async fn document_addition(
        }
    };

-    if let Some(task_network) = task.network.take() {
+    if network.sharding {
        if let Some(file) = file {
            proxy(
                &index_scheduler,
-                Some(&index_uid),
+                &index_uid,
                req,
-                task_network,
                network,
                Body::with_ndjson_payload(file),
                &task,
@@ -1213,7 +1194,6 @@ pub async fn delete_documents_batch(

    let index_uid = IndexUid::try_from(index_uid.into_inner())?;
    let network = index_scheduler.network();
-    let task_network = task_network_and_check_leader(&req, &network)?;

    analytics.publish(
        DocumentsDeletionAggregator {
@@ -1234,31 +1214,16 @@ pub async fn delete_documents_batch(
        KindWithContent::DocumentDeletion { index_uid: index_uid.to_string(), documents_ids: ids };
    let uid = get_task_id(&req, &opt)?;
    let dry_run = is_dry_run(&req, &opt)?;
-    let mut task = {
+    let task = {
        let index_scheduler = index_scheduler.clone();
        tokio::task::spawn_blocking(move || {
-            index_scheduler.register_with_custom_metadata(
-                task,
-                uid,
-                custom_metadata,
-                dry_run,
-                task_network,
-            )
+            index_scheduler.register_with_custom_metadata(task, uid, custom_metadata, dry_run)
        })
        .await??
    };

-    if let Some(task_network) = task.network.take() {
-        proxy(
-            &index_scheduler,
-            Some(&index_uid),
-            &req,
-            task_network,
-            network,
-            Body::inline(body),
-            &task,
-        )
-        .await?;
+    if network.sharding && !dry_run {
+        proxy(&index_scheduler, &index_uid, &req, network, Body::Inline(body), &task).await?;
    }

    let task: SummarizedTaskView = task.into();
@@ -1321,7 +1286,6 @@ pub async fn delete_documents_by_filter(
    let index_uid = index_uid.into_inner();
    let filter = body.into_inner();
    let network = index_scheduler.network();
-    let task_network = task_network_and_check_leader(&req, &network)?;

    analytics.publish(
        DocumentsDeletionAggregator {
@@ -1348,31 +1312,16 @@ pub async fn delete_documents_by_filter(

    let uid = get_task_id(&req, &opt)?;
    let dry_run = is_dry_run(&req, &opt)?;
-    let mut task = {
+    let task = {
        let index_scheduler = index_scheduler.clone();
        tokio::task::spawn_blocking(move || {
-            index_scheduler.register_with_custom_metadata(
-                task,
-                uid,
-                custom_metadata,
-                dry_run,
-                task_network,
-            )
+            index_scheduler.register_with_custom_metadata(task, uid, custom_metadata, dry_run)
        })
        .await??
    };

-    if let Some(task_network) = task.network.take() {
-        proxy(
-            &index_scheduler,
-            Some(&index_uid),
-            &req,
-            task_network,
-            network,
-            Body::inline(filter),
-            &task,
-        )
-        .await?;
+    if network.sharding && !dry_run {
+        proxy(&index_scheduler, &index_uid, &req, network, Body::Inline(filter), &task).await?;
    }

    let task: SummarizedTaskView = task.into();
@@ -1472,7 +1421,6 @@ pub async fn edit_documents_by_function(
        .check_edit_documents_by_function("Using the documents edit route")?;

    let network = index_scheduler.network();
-    let task_network = task_network_and_check_leader(&req, &network)?;

    let index_uid = IndexUid::try_from(index_uid.into_inner())?;
    let index_uid = index_uid.into_inner();
@@ -1519,31 +1467,16 @@ pub async fn edit_documents_by_function(

    let uid = get_task_id(&req, &opt)?;
    let dry_run = is_dry_run(&req, &opt)?;
-    let mut task = {
+    let task = {
        let index_scheduler = index_scheduler.clone();
        tokio::task::spawn_blocking(move || {
-            index_scheduler.register_with_custom_metadata(
-                task,
-                uid,
-                custom_metadata,
-                dry_run,
-                task_network,
-            )
+            index_scheduler.register_with_custom_metadata(task, uid, custom_metadata, dry_run)
        })
        .await??
    };

-    if let Some(task_network) = task.network.take() {
-        proxy(
-            &index_scheduler,
-            Some(&index_uid),
-            &req,
-            task_network,
-            network,
-            Body::inline(body),
-            &task,
-        )
-        .await?;
+    if network.sharding && !dry_run {
+        proxy(&index_scheduler, &index_uid, &req, network, Body::Inline(body), &task).await?;
    }

    let task: SummarizedTaskView = task.into();
@@ -1592,7 +1525,6 @@ pub async fn clear_all_documents(
    let index_uid = IndexUid::try_from(index_uid.into_inner())?;
    let network = index_scheduler.network();
    let CustomMetadataQuery { custom_metadata } = params.into_inner();
-    let task_network = task_network_and_check_leader(&req, &network)?;

    analytics.publish(
        DocumentsDeletionAggregator {
@@ -1608,24 +1540,17 @@ pub async fn clear_all_documents(
    let uid = get_task_id(&req, &opt)?;
    let dry_run = is_dry_run(&req, &opt)?;

-    let mut task = {
+    let task = {
        let index_scheduler = index_scheduler.clone();

        tokio::task::spawn_blocking(move || {
-            index_scheduler.register_with_custom_metadata(
-                task,
-                uid,
-                custom_metadata,
-                dry_run,
-                task_network,
-            )
+            index_scheduler.register_with_custom_metadata(task, uid, custom_metadata, dry_run)
        })
        .await??
    };

-    if let Some(task_network) = task.network.take() {
-        proxy(&index_scheduler, Some(&index_uid), &req, task_network, network, Body::none(), &task)
-            .await?;
+    if network.sharding && !dry_run {
+        proxy(&index_scheduler, &index_uid, &req, network, Body::none(), &task).await?;
    }

    let task: SummarizedTaskView = task.into();
--- a/crates/meilisearch/src/routes/indexes/enterprise_edition/proxy.rs
+++ b/crates/meilisearch/src/routes/indexes/enterprise_edition/proxy.rs
@@ -3,7 +3,6 @@
 // Use of this source code is governed by the Business Source License 1.1,
 // as found in the LICENSE-EE file or at <https://mariadb.com/bsl11>

-use std::borrow::Cow;
 use std::collections::BTreeMap;
 use std::fs::File;

@@ -11,18 +10,8 @@ use actix_web::http::header::CONTENT_TYPE;
 use actix_web::HttpRequest;
 use bytes::Bytes;
 use index_scheduler::IndexScheduler;
-use meilisearch_types::enterprise_edition::network::Remote;
 use meilisearch_types::error::ResponseError;
-use meilisearch_types::milli::DocumentId;
-use meilisearch_types::tasks::enterprise_edition::network::headers::{
-    PROXY_IMPORT_DOCS_HEADER, PROXY_IMPORT_INDEX_COUNT_HEADER, PROXY_IMPORT_INDEX_HEADER,
-    PROXY_IMPORT_REMOTE_HEADER, PROXY_IMPORT_TASK_KEY_HEADER, PROXY_IMPORT_TOTAL_INDEX_DOCS_HEADER,
-    PROXY_ORIGIN_NETWORK_VERSION_HEADER, PROXY_ORIGIN_REMOTE_HEADER, PROXY_ORIGIN_TASK_UID_HEADER,
-};
-use meilisearch_types::tasks::enterprise_edition::network::{
-    DbTaskNetwork, ImportData, ImportMetadata, Origin, TaskNetwork,
-};
-use meilisearch_types::tasks::Task;
+use meilisearch_types::tasks::{Origin, RemoteTask, TaskNetwork};
 use reqwest::StatusCode;
 use serde::de::DeserializeOwned;
 use serde_json::Value;
@@ -33,18 +22,13 @@ use crate::routes::indexes::enterprise_edition::proxy::error::{
 };
 use crate::routes::SummarizedTaskView;

-pub enum Body<T, F>
-where
-    T: serde::Serialize,
-    F: FnMut(&str, &Remote, &mut T),
-{
+pub enum Body<T: serde::Serialize> {
    NdJsonPayload(File),
    Inline(T),
-    Generated(T, F),
    None,
 }

-impl Body<(), fn(&str, &Remote, &mut ())> {
+impl Body<()> {
    pub fn with_ndjson_payload(file: File) -> Self {
        Self::NdJsonPayload(file)
    }
@@ -54,115 +38,7 @@ impl Body<(), fn(&str, &Remote, &mut ())> {
    }
 }

-impl<T> Body<T, fn(&str, &Remote, &mut T)>
-where
-    T: serde::Serialize,
-{
-    pub fn inline(payload: T) -> Self {
-        Self::Inline(payload)
-    }
-}
-
-impl<T, F> Body<T, F>
-where
-    T: serde::Serialize,
-    F: FnMut(&str, &Remote, &mut T),
-{
-    pub fn generated(initial: T, f: F) -> Self {
-        Self::Generated(initial, f)
-    }
-}
-
-impl<T, F> Body<T, F>
-where
-    T: serde::Serialize,
-    F: FnMut(&str, &Remote, &mut T),
-{
-    pub fn into_bytes_iter(
-        self,
-        remotes: impl IntoIterator<Item = (String, Remote)>,
-    ) -> Result<
-        impl Iterator<Item = (Option<Bytes>, (String, Remote))>,
-        meilisearch_types::milli::Error,
-    > {
-        let bytes = match self {
-            Body::NdJsonPayload(file) => {
-                Some(Bytes::from_owner(unsafe { memmap2::Mmap::map(&file)? }))
-            }
-
-            Body::Inline(payload) => {
-                Some(Bytes::copy_from_slice(&serde_json::to_vec(&payload).unwrap()))
-            }
-
-            Body::None => None,
-
-            Body::Generated(mut initial, mut f) => {
-                return Ok(either::Right(remotes.into_iter().map(move |(name, remote)| {
-                    f(&name, &remote, &mut initial);
-                    let bytes =
-                        Some(Bytes::copy_from_slice(&serde_json::to_vec(&initial).unwrap()));
-                    (bytes, (name, remote))
-                })));
-            }
-        };
-        Ok(either::Left(std::iter::repeat(bytes).zip(remotes)))
-    }
-}
-
-/// Parses the header to determine if this task is a duplicate and originates with a remote.
-///
-/// If not, checks whether this remote is the leader and return `MeilisearchHttpError::NotLeader` if not.
-///
-/// If there is no leader, returns `Ok(None)`
-///
-/// # Errors
-///
-/// - `MeiliearchHttpError::NotLeader`: if the following are true simultaneously:
-///     1. The task originates with the current node
-///     2. There's a declared `leader`
-///     3. The declared leader is **not** the current node
-/// - `MeilisearchHttpError::InvalidHeaderValue`: if only parts of the headers are present, or if they cannot be parsed as a task network.
-/// - `MeilisearchHttpError::Inconsistent`
-pub fn task_network_and_check_leader(
-    req: &HttpRequest,
-    network: &meilisearch_types::enterprise_edition::network::Network,
-) -> Result<Option<TaskNetwork>, MeilisearchHttpError> {
-    match (origin_from_req(req)?, import_data_from_req(req)?, import_metadata_from_req(req)?) {
-        (Some(network_change), Some(import_from), Some(metadata)) => {
-            Ok(Some(TaskNetwork::Import { import_from, network_change, metadata }))
-        }
-        (Some(origin), None, None) => Ok(Some(TaskNetwork::Origin { origin })),
-        (None, None, None) => {
-            match (network.leader.as_deref(), network.local.as_deref()) {
-                // 1. Always allowed if there is no leader
-                (None, _) => return Ok(None),
-                // 2. Allowed if the leader is self
-                (Some(leader), Some(this)) if leader == this => (),
-                // 3. Any other change is disallowed
-                (Some(leader), _) => {
-                    return Err(
-                        MeilisearchHttpError::NotLeader { leader: leader.to_string() }.into()
-                    )
-                }
-            }
-
-            Ok(Some(TaskNetwork::Remotes {
-                remote_tasks: Default::default(),
-                network_version: network.version,
-            }))
-        }
-        // all good cases were matched, so this is always an error
-        (origin, import_from, metadata) => {
-            Err(MeilisearchHttpError::InconsistentTaskNetworkHeaders {
-                is_missing_origin: origin.is_none(),
-                is_missing_import: import_from.is_none(),
-                is_missing_import_metadata: metadata.is_none(),
-            })
-        }
-    }
-}
-
-/// Updates the task description and, if necessary, proxies the passed request to the network and update the task description.
+/// If necessary, proxies the passed request to the network and update the task description.
 ///
 /// This function reads the custom headers from the request to determine if must proxy the request or if the request
 /// has already been proxied.
@@ -172,139 +48,152 @@ pub fn task_network_and_check_leader(
 ///   with the task ids from the task queues of the remotes.
 /// - when the request has already been proxied, the custom headers contains information about the remote that created the initial task.
 ///   This information is copied to the passed task.
-///
-/// # Returns
-///
-/// The updated task. The task is read back from the database to avoid erasing concurrent changes.
-pub async fn proxy<T, F>(
+pub async fn proxy<T: serde::Serialize>(
    index_scheduler: &IndexScheduler,
-    index_uid: Option<&str>,
+    index_uid: &str,
    req: &HttpRequest,
-    mut task_network: DbTaskNetwork,
    network: meilisearch_types::enterprise_edition::network::Network,
-    body: Body<T, F>,
+    body: Body<T>,
    task: &meilisearch_types::tasks::Task,
-) -> Result<Task, MeilisearchHttpError>
-where
-    T: serde::Serialize,
-    F: FnMut(&str, &Remote, &mut T),
-{
-    if let DbTaskNetwork::Remotes { remote_tasks, network_version: _ } = &mut task_network {
-        let this = network
-            .local
-            .as_deref()
-            .expect("inconsistent `network.sharding` and `network.self`")
-            .to_owned();
-
-        let content_type = match &body {
-            // for file bodies, force x-ndjson
-            Body::NdJsonPayload(_) => Some(b"application/x-ndjson".as_slice()),
-            // otherwise get content type from request
-            _ => req.headers().get(CONTENT_TYPE).map(|h| h.as_bytes()),
-        };
-
-        let mut in_flight_remote_queries = BTreeMap::new();
-        let client = reqwest::ClientBuilder::new()
-            .connect_timeout(std::time::Duration::from_secs(3))
-            .build()
-            .unwrap();
-
-        let method = from_old_http_method(req.method());
-
-        // send payload to all remotes
-        for (body, (node_name, node)) in body
-            .into_bytes_iter(network.remotes.into_iter().filter(|(name, _)| name.as_str() != this))
-            .map_err(|err| {
-                MeilisearchHttpError::from_milli(err, index_uid.map(ToOwned::to_owned))
-            })?
-        {
-            let client = client.clone();
-            let api_key = node.write_api_key;
-            let this = this.clone();
-            let method = method.clone();
-            let path_and_query = req.uri().path_and_query().map(|paq| paq.as_str()).unwrap_or("/");
-
-            in_flight_remote_queries.insert(
-                node_name,
-                tokio::spawn({
-                    let url = format!("{}{}", node.url, path_and_query);
-
-                    let url_encoded_this = urlencoding::encode(&this).into_owned();
-                    let url_encoded_task_uid = task.uid.to_string(); // it's url encoded i promize
-
-                    let content_type = content_type.map(|b| b.to_owned());
-
-                    let backoff = backoff::ExponentialBackoffBuilder::new()
-                        .with_max_elapsed_time(Some(std::time::Duration::from_secs(25)))
-                        .build();
-
-                    backoff::future::retry(backoff, move || {
-                        let url = url.clone();
-                        let client = client.clone();
-                        let url_encoded_this = url_encoded_this.clone();
-                        let url_encoded_task_uid = url_encoded_task_uid.clone();
-                        let content_type = content_type.clone();
-
-                        let body = body.clone();
-                        let api_key = api_key.clone();
-                        let method = method.clone();
-
-                        async move {
-                            try_proxy(
-                                method,
-                                &url,
-                                content_type.as_deref(),
-                                api_key.as_deref(),
-                                &client,
-                                &url_encoded_this,
-                                &url_encoded_task_uid,
-                                body,
-                            )
-                            .await
-                        }
-                    })
-                }),
-            );
+) -> Result<(), MeilisearchHttpError> {
+    match origin_from_req(req)? {
+        Some(origin) => {
+            index_scheduler.set_task_network(task.uid, TaskNetwork::Origin { origin })?
        }
+        None => {
+            let this = network
+                .local
+                .as_deref()
+                .expect("inconsistent `network.sharding` and `network.self`")
+                .to_owned();

-        // wait for all in-flight queries to finish and collect their results
-        for (node_name, handle) in in_flight_remote_queries {
-            match handle.await {
-                Ok(Ok(res)) => {
-                    let task_uid = res.task_uid;
+            let content_type = match &body {
+                // for file bodies, force x-ndjson
+                Body::NdJsonPayload(_) => Some(b"application/x-ndjson".as_slice()),
+                // otherwise get content type from request
+                _ => req.headers().get(CONTENT_TYPE).map(|h| h.as_bytes()),
+            };

-                    remote_tasks.insert(node_name, Ok(task_uid).into());
+            let body = match body {
+                Body::NdJsonPayload(file) => Some(Bytes::from_owner(unsafe {
+                    memmap2::Mmap::map(&file).map_err(|err| {
+                        MeilisearchHttpError::from_milli(err.into(), Some(index_uid.to_owned()))
+                    })?
+                })),
+
+                Body::Inline(payload) => {
+                    Some(Bytes::copy_from_slice(&serde_json::to_vec(&payload).unwrap()))
                }
-                Ok(Err(error)) => {
-                    remote_tasks.insert(node_name, Err(error.as_response_error()).into());
-                }
-                Err(panic) => match panic.try_into_panic() {
-                    Ok(panic) => {
-                        let msg = match panic.downcast_ref::<&'static str>() {
-                            Some(s) => *s,
-                            None => match panic.downcast_ref::<String>() {
-                                Some(s) => &s[..],
-                                None => "Box<dyn Any>",
-                            },
-                        };
-                        remote_tasks.insert(
-                            node_name,
-                            Err(ResponseError::from_msg(
-                                msg.to_string(),
-                                meilisearch_types::error::Code::Internal,
-                            ))
-                            .into(),
-                        );
-                    }
-                    Err(_) => {
-                        tracing::error!("proxy task was unexpectedly cancelled")
-                    }
-                },
+
+                Body::None => None,
+            };
+
+            let mut in_flight_remote_queries = BTreeMap::new();
+            let client = reqwest::ClientBuilder::new()
+                .connect_timeout(std::time::Duration::from_secs(3))
+                .build()
+                .unwrap();
+
+            let method = from_old_http_method(req.method());
+
+            // send payload to all remotes
+            for (node_name, node) in
+                network.remotes.into_iter().filter(|(name, _)| name.as_str() != this)
+            {
+                let body = body.clone();
+                let client = client.clone();
+                let api_key = node.write_api_key;
+                let this = this.clone();
+                let method = method.clone();
+                let path_and_query =
+                    req.uri().path_and_query().map(|paq| paq.as_str()).unwrap_or("/");
+
+                in_flight_remote_queries.insert(
+                    node_name,
+                    tokio::spawn({
+                        let url = format!("{}{}", node.url, path_and_query);
+
+                        let url_encoded_this = urlencoding::encode(&this).into_owned();
+                        let url_encoded_task_uid = task.uid.to_string(); // it's url encoded i promize
+
+                        let content_type = content_type.map(|b| b.to_owned());
+
+                        let backoff = backoff::ExponentialBackoffBuilder::new()
+                            .with_max_elapsed_time(Some(std::time::Duration::from_secs(25)))
+                            .build();
+
+                        backoff::future::retry(backoff, move || {
+                            let url = url.clone();
+                            let client = client.clone();
+                            let url_encoded_this = url_encoded_this.clone();
+                            let url_encoded_task_uid = url_encoded_task_uid.clone();
+                            let content_type = content_type.clone();
+
+                            let body = body.clone();
+                            let api_key = api_key.clone();
+                            let method = method.clone();
+
+                            async move {
+                                try_proxy(
+                                    method,
+                                    &url,
+                                    content_type.as_deref(),
+                                    api_key.as_deref(),
+                                    &client,
+                                    &url_encoded_this,
+                                    &url_encoded_task_uid,
+                                    body,
+                                )
+                                .await
+                            }
+                        })
+                    }),
+                );
            }
+
+            // wait for all in-flight queries to finish and collect their results
+            let mut remote_tasks: BTreeMap<String, RemoteTask> = BTreeMap::new();
+            for (node_name, handle) in in_flight_remote_queries {
+                match handle.await {
+                    Ok(Ok(res)) => {
+                        let task_uid = res.task_uid;
+
+                        remote_tasks.insert(node_name, Ok(task_uid).into());
+                    }
+                    Ok(Err(error)) => {
+                        remote_tasks.insert(node_name, Err(error.as_response_error()).into());
+                    }
+                    Err(panic) => match panic.try_into_panic() {
+                        Ok(panic) => {
+                            let msg = match panic.downcast_ref::<&'static str>() {
+                                Some(s) => *s,
+                                None => match panic.downcast_ref::<String>() {
+                                    Some(s) => &s[..],
+                                    None => "Box<dyn Any>",
+                                },
+                            };
+                            remote_tasks.insert(
+                                node_name,
+                                Err(ResponseError::from_msg(
+                                    msg.to_string(),
+                                    meilisearch_types::error::Code::Internal,
+                                ))
+                                .into(),
+                            );
+                        }
+                        Err(_) => {
+                            tracing::error!("proxy task was unexpectedly cancelled")
+                        }
+                    },
+                }
+            }
+
+            // edit details to contain the return values from the remotes
+            index_scheduler.set_task_network(task.uid, TaskNetwork::Remotes { remote_tasks })?;
        }
    }

-    Ok(index_scheduler.set_task_network(task.uid, task_network)?)
+    Ok(())
 }

 fn from_old_http_method(method: &actix_http::Method) -> reqwest::Method {
@@ -486,23 +375,25 @@ mod error {
    }
 }

+pub const PROXY_ORIGIN_REMOTE_HEADER: &str = "Meili-Proxy-Origin-Remote";
+pub const PROXY_ORIGIN_TASK_UID_HEADER: &str = "Meili-Proxy-Origin-TaskUid";
+
 pub fn origin_from_req(req: &HttpRequest) -> Result<Option<Origin>, MeilisearchHttpError> {
-    let (remote_name, task_uid, network_version) = match (
+    let (remote_name, task_uid) = match (
        req.headers().get(PROXY_ORIGIN_REMOTE_HEADER),
        req.headers().get(PROXY_ORIGIN_TASK_UID_HEADER),
-        req.headers().get(PROXY_ORIGIN_NETWORK_VERSION_HEADER),
    ) {
-        (None, None, _) => return Ok(None),
-        (None, Some(_), _) => {
+        (None, None) => return Ok(None),
+        (None, Some(_)) => {
            return Err(MeilisearchHttpError::InconsistentOriginHeaders { is_remote_missing: true })
        }
-        (Some(_), None, _) => {
+        (Some(_), None) => {
            return Err(MeilisearchHttpError::InconsistentOriginHeaders {
                is_remote_missing: false,
            })
        }
-        (Some(remote_name), Some(task_uid), network_version) => {
-            let remote_name = urlencoding::decode(remote_name.to_str().map_err(|err| {
+        (Some(remote_name), Some(task_uid)) => (
+            urlencoding::decode(remote_name.to_str().map_err(|err| {
                MeilisearchHttpError::InvalidHeaderValue {
                    header_name: PROXY_ORIGIN_REMOTE_HEADER,
                    msg: format!("while parsing remote name as UTF-8: {err}"),
@@ -511,8 +402,8 @@ pub fn origin_from_req(req: &HttpRequest) -> Result<Option<Origin>, MeilisearchH
            .map_err(|err| MeilisearchHttpError::InvalidHeaderValue {
                header_name: PROXY_ORIGIN_REMOTE_HEADER,
                msg: format!("while URL-decoding remote name: {err}"),
-            })?;
-            let task_uid = urlencoding::decode(task_uid.to_str().map_err(|err| {
+            })?,
+            urlencoding::decode(task_uid.to_str().map_err(|err| {
                MeilisearchHttpError::InvalidHeaderValue {
                    header_name: PROXY_ORIGIN_TASK_UID_HEADER,
                    msg: format!("while parsing task UID as UTF-8: {err}"),
@@ -521,182 +412,15 @@ pub fn origin_from_req(req: &HttpRequest) -> Result<Option<Origin>, MeilisearchH
            .map_err(|err| MeilisearchHttpError::InvalidHeaderValue {
                header_name: PROXY_ORIGIN_TASK_UID_HEADER,
                msg: format!("while URL-decoding task UID: {err}"),
-            })?;
-            let network_version = match network_version {
-                Some(network_version) => {
-                    urlencoding::decode(network_version.to_str().map_err(|err| {
-                        MeilisearchHttpError::InvalidHeaderValue {
-                            header_name: PROXY_ORIGIN_NETWORK_VERSION_HEADER,
-                            msg: format!("while parsing network version as UTF-8: {err}"),
-                        }
-                    })?)
-                    .map_err(|err| {
-                        MeilisearchHttpError::InvalidHeaderValue {
-                            header_name: PROXY_ORIGIN_NETWORK_VERSION_HEADER,
-                            msg: format!("while URL-decoding network version: {err}"),
-                        }
-                    })?
-                }
-                None => Cow::Borrowed("0"),
-            };
-            (remote_name, task_uid, network_version)
-        }
+            })?,
+        ),
    };

-    let task_uid: u32 =
+    let task_uid: usize =
        task_uid.parse().map_err(|err| MeilisearchHttpError::InvalidHeaderValue {
            header_name: PROXY_ORIGIN_TASK_UID_HEADER,
            msg: format!("while parsing the task UID as an integer: {err}"),
        })?;

-    let network_version: u128 =
-        network_version.parse().map_err(|err| MeilisearchHttpError::InvalidHeaderValue {
-            header_name: PROXY_ORIGIN_NETWORK_VERSION_HEADER,
-            msg: format!("while parsing the network version as a u128: {err}"),
-        })?;
-
-    let network_version = uuid::Uuid::from_u128(network_version);
-
-    Ok(Some(Origin { remote_name: remote_name.into_owned(), task_uid, network_version }))
-}
-
-pub fn import_data_from_req(req: &HttpRequest) -> Result<Option<ImportData>, MeilisearchHttpError> {
-    let (remote_name, index_name, documents) = match (
-        req.headers().get(PROXY_IMPORT_REMOTE_HEADER),
-        req.headers().get(PROXY_IMPORT_INDEX_HEADER),
-        req.headers().get(PROXY_IMPORT_DOCS_HEADER),
-    ) {
-        (None, None, None) => return Ok(None),
-        (Some(remote_name), Some(index_name), Some(documents)) => {
-            let remote_name = urlencoding::decode(remote_name.to_str().map_err(|err| {
-                MeilisearchHttpError::InvalidHeaderValue {
-                    header_name: PROXY_IMPORT_REMOTE_HEADER,
-                    msg: format!("while parsing import remote name as UTF-8: {err}"),
-                }
-            })?)
-            .map_err(|err| MeilisearchHttpError::InvalidHeaderValue {
-                header_name: PROXY_IMPORT_REMOTE_HEADER,
-                msg: format!("while URL-decoding import remote name: {err}"),
-            })?;
-
-            let index_name = urlencoding::decode(index_name.to_str().map_err(|err| {
-                MeilisearchHttpError::InvalidHeaderValue {
-                    header_name: PROXY_IMPORT_INDEX_HEADER,
-                    msg: format!("while parsing import index name as UTF-8: {err}"),
-                }
-            })?)
-            .map_err(|err| MeilisearchHttpError::InvalidHeaderValue {
-                header_name: PROXY_IMPORT_INDEX_HEADER,
-                msg: format!("while URL-decoding import index name: {err}"),
-            })?;
-
-            let documents = urlencoding::decode(documents.to_str().map_err(|err| {
-                MeilisearchHttpError::InvalidHeaderValue {
-                    header_name: PROXY_IMPORT_DOCS_HEADER,
-                    msg: format!("while parsing documents as UTF-8: {err}"),
-                }
-            })?)
-            .map_err(|err| MeilisearchHttpError::InvalidHeaderValue {
-                header_name: PROXY_IMPORT_DOCS_HEADER,
-                msg: format!("while URL-decoding documents: {err}"),
-            })?;
-            (remote_name, index_name, documents)
-        }
-        // catch-all pattern that has to contain an inconsistency since we already matched (None, None, None) and (Some, Some, Some)
-        (remote_name, index_name, documents) => {
-            return Err(MeilisearchHttpError::InconsistentImportHeaders {
-                is_remote_missing: remote_name.is_none(),
-                is_index_missing: index_name.is_none(),
-                is_docs_missing: documents.is_none(),
-            })
-        }
-    };
-
-    let document_count: u64 =
-        documents.parse().map_err(|err| MeilisearchHttpError::InvalidHeaderValue {
-            header_name: PROXY_IMPORT_DOCS_HEADER,
-            msg: format!("while parsing the documents as an integer: {err}"),
-        })?;
-
-    Ok(Some(ImportData {
-        remote_name: remote_name.to_string(),
-        index_name: index_name.to_string(),
-        document_count,
-    }))
-}
-
-pub fn import_metadata_from_req(
-    req: &HttpRequest,
-) -> Result<Option<ImportMetadata>, MeilisearchHttpError> {
-    let (index_count, task_key, total_index_documents) = match (
-        req.headers().get(PROXY_IMPORT_INDEX_COUNT_HEADER),
-        req.headers().get(PROXY_IMPORT_TASK_KEY_HEADER),
-        req.headers().get(PROXY_IMPORT_TOTAL_INDEX_DOCS_HEADER),
-    ) {
-        (None, None, None) => return Ok(None),
-        (Some(index_count), Some(task_key), Some(total_index_documents)) => {
-            let index_count = urlencoding::decode(index_count.to_str().map_err(|err| {
-                MeilisearchHttpError::InvalidHeaderValue {
-                    header_name: PROXY_IMPORT_REMOTE_HEADER,
-                    msg: format!("while parsing import index count as UTF-8: {err}"),
-                }
-            })?)
-            .map_err(|err| MeilisearchHttpError::InvalidHeaderValue {
-                header_name: PROXY_IMPORT_INDEX_COUNT_HEADER,
-                msg: format!("while URL-decoding import index count: {err}"),
-            })?;
-
-            let task_key = urlencoding::decode(task_key.to_str().map_err(|err| {
-                MeilisearchHttpError::InvalidHeaderValue {
-                    header_name: PROXY_IMPORT_TASK_KEY_HEADER,
-                    msg: format!("while parsing import task key as UTF-8: {err}"),
-                }
-            })?)
-            .map_err(|err| MeilisearchHttpError::InvalidHeaderValue {
-                header_name: PROXY_IMPORT_TASK_KEY_HEADER,
-                msg: format!("while URL-decoding import task key: {err}"),
-            })?;
-
-            let total_index_documents =
-                urlencoding::decode(total_index_documents.to_str().map_err(|err| {
-                    MeilisearchHttpError::InvalidHeaderValue {
-                        header_name: PROXY_IMPORT_TOTAL_INDEX_DOCS_HEADER,
-                        msg: format!("while parsing total index documents as UTF-8: {err}"),
-                    }
-                })?)
-                .map_err(|err| MeilisearchHttpError::InvalidHeaderValue {
-                    header_name: PROXY_IMPORT_TOTAL_INDEX_DOCS_HEADER,
-                    msg: format!("while URL-decoding total index documents: {err}"),
-                })?;
-            (index_count, task_key, total_index_documents)
-        }
-        // catch-all pattern that has to contain an inconsistency since we already matched (None, None, None) and (Some, Some, Some)
-        (index_count, task_key, total_index_documents) => {
-            return Err(MeilisearchHttpError::InconsistentImportMetadataHeaders {
-                is_index_count_missing: index_count.is_none(),
-                is_task_key_missing: task_key.is_none(),
-                is_total_index_documents_missing: total_index_documents.is_none(),
-            })
-        }
-    };
-
-    let index_count: u64 =
-        index_count.parse().map_err(|err| MeilisearchHttpError::InvalidHeaderValue {
-            header_name: PROXY_IMPORT_INDEX_COUNT_HEADER,
-            msg: format!("while parsing the index count as an integer: {err}"),
-        })?;
-
-    let task_key: DocumentId =
-        task_key.parse().map_err(|err| MeilisearchHttpError::InvalidHeaderValue {
-            header_name: PROXY_IMPORT_TASK_KEY_HEADER,
-            msg: format!("while parsing import task key as an integer: {err}"),
-        })?;
-
-    let total_index_documents: u64 =
-        total_index_documents.parse().map_err(|err| MeilisearchHttpError::InvalidHeaderValue {
-            header_name: PROXY_IMPORT_TOTAL_INDEX_DOCS_HEADER,
-            msg: format!("while parsing the total index documents as an integer: {err}"),
-        })?;
-
-    Ok(Some(ImportMetadata { index_count, task_key, total_index_documents }))
+    Ok(Some(Origin { remote_name: remote_name.into_owned(), task_uid }))
 }
--- a/crates/meilisearch/src/routes/indexes/mod.rs
+++ b/crates/meilisearch/src/routes/indexes/mod.rs
@@ -30,7 +30,7 @@ use crate::Opt;

 pub mod compact;
 pub mod documents;
-pub mod enterprise_edition;
+mod enterprise_edition;
 pub mod facet_search;
 pub mod search;
 mod search_analytics;
@@ -41,9 +41,7 @@ mod settings_analytics;
 pub mod similar;
 mod similar_analytics;

-pub use meilisearch_types::tasks::enterprise_edition::network::headers::{
-    PROXY_ORIGIN_REMOTE_HEADER, PROXY_ORIGIN_TASK_UID_HEADER,
-};
+pub use enterprise_edition::proxy::{PROXY_ORIGIN_REMOTE_HEADER, PROXY_ORIGIN_TASK_UID_HEADER};

 #[derive(OpenApi)]
 #[openapi(
--- a/crates/meilisearch/src/routes/network.rs
+++ b/crates/meilisearch/src/routes/network.rs
@@ -9,27 +9,20 @@ use itertools::{EitherOrBoth, Itertools};
 use meilisearch_types::deserr::DeserrJsonError;
 use meilisearch_types::enterprise_edition::network::{Network as DbNetwork, Remote as DbRemote};
 use meilisearch_types::error::deserr_codes::{
-    InvalidNetworkLeader, InvalidNetworkRemotes, InvalidNetworkSearchApiKey, InvalidNetworkSelf,
+    InvalidNetworkRemotes, InvalidNetworkSearchApiKey, InvalidNetworkSelf, InvalidNetworkSharding,
    InvalidNetworkUrl, InvalidNetworkWriteApiKey,
 };
 use meilisearch_types::error::ResponseError;
 use meilisearch_types::keys::actions;
 use meilisearch_types::milli::update::Setting;
-use meilisearch_types::tasks::enterprise_edition::network::{
-    NetworkTopologyChange, Origin, DbTaskNetwork,
-};
-use meilisearch_types::tasks::KindWithContent;
 use serde::Serialize;
 use tracing::debug;
 use utoipa::{OpenApi, ToSchema};

 use crate::analytics::{Aggregate, Analytics};
-use crate::error::MeilisearchHttpError;
 use crate::extractors::authentication::policies::ActionPolicy;
 use crate::extractors::authentication::GuardedData;
 use crate::extractors::sequential_extractor::SeqHandler;
-use crate::routes::indexes::enterprise_edition::proxy::{proxy, Body};
-use crate::routes::SummarizedTaskView;

 #[derive(OpenApi)]
 #[openapi(
@@ -90,7 +83,7 @@ async fn get_network(
    Ok(HttpResponse::Ok().json(network))
 }

-#[derive(Clone, Debug, Deserr, ToSchema, Serialize)]
+#[derive(Debug, Deserr, ToSchema, Serialize)]
 #[deserr(error = DeserrJsonError<InvalidNetworkRemotes>, rename_all = camelCase, deny_unknown_fields)]
 #[serde(rename_all = "camelCase")]
 #[schema(rename_all = "camelCase")]
@@ -113,19 +106,12 @@ pub struct Remote {
    pub write_api_key: Setting<String>,
 }

-#[derive(Clone, Debug, Deserr, ToSchema, Serialize)]
+#[derive(Debug, Deserr, ToSchema, Serialize)]
 #[deserr(error = DeserrJsonError, rename_all = camelCase, deny_unknown_fields)]
 #[serde(rename_all = "camelCase")]
 #[schema(rename_all = "camelCase")]
 pub struct Network {
-    #[schema(value_type = Option<BTreeMap<String, Remote>>, example = json!({
-        "ms-00": {
-            "url": "http://localhost:7700"
-        },
-        "ms-01": {
-            "url": "http://localhost:7701"
-        }
-    }))]
+    #[schema(value_type = Option<BTreeMap<String, Remote>>, example = json!("http://localhost:7700"))]
    #[deserr(default, error = DeserrJsonError<InvalidNetworkRemotes>)]
    #[serde(default)]
    pub remotes: Setting<BTreeMap<String, Option<Remote>>>,
@@ -133,21 +119,10 @@ pub struct Network {
    #[serde(default, rename = "self")]
    #[deserr(default, rename = "self", error = DeserrJsonError<InvalidNetworkSelf>)]
    pub local: Setting<String>,
-    #[schema(value_type = Option<String>, example = json!("ms-00"))]
+    #[schema(value_type = Option<bool>, example = json!(true))]
    #[serde(default)]
-    #[deserr(default, error = DeserrJsonError<InvalidNetworkLeader>)]
-    pub leader: Setting<String>,
-    #[schema(value_type = Option<BTreeMap<String, Remote>>, example = json!({
-        "ms-00": {
-            "url": "http://localhost:7700"
-        },
-        "ms-01": {
-            "url": "http://localhost:7701"
-        }
-    }))]
-    #[deserr(default, error = DeserrJsonError<InvalidNetworkRemotes>)]
-    #[serde(default)]
-    pub previous_remotes: Setting<BTreeMap<String, Option<Remote>>>,
+    #[deserr(default, error = DeserrJsonError<InvalidNetworkSharding>)]
+    pub sharding: Setting<bool>,
 }

 impl Remote {
@@ -232,203 +207,29 @@ async fn patch_network(
 ) -> Result<HttpResponse, ResponseError> {
    index_scheduler.features().check_network("Using the /network route")?;

-    match crate::routes::indexes::enterprise_edition::proxy::origin_from_req(&req)? {
-        Some(origin) => {
-            patch_network_with_origin(index_scheduler, new_network, req, origin, analytics).await
-        }
-        None => patch_network_without_origin(index_scheduler, new_network, req, analytics).await,
-    }
-}
-
-async fn patch_network_without_origin(
-    index_scheduler: GuardedData<ActionPolicy<{ actions::NETWORK_UPDATE }>, Data<IndexScheduler>>,
-    new_network: AwebJson<Network, DeserrJsonError>,
-    req: HttpRequest,
-    analytics: Data<Analytics>,
-) -> Result<HttpResponse, ResponseError> {
    let new_network = new_network.0;
    let old_network = index_scheduler.network();
    debug!(parameters = ?new_network, "Patch network");

-    if !matches!(new_network.previous_remotes, Setting::NotSet) {
-        return Err(MeilisearchHttpError::UnexpectedNetworkPreviousRemotes.into());
-    }
-
-    let merged_network = merge_networks(old_network.clone(), new_network)?;
-    index_scheduler.put_network(merged_network.clone())?;
-
-    analytics.publish(
-        PatchNetworkAnalytics {
-            network_size: merged_network.remotes.len(),
-            network_has_self: merged_network.local.is_some(),
-        },
-        &req,
-    );
-
-    /// TODO: spawn task only if necessary
-    let network_topology_change =
-        NetworkTopologyChange::new(old_network.clone(), merged_network.clone());
-    let task = KindWithContent::NetworkTopologyChange(network_topology_change);
-    let task = {
-        let index_scheduler = index_scheduler.clone();
-        tokio::task::spawn_blocking(move || index_scheduler.register(task, None, false)).await??
-    };
-
-    let mut proxied_network = Network {
-        remotes: Setting::Set(to_settings_remotes(&merged_network.remotes)),
-        local: Setting::NotSet,
-        leader: Setting::some_or_not_set(merged_network.leader.clone()),
-        previous_remotes: Setting::Set(to_settings_remotes(&old_network.remotes)),
-    };
-    let mut deleted_network = old_network;
-
-    let deleted_remotes = &mut deleted_network.remotes;
-    deleted_remotes.retain(|node, _| !merged_network.remotes.contains_key(node));
-
-    // proxy network change to the remaining remotes.
-    let updated_task = proxy(
-        &index_scheduler,
-        None,
-        &req,
-        DbTaskNetwork::Remotes {
-            remote_tasks: Default::default(),
-            network_version: merged_network.version,
-        },
-        merged_network,
-        Body::generated(proxied_network.clone(), |name, _remote, network| {
-            network.local = Setting::Set(name.to_string());
-        }),
-        &task,
-    )
-    .await?;
-    // unwrap: network was set by `proxy`
-    let task_network = updated_task.network.unwrap();
-
-    proxied_network.previous_remotes = Setting::NotSet;
-
-    // proxy network change to the deleted remotes
-    proxy(
-        &index_scheduler,
-        None,
-        &req,
-        task_network,
-        deleted_network,
-        Body::generated(proxied_network.clone(), |_name, _remote, network| {
-            network.local = Setting::Reset;
-        }),
-        &task,
-    )
-    .await?;
-
-    let task: SummarizedTaskView = task.into();
-    debug!("returns: {:?}", task);
-    Ok(HttpResponse::Accepted().json(task))
-}
-
-async fn patch_network_with_origin(
-    index_scheduler: GuardedData<ActionPolicy<{ actions::NETWORK_UPDATE }>, Data<IndexScheduler>>,
-    merged_network: AwebJson<Network, DeserrJsonError>,
-    req: HttpRequest,
-    origin: Origin,
-    analytics: Data<Analytics>,
-) -> Result<HttpResponse, ResponseError> {
-    let merged_network = merged_network.into_inner();
-    debug!(parameters = ?merged_network, ?origin, "Patch network");
-    let mut remotes = BTreeMap::new();
-    let mut old_network = index_scheduler.network();
-
-    for (name, remote) in merged_network.remotes.set().into_iter().flat_map(|x| x.into_iter()) {
-        let Some(remote) = remote else { continue };
-        let remote = remote.try_into_db_node(&name)?;
-        remotes.insert(name, remote);
-    }
-    let mut previous_remotes = BTreeMap::new();
-    for (name, remote) in
-        merged_network.previous_remotes.set().into_iter().flat_map(|x| x.into_iter())
-    {
-        let Some(remote) = remote else {
-            continue;
-        };
-        let remote = remote.try_into_db_node(&name)?;
-        previous_remotes.insert(name, remote);
-    }
-
-    old_network.remotes = previous_remotes;
-
-    let new_network = DbNetwork {
-        local: merged_network.local.set(),
-        remotes,
-        leader: merged_network.leader.set(),
-        version: origin.network_version,
-    };
-    index_scheduler.put_network(new_network.clone())?;
-
-    analytics.publish(
-        PatchNetworkAnalytics {
-            network_size: new_network.remotes.len(),
-            network_has_self: new_network.local.is_some(),
-        },
-        &req,
-    );
-
-    /// TODO: spawn task only if necessary
-    let network_topology_change = NetworkTopologyChange::new(old_network, new_network);
-    let task = KindWithContent::NetworkTopologyChange(network_topology_change);
-    let task = {
-        let index_scheduler = index_scheduler.clone();
-        tokio::task::spawn_blocking(move || index_scheduler.register(task, None, false)).await??
-    };
-
-    index_scheduler.set_task_network(task.uid, DbTaskNetwork::Origin { origin })?;
-
-    let task: SummarizedTaskView = task.into();
-    debug!("returns: {:?}", task);
-    Ok(HttpResponse::Accepted().json(task))
-}
-
-fn to_settings_remotes(
-    db_remotes: &BTreeMap<String, DbRemote>,
-) -> BTreeMap<String, Option<Remote>> {
-    db_remotes
-        .iter()
-        .map(|(name, remote)| {
-            (
-                name.clone(),
-                Some(Remote {
-                    url: Setting::Set(remote.url.clone()),
-                    search_api_key: Setting::some_or_not_set(remote.search_api_key.clone()),
-                    write_api_key: Setting::some_or_not_set(remote.write_api_key.clone()),
-                }),
-            )
-        })
-        .collect()
-}
-
-fn merge_networks(
-    old_network: DbNetwork,
-    new_network: Network,
-) -> Result<DbNetwork, ResponseError> {
    let merged_self = match new_network.local {
        Setting::Set(new_self) => Some(new_self),
        Setting::Reset => None,
        Setting::NotSet => old_network.local,
    };
-    let merged_leader = match new_network.leader {
-        Setting::Set(new_leader) => Some(new_leader),
-        Setting::Reset => None,
-        Setting::NotSet => old_network.leader,
+
+    let merged_sharding = match new_network.sharding {
+        Setting::Set(new_sharding) => new_sharding,
+        Setting::Reset => false,
+        Setting::NotSet => old_network.sharding,
    };
-    match (merged_leader.as_deref(), merged_self.as_deref()) {
-        // 1. Always allowed if there is no leader
-        (None, _) => (),
-        // 2. Allowed if the leader is self
-        (Some(leader), Some(this)) if leader == this => (),
-        // 3. Any other change is disallowed
-        (Some(leader), _) => {
-            return Err(MeilisearchHttpError::NotLeader { leader: leader.to_string() }.into())
-        }
+
+    if merged_sharding && merged_self.is_none() {
+        return Err(ResponseError::from_msg(
+            "`.sharding`: enabling the sharding requires `.self` to be set\n  - Hint: Disable `sharding` or set `self` to a value.".into(),
+            meilisearch_types::error::Code::InvalidNetworkSharding,
+        ));
    }
-    let new_version = uuid::Uuid::now_v7();
+
    let merged_remotes = match new_network.remotes {
        Setting::Set(new_remotes) => {
            let mut merged_remotes = BTreeMap::new();
@@ -500,11 +301,18 @@ fn merge_networks(
        Setting::Reset => BTreeMap::new(),
        Setting::NotSet => old_network.remotes,
    };
-    let merged_network = DbNetwork {
-        local: merged_self,
-        remotes: merged_remotes,
-        leader: merged_leader,
-        version: new_version,
-    };
-    Ok(merged_network)
+
+    analytics.publish(
+        PatchNetworkAnalytics {
+            network_size: merged_remotes.len(),
+            network_has_self: merged_self.is_some(),
+        },
+        &req,
+    );
+
+    let merged_network =
+        DbNetwork { local: merged_self, remotes: merged_remotes, sharding: merged_sharding };
+    index_scheduler.put_network(merged_network.clone())?;
+    debug!(returns = ?merged_network, "Patch network");
+    Ok(HttpResponse::Ok().json(merged_network))
 }
--- a/crates/meilisearch/tests/upgrade/mod.rs
+++ b/crates/meilisearch/tests/upgrade/mod.rs
@@ -43,7 +43,7 @@ async fn version_too_old() {
    std::fs::write(db_path.join("VERSION"), "1.11.9999").unwrap();
    let options = Opt { experimental_dumpless_upgrade: true, ..default_settings };
    let err = Server::new_with_options(options).await.map(|_| ()).unwrap_err();
-    snapshot!(err, @"Database version 1.11.9999 is too old for the experimental dumpless upgrade feature. Please generate a dump using the v1.11.9999 and import it in the v1.26.0");
+    snapshot!(err, @"Database version 1.11.9999 is too old for the experimental dumpless upgrade feature. Please generate a dump using the v1.11.9999 and import it in the v1.25.0");
 }

 #[actix_rt::test]
@@ -58,7 +58,7 @@ async fn version_requires_downgrade() {
    std::fs::write(db_path.join("VERSION"), format!("{major}.{minor}.{patch}")).unwrap();
    let options = Opt { experimental_dumpless_upgrade: true, ..default_settings };
    let err = Server::new_with_options(options).await.map(|_| ()).unwrap_err();
-    snapshot!(err, @"Database version 1.26.1 is higher than the Meilisearch version 1.26.0. Downgrade is not supported");
+    snapshot!(err, @"Database version 1.25.1 is higher than the Meilisearch version 1.25.0. Downgrade is not supported");
 }

 #[actix_rt::test]
--- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap
+++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap
@@ -8,7 +8,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs
      "progress": null,
      "details": {
        "upgradeFrom": "v1.12.0",
-        "upgradeTo": "v1.26.0"
+        "upgradeTo": "v1.25.0"
      },
      "stats": {
        "totalNbTasks": 1,
--- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap
+++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap
@@ -8,7 +8,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs
      "progress": null,
      "details": {
        "upgradeFrom": "v1.12.0",
-        "upgradeTo": "v1.26.0"
+        "upgradeTo": "v1.25.0"
      },
      "stats": {
        "totalNbTasks": 1,
--- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap
+++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap
@@ -8,7 +8,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs
      "progress": null,
      "details": {
        "upgradeFrom": "v1.12.0",
-        "upgradeTo": "v1.26.0"
+        "upgradeTo": "v1.25.0"
      },
      "stats": {
        "totalNbTasks": 1,
--- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/tasks_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap
+++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/tasks_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap
@@ -12,7 +12,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs
      "canceledBy": null,
      "details": {
        "upgradeFrom": "v1.12.0",
-        "upgradeTo": "v1.26.0"
+        "upgradeTo": "v1.25.0"
      },
      "error": null,
      "duration": "[duration]",
--- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/tasks_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap
+++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/tasks_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap
@@ -12,7 +12,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs
      "canceledBy": null,
      "details": {
        "upgradeFrom": "v1.12.0",
-        "upgradeTo": "v1.26.0"
+        "upgradeTo": "v1.25.0"
      },
      "error": null,
      "duration": "[duration]",
--- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/tasks_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap
+++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/tasks_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap
@@ -12,7 +12,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs
      "canceledBy": null,
      "details": {
        "upgradeFrom": "v1.12.0",
-        "upgradeTo": "v1.26.0"
+        "upgradeTo": "v1.25.0"
      },
      "error": null,
      "duration": "[duration]",
--- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/the_whole_batch_queue_once_everything_has_been_processed.snap
+++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/the_whole_batch_queue_once_everything_has_been_processed.snap
@@ -8,7 +8,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs
      "progress": null,
      "details": {
        "upgradeFrom": "v1.12.0",
-        "upgradeTo": "v1.26.0"
+        "upgradeTo": "v1.25.0"
      },
      "stats": {
        "totalNbTasks": 1,
--- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/the_whole_task_queue_once_everything_has_been_processed.snap
+++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/the_whole_task_queue_once_everything_has_been_processed.snap
@@ -12,7 +12,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs
      "canceledBy": null,
      "details": {
        "upgradeFrom": "v1.12.0",
-        "upgradeTo": "v1.26.0"
+        "upgradeTo": "v1.25.0"
      },
      "error": null,
      "duration": "[duration]",
--- a/crates/milli/Cargo.toml
+++ b/crates/milli/Cargo.toml
@@ -101,6 +101,7 @@ bumpalo = "3.18.1"
 bumparaw-collections = "0.1.4"
 steppe = { version = "0.4", default-features = false }
 thread_local = "1.1.9"
+allocator-api2 = "0.3.0"
 rustc-hash = "2.1.1"
 enum-iterator = "2.1.0"
 bbqueue = { git = "https://github.com/meilisearch/bbqueue" }
--- a/crates/milli/src/update/new/indexer/enterprise_edition/sharding.rs
+++ b/crates/milli/src/update/new/indexer/enterprise_edition/sharding.rs
@@ -5,36 +5,18 @@

 use std::hash::{BuildHasher as _, BuildHasherDefault};

-pub struct Shards(pub Vec<Shard>);
-
-pub struct Shard {
-    pub is_own: bool,
-    pub name: String,
+pub struct Shards {
+    pub own: Vec<String>,
+    pub others: Vec<String>,
 }

 impl Shards {
-    pub fn from_remotes_local<'a>(
-        remotes: impl IntoIterator<Item = &'a str>,
-        local: Option<&str>,
-    ) -> Self {
-        Shards(
-            remotes
-                .into_iter()
-                .map(|name| Shard { is_own: Some(name) == local, name: name.to_owned() })
-                .collect(),
-        )
-    }
-
    pub fn must_process(&self, docid: &str) -> bool {
-        self.processing_shard(docid).map(|shard| shard.is_own).unwrap_or_default()
-    }
-
-    pub fn processing_shard<'a>(&'a self, docid: &str) -> Option<&'a Shard> {
        let hasher = BuildHasherDefault::<twox_hash::XxHash3_64>::new();
-        let to_hash = |shard: &'a Shard| (shard, hasher.hash_one((&shard.name, docid)));
+        let to_hash = |shard: &String| hasher.hash_one((shard, docid));

-        let shard =
-            self.0.iter().map(to_hash).max_by_key(|(_, hash)| *hash).map(|(shard, _)| shard);
-        shard
+        let max_hash = self.others.iter().map(to_hash).max().unwrap_or_default();
+
+        self.own.iter().map(to_hash).any(|hash| hash > max_hash)
    }
 }
--- a/crates/milli/src/update/upgrade/mod.rs
+++ b/crates/milli/src/update/upgrade/mod.rs
@@ -43,7 +43,6 @@ const UPGRADE_FUNCTIONS: &[&dyn UpgradeIndex] = &[
    &ToTargetNoOp { target: (1, 23, 0) },
    &ToTargetNoOp { target: (1, 24, 0) },
    &ToTargetNoOp { target: (1, 25, 0) },
-    &ToTargetNoOp { target: (1, 26, 0) },
    // This is the last upgrade function, it will be called when the index is up to date.
    // any other upgrade function should be added before this one.
    &ToCurrentNoOp {},
@@ -80,7 +79,6 @@ const fn start(from: (u32, u32, u32)) -> Option<usize> {
        (1, 23, _) => function_index!(13),
        (1, 24, _) => function_index!(14),
        (1, 25, _) => function_index!(15),
-        (1, 26, _) => function_index!(16),
        // We deliberately don't add a placeholder with (VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH) here to force manually
        // considering dumpless upgrade.
        (_major, _minor, _patch) => return None,
Author	SHA1	Message	Date
Kerollmops	ad56e91325	Display the error message on failure	2025-11-13 10:25:48 +01:00
Kerollmops	15321ce924	Replace the hand-made VecDequeue by a FutureUnordered	2025-11-12 09:12:37 +01:00