added seprata timwe for MaxAllowedCopy time which can be specified in the original message

requests_copy.go

@@ -10,22 +10,24 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
+	"time"
 
 	"github.com/fxamacker/cbor/v2"
 	"github.com/google/uuid"
 )
 
 type copyInitialData struct {
-	UUID           string
+	UUID             string
-	SrcMethod      Method
+	SrcMethod        Method
-	SrcNode        Node
+	SrcNode          Node
-	DstMethod      Method
+	DstMethod        Method
-	DstNode        Node
+	DstNode          Node
-	SrcFilePath    string
+	SrcFilePath      string
-	DstDir         string
+	DstDir           string
-	DstFile        string
+	DstFile          string
-	SplitChunkSize int
+	SplitChunkSize   int
-	FileMode       fs.FileMode
+	MaxTotalCopyTime int
+	FileMode         fs.FileMode
 }
 
 type methodREQCopySrc struct {
@@ -94,7 +96,10 @@ func (m methodREQCopySrc) handler(proc process, message Message, node string) ([
 
 		// Set default split chunk size, will be replaced with value from
 		// methodArgs[3] if defined.
-		splitChunkSize := 2
+		splitChunkSize := 100000
+		// Set default max total copy time, will be replaced with value from
+		// methodArgs[4] if defined.
+		maxTotalCopyTime := message.MethodTimeout
 
 		// Verify and check the methodArgs
 		switch {
@@ -108,7 +113,16 @@ func (m methodREQCopySrc) handler(proc process, message Message, node string) ([
 			var err error
 			splitChunkSize, err = strconv.Atoi(message.MethodArgs[3])
 			if err != nil {
-				er := fmt.Errorf("error: methodREQCopySrc: ch")
+				er := fmt.Errorf("error: methodREQCopySrc: unble to convert splitChunkSize into int value: %v", err)
+				proc.errorKernel.errSend(proc, message, er)
+			}
+
+		case len(message.MethodArgs) > 4:
+			// Check if split chunk size was set, if not set default.
+			var err error
+			maxTotalCopyTime, err = strconv.Atoi(message.MethodArgs[3])
+			if err != nil {
+				er := fmt.Errorf("error: methodREQCopySrc: unble to convert maxTotalCopyTime into int value: %v", err)
 				proc.errorKernel.errSend(proc, message, er)
 			}
 		}
@@ -119,11 +133,13 @@ func (m methodREQCopySrc) handler(proc process, message Message, node string) ([
 		DstNode := message.MethodArgs[1]
 		DstFilePath := message.MethodArgs[2]
 
-		// Get a context with the timeout specified in message.MethodTimeout.
+		// Create a child context to use with the procFunc with timeout set to the max allowed total copy time
-		// Since the subProc spawned will outlive this method here we do not
+		// specified in the message.
-		// want to cancel this method. We care about the methodTimeout, but
+		var ctx context.Context
-		// we ignore the CancelFunc.
+		var cancel context.CancelFunc
-		ctx, cancel := getContextForMethodTimeout(proc.ctx, message)
+		func() {
+			ctx, cancel = context.WithTimeout(proc.ctx, time.Second*time.Duration(maxTotalCopyTime))
+		}()
 
 		// Create a subject for one copy request
 		uid := uuid.New()
@@ -150,16 +166,17 @@ func (m methodREQCopySrc) handler(proc process, message Message, node string) ([
 		fileMode := fileInfo.Mode()
 
 		cia := copyInitialData{
-			UUID:           uid.String(),
+			UUID:             uid.String(),
-			SrcNode:        proc.node,
+			SrcNode:          proc.node,
-			SrcMethod:      m,
+			SrcMethod:        m,
-			DstNode:        Node(DstNode),
+			DstNode:          Node(DstNode),
-			DstMethod:      dstM,
+			DstMethod:        dstM,
-			SrcFilePath:    SrcFilePath,
+			SrcFilePath:      SrcFilePath,
-			DstDir:         dstDir,
+			DstDir:           dstDir,
-			DstFile:        dstFile,
+			DstFile:          dstFile,
-			SplitChunkSize: splitChunkSize,
+			SplitChunkSize:   splitChunkSize,
-			FileMode:       fileMode,
+			MaxTotalCopyTime: maxTotalCopyTime,
+			FileMode:         fileMode,
 		}
 
 		sub := newSubjectNoVerifyHandler(m, node)
@@ -245,11 +262,13 @@ func (m methodREQCopyDst) handler(proc process, message Message, node string) ([
 			return
 		}
 
-		// Get a context with the timeout specified in message.MethodTimeout.
+		// Create a child context to use with the procFunc with timeout set to the max allowed total copy time
-		// Since the subProc spawned will outlive this method here we do not
+		// specified in the message.
-		// want to cancel this method. We care about the methodTimeout, but
+		var ctx context.Context
-		// we ignore the CancelFunc.
+		var cancel context.CancelFunc
-		ctx, cancel := getContextForMethodTimeout(proc.ctx, message)
+		func() {
+			ctx, cancel = context.WithTimeout(proc.ctx, time.Second*time.Duration(cia.MaxTotalCopyTime))
+		}()
 
 		// Create a subject for one copy request
 		sub := newSubjectNoVerifyHandler(cia.DstMethod, node)