Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

Commit 96a0be4

Browse files
committed
Remove symbols statefulset
Starting in Sourcegraph 6.4, the Symbols and Searcher services are now combined, for easier operation, simplified architecture, and better resource utilization. Customers can delete the service if not deleted automatically, and may want to consider reallocating resources previously given to symbols to searcher. Environment variables should be copied over from symbols to searcher. Test plan: This deployment ran for ~2 weeks on S2 and dotcom already and has signoff from team-product-platform.
1 parent a011f42 commit 96a0be4

File tree

11 files changed

+5
-43
lines changed

11 files changed

+5
-43
lines changed

prometheus/prometheus_targets.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,6 @@
5656
job: searcher
5757
targets:
5858
- searcher-0:6060
59-
- labels:
60-
nodename: "sourcegraph-docker-compose-host"
61-
job: symbols
62-
targets:
63-
- symbols-0:6060
6459
- labels:
6560
nodename: "sourcegraph-docker-compose-host"
6661
job: pgsql

pure-docker/deploy-frontend-internal.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ docker run --detach \
3131
-e SRC_GIT_SERVERS="$(addresses "gitserver-" $NUM_GITSERVER ":3178")" \
3232
-e SRC_SYNTECT_SERVER=http://syntect-server:9238 \
3333
-e SEARCHER_URL="$(addresses "http://searcher-" $NUM_SEARCHER ":3181")" \
34-
-e SYMBOLS_URL="$(addresses "http://symbols-" $NUM_SYMBOLS ":3184")" \
3534
-e INDEXED_SEARCH_SERVERS="$(addresses "zoekt-webserver-" $NUM_INDEXED_SEARCH ":6070")" \
3635
-e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
3736
-e REPO_UPDATER_URL=http://repo-updater:3182 \

pure-docker/deploy-frontend.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ docker run --detach \
3232
-e SRC_GIT_SERVERS="$(addresses "gitserver-" $NUM_GITSERVER ":3178")" \
3333
-e SRC_SYNTECT_SERVER=http://syntect-server:9238 \
3434
-e SEARCHER_URL="$(addresses "http://searcher-" $NUM_SEARCHER ":3181")" \
35-
-e SYMBOLS_URL="$(addresses "http://symbols-" $NUM_SYMBOLS ":3184")" \
3635
-e INDEXED_SEARCH_SERVERS="$(addresses "zoekt-webserver-" $NUM_INDEXED_SEARCH ":6070")" \
3736
-e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
3837
-e REPO_UPDATER_URL=http://repo-updater:3182 \
@@ -45,7 +44,7 @@ docker run --detach \
4544
-p 0.0.0.0:$((3080 + $1)):3080 \
4645
index.docker.io/sourcegraph/frontend:4.4.0@sha256:403c76413df819964e9eb2762ff2ff73a901718a28e0546475d0293a18d5dea5
4746

48-
# Note: SRC_GIT_SERVERS, SEARCHER_URL, and SYMBOLS_URL are space-separated
47+
# Note: SRC_GIT_SERVERS, and SEARCHER_URL are space-separated
4948
# lists which each allow you to specify more container instances for scaling
5049
# purposes. Be sure to also apply such a change here to the frontend-internal
5150
# service.

pure-docker/deploy-symbols.sh

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

pure-docker/deploy-worker.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ docker run --detach \
2424
-e INDEXED_SEARCH_SERVERS="$(addresses "zoekt-webserver-" $NUM_INDEXED_SEARCH ":6070")" \
2525
-e SEARCHER_URL="$(addresses "http://searcher-" $NUM_SEARCHER ":3181")" \
2626
-e SRC_GIT_SERVERS="$(addresses "gitserver-" $NUM_GITSERVER ":3178")" \
27-
-e SYMBOLS_URL="$(addresses "http://symbols-" $NUM_SYMBOLS ":3184")" \
2827
-e PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore \
2928
-e PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT=http://blobstore:9000 \
3029
-v $VOLUME:/mnt/cache \

pure-docker/deploy.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ for i in $(seq 0 $(($NUM_GITSERVER - 1))); do ./deploy-gitserver.sh $i; done
2727
./deploy-worker.sh
2828
./deploy-otel-collector.sh
2929
for i in $(seq 0 $(($NUM_SEARCHER - 1))); do ./deploy-searcher.sh $i; done
30-
for i in $(seq 0 $(($NUM_SYMBOLS - 1))); do ./deploy-symbols.sh $i; done
3130
./deploy-syntect-server.sh
3231
for i in $(seq 0 $(($NUM_INDEXED_SEARCH - 1))); do ./deploy-zoekt-indexserver.sh $i; done
3332
for i in $(seq 0 $(($NUM_INDEXED_SEARCH - 1))); do ./deploy-zoekt-webserver.sh $i; done

pure-docker/replicas.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# Here you can specify the number of service replicas to deploy.
22
NUM_GITSERVER=18
33
NUM_SEARCHER=16
4-
NUM_SYMBOLS=4
54
NUM_INDEXED_SEARCH=1
65
NUM_FRONTEND=3
76

8-
addresses() { for i in $(seq 0 $(($2 - 1))); do echo -n "$1$i$3 "; done }
7+
addresses() { for i in $(seq 0 $(($2 - 1))); do echo -n "$1$i$3 "; done; }

pure-docker/teardown.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ docker rm -f redis-store &>/dev/null || true &
2626
docker rm -f repo-updater &>/dev/null || true &
2727
docker rm -f worker &>/dev/null || true &
2828
docker rm -f $(addresses "searcher-" $NUM_SEARCHER "") &>/dev/null || true &
29-
docker rm -f $(addresses "symbols-" $NUM_SYMBOLS "") &>/dev/null || true &
3029
docker rm -f syntect-server &>/dev/null || true &
3130
docker rm -f $(addresses "zoekt-indexserver-" $NUM_INDEXED_SEARCH "") &>/dev/null || true &
3231
docker rm -f $(addresses "zoekt-webserver-" $NUM_INDEXED_SEARCH "") &>/dev/null || true &

test/pure-docker/Vagrantfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Vagrant.configure("2") do |config|
5353
echo "forcing static permissions on volume directories"
5454
echo
5555
pushd ~/sourcegraph-docker
56-
chown -R 100:101 gitserver* lsif-server* prometheus-v2* repo-updater* searcher* sourcegraph-frontend* symbols* zoekt*
56+
chown -R 100:101 gitserver* lsif-server* prometheus-v2* repo-updater* searcher* sourcegraph-frontend* zoekt*
5757
chown -R 999:1000 redis-store-disk redis-cache-disk
5858
chown -R 472:472 grafana-disk
5959
chown -R 999:999 pgsql-disk

test/pure-docker/volume-config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ echo
1818
echo "forcing static permissions on volume directories"
1919
echo
2020
pushd ~/sourcegraph-docker
21-
chown -R 100:101 gitserver* lsif-server* prometheus-v2* repo-updater* searcher* sourcegraph-frontend* symbols* zoekt* minio-disk
21+
chown -R 100:101 gitserver* lsif-server* prometheus-v2* repo-updater* searcher* sourcegraph-frontend* zoekt* minio-disk
2222
chown -R 999:1000 redis-store-disk redis-cache-disk
2323
chown -R 472:472 grafana-disk
2424
chown -R 999:999 pgsql-disk codeintel-db-disk

0 commit comments

Comments
 (0)