Merge branch 'main' into ep/refactor-cluster-map

googleforgames · Sep 20, 2023 · 8e4fdf3 · 8e4fdf3
2 parents c2400bb + 939429a
commit 8e4fdf3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -20,6 +20,7 @@ jobs:
       - run: mkdir -p ${{ env.docs_dir }}
       - run: |
           export GITHUB_REF_NAME=${{ github.ref_name }}
+          [[ $GITHUB_REF_NAME = v* ]] && export QUILKIN_RELEASE=1
           export QUILKIN_VERSION=$(make --directory=./build version --no-print-directory)
           echo GITHUB_REF_NAME=${GITHUB_REF_NAME}
           echo QUILKIN_VERSION=${QUILKIN_VERSION}

diff --git a/src/xds/client.rs b/src/xds/client.rs
@@ -204,7 +204,7 @@ impl<C: ServiceClient> Client<C> {
         let client = connect_to_server
             .instrument(tracing::trace_span!("client_connect"))
             .await?;
-        tracing::info!("Connected to relay server");
+        tracing::info!("Connected to management server");
         Ok(client)
     }
 }
@@ -395,7 +395,7 @@ impl MdsStream {
                     let mut stream = control_plane.stream_aggregated_resources(stream).await?;
                     while let Some(result) = stream.next().await {
                         let response = result?;
-                        tracing::info!(config=%serde_json::to_value(&config).unwrap(), "received discovery response");
+                        tracing::debug!(config=%serde_json::to_value(&config).unwrap(), "received discovery response");
                         requests.send(response)?;
                     }
 
@@ -506,7 +506,7 @@ pub fn handle_discovery_responses(
 ) -> std::pin::Pin<Box<dyn futures::Stream<Item = Result<DiscoveryRequest>> + Send>> {
     Box::pin(async_stream::try_stream! {
         let _stream_metrics = super::metrics::StreamConnectionMetrics::new(identifier.clone());
-        tracing::info!("awaiting response");
+        tracing::debug!("awaiting response");
         for await response in stream
         {
             let response = match response {
@@ -520,7 +520,7 @@ pub fn handle_discovery_responses(
             let control_plane_identifier = response.control_plane.as_ref().map(|cp| cp.identifier.clone()).unwrap_or_default();
 
             super::metrics::discovery_responses(&control_plane_identifier, &response.type_url).inc();
-            tracing::info!(
+            tracing::debug!(
                 version = &*response.version_info,
                 r#type = &*response.type_url,
                 nonce = &*response.nonce,
@@ -534,7 +534,7 @@ pub fn handle_discovery_responses(
                 .map(Resource::try_from)
                 .try_for_each(|resource| {
                     let resource = resource?;
-                    tracing::info!("applying resource");
+                    tracing::debug!("applying resource");
                     (on_new_resource)(&resource)
                 });
 

diff --git a/src/xds/server.rs b/src/xds/server.rs
@@ -249,7 +249,7 @@ impl ControlPlane {
                             // Currently just resend previous discovery response.
                         } else if uuid::Uuid::parse_str(&new_message.response_nonce).is_ok() {
                             if pending_acks.cache_get(&new_message.response_nonce).is_some() {
-                                tracing::info!(nonce = %new_message.response_nonce, "ACK");
+                                tracing::debug!(nonce = %new_message.response_nonce, "ACK");
                                 continue
                             } else {
                                 tracing::trace!(nonce = %new_message.response_nonce, "Unknown nonce: could not be found in cache");