1
0
Fork 0

Fix WAL copy file path for removal

master
Philip O'Toole 1 year ago
parent 97b172401d
commit f150094b3b

@ -512,11 +512,11 @@ func (s *Store) check() (retError error) {
// If we have a WAL file in the current generation which ends with the same ID as // If we have a WAL file in the current generation which ends with the same ID as
// the oldest snapshot, then the copy of the WAL from the snapshot didn't complete. // the oldest snapshot, then the copy of the WAL from the snapshot didn't complete.
// Complete it now. // Complete it now.
walSnapshotCopy := filepath.Join(currGenDir, baseSqliteWALFile+snapshots[0].ID) walSnapshotCopyPath := filepath.Join(currGenDir, baseSqliteWALFile+snapshots[0].ID)
snapDirPath := filepath.Join(currGenDir, snapshots[0].ID) snapDirPath := filepath.Join(currGenDir, snapshots[0].ID)
if fileExists(filepath.Join(currGenDir, walSnapshotCopy)) { if fileExists(walSnapshotCopyPath) {
if err := os.Remove(walSnapshotCopy); err != nil { if err := os.Remove(walSnapshotCopyPath); err != nil {
return fmt.Errorf("failed to remove copy of WAL file %s: %s", walSnapshotCopy, err) return fmt.Errorf("failed to remove copy of WAL file %s: %s", walSnapshotCopyPath, err)
} }
if err := copyWALFromSnapshot(snapDirPath, baseSqliteWALFilePath); err != nil { if err := copyWALFromSnapshot(snapDirPath, baseSqliteWALFilePath); err != nil {
s.logger.Printf("failed to copy WAL file from snapshot %s: %s", snapshots[0].ID, err) s.logger.Printf("failed to copy WAL file from snapshot %s: %s", snapshots[0].ID, err)

Loading…
Cancel
Save