From f4e9d3c114882668287ef895d6d5106dcaf6d32f Mon Sep 17 00:00:00 2001
From: Rahul Aggarwal <rahul.aggarwal@cockroachlabs.com>
Date: Mon, 26 Jun 2023 14:16:28 -0400
Subject: [PATCH] pebble: Fix TestManualCompaction Flaky Test

This change ensures that `TestManualCompaction` uses table format
`TableFormatPebblev1` as the size was changed in the following pr
https://github.com/cockroachdb/pebble/pull/2585

Fixes: #2613
---
 compaction_test.go | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/compaction_test.go b/compaction_test.go
index 99301127c6..fc1e0136fb 100644
--- a/compaction_test.go
+++ b/compaction_test.go
@@ -1247,9 +1247,6 @@ func TestValidateVersionEdit(t *testing.T) {
 }
 
 func TestManualCompaction(t *testing.T) {
-	// skip flaky test until fixed (https://github.com/cockroachdb/pebble/issues/2613)
-	t.Skip()
-
 	var mem vfs.FS
 	var d *DB
 	defer func() {
@@ -1588,7 +1585,7 @@ func TestManualCompaction(t *testing.T) {
 		},
 		{
 			testData:   "testdata/manual_compaction_set_with_del",
-			minVersion: FormatSetWithDelete,
+			minVersion: FormatBlockPropertyCollector,
 			maxVersion: FormatPrePebblev1MarkedCompacted,
 		},
 		{