161sh/CatgirlIntelligenceAgency
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(backup) Add task heartbeats to the backup service

Browse Source
This commit is contained in:
Viktor Lofgren 2024-01-01 15:20:57 +01:00
parent 75d87c73d1
commit 7f3f3f577c
1 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
code/services-core/executor-service/src/main/java/nu/marginalia/svc/BackupService.java
View File

@ -3,6 +3,7 @@ package nu.marginalia.svc;
import com.github.luben.zstd.ZstdInputStream; import com.github.luben.zstd.ZstdInputStream;
import com.github.luben.zstd.ZstdOutputStream; import com.github.luben.zstd.ZstdOutputStream;
import nu.marginalia.IndexLocations; import nu.marginalia.IndexLocations;
import nu.marginalia.service.control.ServiceHeartbeat;
import nu.marginalia.storage.FileStorageService; import nu.marginalia.storage.FileStorageService;
import nu.marginalia.storage.model.FileStorageBaseType; import nu.marginalia.storage.model.FileStorageBaseType;
import nu.marginalia.storage.model.FileStorageId; import nu.marginalia.storage.model.FileStorageId;
@ -21,10 +22,19 @@ import java.util.List;
public class BackupService { public class BackupService {
private final FileStorageService storageService; private final FileStorageService storageService;
private final ServiceHeartbeat serviceHeartbeat;
public enum BackupHeartbeatSteps {
LINKS,
JOURNAL,
DONE
}
@Inject @Inject
public BackupService(FileStorageService storageService) { public BackupService(FileStorageService storageService,
ServiceHeartbeat serviceHeartbeat) {
this.storageService = storageService; this.storageService = storageService;
this.serviceHeartbeat = serviceHeartbeat;
} }
/** Create a new backup of the contents in the _STAGING storage areas. /** Create a new backup of the contents in the _STAGING storage areas.
@ -42,13 +52,22 @@ public class BackupService {
storageService.relateFileStorages(associatedId, backupStorage.id()); storageService.relateFileStorages(associatedId, backupStorage.id());
} }
var indexStagingStorage = IndexLocations.getIndexConstructionArea(storageService); var indexStagingStorage = IndexLocations.getIndexConstructionArea(storageService);
var linkdbStagingStorage = IndexLocations.getLinkdbWritePath(storageService); var linkdbStagingStorage = IndexLocations.getLinkdbWritePath(storageService);
backupFileCompressed("links.db", linkdbStagingStorage, backupStorage.asPath());
// This file format is already compressed try (var heartbeat = serviceHeartbeat.createServiceTaskHeartbeat(BackupHeartbeatSteps.class, "Backup")) {
backupJournal(indexStagingStorage, backupStorage.asPath()); heartbeat.progress(BackupHeartbeatSteps.LINKS);
backupFileCompressed("links.db", linkdbStagingStorage, backupStorage.asPath());
heartbeat.progress(BackupHeartbeatSteps.JOURNAL);
// This file format is already compressed
backupJournal(indexStagingStorage, backupStorage.asPath());
heartbeat.progress(BackupHeartbeatSteps.DONE);
}
} }
@ -59,8 +78,15 @@ public class BackupService {
var indexStagingStorage = IndexLocations.getIndexConstructionArea(storageService); var indexStagingStorage = IndexLocations.getIndexConstructionArea(storageService);
var linkdbStagingStorage = IndexLocations.getLinkdbWritePath(storageService); var linkdbStagingStorage = IndexLocations.getLinkdbWritePath(storageService);
restoreBackupCompressed("links.db", linkdbStagingStorage, backupStorage); try (var heartbeat = serviceHeartbeat.createServiceTaskHeartbeat(BackupHeartbeatSteps.class, "Restore Backup")) {
restoreJournal(indexStagingStorage, backupStorage); heartbeat.progress(BackupHeartbeatSteps.LINKS);
restoreBackupCompressed("links.db", linkdbStagingStorage, backupStorage);
heartbeat.progress(BackupHeartbeatSteps.JOURNAL);
restoreJournal(indexStagingStorage, backupStorage);
heartbeat.progress(BackupHeartbeatSteps.DONE);
}
} }