Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

grpc: remove zoekt-webserver specific feature flag#56302

Merged
ggilmore merged 1 commit into
mainfrom
re-enable-zoekt-grpc-2
Aug 31, 2023
Merged

grpc: remove zoekt-webserver specific feature flag#56302
ggilmore merged 1 commit into
mainfrom
re-enable-zoekt-grpc-2

Conversation

@ggilmore

@ggilmore ggilmore commented Aug 30, 2023

Copy link
Copy Markdown
Contributor

grpc-zoekt webserver support has been running successfully on sourcegraph.com for a while now, so there is no need for two layers of feature flags here.

sourcegraph.com will speak zoekt-webserver via gRPC when the main conf.IsGRPCEnabled setting is set to true (like every other service).

Test plan

CI

@sourcegraph-bot

sourcegraph-bot commented Aug 30, 2023

Copy link
Copy Markdown
Contributor

Codenotify: Notifying subscribers in CODENOTIFY files for diff f7a1545...5b4d2c5.

Notify File(s)
@camdencheek internal/search/backend/BUILD.bazel
internal/search/backend/grpc.go
internal/search/backend/horizontal.go
@jtibshirani internal/search/backend/BUILD.bazel
internal/search/backend/grpc.go
internal/search/backend/horizontal.go
@keegancsmith internal/search/backend/BUILD.bazel
internal/search/backend/grpc.go
internal/search/backend/horizontal.go

@ggilmore ggilmore force-pushed the re-enable-zoekt-grpc-2 branch from d998122 to cb7a8c5 Compare August 30, 2023 23:12
@ggilmore ggilmore enabled auto-merge (squash) August 30, 2023 23:12
grpc-zoekt webserver support has been running successfully on sourcegraph.com for a while now, so there is no-need for two layers of feature flags here.

sourcegraph.com will speak zoekt-webserver via gRPC when the main conf.IsGRPCEnabled setting is set to true (like every other service).
@ggilmore ggilmore force-pushed the re-enable-zoekt-grpc-2 branch from cb7a8c5 to 5b4d2c5 Compare August 30, 2023 23:44
@ggilmore ggilmore merged commit 7c08dcb into main Aug 31, 2023
@ggilmore ggilmore deleted the re-enable-zoekt-grpc-2 branch August 31, 2023 03:20
@github-actions

Copy link
Copy Markdown
Contributor

The backport to 5.1 failed:

Validation Failed: "Could not resolve to a node with the global id of 'T_kwDOADy5QM4AWdx9'."

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-5.1 5.1
# Navigate to the new working tree
cd .worktrees/backport-5.1
# Create a new branch
git switch --create backport-56302-to-5.1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7c08dcbc1158f9359660a768b335a03c7d6a45f4
# Push it to GitHub
git push --set-upstream origin backport-56302-to-5.1
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.1

Then, create a pull request where the base branch is 5.1 and the compare/head branch is backport-56302-to-5.1.
See https://github.com/sourcegraph/sourcegraph/actions/runs/6032658705/jobs/14764 for more information.
Make sure to tag @sourcegraph/release-guild in the pull request description.
Once the backport pull request is created, kindly remove the release-blocker from this pull request.

@github-actions github-actions Bot added backports failed-backport-to-5.1 release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases labels Aug 31, 2023
github-actions Bot pushed a commit that referenced this pull request Aug 31, 2023
keegancsmith pushed a commit that referenced this pull request Aug 31, 2023
…6303)

grpc: remove zoekt-webserver specific feature flag (#56302)

(cherry picked from commit 7c08dcb)

Co-authored-by: Geoffrey Gilmore <geoffrey@sourcegraph.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

backports cla-signed release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants