Debug: make indexing timeout configurable #676
Conversation
jtibshirani
changed the title
| @@ -183,7 +181,13 @@ func gitIndex(c gitIndexConfig, o *indexArgs, sourcegraph Sourcegraph, l sglog.L | |||
|
|
|||
| buildOptions := o.BuildOptions() | |||
|
|
|||
| ctx, cancel := context.WithTimeout(context.Background(), indexTimeout) | |||
| // indexingTimeout defines how long the indexserver waits before killing an indexing job. | |||
| indexingTimeout := getEnvWithDefaultDuration("INDEXING_TIMEOUT", defaultIndexingTimeout) | |||
There was a problem hiding this comment.
Should we make this part of indexArgs and set it in Server.indexArgs?
There was a problem hiding this comment.
We chatted about this over video, @stefanhengl is okay with an environment variable since we want to be able to change it without bouncing the server.
There was a problem hiding this comment.
I took a closer look at this, and decided to go with your suggestion, to match what we do for other debugging options like SKIP_SYMBOLS_REPOS_ALLOWLIST. I think it's best to be consistent, even though that means you need to restart the server to pick up new config.
Bumps the Zoekt version to pick up debugging improvements for slow indexing jobs (sourcegraph/zoekt#676). There are no other changes since the last bump.
On large repos, indexing might take quite a while and hit the indexing timeout. This change helps debug these situations: * Make the indexing timeout configurable through an env variable `INDEXING_TIMEOUT` * Add more info to progress logging: log the total number of files being indexed, plus the file count per shard
| @@ -1088,8 +1088,11 @@ func (b *Builder) writeShard(fn string, ib *zoekt.IndexBuilder) (*finishedShard, | |||
| return nil, err | |||
| } | |||
|
|
|||
| log.Printf("finished %s: %d index bytes (overhead %3.1f)", fn, fi.Size(), | |||
| float64(fi.Size())/float64(ib.ContentSize()+1)) | |||
| log.Printf("finished shard %s: %d index bytes (overhead %3.1f), %d files processed \n", | |||
There was a problem hiding this comment.
minor: you don't need the \n with the log pkg.
| log.Printf("finished shard %s: %d index bytes (overhead %3.1f), %d files processed \n", | |
| log.Printf("finished shard %s: %d index bytes (overhead %3.1f), %d files processed", |
| @@ -183,7 +181,13 @@ func gitIndex(c gitIndexConfig, o *indexArgs, sourcegraph Sourcegraph, l sglog.L | |||
|
|
|||
| buildOptions := o.BuildOptions() | |||
|
|
|||
| ctx, cancel := context.WithTimeout(context.Background(), indexTimeout) | |||
| // indexingTimeout defines how long the indexserver waits before killing an indexing job. | |||
| indexingTimeout := getEnvWithDefaultDuration("INDEXING_TIMEOUT", defaultIndexingTimeout) | |||
There was a problem hiding this comment.
very minor: I think prefixing the envvar with something can help when reading configuration files. I see we have lost our consistency here, but will still have a lot of envvars prefixed with SRC_. We don't use single container deployments as much these days so likely less important, but the prefix can help with accidental collisions as well.
Bumps the Zoekt version to pick up debugging improvements for slow indexing jobs (sourcegraph/zoekt#676). There are no other changes since the last bump.
On large repos, indexing might take quite a while and hit the indexing timeout.
This change helps debug these situations:
INDEXING_TIMEOUTindexed, plus the file count per shard