Skip to content

Commit 2c0a881

Browse files
authored
Introduce worker service (#440)
1 parent 5e769c0 commit 2c0a881

8 files changed

Lines changed: 62 additions & 5 deletions

File tree

deploy-precise-code-intel-worker.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ docker run --detach \
1313
--restart=always \
1414
--cpus=2 \
1515
--memory=4g \
16-
-e 'SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090' \
16+
-e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
17+
-e JAEGER_AGENT_HOST=jaeger \
1718
index.docker.io/sourcegraph/precise-code-intel-worker:insiders@sha256:b635e06165d1e6a4ca7573f7aa97baba7e392d88b83d7cee8752928202db94a1
1819

1920
echo "Deployed precise-code-intel-worker service"

deploy-worker.sh

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
source ./replicas.sh
4+
5+
# Description: Manages background processes.
6+
#
7+
# Disk: 128GB / non-persistent SSD
8+
# Network: 100mbps
9+
# Liveness probe: n/a
10+
# Ports exposed to other Sourcegraph services: 3189/TCP 6060/TCP
11+
# Ports exposed to the public internet: none
12+
#
13+
VOLUME="$HOME/sourcegraph-docker/worker-disk"
14+
./ensure-volume.sh $VOLUME 100
15+
docker run --detach \
16+
--name=worker \
17+
--network=sourcegraph \
18+
--restart=always \
19+
--cpus=4 \
20+
--memory=4g \
21+
-e GOMAXPROCS=1 \
22+
-e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
23+
-e JAEGER_AGENT_HOST=jaeger \
24+
-v $VOLUME:/mnt/cache \
25+
index.docker.io/sourcegraph/worker:insiders@sha256:c724fc8d29c30135d30e41a798b6a7688b5eda0a3b9a7b74753faf7028c02b41
26+
27+
echo "Deployed worker service"

deploy.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ for i in $(seq 0 $(($NUM_GITSERVER - 1))); do ./deploy-gitserver.sh $i; done
2121
./deploy-redis-cache.sh
2222
./deploy-redis-store.sh
2323
./deploy-repo-updater.sh
24+
./deploy-worker.sh
2425
for i in $(seq 0 $(($NUM_SEARCHER - 1))); do ./deploy-searcher.sh $i; done
2526
for i in $(seq 0 $(($NUM_SYMBOLS - 1))); do ./deploy-symbols.sh $i; done
2627
./deploy-syntect-server.sh

docker-compose/docker-compose.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ services:
280280
mem_limit: '4g'
281281
environment:
282282
- 'SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090'
283+
- JAEGER_AGENT_HOST=jaeger
283284
healthcheck:
284285
test: "wget -q 'http://127.0.0.1:3188/healthz' -O /dev/null || exit 1"
285286
interval: 5s
@@ -333,6 +334,27 @@ services:
333334
- sourcegraph
334335
restart: always
335336

337+
# Description: Manages background processes.
338+
#
339+
# Disk: 128GB / non-persistent SSD
340+
# Ports exposed to other Sourcegraph services: 3189/TCP 6060/TCP
341+
# Ports exposed to the public internet: none
342+
#
343+
worker:
344+
container_name: worker
345+
image: 'index.docker.io/sourcegraph/worker:insiders@sha256:c724fc8d29c30135d30e41a798b6a7688b5eda0a3b9a7b74753faf7028c02b41'
346+
cpus: 4
347+
mem_limit: '4g'
348+
environment:
349+
- GOMAXPROCS=1
350+
- 'SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090'
351+
- JAEGER_AGENT_HOST=jaeger
352+
volumes:
353+
- 'worker:/mnt/cache'
354+
networks:
355+
- sourcegraph
356+
restart: always
357+
336358
# Description: Backend for syntax highlighting operations.
337359
#
338360
# Disk: none
@@ -626,6 +648,7 @@ volumes:
626648
redis-cache:
627649
redis-store:
628650
repo-updater:
651+
worker:
629652
searcher-0:
630653
sourcegraph-frontend-0:
631654
sourcegraph-frontend-internal-0:

prometheus/prometheus_targets.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
job: repo-updater
2626
targets:
2727
- repo-updater:6060
28+
- labels:
29+
job: worker
30+
targets:
31+
- worker:6060
2832
- labels:
2933
job: node
3034
targets:

teardown.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ docker rm -f query-runner &> /dev/null || true &
2020
docker rm -f redis-cache &> /dev/null || true &
2121
docker rm -f redis-store &> /dev/null || true &
2222
docker rm -f repo-updater &> /dev/null || true &
23+
docker rm -f worker &> /dev/null || true &
2324
docker rm -f $(addresses "searcher-" $NUM_SEARCHER "") &> /dev/null || true &
2425
docker rm -f $(addresses "symbols-" $NUM_SYMBOLS "") &> /dev/null || true &
2526
docker rm -f syntect-server &> /dev/null || true &

test/smoke-test.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ deploy_sourcegraph() {
1010

1111
if [[ "$GIT_BRANCH" == *"customer-replica"* ]]; then
1212
# Expected number of containers on e.g. 3.18-customer-replica branch.
13-
expect_containers="60"
13+
expect_containers="61"
1414
else
1515
# Expected number of containers on `master` branch.
16-
expect_containers="25"
16+
expect_containers="26"
1717
fi
1818
elif [[ "$TEST_TYPE" == "docker-compose-test" ]]; then
1919
docker-compose --file docker-compose/docker-compose.yaml up -d
20-
expect_containers="23"
20+
expect_containers="24"
2121
fi
2222

2323
echo "Giving containers 30s to start..."

test/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* prometheus-v2* repo-updater* searcher* sourcegraph-frontend* symbols* zoekt* minio-disk
21+
chown -R 100:101 gitserver* prometheus-v2* worker* repo-updater* searcher* sourcegraph-frontend* symbols* 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 codeinsights-db-disk

0 commit comments

Comments
 (0)