diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2019-08-23 01:03:13 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2019-08-23 01:03:13 +0300 |
| commit | d40a17c321cfe736fc01bdfeb8b4aa25a86af1bd (patch) | |
| tree | ee4610e188311af9b53153515d7904ada41154ab | |
| parent | 959a0fc70849d1b7fba59d4f6e21aab78e71902d (diff) | |
Disable invalidator and info-ref cache feature flagspo-disable-feature-flags
| -rw-r--r-- | internal/middleware/cache/cache.go | 9 | ||||
| -rw-r--r-- | internal/service/smarthttp/cache.go | 4 |
2 files changed, 1 insertions, 12 deletions
diff --git a/internal/middleware/cache/cache.go b/internal/middleware/cache/cache.go index 2a65c6447..2f931bdda 100644 --- a/internal/middleware/cache/cache.go +++ b/internal/middleware/cache/cache.go @@ -8,7 +8,6 @@ import ( "github.com/golang/protobuf/proto" "github.com/sirupsen/logrus" diskcache "gitlab.com/gitlab-org/gitaly/internal/cache" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" "google.golang.org/grpc" @@ -36,10 +35,6 @@ func methodErrLogger(method string) func(error) { // repository in a gRPC stream based RPC func StreamInvalidator(ci Invalidator, reg *protoregistry.Registry) grpc.StreamServerInterceptor { return func(srv interface{}, ss grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error { - if !featureflag.IsEnabled(ss.Context(), FeatureFlag) { - return handler(srv, ss) - } - errLogger := methodErrLogger(info.FullMethod) mInfo, err := reg.LookupMethod(info.FullMethod) @@ -63,10 +58,6 @@ func StreamInvalidator(ci Invalidator, reg *protoregistry.Registry) grpc.StreamS // repository in a gRPC unary RPC func UnaryInvalidator(ci Invalidator, reg *protoregistry.Registry) grpc.UnaryServerInterceptor { return func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (resp interface{}, err error) { - if !featureflag.IsEnabled(ctx, FeatureFlag) { - return handler(ctx, req) - } - errLogger := methodErrLogger(info.FullMethod) mInfo, err := reg.LookupMethod(info.FullMethod) diff --git a/internal/service/smarthttp/cache.go b/internal/service/smarthttp/cache.go index 8cb864bdd..247e335b2 100644 --- a/internal/service/smarthttp/cache.go +++ b/internal/service/smarthttp/cache.go @@ -9,7 +9,6 @@ import ( "github.com/prometheus/client_golang/prometheus" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly/internal/cache" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" @@ -49,8 +48,7 @@ func init() { const UploadPackCacheFeatureFlagKey = "inforef-uploadpack-cache" func tryCache(ctx context.Context, in *gitalypb.InfoRefsRequest, w io.Writer, missFn func(io.Writer) error) error { - if !featureflag.IsEnabled(ctx, UploadPackCacheFeatureFlagKey) || - len(in.GetGitConfigOptions()) > 0 || + if len(in.GetGitConfigOptions()) > 0 || len(in.GetGitProtocol()) > 0 { return missFn(w) } |