Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions .schema/pgdog.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,19 @@
"format": "uint64",
"minimum": 0
},
"label_required": {
"description": "Only queries containing labels will be routed to this replica.",
"type": "boolean",
"default": false
},
"labels": {
"description": "Labels.",
"type": "array",
"default": [],
"items": {
"type": "string"
}
},
"lb_weight": {
"description": "Used for weighted load balancing.",
"type": "integer",
Expand Down
8 changes: 8 additions & 0 deletions pgdog-config/src/database.rs
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,14 @@ pub struct Database {
/// Role-specific settings.
#[serde(flatten, default)]
pub role_config: RoleConfig,

/// Labels.
#[serde(default)]
pub labels: Vec<String>,

/// Only queries containing labels will be routed to this replica.
#[serde(default)]
pub label_required: bool,
}

impl Database {
Expand Down
4 changes: 2 additions & 2 deletions pgdog/src/backend/passthrough_auth/check_db.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use tokio::sync::OnceCell;
use tracing::error;

use crate::backend::Cluster;
use crate::backend::pool::Request;
use crate::backend::pool::LbRequest;
use crate::backend::schema::SchemaCache;

use crate::config::config;
Expand Down Expand Up @@ -151,7 +151,7 @@ async fn check_password(user: &User, config: &Config) -> Result<bool, Error> {
.iter()
.next()
.expect("cluster to have at least one shard")
.primary_or_replica(&Request::default()),
.primary_or_replica(&LbRequest::default()),
)
.await
{
Expand Down
9 changes: 9 additions & 0 deletions pgdog/src/backend/pool/address.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ pub(crate) struct Address {
/// back to the `[general]` settings.
#[serde(default)]
pub(crate) tls: ServerTls,
/// Labels.
pub(crate) labels: Vec<String>,
/// Labels are required for this host to be included in the load balancer
/// target list.
pub(crate) label_required: bool,
}

impl Address {
Expand Down Expand Up @@ -92,6 +97,8 @@ impl Address {
database_number,
configured_role: database.role,
tls: database.tls.clone(),
labels: database.labels.clone(),
label_required: database.label_required,
}
}

Expand Down Expand Up @@ -224,6 +231,8 @@ impl Address {
database_number: 0,
configured_role: Role::Primary,
tls: ServerTls::default(),
labels: vec![],
label_required: false,
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions pgdog/src/backend/pool/cluster.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use crate::{

use super::{
Address, CanonicalOids, ClusterFailoverSignalWatcher, ClusterMetrics, Config, Error, Guard,
Request, Shard, ShardConfig,
LbRequest, Shard, ShardConfig,
};
use crate::config::LoadBalancingStrategy;
use launch::Readiness;
Expand Down Expand Up @@ -456,7 +456,7 @@ impl Cluster {
}

/// Get a connection to a primary of the given shard.
pub(crate) async fn primary(&self, shard: usize, request: &Request) -> Result<Guard, Error> {
pub(crate) async fn primary(&self, shard: usize, request: &LbRequest) -> Result<Guard, Error> {
#[allow(clippy::unnecessary_lazy_evaluations)]
let shard = self
.shards
Expand All @@ -466,7 +466,7 @@ impl Cluster {
}

/// Get a connection to a replica of the given shard.
pub(crate) async fn replica(&self, shard: usize, request: &Request) -> Result<Guard, Error> {
pub(crate) async fn replica(&self, shard: usize, request: &LbRequest) -> Result<Guard, Error> {
#[allow(clippy::unnecessary_lazy_evaluations)]
let shard = self
.shards
Expand Down Expand Up @@ -777,7 +777,7 @@ impl Cluster {
.shards
.get(round_robin::next(self.shards.len().max(1)))
.ok_or_else(|| crate::backend::pool::Error::NoDatabases)?;
let mut server = shard.primary_or_replica(&Request::default()).await?;
let mut server = shard.primary_or_replica(&LbRequest::default()).await?;

server
.fetch_all(ServerRequest::parameterized(query, params))
Expand Down
10 changes: 5 additions & 5 deletions pgdog/src/backend/pool/connection/cluster_connection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use crate::{
backend::{
Cluster, databases, passthrough_auth,
pool::{
Error as PoolError, Guard, Request,
Error as PoolError, Guard, LbRequest,
connection::mirror::{Mirror, MirrorHandler},
},
reload_notify,
Expand Down Expand Up @@ -94,7 +94,7 @@ impl ClusterConnection {
/// connect to replicas.
pub(crate) async fn get_conns_for_shards(
&mut self,
request: &Request,
request: &LbRequest,
shards: &[usize],
is_read: bool,
) -> Result<Vec<Guard>, Error> {
Expand All @@ -120,7 +120,7 @@ impl ClusterConnection {
/// Get all connections necessary to serve the request.
pub(super) async fn get_conns(
&mut self,
request: &Request,
request: &LbRequest,
shard: &Shard,
is_read: bool,
) -> Result<(Vec<Guard>, Vec<usize>), Error> {
Expand All @@ -145,7 +145,7 @@ impl ClusterConnection {
/// Get a connection from the cluster for the given `shard`.
pub(super) async fn get_conn(
&mut self,
request: &Request,
request: &LbRequest,
shard: usize,
is_read: bool,
) -> Result<Guard, Error> {
Expand All @@ -171,7 +171,7 @@ impl ClusterConnection {

async fn get_conn_internal(
&self,
request: &Request,
request: &LbRequest,
shard: usize,
is_read: bool,
) -> Result<Guard, Error> {
Expand Down
4 changes: 2 additions & 2 deletions pgdog/src/backend/pool/connection/mirror/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ mod test {
use pgdog_config::MirrorConfig;

use crate::{
backend::{Error as BackendError, pool::Request},
backend::{Error as BackendError, pool::LbRequest},
config::{self, PoolerMode, PreparedStatementsLevel},
net::{Parameter, Parameters, Query},
util::safe_timeout,
Expand Down Expand Up @@ -241,7 +241,7 @@ mod test {
let cluster = Cluster::new_test(&config());
cluster.launch();
let mut mirror = Mirror::spawn("pgdog", &cluster, None).unwrap();
let mut conn = cluster.primary(0, &Request::default()).await.unwrap();
let mut conn = cluster.primary(0, &LbRequest::default()).await.unwrap();
conn.execute("DROP TABLE IF EXISTS pgdog.test_mirror")
.await
.expect("clear the mirror fixture");
Expand Down
19 changes: 13 additions & 6 deletions pgdog/src/backend/pool/connection/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use crate::{

use super::{
super::{Error, pool::Guard},
Address, Cluster, Request,
Address, Cluster, LbRequest,
};

use std::{
Expand Down Expand Up @@ -152,7 +152,11 @@ impl Connection {
}

/// Create a server connection if one doesn't exist already.
pub(crate) async fn connect(&mut self, request: &Request, route: &Route) -> Result<(), Error> {
pub(crate) async fn connect(
&mut self,
request: &LbRequest,
route: &Route,
) -> Result<(), Error> {
self.ensure_connected(request, route).await?;

Ok(())
Expand All @@ -173,7 +177,7 @@ impl Connection {
}

/// Make sure we have all required shard connections to serve the request.
async fn ensure_connected(&mut self, request: &Request, route: &Route) -> Result<(), Error> {
async fn ensure_connected(&mut self, request: &LbRequest, route: &Route) -> Result<(), Error> {
if matches!(
self.binding,
Binding::NotConnected | Binding::Transaction(_)
Expand Down Expand Up @@ -209,7 +213,7 @@ impl Connection {
}

/// Try to get a connection for the given route.
async fn connect_internal(&mut self, request: &Request, route: &Route) -> Result<(), Error> {
async fn connect_internal(&mut self, request: &LbRequest, route: &Route) -> Result<(), Error> {
// Start a transaction on the server(s) if client started one.
let (is_read, transaction_stmt) =
if let Binding::Transaction(ref mut transaction) = self.binding {
Expand Down Expand Up @@ -271,7 +275,10 @@ impl Connection {
}

/// Get server parameters.
pub(crate) async fn parameters(&mut self, request: &Request) -> Result<Arc<Parameters>, Error> {
pub(crate) async fn parameters(
&mut self,
request: &LbRequest,
) -> Result<Arc<Parameters>, Error> {
if matches!(self.binding, Binding::Admin(_)) {
return Ok(ADMIN_PARAMETERS.clone());
}
Expand All @@ -289,7 +296,7 @@ impl Connection {
}
}

async fn try_parameters(&mut self, request: &Request) -> Result<Arc<Parameters>, Error> {
async fn try_parameters(&mut self, request: &LbRequest) -> Result<Arc<Parameters>, Error> {
// Get params from the first database that answers.
// Parameters are cached on the pool.
for shard in self.cluster()?.shards() {
Expand Down
6 changes: 5 additions & 1 deletion pgdog/src/backend/pool/connection/multi_shard/upgrade.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ impl<'a> MultiShardUpgrade<'a> {
}

/// Change the binding by connecting to required shards to serve the request.
pub(crate) async fn upgrade(&mut self, request: &Request, route: &Route) -> Result<(), Error> {
pub(crate) async fn upgrade(
&mut self,
request: &LbRequest,
route: &Route,
) -> Result<(), Error> {
// Don't switch to a replica or to a primary
// between shard connection upgrades.
let is_read = match self.connection.binding {
Expand Down
14 changes: 7 additions & 7 deletions pgdog/src/backend/pool/connection/test/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ async fn two_pc_subset_commit_counts() {
let pid = FrontendPid::new();
for shard in [1, 2] {
connection
.connect(&Request::default(), &route(Shard::Direct(shard), false))
.connect(&LbRequest::default(), &route(Shard::Direct(shard), false))
.await
.unwrap();
connection
Expand Down Expand Up @@ -58,7 +58,7 @@ async fn two_pc_missing_participants_not_counted() {

let mut connection = test_connection();
connection
.connect(&Request::default(), &route(Shard::All, false))
.connect(&LbRequest::default(), &route(Shard::All, false))
.await
.unwrap();
connection
Expand Down Expand Up @@ -90,7 +90,7 @@ async fn two_pc_recovery_subset() {
let pid = FrontendPid::new();
for shard in [1, 2] {
connection
.connect(&Request::default(), &route(Shard::Direct(shard), false))
.connect(&LbRequest::default(), &route(Shard::Direct(shard), false))
.await
.unwrap();
connection
Expand All @@ -111,7 +111,7 @@ async fn two_pc_recovery_subset() {
)
.unwrap();
recovery
.connect(&Request::default(), &route(Shard::All, false))
.connect(&LbRequest::default(), &route(Shard::All, false))
.await
.unwrap();
let recovered = recovery
Expand Down Expand Up @@ -142,7 +142,7 @@ async fn test_connection_upgrade() {
let params = ParameterStore::new(new_test("test_connection_connect_upgrade"));

connection
.connect(&Request::default(), &route(Shard::Direct(0), true))
.connect(&LbRequest::default(), &route(Shard::Direct(0), true))
.await
.unwrap();

Expand All @@ -161,7 +161,7 @@ async fn test_connection_upgrade() {
}

connection
.connect(&Request::default(), &route(Shard::Direct(1), true))
.connect(&LbRequest::default(), &route(Shard::Direct(1), true))
.await
.unwrap();
assert_eq!(2, connection.connected_servers());
Expand All @@ -179,7 +179,7 @@ async fn test_connection_upgrade() {
}

connection
.connect(&Request::default(), &route(Shard::All, false))
.connect(&LbRequest::default(), &route(Shard::All, false))
.await
.unwrap();
assert_eq!(3, connection.connected_servers());
Expand Down
Loading
Loading