Merge pull request #1151 from amvanbaren/delete-file-resource-jobs

Remove jobs for file resources that still exist

Author: amvanbaren

server/src/main/java/org/eclipse/openvsx/entities/MigrationItem.java

@@ -25,6 +25,10 @@ public class MigrationItem {
 
     private String jobName;
 
+    public void setId(long id) {
+        this.id = id;
+    }
+
     public long getId() {
         return id;
     }

server/src/main/java/org/eclipse/openvsx/migration/MigrationItemJobRequestHandler.java

@@ -58,6 +58,8 @@ public void run(HandlerJobRequest<?> jobRequest) throws Exception {
         for(var item : items) {
             migrations.enqueueMigration(item);
         }
+
+        logger.info("Scheduled migration items: {}", items.getSize());
         if(!items.hasNext()) {
             scheduler.deleteRecurringJob(getJobName());
         }

server/src/main/java/org/eclipse/openvsx/migration/MigrationService.java

@@ -25,8 +25,6 @@
 import org.jobrunr.storage.JobNotFoundException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
 import org.springframework.retry.annotation.Retryable;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
@@ -135,15 +133,19 @@ public FileResource getDownload(ExtensionVersion extVersion) {
 
     @Async
     public void clearJobQueue() {
-        // TODO remove after deployment of v0.23.4
-        Pageable page = PageRequest.ofSize(10000);
-        while(page != null) {
-            var migrationItems = repositories.findMigrationItemsByJobName("RemoveFileResourceTypeResourceMigration", page);
+        // TODO remove after deployment of v0.23.5
+        var offset = 0;
+        var limit = 10000;
+        var hasNext = true;
+        var counter = 0;
+        while(hasNext) {
+            var migrationItems = repositories.findRemoveFileResourceTypeResourceMigrationItems(offset, limit);
             for (var item : migrationItems) {
                 var jobIdText = item.getJobName() + "::itemId=" + item.getId();
                 var jobId = UUID.nameUUIDFromBytes(jobIdText.getBytes(StandardCharsets.UTF_8));
                 try {
                     scheduler.delete(jobId);
+                    counter++;
                 } catch (JobNotFoundException | IllegalJobStateChangeException | ConcurrentJobModificationException e) {
                     var suppressException = e instanceof JobNotFoundException || (e instanceof IllegalJobStateChangeException && e.getMessage().endsWith("from DELETED to DELETED."));
                     if(!suppressException) {
@@ -152,7 +154,9 @@ public void clearJobQueue() {
                 }
             }
 
-            page = migrationItems.hasNext() ? migrationItems.getPageable().next() : null;
+            logger.info("Total deleted jobs: {}/{}", counter, offset + limit);
+            offset += limit;
+            hasNext = migrationItems.size() == limit;
         }
     }
 }

server/src/main/java/org/eclipse/openvsx/migration/ScheduleMigrationsListener.java

@@ -42,7 +42,7 @@ public ScheduleMigrationsListener(JobRequestScheduler scheduler, MigrationServic
 
     @EventListener
     public void applicationStarted(ApplicationStartedEvent event) {
-        // TODO remove after deployment of v0.23.4
+        // TODO remove after deployment of v0.23.5
         migrations.clearJobQueue();
 
         var instant = Instant.now().plusSeconds(delay);

server/src/main/java/org/eclipse/openvsx/repositories/MigrationItemJooqRepository.java

@@ -0,0 +1,45 @@
+/** ******************************************************************************
+ * Copyright (c) 2025 Precies. Software OU and others
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ * ****************************************************************************** */
+package org.eclipse.openvsx.repositories;
+
+import org.eclipse.openvsx.entities.MigrationItem;
+import org.jooq.DSLContext;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+import static org.eclipse.openvsx.jooq.Tables.FILE_RESOURCE;
+import static org.eclipse.openvsx.jooq.Tables.MIGRATION_ITEM;
+
+@Component
+public class MigrationItemJooqRepository {
+
+    private final DSLContext dsl;
+
+    public MigrationItemJooqRepository(DSLContext dsl) {
+        this.dsl = dsl;
+    }
+
+    public List<MigrationItem> findRemoveFileResourceTypeResourceMigrationItems(int offset, int limit) {
+        var jobName = "RemoveFileResourceTypeResourceMigration";
+        return dsl.select(MIGRATION_ITEM.ID)
+                .from(MIGRATION_ITEM)
+                .join(FILE_RESOURCE).on(FILE_RESOURCE.ID.eq(MIGRATION_ITEM.ENTITY_ID))
+                .where(MIGRATION_ITEM.JOB_NAME.eq(jobName))
+                .limit(limit)
+                .offset(offset)
+                .fetch(row -> {
+                    var item = new MigrationItem();
+                    item.setJobName(jobName);
+                    item.setId(row.get(MIGRATION_ITEM.ID));
+                    return item;
+                });
+    }
+}

server/src/main/java/org/eclipse/openvsx/repositories/RepositoryService.java

@@ -56,6 +56,7 @@ public class RepositoryService {
     private final AdminStatisticsRepository adminStatisticsRepo;
     private final AdminStatisticCalculationsRepository adminStatisticCalculationsRepo;
     private final MigrationItemRepository migrationItemRepo;
+    private final MigrationItemJooqRepository migrationItemJooqRepo;
     private final SignatureKeyPairRepository signatureKeyPairRepo;
     private final SignatureKeyPairJooqRepository signatureKeyPairJooqRepo;
 
@@ -80,6 +81,7 @@ public RepositoryService(
             AdminStatisticsRepository adminStatisticsRepo,
             AdminStatisticCalculationsRepository adminStatisticCalculationsRepo,
             MigrationItemRepository migrationItemRepo,
+            MigrationItemJooqRepository migrationItemJooqRepo,
             SignatureKeyPairRepository signatureKeyPairRepo,
             SignatureKeyPairJooqRepository signatureKeyPairJooqRepo
     ) {
@@ -103,6 +105,7 @@ public RepositoryService(
         this.adminStatisticsRepo = adminStatisticsRepo;
         this.adminStatisticCalculationsRepo = adminStatisticCalculationsRepo;
         this.migrationItemRepo = migrationItemRepo;
+        this.migrationItemJooqRepo = migrationItemJooqRepo;
         this.signatureKeyPairRepo = signatureKeyPairRepo;
         this.signatureKeyPairJooqRepo = signatureKeyPairJooqRepo;
     }
@@ -632,7 +635,7 @@ public Streamable<Extension> findDeprecatedExtensions(Extension replacement) {
         return extensionRepo.findByReplacement(replacement);
     }
 
-    public Slice<MigrationItem> findMigrationItemsByJobName(String jobName, Pageable page) {
-        return migrationItemRepo.findByJobName(jobName, page);
+    public List<MigrationItem> findRemoveFileResourceTypeResourceMigrationItems(int offset, int limit) {
+        return migrationItemJooqRepo.findRemoveFileResourceTypeResourceMigrationItems(offset, limit);
     }
 }