Revert not using the proxied metastore for the search service

Author: rdettai

Diff for: quickwit/quickwit-metastore/src/metastore/control_plane_metastore.rs

@@ -87,11 +87,6 @@ impl MetastoreService for ControlPlaneMetastore {
         Ok(response)
     }
 
-    // Technically, proxying this call via the control plane is not necessary at the moment because
-    // it does not modify attributes the control plane cares about (retention policy, search
-    // settings). However, it would be easy to forget to do so when we add the ability to update the
-    // doc mapping or merge policy of an index, so we've already set up the proxy here since calling
-    // `update_index` is very infrequent anyway.
     async fn update_index(
         &self,
         request: UpdateIndexRequest,

Diff for: quickwit/quickwit-serve/src/lib.rs

@@ -493,7 +493,7 @@ pub async fn serve_quickwit(
     // Set up the "control plane proxy" for the metastore.
     let metastore_through_control_plane = MetastoreServiceClient::new(ControlPlaneMetastore::new(
         control_plane_client.clone(),
-        metastore_client.clone(),
+        metastore_client,
     ));
 
     // Setup ingest service v1.
@@ -604,7 +604,9 @@ pub async fn serve_quickwit(
     let (search_job_placer, search_service) = setup_searcher(
         &node_config,
         cluster.change_stream(),
-        metastore_client.clone(),
+        // search remains available without a control plane because not all
+        // metastore RPCs are proxied
+        metastore_through_control_plane.clone(),
         storage_resolver.clone(),
         searcher_context,
     )