diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-07-15 14:11:39 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-07-15 14:11:39 +0300 |
| commit | 313a4cb5bd6d3b7f9927e3fcb5f60d4dd050e1d4 (patch) | |
| tree | 27028f1f95e94ae6aca3aee7ae1f2ce584e8f632 | |
| parent | 0e30a325f79450a90565c2ae2dab756566bc2204 (diff) | |
| parent | 5cc8d52c18f5cfead7d0488a1c6479728c8f8fe6 (diff) | |
Merge branch 'jc-remove-catfile-feature-flag' into 'master'
Remove catfile cache feature flag
Closes #1671
See merge request gitlab-org/gitaly!1357
| -rw-r--r-- | changelogs/unreleased/jc-remove-catfile-feature-flag.yml | 5 | ||||
| -rw-r--r-- | internal/git/catfile/catfile.go | 4 | ||||
| -rw-r--r-- | internal/service/commit/find_commit_test.go | 3 |
3 files changed, 6 insertions, 6 deletions
diff --git a/changelogs/unreleased/jc-remove-catfile-feature-flag.yml b/changelogs/unreleased/jc-remove-catfile-feature-flag.yml new file mode 100644 index 000000000..a2cc5da6a --- /dev/null +++ b/changelogs/unreleased/jc-remove-catfile-feature-flag.yml @@ -0,0 +1,5 @@ +--- +title: Remove catfile cache feature flag +merge_request: 1357 +author: +type: other diff --git a/internal/git/catfile/catfile.go b/internal/git/catfile/catfile.go index 01c6f9cd6..8e282db25 100644 --- a/internal/git/catfile/catfile.go +++ b/internal/git/catfile/catfile.go @@ -9,7 +9,6 @@ import ( "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/git/alternates" "gitlab.com/gitlab-org/gitaly/internal/metadata" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" ) var catfileCacheCounter = prometheus.NewCounterVec( @@ -148,8 +147,7 @@ func New(ctx context.Context, repo *gitalypb.Repository) (*Batch, error) { } sessionID := metadata.GetValue(ctx, "gitaly-session-id") - - if featureflag.IsDisabled(ctx, CacheFeatureFlagKey) || sessionID == "" { + if sessionID == "" { return newBatch(ctx, repoPath, env) } diff --git a/internal/service/commit/find_commit_test.go b/internal/service/commit/find_commit_test.go index ab64427c7..7be44bc00 100644 --- a/internal/service/commit/find_commit_test.go +++ b/internal/service/commit/find_commit_test.go @@ -14,7 +14,6 @@ import ( "gitlab.com/gitlab-org/gitaly/internal/git/catfile" "gitlab.com/gitlab-org/gitaly/internal/git/log" "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" "gitlab.com/gitlab-org/gitaly/internal/testhelper" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" @@ -332,7 +331,6 @@ func benchmarkFindCommit(withCache bool, b *testing.B) { revision := revisions[b.N%len(revisions)] if withCache { md := metadata.New(map[string]string{ - featureflag.HeaderKey(catfile.CacheFeatureFlagKey): "true", "gitaly-session-id": "abc123", }) @@ -378,7 +376,6 @@ func TestFindCommitWithCache(t *testing.T) { for i := 0; i < 10; i++ { revision := revisions[i%len(revisions)] md := metadata.New(map[string]string{ - featureflag.HeaderKey(catfile.CacheFeatureFlagKey): "true", "gitaly-session-id": "abc123", }) |