diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml index 0c1f77f68..3252b0822 100644 --- a/docker-compose/docker-compose.yaml +++ b/docker-compose/docker-compose.yaml @@ -139,7 +139,6 @@ services: - 'SYMBOLS_URL=http://symbols-0:3184' - 'INDEXED_SEARCH_SERVERS=zoekt-webserver-0:6070' - 'SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090' - - 'REPO_UPDATER_URL=http://repo-updater:3182' - 'GRAFANA_SERVER_URL=http://grafana:3370' - 'PROMETHEUS_URL=http://prometheus:9090' - 'PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore' @@ -152,7 +151,6 @@ services: { "Name": "gitserver-0", "Host": "gitserver-0:6060" }, { "Name": "searcher-0", "Host": "searcher-0:6060" }, { "Name": "symbols-0", "Host": "symbols-0:6060" }, - { "Name": "repo-updater", "Host": "repo-updater:6060" }, { "Name": "worker", "Host": "worker:6060" }, { "Name": "zoekt-indexserver-0", "Host": "zoekt-indexserver-0:6072" }, { "Name": "zoekt-webserver-0", "Host": "zoekt-webserver-0:6070", "DefaultPath": "/debug/requests/" } @@ -194,7 +192,6 @@ services: - 'SYMBOLS_URL=http://symbols-0:3184' - 'INDEXED_SEARCH_SERVERS=zoekt-webserver-0:6070' - 'SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090' - - 'REPO_UPDATER_URL=http://repo-updater:3182' - 'GRAFANA_SERVER_URL=http://grafana:3000' - 'PROMETHEUS_URL=http://prometheus:9090' - 'PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore' @@ -342,26 +339,6 @@ services: - sourcegraph restart: always - # Description: Handles repository metadata (not Git data) lookups and updates from external code hosts and other similar services. - # - # Disk: 128GB / non-persistent SSD - # Ports exposed to other Sourcegraph services: 3182/TCP 6060/TCP - # Ports exposed to the public internet: none - # - repo-updater: - container_name: repo-updater - image: 'index.docker.io/sourcegraph/repo-updater:6.1.2889@sha256:95e8a28bd2d13270a5d0ab80eae5e8aac44913bd421fb92cf45d5550c4874fbc' - cpus: 4 - mem_limit: '4g' - environment: - - 'SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090' - - 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' - volumes: - - 'repo-updater:/mnt/cache' - networks: - - sourcegraph - restart: always - # Description: Manages background processes. # # Disk: 128GB / non-persistent SSD @@ -802,7 +779,6 @@ volumes: prometheus-v2: redis-cache: redis-store: - repo-updater: worker: searcher-0: sourcegraph-frontend-0: diff --git a/prometheus/prometheus_targets.yml b/prometheus/prometheus_targets.yml index 777ac3583..c7c0594e7 100644 --- a/prometheus/prometheus_targets.yml +++ b/prometheus/prometheus_targets.yml @@ -5,11 +5,6 @@ targets: - cadvisor:48080 - sourcegraph-frontend-internal:6060 -- labels: - nodename: "sourcegraph-docker-compose-host" - job: repo-updater - targets: - - repo-updater:6060 - labels: nodename: "sourcegraph-docker-compose-host" job: worker diff --git a/pure-docker/deploy-frontend-internal.sh b/pure-docker/deploy-frontend-internal.sh index 13f83f511..b3d25b6d4 100755 --- a/pure-docker/deploy-frontend-internal.sh +++ b/pure-docker/deploy-frontend-internal.sh @@ -34,7 +34,6 @@ docker run --detach \ -e SYMBOLS_URL="$(addresses "http://symbols-" $NUM_SYMBOLS ":3184")" \ -e INDEXED_SEARCH_SERVERS="$(addresses "zoekt-webserver-" $NUM_INDEXED_SEARCH ":6070")" \ -e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \ - -e REPO_UPDATER_URL=http://repo-updater:3182 \ -e GRAFANA_SERVER_URL=http://grafana:3000 \ -e PROMETHEUS_URL=http://prometheus:9090 \ -e PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore \ diff --git a/pure-docker/deploy-frontend.sh b/pure-docker/deploy-frontend.sh index d53014330..c6d8bf47d 100755 --- a/pure-docker/deploy-frontend.sh +++ b/pure-docker/deploy-frontend.sh @@ -35,7 +35,6 @@ docker run --detach \ -e SYMBOLS_URL="$(addresses "http://symbols-" $NUM_SYMBOLS ":3184")" \ -e INDEXED_SEARCH_SERVERS="$(addresses "zoekt-webserver-" $NUM_INDEXED_SEARCH ":6070")" \ -e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \ - -e REPO_UPDATER_URL=http://repo-updater:3182 \ -e GRAFANA_SERVER_URL=http://grafana:3370 \ -e PROMETHEUS_URL=http://prometheus:9090 \ -e PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore \ diff --git a/pure-docker/deploy-repo-updater.sh b/pure-docker/deploy-repo-updater.sh deleted file mode 100755 index f13e4ad34..000000000 --- a/pure-docker/deploy-repo-updater.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash -set -e -source ./replicas.sh - -# Description: Handles repository metadata (not Git data) lookups and updates from external code hosts and other similar services. -# -# Disk: 128GB / non-persistent SSD -# Network: 100mbps -# Liveness probe: n/a -# Ports exposed to other Sourcegraph services: 3182/TCP 6060/TCP -# Ports exposed to the public internet: none -# -VOLUME="$HOME/sourcegraph-docker/repo-updater-disk" -./ensure-volume.sh $VOLUME 100 -docker run --detach \ - --name=repo-updater \ - --network=sourcegraph \ - --restart=always \ - --cpus=4 \ - --memory=4g \ - -e GOMAXPROCS=1 \ - -e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \ - -e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \ - -v $VOLUME:/mnt/cache \ - index.docker.io/sourcegraph/repo-updater:187572_2022-12-06_cbecc5321c7d@sha256:0bf2b95c73bceff8c3edb96299175fe36a550f57fd3f5256d38fa2c42992655a - -echo "Deployed repo-updater service" diff --git a/pure-docker/deploy.sh b/pure-docker/deploy.sh index 660960f28..28a1c71b8 100755 --- a/pure-docker/deploy.sh +++ b/pure-docker/deploy.sh @@ -22,7 +22,6 @@ for i in $(seq 0 $(($NUM_GITSERVER - 1))); do ./deploy-gitserver.sh $i; done ./deploy-prometheus.sh ./deploy-redis-cache.sh ./deploy-redis-store.sh -./deploy-repo-updater.sh ./deploy-worker.sh ./deploy-otel-collector.sh for i in $(seq 0 $(($NUM_SEARCHER - 1))); do ./deploy-searcher.sh $i; done diff --git a/pure-docker/teardown.sh b/pure-docker/teardown.sh index 121b506db..81a6dc0e8 100755 --- a/pure-docker/teardown.sh +++ b/pure-docker/teardown.sh @@ -23,7 +23,6 @@ docker rm -f migrator &>/dev/null || true & docker rm -f prometheus &>/dev/null || true docker rm -f redis-cache &>/dev/null || true & docker rm -f redis-store &>/dev/null || true & -docker rm -f repo-updater &>/dev/null || true & docker rm -f worker &>/dev/null || true & docker rm -f $(addresses "searcher-" $NUM_SEARCHER "") &>/dev/null || true & docker rm -f $(addresses "symbols-" $NUM_SYMBOLS "") &>/dev/null || true & diff --git a/test/smoke-test.sh b/test/smoke-test.sh index feb13bec6..c6a3bbc3f 100755 --- a/test/smoke-test.sh +++ b/test/smoke-test.sh @@ -12,10 +12,10 @@ deploy_sourcegraph() { if [[ "$TEST_TYPE" == "pure-docker-test" ]]; then ./test/volume-config.sh timeout 600s ./pure-docker/deploy.sh - expect_containers="25" + expect_containers="24" elif [[ "$TEST_TYPE" == "docker-compose-test" ]]; then docker-compose --file docker-compose/docker-compose.yaml up -d -t 600 - expect_containers="27" + expect_containers="26" fi echo "Giving containers 90s to start..." diff --git a/test/volume-config.sh b/test/volume-config.sh index 373f26414..45f4bc157 100755 --- a/test/volume-config.sh +++ b/test/volume-config.sh @@ -18,7 +18,7 @@ echo echo "forcing static permissions on volume directories" echo pushd ~/sourcegraph-docker -chown -R 100:101 gitserver* prometheus-v2* worker* repo-updater* searcher* sourcegraph-frontend* symbols* zoekt* blobstore-disk +chown -R 100:101 gitserver* prometheus-v2* worker* searcher* sourcegraph-frontend* symbols* zoekt* blobstore-disk chown -R 999:1000 redis-store-disk redis-cache-disk chown -R 472:472 grafana-disk chown -R 999:999 pgsql-disk codeintel-db-disk