Add: NFS support for MongoDB Archiver

Signed-off-by: sayedppqq <[email protected]>

cmd/mongo/oplog_push.go

@@ -208,7 +208,7 @@ func buildOplogPushRunArgs() (args oplogPushRunArgs, err error) {
 		return
 	}
 
-	return
+	return args, err
 }
 
 type oplogPushStatsArgs struct {

cmd/mongo/oplog_replay.go

@@ -3,9 +3,6 @@ package mongo
 import (
 	"context"
 	"encoding/json"
-	"os"
-	"syscall"
-
 	"github.com/spf13/cobra"
 	"github.com/wal-g/tracelog"
 	"github.com/wal-g/wal-g/internal"
@@ -16,6 +13,8 @@ import (
 	"github.com/wal-g/wal-g/internal/databases/mongo/oplog"
 	"github.com/wal-g/wal-g/internal/databases/mongo/stages"
 	"github.com/wal-g/wal-g/utility"
+	"os"
+	"syscall"
 )
 
 const LatestBackupString = "LATEST_BACKUP"
@@ -91,24 +90,24 @@ func buildOplogReplayRunArgs(cmdargs []string) (args oplogReplayRunArgs, err err
 	return args, nil
 }
 
-func processArg(arg string, downloader *archive.StorageDownloader) (models.Timestamp, error) {
-	switch arg {
-	case internal.LatestString:
-		return downloader.LastKnownArchiveTS()
-	case LatestBackupString:
-		lastBackupName, err := downloader.LastBackupName()
-		if err != nil {
-			return models.Timestamp{}, err
-		}
-		backupMeta, err := downloader.BackupMeta(lastBackupName)
-		if err != nil {
-			return models.Timestamp{}, err
-		}
-		return models.TimestampFromBson(backupMeta.MongoMeta.BackupLastTS), nil
-	default:
-		return models.TimestampFromStr(arg)
-	}
-}
+//func processArg(arg string, downloader *archive.StorageDownloader) (models.Timestamp, error) {
+//	switch arg {
+//	case internal.LatestString:
+//		return downloader.LastKnownArchiveTS()
+//	case LatestBackupString:
+//		lastBackupName, err := downloader.LastBackupName()
+//		if err != nil {
+//			return models.Timestamp{}, err
+//		}
+//		backupMeta, err := downloader.BackupMeta(lastBackupName)
+//		if err != nil {
+//			return models.Timestamp{}, err
+//		}
+//		return models.TimestampFromBson(backupMeta.MongoMeta.BackupLastTS), nil
+//	default:
+//		return models.TimestampFromStr(arg)
+//	}
+//}
 
 func runOplogReplay(ctx context.Context, replayArgs oplogReplayRunArgs) error {
 	tracelog.DebugLogger.Printf("starting replay with arguments: %+v", replayArgs)

internal/databases/mysql/binlog_fetch_handler.go

@@ -47,11 +47,11 @@ func HandleBinlogFetch(folder storage.Folder, backupName string, untilTS string,
 	tracelog.ErrorLogger.FatalOnError(err)
 	var startTS, endTS, endBinlogTS time.Time
 	if skipStartTime {
-		startTS, endTS, endBinlogTS, err = getEndTimestamps(folder, untilTS, untilBinlogLastModifiedTS)
+		startTS, endTS, endBinlogTS, err = getEndTimestamps(untilTS, untilBinlogLastModifiedTS)
 	} else {
 		startTS, endTS, endBinlogTS, err = getTimestamps(folder, backupName, untilTS, untilBinlogLastModifiedTS)
-		tracelog.ErrorLogger.FatalOnError(err)
 	}
+	tracelog.ErrorLogger.FatalOnError(err)
 
 	handler := newIndexHandler(dstDir)
 

internal/databases/mysql/binlog_replay_handler.go

@@ -112,7 +112,7 @@ func getTimestamps(folder storage.Folder, backupName, untilTS, untilBinlogLastMo
 	return startTS, endTS, endBinlogTS, nil
 }
 
-func getEndTimestamps(folder storage.Folder, untilTS, untilBinlogLastModifiedTS string) (time.Time, time.Time, time.Time, error) {
+func getEndTimestamps(untilTS, untilBinlogLastModifiedTS string) (time.Time, time.Time, time.Time, error) {
 	endTS, err := utility.ParseUntilTS(untilTS)
 	if err != nil {
 		return time.Time{}, time.Time{}, time.Time{}, err

pkg/storages/fs/folder.go

@@ -92,7 +92,6 @@ func (folder *Folder) Exists(objectRelativePath string) (bool, error) {
 
 func (folder *Folder) GetSubFolder(subFolderRelativePath string) storage.Folder {
 	sf := NewFolder(folder.rootPath, path.Join(folder.subpath, subFolderRelativePath))
-	fmt.Println("---------------", sf)
 	_ = sf.EnsureExists()
 
 	// This is something unusual when we cannot be sure that our subfolder exists in FS