Skip to content

MIGRATION-434 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 3, 2025
Merged

MIGRATION-434 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
test.out
outputs/
*.log
.DS_Store

59 changes: 48 additions & 11 deletions fscopy/fscopy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"bufio"
"bytes"
"fmt"
"io"
//"io"
"os"
"os/exec"
"strings"
Expand All @@ -35,7 +35,7 @@ type RemoteCred struct {
func (rc *RemoteCred) Get() error {
reader := bufio.NewReader(os.Stdin)
fmt.Println(
"Enter PasswordLess ssh User for remote copy. Leave Blank for cluster without remote nodes): ",
"Enter ssh User for remote copy. Leave Blank for cluster without remote nodes): ",
)
username, err := reader.ReadString('\n')
if err != nil {
Expand Down Expand Up @@ -96,7 +96,7 @@ func (fcjwp *FSCopyJobWithPattern) StartCopyRemoteWithPattern() error {
// 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",
"preparing command rsync -az --include=%s --exclude=%s --progress %s@%s:%s/ %s",
filepattern,
excludepattern,
fcjwp.CopyJobDetails.Src.Username,
Expand All @@ -110,7 +110,7 @@ func (fcjwp *FSCopyJobWithPattern) StartCopyRemoteWithPattern() error {
"bash",
"-c",
fmt.Sprintf(
"rsync -az --include=%s --exclude=%s --info=progress2 %s@%s:%s/ %s",
"rsync -az --include=%s --exclude=%s --progress %s@%s:%s/ %s",
filepattern,
excludepattern,
fcjwp.CopyJobDetails.Src.Username,
Expand All @@ -119,9 +119,28 @@ func (fcjwp *FSCopyJobWithPattern) StartCopyRemoteWithPattern() error {
fcjwp.CopyJobDetails.Dst.Path,
))

cmd.Stdout = fcjwp.CopyJobDetails.Output

stderr, err := cmd.StderrPipe()
//commenting out the cmd.Stdout because it is being used to capture the output below.
//cmd.Stdout = fcjwp.CopyJobDetails.Output

//Allow user to provide input if needed.
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr

//Executing the rsync command
fcjwp.Dcrlog.Debug("rsync command start")
fmt.Println("Please add your password for SSH connection:")
err := cmd.Run()
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

// Removing stderr pipe for now. cmd.StderrPipe() The error produced by the command will appear in real time in the terminal.
/* stderr, err := cmd.StderrPipe()
if err != nil {
return err
}
Expand Down Expand Up @@ -149,6 +168,7 @@ func (fcjwp *FSCopyJobWithPattern) StartCopyRemoteWithPattern() error {
return fmt.Errorf("StartCopyRemoteWithPattern: error doing remote copy job wait %w", err)
}
return nil
*/
}

// Copy job
Expand All @@ -169,7 +189,7 @@ type FSCopyJob struct {
func (fcj *FSCopyJob) StartCopyRemote() error {
// var cmd *exec.Cmd

fcj.Dcrlog.Debug(fmt.Sprintf("preparing command rsync -az --info=progress2 %s@%s:%s/ %s",
fcj.Dcrlog.Debug(fmt.Sprintf("preparing command rsync -az --progress %s@%s:%s/ %s",
fcj.Src.Username,
fcj.Src.Hostname,
fcj.Src.Path,
Expand All @@ -178,7 +198,7 @@ func (fcj *FSCopyJob) StartCopyRemote() error {
cmd := exec.Command(
"rsync",
"-az",
"--info=progress2",
"--progress",
fmt.Sprintf(`%s@%s:%s`,
fcj.Src.Username,
fcj.Src.Hostname,
Expand All @@ -187,9 +207,24 @@ func (fcj *FSCopyJob) StartCopyRemote() error {
fcj.Dst.Path),
)

cmd.Stdout = fcj.Output
//cmd.Stdout = fcj.Output
// Allow user to provide input if needed
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr


stderr, err := cmd.StderrPipe()
fcj.Dcrlog.Debug("starting rsync command")
// Ask for SSH password
fmt.Println("Please add your password for SSH connection ")
err := cmd.Run()
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)
}
return nil

/* stderr, err := cmd.StderrPipe()
if err != nil {
return err
}
Expand All @@ -214,6 +249,8 @@ func (fcj *FSCopyJob) StartCopyRemote() error {
}

return nil
*/

}

func (fcj *FSCopyJob) StartCopyLocal() error {
Expand Down