metadata: narrow error type of query_metadata

scylladb · Jan 24, 2025 · 3baa0b8 · 3baa0b8
1 parent f41a708
commit 3baa0b8
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/scylla/src/cluster/metadata.rs b/scylla/src/cluster/metadata.rs
@@ -680,7 +680,7 @@ impl MetadataReader {
             }
         }
 
-        res
+        res.map_err(QueryError::MetadataError)
     }
 
     fn update_known_peers(&mut self, metadata: &Metadata) {
@@ -774,20 +774,20 @@ async fn query_metadata(
     connect_port: u16,
     keyspace_to_fetch: &[String],
     fetch_schema: bool,
-) -> Result<Metadata, QueryError> {
+) -> Result<Metadata, MetadataError> {
     let peers_query = query_peers(conn, connect_port).map_err(MetadataError::Peers);
     let keyspaces_query = query_keyspaces(conn, keyspace_to_fetch, fetch_schema);
 
     let (peers, keyspaces) = tokio::try_join!(peers_query, keyspaces_query)?;
 
     // There must be at least one peer
     if peers.is_empty() {
-        return Err(MetadataError::Peers(PeersMetadataError::EmptyPeers).into());
+        return Err(MetadataError::Peers(PeersMetadataError::EmptyPeers));
     }
 
     // At least one peer has to have some tokens
     if peers.iter().all(|peer| peer.tokens.is_empty()) {
-        return Err(MetadataError::Peers(PeersMetadataError::EmptyTokenLists).into());
+        return Err(MetadataError::Peers(PeersMetadataError::EmptyTokenLists));
     }
 
     Ok(Metadata { peers, keyspaces })