Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve missing gameserver warning #743

Merged
merged 4 commits into from
Jul 4, 2023
Merged

Improve missing gameserver warning #743

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad81cc4
Remove shutdown_rx from downstream loop
XAMPPRocky May 12, 2023
4222eed
Improve missing gameserver warning
XAMPPRocky May 23, 2023
f282ad2
Add name as property in warning
XAMPPRocky May 23, 2023
5a0b1d3
Merge branch 'main' into ep/improve-missing-warning
XAMPPRocky Jul 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions src/cli/proxy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
* limitations under the License.
*/

use std::{net::SocketAddr, sync::Arc};
use std::{net::SocketAddr, sync::Arc, time::Duration};

use tokio::{sync::watch, time::Duration};
use tonic::transport::Endpoint;

use crate::{proxy::SessionMap, utils::net, xds::ResourceType, Config, Result};
Expand Down Expand Up @@ -115,7 +114,7 @@ impl Proxy {
None
};

self.run_recv_from(&config, sessions.clone(), shutdown_rx.clone())?;
self.run_recv_from(&config, sessions.clone())?;
tracing::info!("Quilkin is ready");

shutdown_rx
Expand All @@ -138,12 +137,7 @@ impl Proxy {
/// This function also spawns the set of worker tasks responsible for consuming packets
/// off the aforementioned queue and processing them through the filter chain and session
/// pipeline.
fn run_recv_from(
&self,
config: &Arc<Config>,
sessions: SessionMap,
shutdown_rx: watch::Receiver<()>,
) -> Result<()> {
fn run_recv_from(&self, config: &Arc<Config>, sessions: SessionMap) -> Result<()> {
// The number of worker tasks to spawn. Each task gets a dedicated queue to
// consume packets off.
let num_workers = num_cpus::get();
Expand All @@ -155,7 +149,6 @@ impl Proxy {
workers.push(crate::proxy::DownstreamReceiveWorkerConfig {
worker_id,
socket: socket.clone(),
shutdown_rx: shutdown_rx.clone(),
config: config.clone(),
sessions: sessions.clone(),
})
Expand Down Expand Up @@ -315,7 +308,6 @@ mod tests {

let socket = Arc::new(create_socket().await);
let addr = socket.local_addr().unwrap();
let (_shutdown_tx, shutdown_rx) = watch::channel(());
let endpoint = t.open_socket_and_recv_single_packet().await;
let msg = "hello";
let config = Arc::new(Config::default());
Expand All @@ -329,7 +321,6 @@ mod tests {
socket: socket.clone(),
config,
sessions: <_>::default(),
shutdown_rx,
}
.spawn();

Expand All @@ -348,7 +339,6 @@ mod tests {
#[tokio::test]
async fn run_recv_from() {
let t = TestHelper::default();
let (_shutdown_tx, shutdown_rx) = watch::channel(());

let msg = "hello";
let endpoint = t.open_socket_and_recv_single_packet().await;
Expand All @@ -363,9 +353,7 @@ mod tests {
clusters.insert_default(vec![endpoint.socket.local_addr().unwrap()])
});

proxy
.run_recv_from(&config, <_>::default(), shutdown_rx)
.unwrap();
proxy.run_recv_from(&config, <_>::default()).unwrap();

let socket = create_socket().await;
socket.send_to(msg.as_bytes(), &local_addr).await.unwrap();
Expand Down
13 changes: 6 additions & 7 deletions src/config/providers/k8s.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,7 @@ pub fn update_endpoints_from_gameservers(
}

Event::Deleted(server) => {
let found = if let Some(status) = &server.status {
let port = status.ports.as_ref()
.and_then(|ports| ports.first().map(|status| status.port))
.unwrap_or_default();

let endpoint = Endpoint::from((status.address.clone(), port));
let found = if let Some(endpoint) = server.endpoint() {
config.clusters.value().remove_endpoint(&endpoint)
} else {
config.clusters.value().remove_endpoint_if(|endpoint| {
Expand All @@ -159,7 +154,11 @@ pub fn update_endpoints_from_gameservers(
};

if found.is_none() {
tracing::warn!(?server, "received unknown gameserver to delete from k8s");
tracing::warn!(
endpoint=%serde_json::to_value(server.endpoint()).unwrap(),
name=%serde_json::to_value(server.metadata.name).unwrap(),
"received unknown gameserver to delete from k8s"
);
}
}
};
Expand Down
86 changes: 50 additions & 36 deletions src/config/providers/k8s/agones.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,53 @@ pub struct GameServer {
pub status: Option<GameServerStatus>,
}

impl GameServer {
pub fn endpoint(&self) -> Option<Endpoint> {
self.status.as_ref().map(|status| {
let port = status
.ports
.as_ref()
.and_then(|ports| ports.first().map(|status| status.port))
.unwrap_or_default();

let tokens = self.tokens();
let extra_metadata = {
let mut map = serde_json::Map::default();
map.insert(
"name".into(),
self.metadata.name.clone().unwrap_or_default().into(),
);
map
};

Endpoint::with_metadata(
(status.address.clone(), port).into(),
crate::metadata::MetadataView::with_unknown(
crate::endpoint::Metadata { tokens },
extra_metadata,
),
)
})
}

pub fn tokens(&self) -> std::collections::BTreeSet<Vec<u8>> {
match self.metadata.annotations.as_ref() {
Some(annotations) => annotations
.get(QUILKIN_TOKEN_LABEL)
.map(|value| {
value
.split(',')
.map(String::from)
.map(base64::decode)
.filter_map(Result::ok)
.collect()
})
.unwrap_or_default(),
None => <_>::default(),
}
}
}

#[derive(Clone, Debug, Deserialize, schemars::JsonSchema)]
#[serde(rename_all = "camelCase")]
pub struct Inner {
Expand Down Expand Up @@ -246,42 +293,9 @@ impl TryFrom<GameServer> for Endpoint {
type Error = tonic::Status;

fn try_from(server: GameServer) -> Result<Self, Self::Error> {
let status = server
.status
.as_ref()
.ok_or_else(|| tonic::Status::internal("No status found for game server"))?;
let mut extra_metadata = serde_json::Map::default();
extra_metadata.insert(
"name".into(),
server.metadata.name.clone().unwrap_or_default().into(),
);

let tokens = match server.metadata.annotations.as_ref() {
Some(annotations) => annotations
.get(QUILKIN_TOKEN_LABEL)
.map(|value| {
value
.split(',')
.map(String::from)
.map(crate::utils::base64_decode)
.filter_map(Result::ok)
.collect::<std::collections::BTreeSet<_>>()
})
.unwrap_or_default(),
None => <_>::default(),
};

let address = status.address.clone();
let port = status
.ports
.as_ref()
.and_then(|ports| ports.first().map(|status| status.port))
.unwrap_or_default();
let filter_metadata = crate::endpoint::Metadata { tokens };
Ok(Self::with_metadata(
(address, port).into(),
crate::metadata::MetadataView::with_unknown(filter_metadata, extra_metadata),
))
server
.endpoint()
.ok_or_else(|| tonic::Status::internal("No status found for game server"))
}
}

Expand Down
37 changes: 14 additions & 23 deletions src/proxy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ mod sessions;

use std::sync::Arc;

use tokio::{net::UdpSocket, sync::watch};
use tokio::net::UdpSocket;

use crate::{
endpoint::{Endpoint, EndpointAddress},
Expand Down Expand Up @@ -47,8 +47,6 @@ pub(crate) struct DownstreamReceiveWorkerConfig {
pub socket: Arc<UdpSocket>,
pub config: Arc<Config>,
pub sessions: SessionMap,
/// The worker task exits when a value is received from this shutdown channel.
pub shutdown_rx: watch::Receiver<()>,
}

impl DownstreamReceiveWorkerConfig {
Expand All @@ -58,7 +56,6 @@ impl DownstreamReceiveWorkerConfig {
socket,
config,
sessions,
mut shutdown_rx,
} = self;

tokio::spawn(async move {
Expand All @@ -71,26 +68,20 @@ impl DownstreamReceiveWorkerConfig {
addr = ?socket.local_addr(),
"Awaiting packet"
);
tokio::select! {
result = socket.recv_from(&mut buf) => {
match result {
Ok((size, source)) => {
let packet = DownstreamPacket {
received_at: chrono::Utc::now().timestamp_nanos(),
source: source.into(),
contents: buf[..size].to_vec(),
};

Self::spawn_process_task(packet, source, worker_id, &socket, &config, &sessions)
}
Err(error) => {
tracing::error!(%error, "error receiving packet");
return;
}
}
match socket.recv_from(&mut buf).await {
Ok((size, source)) => {
let packet = DownstreamPacket {
received_at: chrono::Utc::now().timestamp_nanos(),
source: source.into(),
contents: buf[..size].to_vec(),
};

Self::spawn_process_task(
packet, source, worker_id, &socket, &config, &sessions,
)
}
_ = shutdown_rx.changed() => {
tracing::debug!(id = worker_id, "Received shutdown signal");
Err(error) => {
tracing::error!(%error, "error receiving packet");
return;
}
}
Expand Down