reslve conflicts

Signed-off-by: Alex Chi Z <[email protected]>

pageserver/src/tenant.rs

@@ -3031,6 +3031,8 @@ impl Tenant {
                                 let mut guard = self.scheduled_compaction_tasks.lock().unwrap();
                                 let tline_pending_tasks = guard.entry(*timeline_id).or_default();
                                 for (idx, job) in jobs.into_iter().enumerate() {
+                                    // Unfortunately we need to convert the `GcCompactJob` back to `CompactionOptions`
+                                    // until we do further refactors to allow directly call `compact_with_gc`.
                                     let options = CompactOptions {
                                         flags: if job.dry_run {
                                             let mut flags: EnumSet<CompactFlags> =
@@ -10473,6 +10475,12 @@ mod tests {
             )
             .await?;
         {
+            tline
+            .latest_gc_cutoff_lsn
+            .lock_for_write()
+            .store_and_unlock(Lsn(0x30))
+            .wait()
+            .await;
             // Update GC info
             let mut guard = tline.gc_info.write().unwrap();
             *guard = GcInfo {
@@ -10718,6 +10726,12 @@ mod tests {
             )
             .await?;
         {
+            tline
+            .latest_gc_cutoff_lsn
+            .lock_for_write()
+            .store_and_unlock(Lsn(0x30))
+            .wait()
+            .await;
             // Update GC info
             let mut guard = tline.gc_info.write().unwrap();
             *guard = GcInfo {