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

Add source column to consul services and checks tables #265

Merged
merged 1 commit into from
Dec 5, 2024
Merged

Add source column to consul services and checks tables #265

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions crates/corrosion/src/command/consul/sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ async fn update_hashes(

let services = conn
.prepare(
"SELECT id, name, tags, meta, port, address FROM consul_services WHERE node = ?",
"SELECT id, name, tags, meta, port, address FROM consul_services WHERE node = ? AND source IS NULL",
)?
.query_map([nodename], |row| {
let tag_json: String = row.get(2)?;
Expand Down Expand Up @@ -258,7 +258,7 @@ async fn update_hashes(
.map_err(|e| eyre::eyre!("could not query consul_checks' table_info: {e}"))?
.collect::<Result<Vec<_>, _>>()?;

let checks = conn.prepare("SELECT id, name, status, output, service_id, service_name FROM consul_checks WHERE node = ?")?
let checks = conn.prepare("SELECT id, name, status, output, service_id, service_name FROM consul_checks WHERE node = ? AND source IS NULL")?
.query_map([nodename], |row| {
Ok(AgentCheck{
id: row.get(0)?,
Expand Down Expand Up @@ -659,7 +659,7 @@ async fn execute(
}

// delete everything that's wrong in the DB! this is useful on restore from a backup...
statements.push(Statement::WithParams("DELETE FROM consul_services WHERE node = ? AND id NOT IN (SELECT id FROM __corro_consul_services)".into(), vec![node.into()]));
statements.push(Statement::WithParams("DELETE FROM consul_services WHERE node = ? AND source IS NULL AND id NOT IN (SELECT id FROM __corro_consul_services)".into(), vec![node.into()]));

let mut check_to_upsert = vec![];
let mut check_to_delete = vec![];
Expand All @@ -685,7 +685,7 @@ async fn execute(
}

// delete everything that's wrong in the DB! this is useful on restore from a backup...
statements.push(Statement::WithParams("DELETE FROM consul_checks WHERE node = ? AND id NOT IN (SELECT id FROM __corro_consul_checks)".into(), vec![node.into()]));
statements.push(Statement::WithParams("DELETE FROM consul_checks WHERE node = ? AND source IS NULL AND id NOT IN (SELECT id FROM __corro_consul_checks)".into(), vec![node.into()]));

if !statements.is_empty() {
if let Some(e) = corrosion
Expand Down Expand Up @@ -756,6 +756,7 @@ mod tests {
address TEXT NOT NULL DEFAULT '',
updated_at INTEGER NOT NULL DEFAULT 0,
app_id INTEGER AS (CAST(JSON_EXTRACT(meta, '$.app_id') AS INTEGER)),
source TEXT,

PRIMARY KEY (node, id)
);
Expand All @@ -769,6 +770,7 @@ mod tests {
status TEXT NOT NULL DEFAULT '',
output TEXT NOT NULL DEFAULT '',
updated_at INTEGER NOT NULL DEFAULT 0,
source TEXT,
PRIMARY KEY (node, id)
);
",
Expand Down
Loading