mirrors/ctrl
1
0
Fork 0
mirror of https://github.com/postmannen/ctrl.git synced 2025-01-05 20:09:16 +00:00
Code Activity

fixed using the MaxTotalCopyTime from message

Browse source
This commit is contained in:
postmannen 2022-06-16 23:00:27 +02:00
parent 800bd16d33
commit a03ff25da4
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
requests_copy.go
View file

@ -111,26 +111,25 @@ func (m methodREQCopySrc) handler(proc process, message Message, node string) ([
return return
case len(message.MethodArgs) > 3: case len(message.MethodArgs) > 3:
// Check if split chunk size was set, if not set default. // Check if split chunk size was set, if not keep default.
var err error var err error
splitChunkSize, err = strconv.Atoi(message.MethodArgs[3]) splitChunkSize, err = strconv.Atoi(message.MethodArgs[3])
if err != nil { if err != nil {
er := fmt.Errorf("error: methodREQCopySrc: unble to convert splitChunkSize into int value: %v", err) er := fmt.Errorf("error: methodREQCopySrc: unble to convert splitChunkSize into int value: %v", err)
proc.errorKernel.errSend(proc, message, er) proc.errorKernel.errSend(proc, message, er)
} }
fallthrough
case len(message.MethodArgs) > 4: case len(message.MethodArgs) > 4:
// Check if split chunk size was set, if not set default. // Check if maxTotalCopyTime was set, if not keep default.
var err error var err error
maxTotalCopyTime, err = strconv.Atoi(message.MethodArgs[3]) maxTotalCopyTime, err = strconv.Atoi(message.MethodArgs[4])
if err != nil { if err != nil {
er := fmt.Errorf("error: methodREQCopySrc: unble to convert maxTotalCopyTime into int value: %v", err) er := fmt.Errorf("error: methodREQCopySrc: unble to convert maxTotalCopyTime into int value: %v", err)
proc.errorKernel.errSend(proc, message, er) proc.errorKernel.errSend(proc, message, er)
} }
} }
fmt.Printf("\n * DEBUG: IN THE BEGINNING: SPLITCHUNKSIZE: %v\n\n", splitChunkSize)
SrcFilePath := message.MethodArgs[0] SrcFilePath := message.MethodArgs[0]
DstNode := message.MethodArgs[1] DstNode := message.MethodArgs[1]
DstFilePath := message.MethodArgs[2] DstFilePath := message.MethodArgs[2]
@ -422,7 +421,7 @@ func copySrcSubProcFunc(proc process, cia copyInitialData, cancel context.Cancel
} }
// We want to send a message back to src that we are ready to start. // We want to send a message back to src that we are ready to start.
fmt.Printf("\n\n\n ************** DEBUG: copyDstHandler sub process sending copyReady to:%v\n ", message.FromNode) // fmt.Printf("\n\n\n ************** DEBUG: copyDstHandler sub process sending copyReady to:%v\n ", message.FromNode)
msg := Message{ msg := Message{
ToNode: cia.DstNode, ToNode: cia.DstNode,
FromNode: cia.SrcNode, FromNode: cia.SrcNode,
@ -431,7 +430,7 @@ func copySrcSubProcFunc(proc process, cia copyInitialData, cancel context.Cancel
Data: csaSerialized, Data: csaSerialized,
} }
fmt.Printf("\n ***** DEBUG: copyDstSubProcFunc: cia.SrcMethod: %v\n\n ", cia.SrcMethod) // fmt.Printf("\n ***** DEBUG: copyDstSubProcFunc: cia.SrcMethod: %v\n\n ", cia.SrcMethod)
sam, err := newSubjectAndMessage(msg) sam, err := newSubjectAndMessage(msg)
if err != nil { if err != nil {
@ -463,7 +462,7 @@ func copySrcSubProcFunc(proc process, cia copyInitialData, cancel context.Cancel
chunkNumber++ chunkNumber++
// Create message and send data to dst // Create message and send data to dst
fmt.Printf("**** DATA READ: %v\n", b) // fmt.Printf("**** DATA READ: %v\n", b)
csa := copySubData{ csa := copySubData{
CopyStatus: status, CopyStatus: status,
@ -478,7 +477,7 @@ func copySrcSubProcFunc(proc process, cia copyInitialData, cancel context.Cancel
} }
// We want to send a message back to src that we are ready to start. // We want to send a message back to src that we are ready to start.
fmt.Printf("\n\n\n ************** DEBUG: copyDstHandler sub process sending copyReady to:%v\n ", message.FromNode) // fmt.Printf("\n\n\n ************** DEBUG: copyDstHandler sub process sending copyReady to:%v\n ", message.FromNode)
msg := Message{ msg := Message{
ToNode: cia.DstNode, ToNode: cia.DstNode,
FromNode: cia.SrcNode, FromNode: cia.SrcNode,
@ -487,7 +486,7 @@ func copySrcSubProcFunc(proc process, cia copyInitialData, cancel context.Cancel
Data: csaSerialized, Data: csaSerialized,
} }
fmt.Printf("\n ***** DEBUG: copyDstSubProcFunc: cia.SrcMethod: %v\n\n ", cia.SrcMethod) // fmt.Printf("\n ***** DEBUG: copyDstSubProcFunc: cia.SrcMethod: %v\n\n ", cia.SrcMethod)
sam, err := newSubjectAndMessage(msg) sam, err := newSubjectAndMessage(msg)
if err != nil { if err != nil {
@ -575,7 +574,7 @@ func copyDstSubProcFunc(proc process, cia copyInitialData, message Message, canc
csa.CopyStatus = copyResendLast csa.CopyStatus = copyResendLast
} }
fmt.Printf(" * DEBUG: Hash was verified OK\n") // fmt.Printf(" * DEBUG: Hash was verified OK\n")
switch csa.CopyStatus { switch csa.CopyStatus {
case copyData: case copyData:
@ -606,7 +605,7 @@ func copyDstSubProcFunc(proc process, cia copyInitialData, message Message, canc
log.Fatalf("error: copyDstSubProcFunc: cbor marshal of csa failed: %v\n", err) log.Fatalf("error: copyDstSubProcFunc: cbor marshal of csa failed: %v\n", err)
} }
fmt.Printf("\n\n\n ************** DEBUG: copyDstHandler sub process sending copyReady to:%v\n ", message.FromNode) // fmt.Printf("\n\n\n ************** DEBUG: copyDstHandler sub process sending copyReady to:%v\n ", message.FromNode)
msg := Message{ msg := Message{
ToNode: cia.SrcNode, ToNode: cia.SrcNode,
FromNode: cia.DstNode, FromNode: cia.DstNode,
@ -615,7 +614,7 @@ func copyDstSubProcFunc(proc process, cia copyInitialData, message Message, canc
Data: csaSer, Data: csaSer,
} }
fmt.Printf("\n ***** DEBUG: copyDstSubProcFunc: cia.SrcMethod: %v\n\n ", cia.SrcMethod) // fmt.Printf("\n ***** DEBUG: copyDstSubProcFunc: cia.SrcMethod: %v\n\n ", cia.SrcMethod)
sam, err := newSubjectAndMessage(msg) sam, err := newSubjectAndMessage(msg)
if err != nil { if err != nil {
@ -765,7 +764,7 @@ func copyDstSubProcFunc(proc process, cia copyInitialData, message Message, canc
} }
// We want to send a message back to src that we are ready to start. // We want to send a message back to src that we are ready to start.
fmt.Printf("\n\n\n ************** DEBUG: copyDstHandler sub process sending copyReady to:%v\n ", message.FromNode) // fmt.Printf("\n\n\n ************** DEBUG: copyDstHandler sub process sending copyReady to:%v\n ", message.FromNode)
msg := Message{ msg := Message{
ToNode: cia.SrcNode, ToNode: cia.SrcNode,
FromNode: cia.DstNode, FromNode: cia.DstNode,
@ -774,7 +773,7 @@ func copyDstSubProcFunc(proc process, cia copyInitialData, message Message, canc
Data: csaSerialized, Data: csaSerialized,
} }
fmt.Printf("\n ***** DEBUG: copyDstSubProcFunc: cia.SrcMethod: %v\n\n ", cia.SrcMethod) // fmt.Printf("\n ***** DEBUG: copyDstSubProcFunc: cia.SrcMethod: %v\n\n ", cia.SrcMethod)
sam, err := newSubjectAndMessage(msg) sam, err := newSubjectAndMessage(msg)
if err != nil { if err != nil {