diff --git a/_download/test2.txt b/_download/test2.txt deleted file mode 100644 index e69de29..0000000 diff --git a/chord/daemons.go b/chord/daemons.go index 5fb8ab6..864be4b 100644 --- a/chord/daemons.go +++ b/chord/daemons.go @@ -108,6 +108,7 @@ func CheckPredecessorDaemon(chordNode *ChordNode) { // transfer keys from the predecessor that have ID higher than // predecessor's ID err = chordNode.stubTransferKeys(ipAddr(pred.Ip), ctx, pred.Id, chordNode.node) - - log.WithField("err", err).Info("check predecessor daemon failed") + if err != nil { + log.WithField("err", err).Info("check predecessor daemon failed") + } } diff --git a/chord/fileSharingServerImpl.go b/chord/fileSharingServerImpl.go index f852b82..7448a8b 100644 --- a/chord/fileSharingServerImpl.go +++ b/chord/fileSharingServerImpl.go @@ -26,8 +26,6 @@ func (chordNode *ChordNode) TransferFile(fileInfo *FileInfo, stream FileShareSer if !fileExist(filePath) { fmt.Println(fmt.Sprintf("File [%v] does not exist", filePath)) return nil // Do not stop the server - } else { - fmt.Println(fmt.Sprintf("File [%v] does exist", filePath)) } file, err := os.Open(filePath) diff --git a/tests/demo_downloadFile.sh b/tests/demo_downloadFile.sh new file mode 100755 index 0000000..b7e8c3c --- /dev/null +++ b/tests/demo_downloadFile.sh @@ -0,0 +1,27 @@ +#!/bin/bash + + +# Test the FileSharing service and client interaction +cd .. + +go build + +# Removed current file1.txt for fair results +rm _download/file1.txt + +xterm -title "Node A " -hold -e "./CS438_Project -name A -ipAddr=127.0.0.1:5000 -create -m 8" & +xterm -title "Node B " -hold -e "./CS438_Project -name B -ipAddr=127.0.0.1:10001 -join -existingNodeIp 127.0.0.1:5000 -existingNodeId db -m 8" & +xterm -title "Node C " -hold -e "./CS438_Project -name C -ipAddr=127.0.0.1:10002 -join -existingNodeIp 127.0.0.1:5000 -existingNodeId db -m 8 -v" & +xterm -title "Node D " -hold -e "./CS438_Project -name D -ipAddr=127.0.0.1:10003 -join -existingNodeIp 127.0.0.1:5000 -existingNodeId db -m 8" & +xterm -title "Node E " -hold -e "./CS438_Project -name E -ipAddr=127.0.0.1:10004 -join -existingNodeIp 127.0.0.1:5000 -existingNodeId db -m 8" & + +sleep 15 +cd client +go build +./client -PeersterAddress=127.0.0.1:10004 -command=download -file=file1.txt -nameToStore=file1.txt -ID="db" +cd .. +echo "Diference between uploaded and downloaded:" +diff _upload/file1.txt _download/file1.txt + +# Go back to tests +cd tests \ No newline at end of file