Skip to content
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

Jump to bottom

Add sctp support for network performance test #1153

Merged
merged 2 commits into from
Apr 30, 2020
Merged

Add sctp support for network performance test #1153

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
899a8e4
build iperf-3.1 with sctp support
alegacy Oct 9, 2019
0bd0dea
add support for the sctp protocol
alegacy Oct 9, 2019
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
Prev Previous commit
add support for the sctp protocol 
The SCTP protocol can be tested using the same iperf3 client command
line as the TCP protocol with the addition of a single parameter
(--sctp).  The test parameters and output are otherwise the same as
the TCP protocol.

Co-authored-by: Allain Legacy <allain.legacy@windriver.com>
Signed-off-by: Thomas Gao <thomas.gao@windriver.com>
  • Loading branch information
@alegacy
alegacy authored and Thomas Gao committed Apr 1, 2020
commit 0bd0dea4dd759a7267de0144d6462db8e64a468a
7 changes: 7 additions & 0 deletions network/benchmarks/netperf/launch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,12 @@ func createServices(c *kubernetes.Clientset) bool {
Port: iperf3Port,
TargetPort: intstr.FromInt(iperf3Port),
},
{
Name: "netperf-w2-sctp",
Protocol: api.ProtocolSCTP,
Port: iperf3Port,
TargetPort: intstr.FromInt(iperf3Port),
},
{
Name: "netperf-w2-udp",
Protocol: api.ProtocolUDP,
Expand Down Expand Up @@ -259,6 +265,7 @@ func createRCs(c *kubernetes.Clientset) bool {
if i > 1 {
// Worker W1 is a client-only pod - no ports are exposed
portSpec = append(portSpec, api.ContainerPort{ContainerPort: iperf3Port, Protocol: api.ProtocolTCP})
portSpec = append(portSpec, api.ContainerPort{ContainerPort: iperf3Port, Protocol: api.ProtocolSCTP})
}

workerEnv := []api.EnvVar{
Expand Down
62 changes: 47 additions & 15 deletions network/benchmarks/netperf/nptest/nptest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ var podname string
var workerStateMap map[string]*workerState

var iperfTCPOutputRegexp *regexp.Regexp
var iperfSCTPOutputRegexp *regexp.Regexp
var iperfUDPOutputRegexp *regexp.Regexp
var netperfOutputRegexp *regexp.Regexp
var iperfCPUOutputRegexp *regexp.Regexp
Expand All @@ -82,9 +83,10 @@ const (
)

const (
iperfTcpTest = iota
iperfUdpTest = iota
netperfTest = iota
iperfTcpTest = iota
iperfUdpTest = iota
iperfSctpTest = iota
netperfTest = iota
)

// NetPerfRpc service that exposes RegisterClient and ReceiveOutput for clients
Expand Down Expand Up @@ -161,20 +163,26 @@ func init() {
{SourceNode: "netperf-w1", DestinationNode: "netperf-w3", Label: "3 iperf TCP. Remote VM using Pod IP", Type: iperfTcpTest, ClusterIP: false, MSS: mssMin},
{SourceNode: "netperf-w3", DestinationNode: "netperf-w2", Label: "4 iperf TCP. Remote VM using Virtual IP", Type: iperfTcpTest, ClusterIP: true, MSS: mssMin},
{SourceNode: "netperf-w2", DestinationNode: "netperf-w2", Label: "5 iperf TCP. Hairpin Pod to own Virtual IP", Type: iperfTcpTest, ClusterIP: true, MSS: mssMin},
{SourceNode: "netperf-w1", DestinationNode: "netperf-w2", Label: "6 iperf UDP. Same VM using Pod IP", Type: iperfUdpTest, ClusterIP: false, MSS: mssMax},
{SourceNode: "netperf-w1", DestinationNode: "netperf-w2", Label: "7 iperf UDP. Same VM using Virtual IP", Type: iperfUdpTest, ClusterIP: true, MSS: mssMax},
{SourceNode: "netperf-w1", DestinationNode: "netperf-w3", Label: "8 iperf UDP. Remote VM using Pod IP", Type: iperfUdpTest, ClusterIP: false, MSS: mssMax},
{SourceNode: "netperf-w3", DestinationNode: "netperf-w2", Label: "9 iperf UDP. Remote VM using Virtual IP", Type: iperfUdpTest, ClusterIP: true, MSS: mssMax},
{SourceNode: "netperf-w1", DestinationNode: "netperf-w2", Label: "10 netperf. Same VM using Pod IP", Type: netperfTest, ClusterIP: false},
{SourceNode: "netperf-w1", DestinationNode: "netperf-w2", Label: "11 netperf. Same VM using Virtual IP", Type: netperfTest, ClusterIP: true},
{SourceNode: "netperf-w1", DestinationNode: "netperf-w3", Label: "12 netperf. Remote VM using Pod IP", Type: netperfTest, ClusterIP: false},
{SourceNode: "netperf-w3", DestinationNode: "netperf-w2", Label: "13 netperf. Remote VM using Virtual IP", Type: netperfTest, ClusterIP: true},
{SourceNode: "netperf-w1", DestinationNode: "netperf-w2", Label: "6 iperf SCTP. Same VM using Pod IP", Type: iperfSctpTest, ClusterIP: false, MSS: mssMin},
{SourceNode: "netperf-w1", DestinationNode: "netperf-w2", Label: "7 iperf SCTP. Same VM using Virtual IP", Type: iperfSctpTest, ClusterIP: true, MSS: mssMin},
{SourceNode: "netperf-w1", DestinationNode: "netperf-w3", Label: "8 iperf SCTP. Remote VM using Pod IP", Type: iperfSctpTest, ClusterIP: false, MSS: mssMin},
{SourceNode: "netperf-w3", DestinationNode: "netperf-w2", Label: "9 iperf SCTP. Remote VM using Virtual IP", Type: iperfSctpTest, ClusterIP: true, MSS: mssMin},
{SourceNode: "netperf-w2", DestinationNode: "netperf-w2", Label: "10 iperf SCTP. Hairpin Pod to own Virtual IP", Type: iperfSctpTest, ClusterIP: true, MSS: mssMin},
{SourceNode: "netperf-w1", DestinationNode: "netperf-w2", Label: "11 iperf UDP. Same VM using Pod IP", Type: iperfUdpTest, ClusterIP: false, MSS: mssMax},
{SourceNode: "netperf-w1", DestinationNode: "netperf-w2", Label: "12 iperf UDP. Same VM using Virtual IP", Type: iperfUdpTest, ClusterIP: true, MSS: mssMax},
{SourceNode: "netperf-w1", DestinationNode: "netperf-w3", Label: "13 iperf UDP. Remote VM using Pod IP", Type: iperfUdpTest, ClusterIP: false, MSS: mssMax},
{SourceNode: "netperf-w3", DestinationNode: "netperf-w2", Label: "14 iperf UDP. Remote VM using Virtual IP", Type: iperfUdpTest, ClusterIP: true, MSS: mssMax},
{SourceNode: "netperf-w1", DestinationNode: "netperf-w2", Label: "15 netperf. Same VM using Pod IP", Type: netperfTest, ClusterIP: false},
{SourceNode: "netperf-w1", DestinationNode: "netperf-w2", Label: "16 netperf. Same VM using Virtual IP", Type: netperfTest, ClusterIP: true},
{SourceNode: "netperf-w1", DestinationNode: "netperf-w3", Label: "17 netperf. Remote VM using Pod IP", Type: netperfTest, ClusterIP: false},
{SourceNode: "netperf-w3", DestinationNode: "netperf-w2", Label: "18 netperf. Remote VM using Virtual IP", Type: netperfTest, ClusterIP: true},
}

currentJobIndex = 0

// Regexes to parse the Mbits/sec out of iperf TCP, UDP and netperf output
// Regexes to parse the Mbits/sec out of iperf TCP, SCTP, UDP and netperf output
iperfTCPOutputRegexp = regexp.MustCompile("SUM.*\\s+(\\d+)\\sMbits/sec\\s+receiver")
iperfSCTPOutputRegexp = regexp.MustCompile("SUM.*\\s+(\\d+)\\sMbits/sec\\s+receiver")
iperfUDPOutputRegexp = regexp.MustCompile("\\s+(\\S+)\\sMbits/sec\\s+\\S+\\s+ms\\s+")
netperfOutputRegexp = regexp.MustCompile("\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\S+\\s+(\\S+)\\s+")
iperfCPUOutputRegexp = regexp.MustCompile(`local/sender\s(\d+\.\d+)%\s\((\d+\.\d+)%\w/(\d+\.\d+)%\w\),\sremote/receiver\s(\d+\.\d+)%\s\((\d+\.\d+)%\w/(\d+\.\d+)%\w\)`)
Expand Down Expand Up @@ -282,7 +290,7 @@ func allocateWorkToClient(workerS *workerState, reply *WorkItem) {
}

switch {
case v.Type == iperfTcpTest || v.Type == iperfUdpTest:
case v.Type == iperfTcpTest || v.Type == iperfUdpTest || v.Type == iperfSctpTest:
reply.ClientItem.Port = "5201"
reply.ClientItem.MSS = v.MSS

Expand Down Expand Up @@ -404,6 +412,15 @@ func parseIperfTcpBandwidth(output string) string {
return "0"
}

func parseIperfSctpBandwidth(output string) string {
// Parses the output of iperf3 and grabs the group Mbits/sec from the output
match := iperfSCTPOutputRegexp.FindStringSubmatch(output)
if match != nil && len(match) > 1 {
return match[1]
}
return "0"
}

func parseIperfUdpBandwidth(output string) string {
// Parses the output of iperf3 (UDP mode) and grabs the Mbits/sec from the output
match := iperfUDPOutputRegexp.FindStringSubmatch(output)
Expand Down Expand Up @@ -453,6 +470,15 @@ func (t *NetPerfRpc) ReceiveOutput(data *WorkerOutput, reply *int) error {
cpuSender, cpuReceiver = parseIperfCpuUsage(data.Output)
registerDataPoint(testcase.Label, mss, bw, currentJobIndex)

case iperfSctpTest:
mss := testcases[currentJobIndex].MSS - mssStepSize
outputLog = outputLog + fmt.Sprintln("Received SCTP output from worker", data.Worker, "for test", testcase.Label,
"from", testcase.SourceNode, "to", testcase.DestinationNode, "MSS:", mss) + data.Output
writeOutputFile(outputCaptureFile, outputLog)
bw = parseIperfSctpBandwidth(data.Output)
cpuSender, cpuReceiver = parseIperfCpuUsage(data.Output)
registerDataPoint(testcase.Label, mss, bw, currentJobIndex)

case iperfUdpTest:
mss := testcases[currentJobIndex].MSS - mssStepSize
outputLog = outputLog + fmt.Sprintln("Received UDP output from worker", data.Worker, "for test", testcase.Label,
Expand All @@ -472,7 +498,7 @@ func (t *NetPerfRpc) ReceiveOutput(data *WorkerOutput, reply *int) error {
}

switch data.Type {
case iperfTcpTest:
case iperfTcpTest, iperfSctpTest:
fmt.Println("Jobdone from worker", data.Worker, "Bandwidth was", bw, "Mbits/sec. CPU usage sender was", cpuSender, "%. CPU usage receiver was", cpuReceiver, "%.")
default:
fmt.Println("Jobdone from worker", data.Worker, "Bandwidth was", bw, "Mbits/sec")
Expand Down Expand Up @@ -526,7 +552,7 @@ func getMyIP() string {
func handleClientWorkItem(client *rpc.Client, workItem *WorkItem) {
fmt.Println("Orchestrator requests worker run item Type:", workItem.ClientItem.Type)
switch {
case workItem.ClientItem.Type == iperfTcpTest || workItem.ClientItem.Type == iperfUdpTest:
case workItem.ClientItem.Type == iperfTcpTest || workItem.ClientItem.Type == iperfUdpTest || workItem.ClientItem.Type == iperfSctpTest:
outputString := iperfClient(workItem.ClientItem.Host, workItem.ClientItem.Port, workItem.ClientItem.MSS, workItem.ClientItem.Type)
var reply int
client.Call("NetPerfRpc.ReceiveOutput", WorkerOutput{Output: outputString, Worker: worker, Type: workItem.ClientItem.Type}, &reply)
Expand Down Expand Up @@ -610,6 +636,12 @@ func iperfClient(serverHost, serverPort string, mss int, workItemType int) (rv s
rv = output
}

case workItemType == iperfSctpTest:
output, success := cmdExec(iperf3Path, []string{iperf3Path, "-c", serverHost, "-V", "-N", "-i", "30", "-t", "10", "-f", "m", "-w", "512M", "-Z", "-P", parallelStreams, "-M", strconv.Itoa(mss), "--sctp"}, 15)
if success {
rv = output
}

case workItemType == iperfUdpTest:
output, success := cmdExec(iperf3Path, []string{iperf3Path, "-c", serverHost, "-i", "30", "-t", "10", "-f", "m", "-b", "0", "-u"}, 15)
if success {
Expand Down