Merge branch 'pks-housekeeping-remove-bitmap-lookup-table-ff' into 'master'

housekeeping: Unconditionally write bitmap lookup tables

Closes #4744

See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5343

Merged-by: Toon Claes <toon@gitlab.com>
Approved-by: Toon Claes <toon@gitlab.com>
Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com>

11 files changed, 25 insertions, 147 deletions

diff --git a/internal/git/housekeeping/objects.go b/internal/git/housekeeping/objects.go
index 3e4fbaeab..042efb798 100644
--- a/internal/git/housekeeping/objects.go
+++ b/internal/git/housekeeping/objects.go
@@ -8,7 +8,6 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v15/internal/git/localrepo"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/git/repository"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/git/stats"
-	"gitlab.com/gitlab-org/gitaly/v15/internal/metadata/featureflag"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/structerr"
 )
 
@@ -69,7 +68,7 @@ func GetRepackGitConfig(ctx context.Context, repo repository.GitRepo, bitmap boo
 	config := []git.ConfigPair{
 		{Key: "repack.useDeltaIslands", Value: "true"},
 		{Key: "repack.writeBitmaps", Value: strconv.FormatBool(bitmap)},
-		{Key: "pack.writeBitmapLookupTable", Value: strconv.FormatBool(featureflag.WriteBitmapLookupTable.IsEnabled(ctx))},
+		{Key: "pack.writeBitmapLookupTable", Value: "true"},
 	}
 
 	if stats.IsPoolRepository(repo) {
diff --git a/internal/git/housekeeping/objects_test.go b/internal/git/housekeeping/objects_test.go
index c8005e911..b4ac2168f 100644
--- a/internal/git/housekeeping/objects_test.go
+++ b/internal/git/housekeeping/objects_test.go
@@ -1,7 +1,6 @@
 package housekeeping
 
 import (
-	"context"
 	"path/filepath"
 	"testing"
 
@@ -9,7 +8,6 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v15/internal/git/gittest"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/git/localrepo"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/git/stats"
-	"gitlab.com/gitlab-org/gitaly/v15/internal/metadata/featureflag"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/structerr"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper/testcfg"
@@ -17,12 +15,8 @@ import (
 
 func TestRepackObjects(t *testing.T) {
 	t.Parallel()
-	testhelper.NewFeatureSets(featureflag.WriteBitmapLookupTable).Run(t, testRepackObjects)
-}
-
-func testRepackObjects(t *testing.T, ctx context.Context) {
-	t.Parallel()
 
+	ctx := testhelper.Context(t)
 	cfg := testcfg.Build(t)
 
 	gitVersion, err := gittest.NewCommandFactory(t, cfg).GitVersion(ctx)
diff --git a/internal/git/housekeeping/optimize_repository_ext_test.go b/internal/git/housekeeping/optimize_repository_ext_test.go
index c37cb3a5b..f53bf4d59 100644
--- a/internal/git/housekeeping/optimize_repository_ext_test.go
+++ b/internal/git/housekeeping/optimize_repository_ext_test.go
@@ -33,7 +33,6 @@ import (
 func TestPruneIfNeeded(t *testing.T) {
 	t.Parallel()
 	testhelper.NewFeatureSets(
-		featureflag.WriteBitmapLookupTable,
 		featureflag.WriteMultiPackIndex,
 	).Run(t, testPruneIfNeeded)
 }
@@ -243,7 +242,6 @@ func testPruneIfNeeded(t *testing.T, ctx context.Context) {
 func TestOptimizeRepository_objectPoolMember(t *testing.T) {
 	t.Parallel()
 	testhelper.NewFeatureSets(
-		featureflag.WriteBitmapLookupTable,
 		featureflag.WriteMultiPackIndex,
 	).Run(t, testOptimizeRepositoryObjectPoolMember)
 }
diff --git a/internal/git/housekeeping/optimize_repository_test.go b/internal/git/housekeeping/optimize_repository_test.go
index 318995475..e24a0bc4b 100644
--- a/internal/git/housekeeping/optimize_repository_test.go
+++ b/internal/git/housekeeping/optimize_repository_test.go
@@ -30,7 +30,6 @@ import (
 func TestRepackIfNeeded(t *testing.T) {
 	t.Parallel()
 	testhelper.NewFeatureSets(
-		featureflag.WriteBitmapLookupTable,
 		featureflag.WriteMultiPackIndex,
 	).Run(t, testRepackIfNeeded)
 }
@@ -159,7 +158,6 @@ func TestPackRefsIfNeeded(t *testing.T) {
 func TestOptimizeRepository(t *testing.T) {
 	t.Parallel()
 	testhelper.NewFeatureSets(
-		featureflag.WriteBitmapLookupTable,
 		featureflag.WriteMultiPackIndex,
 	).Run(t, testOptimizeRepository)
 }
diff --git a/internal/git/objectpool/fetch_test.go b/internal/git/objectpool/fetch_test.go
index 9df238646..5b14543ab 100644
--- a/internal/git/objectpool/fetch_test.go
+++ b/internal/git/objectpool/fetch_test.go
@@ -23,7 +23,6 @@ import (
 func TestFetchFromOrigin_dangling(t *testing.T) {
 	t.Parallel()
 	testhelper.NewFeatureSets(
-		featureflag.WriteBitmapLookupTable,
 		featureflag.WriteMultiPackIndex,
 	).Run(t, testFetchFromOriginDangling)
 }
@@ -115,7 +114,6 @@ func TestFetchFromOrigin_fsck(t *testing.T) {
 func TestFetchFromOrigin_deltaIslands(t *testing.T) {
 	t.Parallel()
 	testhelper.NewFeatureSets(
-		featureflag.WriteBitmapLookupTable,
 		featureflag.WriteMultiPackIndex,
 	).Run(t, testFetchFromOriginDeltaIslands)
 }
@@ -148,7 +146,6 @@ func testFetchFromOriginDeltaIslands(t *testing.T, ctx context.Context) {
 func TestFetchFromOrigin_bitmapHashCache(t *testing.T) {
 	t.Parallel()
 	testhelper.NewFeatureSets(
-		featureflag.WriteBitmapLookupTable,
 		featureflag.WriteMultiPackIndex,
 	).Run(t, testFetchFromOriginBitmapHashCache)
 }
@@ -174,14 +171,13 @@ func testFetchFromOriginBitmapHashCache(t *testing.T, ctx context.Context) {
 		Exists:         true,
 		Version:        1,
 		HasHashCache:   true,
-		HasLookupTable: featureflag.WriteBitmapLookupTable.IsEnabled(ctx),
+		HasLookupTable: true,
 	}, bitmapInfo)
 }
 
 func TestFetchFromOrigin_refUpdates(t *testing.T) {
 	t.Parallel()
 	testhelper.NewFeatureSets(
-		featureflag.WriteBitmapLookupTable,
 		featureflag.WriteMultiPackIndex,
 	).Run(t, testFetchFromOriginRefUpdates)
 }
@@ -235,7 +231,6 @@ func testFetchFromOriginRefUpdates(t *testing.T, ctx context.Context) {
 func TestFetchFromOrigin_refs(t *testing.T) {
 	t.Parallel()
 	testhelper.NewFeatureSets(
-		featureflag.WriteBitmapLookupTable,
 		featureflag.WriteMultiPackIndex,
 	).Run(t, testFetchFromOriginRefs)
 }
diff --git a/internal/gitaly/service/objectpool/fetch_into_object_pool_test.go b/internal/gitaly/service/objectpool/fetch_into_object_pool_test.go
index 5c25adbeb..b5363deb3 100644
--- a/internal/gitaly/service/objectpool/fetch_into_object_pool_test.go
+++ b/internal/gitaly/service/objectpool/fetch_into_object_pool_test.go
@@ -40,7 +40,6 @@ import (
 func TestFetchIntoObjectPool_Success(t *testing.T) {
 	t.Parallel()
 	testhelper.NewFeatureSets(
-		featureflag.WriteBitmapLookupTable,
 		featureflag.WriteMultiPackIndex,
 	).Run(t, testFetchIntoObjectPoolSuccess)
 }
@@ -96,7 +95,6 @@ func testFetchIntoObjectPoolSuccess(t *testing.T, ctx context.Context) {
 func TestFetchIntoObjectPool_transactional(t *testing.T) {
 	t.Parallel()
 	testhelper.NewFeatureSets(
-		featureflag.WriteBitmapLookupTable,
 		featureflag.WriteMultiPackIndex,
 	).Run(t, testFetchIntoObjectPoolTransactional)
 }
@@ -215,7 +213,6 @@ func testFetchIntoObjectPoolTransactional(t *testing.T, ctx context.Context) {
 func TestFetchIntoObjectPool_CollectLogStatistics(t *testing.T) {
 	t.Parallel()
 	testhelper.NewFeatureSets(
-		featureflag.WriteBitmapLookupTable,
 		featureflag.WriteMultiPackIndex,
 	).Run(t, testFetchIntoObjectPoolCollectLogStatistics)
 }
@@ -314,7 +311,6 @@ func TestFetchIntoObjectPool_Failure(t *testing.T) {
 func TestFetchIntoObjectPool_dfConflict(t *testing.T) {
 	t.Parallel()
 	testhelper.NewFeatureSets(
-		featureflag.WriteBitmapLookupTable,
 		featureflag.WriteMultiPackIndex,
 	).Run(t, testFetchIntoObjectPoolDfConflict)
 }
diff --git a/internal/gitaly/service/repository/gc_test.go b/internal/gitaly/service/repository/gc_test.go
index b6fe71cee..7eba095e9 100644
--- a/internal/gitaly/service/repository/gc_test.go
+++ b/internal/gitaly/service/repository/gc_test.go
@@ -4,7 +4,6 @@ package repository
 
 import (
 	"bytes"
-	"context"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -20,7 +19,6 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v15/internal/git/stats"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/helper/perm"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/helper/text"
-	"gitlab.com/gitlab-org/gitaly/v15/internal/metadata/featureflag"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper/testserver"
 	"gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb"
@@ -35,12 +33,8 @@ var (
 
 func TestGarbageCollectCommitGraph(t *testing.T) {
 	t.Parallel()
-	testhelper.NewFeatureSets(featureflag.WriteBitmapLookupTable).Run(t, testGarbageCollectCommitGraph)
-}
-
-func testGarbageCollectCommitGraph(t *testing.T, ctx context.Context) {
-	t.Parallel()
 
+	ctx := testhelper.Context(t)
 	_, repo, repoPath, client := setupRepositoryService(t, ctx)
 
 	//nolint:staticcheck
@@ -58,12 +52,8 @@ func testGarbageCollectCommitGraph(t *testing.T, ctx context.Context) {
 
 func TestGarbageCollectSuccess(t *testing.T) {
 	t.Parallel()
-	testhelper.NewFeatureSets(featureflag.WriteBitmapLookupTable).Run(t, testGarbageCollectSuccess)
-}
-
-func testGarbageCollectSuccess(t *testing.T, ctx context.Context) {
-	t.Parallel()
 
+	ctx := testhelper.Context(t)
 	_, repo, repoPath, client := setupRepositoryService(t, ctx)
 
 	tests := []struct {
@@ -114,12 +104,8 @@ func testGarbageCollectSuccess(t *testing.T, ctx context.Context) {
 
 func TestGarbageCollectWithPrune(t *testing.T) {
 	t.Parallel()
-	testhelper.NewFeatureSets(featureflag.WriteBitmapLookupTable).Run(t, testGarbageCollectWithPrune)
-}
-
-func testGarbageCollectWithPrune(t *testing.T, ctx context.Context) {
-	t.Parallel()
 
+	ctx := testhelper.Context(t)
 	cfg, repo, repoPath, client := setupRepositoryService(t, ctx)
 
 	blobHashes := gittest.WriteBlobs(t, cfg, repoPath, 3)
@@ -161,12 +147,8 @@ func testGarbageCollectWithPrune(t *testing.T, ctx context.Context) {
 
 func TestGarbageCollectLogStatistics(t *testing.T) {
 	t.Parallel()
-	testhelper.NewFeatureSets(featureflag.WriteBitmapLookupTable).Run(t, testGarbageCollectLogStatistics)
-}
-
-func testGarbageCollectLogStatistics(t *testing.T, ctx context.Context) {
-	t.Parallel()
 
+	ctx := testhelper.Context(t)
 	logger, hook := test.NewNullLogger()
 	_, repo, _, client := setupRepositoryService(t, ctx, testserver.WithLogger(logger))
 
@@ -179,12 +161,8 @@ func testGarbageCollectLogStatistics(t *testing.T, ctx context.Context) {
 
 func TestGarbageCollectDeletesRefsLocks(t *testing.T) {
 	t.Parallel()
-	testhelper.NewFeatureSets(featureflag.WriteBitmapLookupTable).Run(t, testGarbageCollectDeletesRefsLocks)
-}
-
-func testGarbageCollectDeletesRefsLocks(t *testing.T, ctx context.Context) {
-	t.Parallel()
 
+	ctx := testhelper.Context(t)
 	_, repo, repoPath, client := setupRepositoryService(t, ctx)
 
 	req := &gitalypb.GarbageCollectRequest{Repository: repo}
@@ -228,12 +206,8 @@ func testGarbageCollectDeletesRefsLocks(t *testing.T, ctx context.Context) {
 
 func TestGarbageCollectDeletesPackedRefsLock(t *testing.T) {
 	t.Parallel()
-	testhelper.NewFeatureSets(featureflag.WriteBitmapLookupTable).Run(t, testGarbageCollectDeletesPackedRefsLock)
-}
-
-func testGarbageCollectDeletesPackedRefsLock(t *testing.T, ctx context.Context) {
-	t.Parallel()
 
+	ctx := testhelper.Context(t)
 	cfg, client := setupRepositoryServiceWithoutRepo(t)
 
 	for _, tc := range []struct {
@@ -307,12 +281,8 @@ func testGarbageCollectDeletesPackedRefsLock(t *testing.T, ctx context.Context)
 
 func TestGarbageCollectDeletesFileLocks(t *testing.T) {
 	t.Parallel()
-	testhelper.NewFeatureSets(featureflag.WriteBitmapLookupTable).Run(t, testGarbageCollectDeletesFileLocks)
-}
-
-func testGarbageCollectDeletesFileLocks(t *testing.T, ctx context.Context) {
-	t.Parallel()
 
+	ctx := testhelper.Context(t)
 	cfg, client := setupRepositoryServiceWithoutRepo(t)
 
 	for _, tc := range []struct {
@@ -388,12 +358,8 @@ func testGarbageCollectDeletesFileLocks(t *testing.T, ctx context.Context) {
 
 func TestGarbageCollectDeletesPackedRefsNew(t *testing.T) {
 	t.Parallel()
-	testhelper.NewFeatureSets(featureflag.WriteBitmapLookupTable).Run(t, testGarbageCollectDeletesPackedRefsNew)
-}
-
-func testGarbageCollectDeletesPackedRefsNew(t *testing.T, ctx context.Context) {
-	t.Parallel()
 
+	ctx := testhelper.Context(t)
 	cfg, client := setupRepositoryServiceWithoutRepo(t)
 
 	testCases := []struct {
@@ -498,12 +464,8 @@ func TestGarbageCollectFailure(t *testing.T) {
 
 func TestCleanupInvalidKeepAroundRefs(t *testing.T) {
 	t.Parallel()
-	testhelper.NewFeatureSets(featureflag.WriteBitmapLookupTable).Run(t, testCleanupInvalidKeepAroundRefs)
-}
-
-func testCleanupInvalidKeepAroundRefs(t *testing.T, ctx context.Context) {
-	t.Parallel()
 
+	ctx := testhelper.Context(t)
 	cfg, repo, repoPath, client := setupRepositoryService(t, ctx)
 
 	// Make the directory, so we can create random reflike things in it
@@ -597,12 +559,8 @@ func mustCreateFileWithTimes(tb testing.TB, path string, mTime time.Time) {
 
 func TestGarbageCollectDeltaIslands(t *testing.T) {
 	t.Parallel()
-	testhelper.NewFeatureSets(featureflag.WriteBitmapLookupTable).Run(t, testGarbageCollectDeltaIslands)
-}
-
-func testGarbageCollectDeltaIslands(t *testing.T, ctx context.Context) {
-	t.Parallel()
 
+	ctx := testhelper.Context(t)
 	cfg, repo, repoPath, client := setupRepositoryService(t, ctx)
 
 	gittest.TestDeltaIslands(t, cfg, repoPath, repoPath, false, func() error {
@@ -614,12 +572,8 @@ func testGarbageCollectDeltaIslands(t *testing.T, ctx context.Context) {
 
 func TestGarbageCollect_commitGraphsWithPrunedObjects(t *testing.T) {
 	t.Parallel()
-	testhelper.NewFeatureSets(featureflag.WriteBitmapLookupTable).Run(t, testGarbageCollectCommitGraphsWithPrunedObjects)
-}
-
-func testGarbageCollectCommitGraphsWithPrunedObjects(t *testing.T, ctx context.Context) {
-	t.Parallel()
 
+	ctx := testhelper.Context(t)
 	cfg, client := setupRepositoryServiceWithoutRepo(t)
 
 	repoProto, repoPath := gittest.CreateRepository(t, ctx, cfg)
diff --git a/internal/gitaly/service/repository/midx_test.go b/internal/gitaly/service/repository/midx_test.go
index 5d7e15c4e..1a337b885 100644
--- a/internal/gitaly/service/repository/midx_test.go
+++ b/internal/gitaly/service/repository/midx_test.go
@@ -26,7 +26,6 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v15/internal/helper/perm"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/helper/text"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/metadata"
-	"gitlab.com/gitlab-org/gitaly/v15/internal/metadata/featureflag"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper/testserver"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/transaction/txinfo"
@@ -85,12 +84,8 @@ func TestMidxRewrite(t *testing.T) {
 
 func TestMidxRepack(t *testing.T) {
 	t.Parallel()
-	testhelper.NewFeatureSets(featureflag.WriteBitmapLookupTable).Run(t, testMidxRepack)
-}
-
-func testMidxRepack(t *testing.T, ctx context.Context) {
-	t.Parallel()
 
+	ctx := testhelper.Context(t)
 	cfg, client := setupRepositoryServiceWithoutRepo(t)
 
 	repoProto, repoPath := gittest.CreateRepository(t, ctx, cfg)
@@ -166,12 +161,8 @@ func TestMidxRepack_transactional(t *testing.T) {
 
 func TestMidxRepackExpire(t *testing.T) {
 	t.Parallel()
-	testhelper.NewFeatureSets(featureflag.WriteBitmapLookupTable).Run(t, testMidxRepackExpire)
-}
-
-func testMidxRepackExpire(t *testing.T, ctx context.Context) {
-	t.Parallel()
 
+	ctx := testhelper.Context(t)
 	cfg, client := setupRepositoryServiceWithoutRepo(t)
 
 	for _, packsAdded := range []uint64{3, 5, 11, 20} {
diff --git a/internal/gitaly/service/repository/optimize_test.go b/internal/gitaly/service/repository/optimize_test.go
index c54fddcca..4f3cf83a6 100644
--- a/internal/gitaly/service/repository/optimize_test.go
+++ b/internal/gitaly/service/repository/optimize_test.go
@@ -30,7 +30,6 @@ import (
 func TestOptimizeRepository(t *testing.T) {
 	t.Parallel()
 	testhelper.NewFeatureSets(
-		featureflag.WriteBitmapLookupTable,
 		featureflag.WriteMultiPackIndex,
 	).Run(t, testOptimizeRepository)
 }
diff --git a/internal/gitaly/service/repository/repack_test.go b/internal/gitaly/service/repository/repack_test.go
index 33d10fe1d..7e50caea9 100644
--- a/internal/gitaly/service/repository/repack_test.go
+++ b/internal/gitaly/service/repository/repack_test.go
@@ -3,7 +3,6 @@
 package repository
 
 import (
-	"context"
 	"fmt"
 	"path/filepath"
 	"testing"
@@ -14,7 +13,6 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v15/internal/git/gittest"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/git/localrepo"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/git/stats"
-	"gitlab.com/gitlab-org/gitaly/v15/internal/metadata/featureflag"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper/testserver"
 	"gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb"
@@ -24,12 +22,8 @@ import (
 
 func TestRepackIncrementalSuccess(t *testing.T) {
 	t.Parallel()
-	testhelper.NewFeatureSets(featureflag.WriteBitmapLookupTable).Run(t, testRepackIncrementalSuccess)
-}
-
-func testRepackIncrementalSuccess(t *testing.T, ctx context.Context) {
-	t.Parallel()
 
+	ctx := testhelper.Context(t)
 	cfg, client := setupRepositoryServiceWithoutRepo(t)
 	repoProto, repoPath := gittest.CreateRepository(t, ctx, cfg)
 	repo := localrepo.NewTestRepo(t, cfg, repoProto)
@@ -66,12 +60,8 @@ func testRepackIncrementalSuccess(t *testing.T, ctx context.Context) {
 
 func TestRepackIncrementalCollectLogStatistics(t *testing.T) {
 	t.Parallel()
-	testhelper.NewFeatureSets(featureflag.WriteBitmapLookupTable).Run(t, testRepackIncrementalCollectLogStatistics)
-}
-
-func testRepackIncrementalCollectLogStatistics(t *testing.T, ctx context.Context) {
-	t.Parallel()
 
+	ctx := testhelper.Context(t)
 	logger, hook := test.NewNullLogger()
 	_, repo, _, client := setupRepositoryService(t, ctx, testserver.WithLogger(logger))
 
@@ -84,12 +74,8 @@ func testRepackIncrementalCollectLogStatistics(t *testing.T, ctx context.Context
 
 func TestRepackLocal(t *testing.T) {
 	t.Parallel()
-	testhelper.NewFeatureSets(featureflag.WriteBitmapLookupTable).Run(t, testRepackLocal)
-}
-
-func testRepackLocal(t *testing.T, ctx context.Context) {
-	t.Parallel()
 
+	ctx := testhelper.Context(t)
 	cfg, repo, repoPath, client := setupRepositoryService(t, ctx)
 
 	altObjectsDir := "./alt-objects"
@@ -127,12 +113,8 @@ const praefectErr = `routing repository maintenance: getting repository metadata
 
 func TestRepackIncrementalFailure(t *testing.T) {
 	t.Parallel()
-	testhelper.NewFeatureSets(featureflag.WriteBitmapLookupTable).Run(t, testRepackIncrementalFailure)
-}
-
-func testRepackIncrementalFailure(t *testing.T, ctx context.Context) {
-	t.Parallel()
 
+	ctx := testhelper.Context(t)
 	cfg, client := setupRepositoryServiceWithoutRepo(t)
 
 	tests := []struct {
@@ -188,12 +170,8 @@ func testRepackIncrementalFailure(t *testing.T, ctx context.Context) {
 
 func TestRepackFullSuccess(t *testing.T) {
 	t.Parallel()
-	testhelper.NewFeatureSets(featureflag.WriteBitmapLookupTable).Run(t, testRepackFullSuccess)
-}
-
-func testRepackFullSuccess(t *testing.T, ctx context.Context) {
-	t.Parallel()
 
+	ctx := testhelper.Context(t)
 	cfg, client := setupRepositoryServiceWithoutRepo(t)
 
 	for _, tc := range []struct {
@@ -252,7 +230,7 @@ func testRepackFullSuccess(t *testing.T, ctx context.Context) {
 					Exists:         true,
 					Version:        1,
 					HasHashCache:   true,
-					HasLookupTable: featureflag.WriteBitmapLookupTable.IsEnabled(ctx),
+					HasLookupTable: true,
 				}, bitmapInfo)
 			} else {
 				require.Empty(t, bitmaps)
@@ -271,12 +249,9 @@ func testRepackFullSuccess(t *testing.T, ctx context.Context) {
 }
 
 func TestRepackFullCollectLogStatistics(t *testing.T) {
-	testhelper.NewFeatureSets(featureflag.WriteBitmapLookupTable).Run(t, testRepackFullCollectLogStatistics)
-}
-
-func testRepackFullCollectLogStatistics(t *testing.T, ctx context.Context) {
 	t.Parallel()
 
+	ctx := testhelper.Context(t)
 	logger, hook := test.NewNullLogger()
 	_, repo, _, client := setupRepositoryService(t, ctx, testserver.WithLogger(logger))
 
@@ -289,12 +264,8 @@ func testRepackFullCollectLogStatistics(t *testing.T, ctx context.Context) {
 
 func TestRepackFullFailure(t *testing.T) {
 	t.Parallel()
-	testhelper.NewFeatureSets(featureflag.WriteBitmapLookupTable).Run(t, testRepackFullFailure)
-}
-
-func testRepackFullFailure(t *testing.T, ctx context.Context) {
-	t.Parallel()
 
+	ctx := testhelper.Context(t)
 	cfg, client := setupRepositoryServiceWithoutRepo(t)
 
 	tests := []struct {
@@ -341,12 +312,8 @@ func testRepackFullFailure(t *testing.T, ctx context.Context) {
 
 func TestRepackFullDeltaIslands(t *testing.T) {
 	t.Parallel()
-	testhelper.NewFeatureSets(featureflag.WriteBitmapLookupTable).Run(t, testRepackFullDeltaIslands)
-}
-
-func testRepackFullDeltaIslands(t *testing.T, ctx context.Context) {
-	t.Parallel()
 
+	ctx := testhelper.Context(t)
 	cfg, repo, repoPath, client := setupRepositoryService(t, ctx)
 
 	gittest.TestDeltaIslands(t, cfg, repoPath, repoPath, false, func() error {
diff --git a/internal/metadata/featureflag/ff_write_bitmap_lookup_table.go b/internal/metadata/featureflag/ff_write_bitmap_lookup_table.go
deleted file mode 100644
index cfcc2a368..000000000
--- a/internal/metadata/featureflag/ff_write_bitmap_lookup_table.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package featureflag
-
-// WriteBitmapLookupTable enables writing of the lookup table extension in bitmaps. When enabled,
-// the lookup table is used to defer loading individual bitmaps. This can be especially beneficial
-// in large repositories that have large bitmap indexes.
-//
-// This feature has been introduced with Git v2.38.0.
-var WriteBitmapLookupTable = NewFeatureFlag(
-	"write_bitmap_lookup_table",
-	"v15.9.0",
-	"https://gitlab.com/gitlab-org/gitaly/-/issues/4744",
-	false,
-)