Skip to content

fix(tunnel): fix ups race condition #2858

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

Closed
wants to merge 1 commit into from
+261 −334
Closed

fix(tunnel): fix ups race condition #2858

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docker/dev-host/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ services:
- CMD
- curl
- '-f'
- http://127.0.0.1:6421/health
- http://127.0.0.1:6420/health
interval: 2s
timeout: 10s
retries: 10
Expand Down
18 changes: 9 additions & 9 deletions docker/dev-multidc-multinode/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ services:
- CMD
- curl
- '-f'
- http://127.0.0.1:6421/health
- http://127.0.0.1:6420/health
interval: 2s
timeout: 10s
retries: 10
Expand Down Expand Up @@ -224,7 +224,7 @@ services:
- CMD
- curl
- '-f'
- http://127.0.0.1:6421/health
- http://127.0.0.1:6420/health
interval: 2s
timeout: 10s
retries: 10
Expand Down Expand Up @@ -264,7 +264,7 @@ services:
- CMD
- curl
- '-f'
- http://127.0.0.1:6421/health
- http://127.0.0.1:6420/health
interval: 2s
timeout: 10s
retries: 10
Expand Down Expand Up @@ -444,7 +444,7 @@ services:
- CMD
- curl
- '-f'
- http://127.0.0.1:6421/health
- http://127.0.0.1:6420/health
interval: 2s
timeout: 10s
retries: 10
Expand Down Expand Up @@ -484,7 +484,7 @@ services:
- CMD
- curl
- '-f'
- http://127.0.0.1:6421/health
- http://127.0.0.1:6420/health
interval: 2s
timeout: 10s
retries: 10
Expand Down Expand Up @@ -524,7 +524,7 @@ services:
- CMD
- curl
- '-f'
- http://127.0.0.1:6421/health
- http://127.0.0.1:6420/health
interval: 2s
timeout: 10s
retries: 10
Expand Down Expand Up @@ -702,7 +702,7 @@ services:
- CMD
- curl
- '-f'
- http://127.0.0.1:6421/health
- http://127.0.0.1:6420/health
interval: 2s
timeout: 10s
retries: 10
Expand Down Expand Up @@ -742,7 +742,7 @@ services:
- CMD
- curl
- '-f'
- http://127.0.0.1:6421/health
- http://127.0.0.1:6420/health
interval: 2s
timeout: 10s
retries: 10
Expand Down Expand Up @@ -782,7 +782,7 @@ services:
- CMD
- curl
- '-f'
- http://127.0.0.1:6421/health
- http://127.0.0.1:6420/health
interval: 2s
timeout: 10s
retries: 10
Expand Down
6 changes: 3 additions & 3 deletions docker/dev-multidc/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ services:
- CMD
- curl
- '-f'
- http://127.0.0.1:6421/health
- http://127.0.0.1:6420/health
interval: 2s
timeout: 10s
retries: 10
Expand Down Expand Up @@ -330,7 +330,7 @@ services:
- CMD
- curl
- '-f'
- http://127.0.0.1:6421/health
- http://127.0.0.1:6420/health
interval: 2s
timeout: 10s
retries: 10
Expand Down Expand Up @@ -476,7 +476,7 @@ services:
- CMD
- curl
- '-f'
- http://127.0.0.1:6421/health
- http://127.0.0.1:6420/health
interval: 2s
timeout: 10s
retries: 10
Expand Down
6 changes: 3 additions & 3 deletions docker/dev-multinode/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ services:
- CMD
- curl
- '-f'
- http://127.0.0.1:6421/health
- http://127.0.0.1:6420/health
interval: 2s
timeout: 10s
retries: 10
Expand Down Expand Up @@ -210,7 +210,7 @@ services:
- CMD
- curl
- '-f'
- http://127.0.0.1:6421/health
- http://127.0.0.1:6420/health
interval: 2s
timeout: 10s
retries: 10
Expand Down Expand Up @@ -247,7 +247,7 @@ services:
- CMD
- curl
- '-f'
- http://127.0.0.1:6421/health
- http://127.0.0.1:6420/health
interval: 2s
timeout: 10s
retries: 10
Expand Down
2 changes: 1 addition & 1 deletion docker/dev/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ services:
- CMD
- curl
- '-f'
- http://127.0.0.1:6421/health
- http://127.0.0.1:6420/health
interval: 2s
timeout: 10s
retries: 10
Expand Down
7 changes: 7 additions & 0 deletions docker/dev/rivet-engine/config.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@
"postgres": {
"url": "postgresql://postgres:postgres@postgres:5432/rivet_engine"
},
"postgres_notify": {
"url": "postgresql://postgres:postgres@postgres:5432/rivet_engine",
"memory_optimization": false
},
// "memory": {
// "channel": "default"
// },
"cache": {
"driver": "in_memory"
},
Expand Down
2 changes: 1 addition & 1 deletion docker/template/src/docker-compose.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CORE_NETWORK_NAME, TemplateContext } from "./context";

Check warning on line 1 in docker/template/src/docker-compose.ts

View workflow job for this annotation

GitHub Actions / quality

lint/style/useImportType 

Some named imports are only used as types.

Check warning on line 1 in docker/template/src/docker-compose.ts

View workflow job for this annotation

GitHub Actions / quality

lint/style/useImportType 

Some named imports are only used as types.
import * as yaml from "js-yaml";

export function generateDockerCompose(context: TemplateContext) {
Expand All @@ -24,7 +24,7 @@
};

// ClickHouse
services["clickhouse"] = {

Check notice on line 27 in docker/template/src/docker-compose.ts

View workflow job for this annotation

GitHub Actions / quality

lint/complexity/useLiteralKeys 

The computed expression can be simplified without the use of a string literal.

Check notice on line 27 in docker/template/src/docker-compose.ts

View workflow job for this annotation

GitHub Actions / quality

lint/complexity/useLiteralKeys 

The computed expression can be simplified without the use of a string literal.
restart: "unless-stopped",
image: "clickhouse/clickhouse-server:25.1.5",
volumes: [
Expand Down Expand Up @@ -66,7 +66,7 @@
volumes["clickhouse-data"] = null;

// Grafana
services["grafana"] = {

Check notice on line 69 in docker/template/src/docker-compose.ts

View workflow job for this annotation

GitHub Actions / quality

lint/complexity/useLiteralKeys 

The computed expression can be simplified without the use of a string literal.

Check notice on line 69 in docker/template/src/docker-compose.ts

View workflow job for this annotation

GitHub Actions / quality

lint/complexity/useLiteralKeys 

The computed expression can be simplified without the use of a string literal.
image: "grafana/grafana:11.5.2",
volumes: [
"grafana-data:/var/lib/grafana",
Expand Down Expand Up @@ -294,7 +294,7 @@
],
ports: isPrimary && i === 0 ? [`6420:6420`] : undefined,
healthcheck: {
test: ["CMD", "curl", "-f", "http://127.0.0.1:6421/health"],
test: ["CMD", "curl", "-f", "http://127.0.0.1:6420/health"],
interval: "2s",
timeout: "10s",
retries: 10,
Expand Down Expand Up @@ -343,14 +343,14 @@
// If host networking is requested, set network_mode for all services
if (context.config.networkMode === "host") {
for (const svc of Object.values(dockerComposeConfig.services)) {
// @ts-ignore - mutate dynamic service objects

Check warning on line 346 in docker/template/src/docker-compose.ts

View workflow job for this annotation

GitHub Actions / quality

lint/suspicious/noTsIgnore 

Unsafe use of the @ts-ignore directive found in this comment.

Check warning on line 346 in docker/template/src/docker-compose.ts

View workflow job for this annotation

GitHub Actions / quality

lint/suspicious/noTsIgnore 

Unsafe use of the @ts-ignore directive found in this comment.
svc.network_mode = "host";
// Remove networks field as it's incompatible with host networking
// @ts-ignore

Check warning on line 349 in docker/template/src/docker-compose.ts

View workflow job for this annotation

GitHub Actions / quality

lint/suspicious/noTsIgnore 

Unsafe use of the @ts-ignore directive found in this comment.

Check warning on line 349 in docker/template/src/docker-compose.ts

View workflow job for this annotation

GitHub Actions / quality

lint/suspicious/noTsIgnore 

Unsafe use of the @ts-ignore directive found in this comment.
if (svc.networks) delete svc.networks;
// Remove ports since published ports are ignored with host networking
// and produce warnings in Docker Compose output.
// @ts-ignore

Check warning on line 353 in docker/template/src/docker-compose.ts

View workflow job for this annotation

GitHub Actions / quality

lint/suspicious/noTsIgnore 

Unsafe use of the @ts-ignore directive found in this comment.

Check warning on line 353 in docker/template/src/docker-compose.ts

View workflow job for this annotation

GitHub Actions / quality

lint/suspicious/noTsIgnore 

Unsafe use of the @ts-ignore directive found in this comment.
if (svc.ports) delete svc.ports;
}
}
Expand Down
1 change: 1 addition & 0 deletions packages/common/config/src/config/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ impl Root {
{
self.pubsub = Some(PubSub::PostgresNotify(pubsub::Postgres {
url: pg.url.clone(),
memory_optimization: true,
}));
}

Expand Down
9 changes: 5 additions & 4 deletions packages/common/universalpubsub/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,18 @@ edition.workspace = true
anyhow.workspace = true
async-nats.workspace = true
async-trait.workspace = true
base64.workspace = true
deadpool-postgres.workspace = true
futures-util.workspace = true
moka.workspace = true
rivet-error.workspace = true
serde.workspace = true
serde_json.workspace = true
serde.workspace = true
sha2.workspace = true
tokio-postgres.workspace = true
tokio.workspace = true
tracing.workspace = true
uuid.workspace = true
tokio-postgres.workspace = true
base64 = "0.22"
sha2.workspace = true

[dev-dependencies]
rivet-config.workspace = true
Expand Down
Loading
Loading