Skip to content

Commit 171c245

Browse files
committed
Revert "feat: use Redis read replicas (#8405)"
This reverts commit 3b5d2ed.
1 parent 6e22c0d commit 171c245

File tree

19 files changed

+388
-1539
lines changed

19 files changed

+388
-1539
lines changed

.cargo/nextest.toml

Lines changed: 0 additions & 8 deletions
This file was deleted.

.changesets/feat_caroline_redis_replicas.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

.circleci/config.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,9 @@ commands:
253253
command: |
254254
curl https://mise.jdx.dev/install.sh | sh
255255
mise activate bash >> "$BASH_ENV"
256-
mise install --yes --quiet
256+
# --raw disables the terminal timer/progress bars, so if mise gets stuck,
257+
# it will not continue to produce output preventing CCI from timing it out
258+
mise install --yes --raw
257259
- when:
258260
condition:
259261
or:
@@ -269,7 +271,9 @@ commands:
269271
name: Install mise
270272
command: |
271273
scoop install mise@${MISE_VERSION#v}
272-
mise install --yes --quiet
274+
# --raw disables the terminal timer/progress bars, so if mise gets stuck,
275+
# it will not continue to produce output preventing CCI from timing it out
276+
mise install --yes --raw
273277
fetch_dependencies:
274278
steps:
275279
- run:

.config/mise/config.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ helm = "3.19.2"
1717
helm-docs = "1.14.2"
1818
yq = "4.48.2"
1919
jq = "1.8.1"
20-
redis = "7.4.7"

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,4 @@ dhat-heap.json
4242
# generated fuzz/ files
4343
fuzz/crash-*
4444
fuzz/slow-unit-*
45-
fuzz/timeout-*
46-
47-
.config/mise/mise.local.toml
45+
fuzz/timeout-*

DEVELOPMENT.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The **Apollo Router Core** is a configurable, high-performance **graph router**
99

1010
## Development
1111

12-
We use [`mise`](https://mise.jdx.dev/) to manage toolchain and test dependencies.
12+
We use [`mise`](https://mise.jdx.dev/) to manage toolchain dependencies.
1313
Example commands in this document assume that mise shims are available in the environment.
1414
If you do not use `mise activate`, you can use `mise x -- <COMMAND>` in place of the commands below, for example `mise x -- cargo build`.
1515

@@ -28,16 +28,15 @@ docker compose up -d
2828
```
2929

3030
This starts:
31-
- **Redis** (port 6379, 7000-7005) - Required for entity caching, response caching, and Redis-related integration tests
31+
- **Redis** (port 6379-7005) - Required for entity caching, response caching, and Redis-related integration tests
32+
- **PostgreSQL** (port 5432) - Used by database integration tests
3233
- **Zipkin** (port 9411) - For distributed tracing tests
3334
- **Datadog Agent** (port 8126) - For Datadog telemetry integration tests
3435

3536
Some tests that use the features above are configured with `required_to_start: true`. The router won't start if these services aren't available, causing test failures.
3637

3738
**Note:** `-d` runs services in the background. Remove `-d` if you want to see logs or run in foreground.
3839

39-
Several tests also require the `redis-cli` binary; this is installed by default if you use `mise`.
40-
4140
#### Enterprise feature testing
4241

4342
Some tests require Apollo GraphOS credentials to test enterprise features like licensing, reporting, and Apollo Studio integration.
@@ -54,8 +53,7 @@ export TEST_APOLLO_GRAPH_REF="your-graph-ref@variant"
5453

5554
### Testing
5655

57-
Tests on this repository are run using [nextest](https://nexte.st/). nextest is installed automatically when you use
58-
`mise`.
56+
Tests on this repository are run using [nextest](https://nexte.st/). nextest is installed automatically when you use `mise`.
5957

6058
#### Test environment setup
6159

apollo-router/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ fred = { version = "10.1.0", features = [
9898
"i-cluster",
9999
"tcp-user-timeouts",
100100
"metrics",
101-
"replicas",
102101
"serde-json"
103102
] }
104103
futures = { version = "0.3.30", features = ["thread-pool"] }
@@ -311,7 +310,6 @@ fred = { version = "10.1.0", features = [
311310
"mocks",
312311
"i-cluster",
313312
"tcp-user-timeouts",
314-
"replicas"
315313
] }
316314
futures-test = "0.3.30"
317315
insta.workspace = true

0 commit comments

Comments
 (0)