Merge pull request #25 from 10gen/logimp

Logimp

Author: hasaketa

dcrlogger/dcrlogger.go

@@ -26,6 +26,7 @@ type DCRLogger struct {
 	FileName      string
 	LogFileHandle *os.File
 	Logger        *slog.Logger
+	LevelVar      *slog.LevelVar
 }
 
 func (dl *DCRLogger) CreateLogFileHandle() error {
@@ -39,7 +40,13 @@ func (dl *DCRLogger) Create() error {
 	if err != nil {
 		return err
 	}
-	dl.Logger = slog.New(slog.NewJSONHandler(dl.LogFileHandle, nil))
+
+	dl.LevelVar = new(slog.LevelVar)
+
+	dljsonhandler := slog.NewJSONHandler(dl.LogFileHandle, &slog.HandlerOptions{Level: dl.LevelVar})
+
+	dl.Logger = slog.New(dljsonhandler)
+
 	return nil
 }
 
@@ -63,3 +70,7 @@ func (dl *DCRLogger) Warn(msg string) {
 func (dl *DCRLogger) Error(msg string) {
 	dl.Logger.Error(msg)
 }
+
+func (dl *DCRLogger) SetLogLevel(sloglvl slog.Level) {
+	dl.LevelVar.Set(sloglvl)
+}

fscopy/fscopy.go

@@ -22,11 +22,14 @@ import (
 	"os"
 	"os/exec"
 	"strings"
+
+	"dcrcli/dcrlogger"
 )
 
 type RemoteCred struct {
 	Username  string
 	Available bool
+	Dcrlog    *dcrlogger.DCRLogger
 }
 
 func (rc *RemoteCred) Get() error {
@@ -38,12 +41,17 @@ func (rc *RemoteCred) Get() error {
 	if err != nil {
 		return err
 	}
+
 	rc.Username = strings.TrimSuffix(username, "\n")
+	rc.Dcrlog.Debug(fmt.Sprintf("passwordless ssh username %s:", rc.Username))
+
 	if rc.Username == "" {
 		println("WARNING: PasswordLess SSH Username is empty assuming all nodes local")
 		rc.Available = false
+		rc.Dcrlog.Debug("passwordless ssh username left blank assuming all nodes local")
 	} else {
 		rc.Available = true
+		rc.Dcrlog.Debug("passwordless ssh username provided")
 	}
 
 	return nil
@@ -61,63 +69,64 @@ type DestDir struct {
 	Path []byte
 }
 
-// Copy job
-// state:
-// N - not started
-// P - Progressing
-// A - Aborted
-// C - Completed successfully
-type FSCopyJob struct {
-	Src    SourceDir
-	Dst    DestDir
-	State  string
-	Output *bytes.Buffer
-}
-
 // example rsync -a --include='mongod.log*' --exclude='*' --include='*/' ubuntu@ip-10-0-0-246:/home/ubuntu/testcluster/dbp/ .
 type FSCopyJobWithPattern struct {
 	CopyJobDetails  *FSCopyJob
 	CurrentFileName string
+	Dcrlog          *dcrlogger.DCRLogger
 }
 
-func (fcj *FSCopyJobWithPattern) StartCopyWithPattern() error {
-	if fcj.CopyJobDetails.Src.IsLocal {
-		return fcj.StartCopyLocalWithPattern()
+func (fcjwp *FSCopyJobWithPattern) StartCopyWithPattern() error {
+	if fcjwp.CopyJobDetails.Src.IsLocal {
+		return fcjwp.StartCopyLocalWithPattern()
 	}
-	return fcj.StartCopyRemoteWithPattern()
+	return fcjwp.StartCopyRemoteWithPattern()
 }
 
-func (fcj *FSCopyJobWithPattern) StartCopyLocalWithPattern() error {
+func (fcjwp *FSCopyJobWithPattern) StartCopyLocalWithPattern() error {
 	return nil
 }
 
-func (fcj *FSCopyJobWithPattern) StartCopyRemoteWithPattern() error {
+func (fcjwp *FSCopyJobWithPattern) StartCopyRemoteWithPattern() error {
 	var cmd *exec.Cmd
 
-	filepattern := `'` + fcj.CurrentFileName + `*` + `'`
+	filepattern := `'` + fcjwp.CurrentFileName + `*` + `'`
 	excludepattern := `'` + `*` + `'`
 
 	// we invoke bash shell because the wildcards are interpretted by bash shell not the rsync program
+	fcjwp.Dcrlog.Debug(
+		fmt.Sprintf(
+			"preparing command rsync -az --include=%s --exclude=%s --info=progress2 %s@%s:%s/ %s",
+			filepattern,
+			excludepattern,
+			fcjwp.CopyJobDetails.Src.Username,
+			fcjwp.CopyJobDetails.Src.Hostname,
+			fcjwp.CopyJobDetails.Src.Path,
+			fcjwp.CopyJobDetails.Dst.Path,
+		),
+	)
+
 	cmd = exec.Command(
 		"bash",
 		"-c",
 		fmt.Sprintf(
 			"rsync -az --include=%s --exclude=%s --info=progress2 %s@%s:%s/ %s",
 			filepattern,
 			excludepattern,
-			fcj.CopyJobDetails.Src.Username,
-			fcj.CopyJobDetails.Src.Hostname,
-			fcj.CopyJobDetails.Src.Path,
-			fcj.CopyJobDetails.Dst.Path,
+			fcjwp.CopyJobDetails.Src.Username,
+			fcjwp.CopyJobDetails.Src.Hostname,
+			fcjwp.CopyJobDetails.Src.Path,
+			fcjwp.CopyJobDetails.Dst.Path,
 		))
 
-	cmd.Stdout = fcj.CopyJobDetails.Output
+	cmd.Stdout = fcjwp.CopyJobDetails.Output
 
 	stderr, err := cmd.StderrPipe()
 	if err != nil {
 		return err
 	}
 
+	fcjwp.Dcrlog.Debug("rsync command start")
 	err = cmd.Start()
 	if err != nil {
 		return err
@@ -126,21 +135,47 @@ func (fcj *FSCopyJobWithPattern) StartCopyRemoteWithPattern() error {
 	_, err = io.ReadAll(stderr)
 	if err != nil {
 		_ = cmd.Process.Kill()
+		fcjwp.Dcrlog.Debug(
+			fmt.Sprintf("StartCopyRemoteWithPattern: Error reading from stderr pipe %w", err),
+		)
 		return fmt.Errorf("StartCopyRemoteWithPattern: Error reading from stderr pipe %w", err)
 	}
 
 	err = cmd.Wait()
 	if err != nil {
+		fcjwp.Dcrlog.Debug(
+			fmt.Sprintf("StartCopyRemoteWithPattern: error doing remote copy job wait %w", err),
+		)
 		return fmt.Errorf("StartCopyRemoteWithPattern: error doing remote copy job wait %w", err)
 	}
 	return nil
 }
 
+// Copy job
+// state:
+// N - not started
+// P - Progressing
+// A - Aborted
+// C - Completed successfully
+type FSCopyJob struct {
+	Src    SourceDir
+	Dst    DestDir
+	State  string
+	Output *bytes.Buffer
+	Dcrlog *dcrlogger.DCRLogger
+}
+
 // currently only run for remote source directories
 func (fcj *FSCopyJob) StartCopyRemote() error {
-	var cmd *exec.Cmd
+	// var cmd *exec.Cmd
 
-	cmd = exec.Command(
+	fcj.Dcrlog.Debug(fmt.Sprintf("preparing command rsync -az --info=progress2 %s@%s:%s/ %s",
+		fcj.Src.Username,
+		fcj.Src.Hostname,
+		fcj.Src.Path,
+		fcj.Dst.Path))
+
+	cmd := exec.Command(
 		"rsync",
 		"-az",
 		"--info=progress2",
@@ -159,6 +194,7 @@ func (fcj *FSCopyJob) StartCopyRemote() error {
 		return err
 	}
 
+	fcj.Dcrlog.Debug("starting rsync command")
 	err = cmd.Start()
 	if err != nil {
 		return err
@@ -167,11 +203,13 @@ func (fcj *FSCopyJob) StartCopyRemote() error {
 	_, err = io.ReadAll(stderr)
 	if err != nil {
 		_ = cmd.Process.Kill()
-		return fmt.Errorf("Error reading from stderr pipe %w", err)
+		fcj.Dcrlog.Debug(fmt.Sprintf("error reading from stderr pipe %w", err))
+		return fmt.Errorf("error reading from stderr pipe %w", err)
 	}
 
 	err = cmd.Wait()
 	if err != nil {
+		fcj.Dcrlog.Debug(fmt.Sprintf("error doing remote copy job wait %w", err))
 		return fmt.Errorf("error doing remote copy job wait %w", err)
 	}