Merge pull request #188 from influxdata/crepererum/get_lead_mode_log

refactor: log metadata mode in `get_leader`

Author: kodiakhq[bot]

src/client/controller.rs

@@ -108,7 +108,7 @@ impl ControllerClient {
         // Request an uncached, fresh copy of the metadata.
         let (metadata, _gen) = self
             .brokers
-            .request_metadata(MetadataLookupMode::ArbitraryBroker, Some(vec![]))
+            .request_metadata(&MetadataLookupMode::ArbitraryBroker, Some(vec![]))
             .await?;
 
         let controller_id = metadata

src/client/mod.rs

@@ -154,7 +154,7 @@ impl Client {
         // will update the cached metadata entry.
         let (response, _gen) = self
             .brokers
-            .request_metadata(MetadataLookupMode::ArbitraryBroker, None)
+            .request_metadata(&MetadataLookupMode::ArbitraryBroker, None)
             .await?;
 
         Ok(response

src/client/partition.rs

@@ -341,7 +341,7 @@ impl PartitionClient {
     ) -> Result<(i32, Option<MetadataCacheGeneration>)> {
         let (metadata, gen) = self
             .brokers
-            .request_metadata(metadata_mode, Some(vec![self.topic.clone()]))
+            .request_metadata(&metadata_mode, Some(vec![self.topic.clone()]))
             .await?;
 
         let topic = metadata
@@ -403,6 +403,7 @@ impl PartitionClient {
             topic=%self.topic,
             partition=%self.partition,
             leader=partition.leader_id.0,
+            %metadata_mode,
             "Detected leader",
         );
         Ok((partition.leader_id.0, gen))

src/connection.rs

@@ -76,6 +76,16 @@ pub enum MetadataLookupMode<B = BrokerConnection> {
     CachedArbitrary,
 }
 
+impl<B> std::fmt::Display for MetadataLookupMode<B> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::ArbitraryBroker => write!(f, "ArbitraryBroker"),
+            Self::SpecificBroker(_) => f.debug_tuple("SpecificBroker").field(&"...").finish(),
+            Self::CachedArbitrary => write!(f, "CachedArbitrary"),
+        }
+    }
+}
+
 /// Info needed to connect to a broker, with [optional broker ID](Self::id) for debugging
 enum BrokerRepresentation {
     /// URL specified as a bootstrap broker
@@ -193,7 +203,7 @@ impl BrokerConnector {
 
     /// Fetch and cache metadata
     pub async fn refresh_metadata(&self) -> Result<()> {
-        self.request_metadata(MetadataLookupMode::ArbitraryBroker, None)
+        self.request_metadata(&MetadataLookupMode::ArbitraryBroker, None)
             .await?;
 
         Ok(())
@@ -223,7 +233,7 @@ impl BrokerConnector {
     /// entry - doing so will panic.
     pub async fn request_metadata(
         &self,
-        metadata_mode: MetadataLookupMode,
+        metadata_mode: &MetadataLookupMode,
         topics: Option<Vec<String>>,
     ) -> Result<(MetadataResponse, Option<MetadataCacheGeneration>)> {
         // Return a cached metadata response as an optimisation to prevent
@@ -251,7 +261,7 @@ impl BrokerConnector {
             allow_auto_topic_creation: None,
         };
 
-        let response = metadata_request_with_retry(&metadata_mode, &request, backoff, self).await?;
+        let response = metadata_request_with_retry(metadata_mode, &request, backoff, self).await?;
 
         // If the request was for a full, unfiltered set of topics, cache the
         // response for later calls to make use of.