Add embeddings to server behind env var (#50288)

This might be useful for some customers, but definitely will be useful
for us to write an E2E pipeline for embeddings.

cc @sourcegraph/dev-experience for a quick glance at the
debugserver/prometheus part of this.

## Test plan

Will build the image locally and see if it works alright with the env
var set.
This commit is contained in:
Erik Seliger 2023-04-04 16:45:50 +02:00 committed by GitHub
parent 5de9993d88
commit fcefe5b372
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 29 additions and 2 deletions

View File

@ -19,6 +19,7 @@ var SrcProfServices = []map[string]string{
{"Name": "repo-updater", "Host": "127.0.0.1:6074"},
{"Name": "worker", "Host": "127.0.0.1:6089"},
{"Name": "precise-code-intel-worker", "Host": "127.0.0.1:6088"},
{"Name": "embeddings", "Host": "127.0.0.1:6099"},
// no executors in server image
{"Name": "zoekt-indexserver", "Host": "127.0.0.1:6072"},
{"Name": "zoekt-webserver", "Host": "127.0.0.1:3070", "DefaultPath": "/debug/requests/"},

View File

@ -68,3 +68,8 @@
targets:
# opentelemetry collector
- host.docker.internal:8888
- labels:
job: embeddings
targets:
# embeddings
- host.docker.internal:6099

View File

@ -68,3 +68,8 @@
targets:
# opentelemetry collector
- host.docker.internal:8888
- labels:
job: embeddings
targets:
# embeddings
- 127.0.0.1:6099

View File

@ -11,6 +11,7 @@
{ "Name": "executor-batches", "Host": "127.0.0.1:6093" },
{ "Name": "zoekt-indexserver-0", "Host": "127.0.0.1:6072" },
{ "Name": "zoekt-indexserver-1", "Host": "127.0.0.1:6073" },
{ "Name": "embeddings", "Host": "127.0.0.1:6099" },
{ "Name": "zoekt-webserver-0", "Host": "127.0.0.1:3070", "DefaultPath": "/debug/requests/" },
{ "Name": "zoekt-webserver-1", "Host": "127.0.0.1:3071", "DefaultPath": "/debug/requests/" }
]

View File

@ -13,4 +13,5 @@ export SERVER_PKG=${SERVER_PKG:-github.com/sourcegraph/sourcegraph/enterprise/cm
github.com/sourcegraph/sourcegraph/enterprise/cmd/migrator \
github.com/sourcegraph/sourcegraph/enterprise/cmd/repo-updater \
github.com/sourcegraph/sourcegraph/enterprise/cmd/symbols \
github.com/sourcegraph/sourcegraph/enterprise/cmd/precise-code-intel-worker
github.com/sourcegraph/sourcegraph/enterprise/cmd/precise-code-intel-worker \
github.com/sourcegraph/sourcegraph/enterprise/cmd/embeddings

View File

@ -24,5 +24,17 @@ func main() {
map[string]string{"Name": "precise-code-intel-worker", "Host": "127.0.0.1:6088"},
)
enableEmbeddings, _ := strconv.ParseBool(os.Getenv("SRC_ENABLE_EMBEDDINGS"))
if enableEmbeddings {
shared.ProcfileAdditions = append(
shared.ProcfileAdditions,
`embeddings: embeddings`,
)
shared.SrcProfServices = append(
shared.SrcProfServices,
map[string]string{"Name": "embeddings", "Host": "127.0.0.1:6099"},
)
}
shared.Main()
}

View File

@ -6,5 +6,6 @@
{ "Name": "repo-updater", "Host": "127.0.0.1:6074" },
{ "Name": "precise-code-intel-worker", "Host": "127.0.0.1:6088" },
{ "Name": "worker", "Host": "127.0.0.1:6089" },
{ "Name": "worker-executors", "Host": "127.0.0.1:6969" }
{ "Name": "worker-executors", "Host": "127.0.0.1:6969" },
{ "Name": "embeddings", "Host": "127.0.0.1:6099" }
]

View File

@ -64,6 +64,7 @@ env:
{ "Name": "github-proxy", "Host": "127.0.0.1:6090" },
{ "Name": "worker", "Host": "127.0.0.1:6089" },
{ "Name": "worker-executors", "Host": "127.0.0.1:6996" },
{ "Name": "embeddings", "Host": "127.0.0.1:6099" },
{ "Name": "zoekt-index-0", "Host": "127.0.0.1:6072" },
{ "Name": "zoekt-index-1", "Host": "127.0.0.1:6073" },
{ "Name": "zoekt-web-0", "Host": "127.0.0.1:3070", "DefaultPath": "/debug/requests/" },