Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request kubernetes#92427 from wojtek-t/improve_affinity_tests
Improve LB session affinity tests
  • Loading branch information
k8s-ci-robot committed Jun 26, 2020
2 parents c90427d + 3c34b56 commit 3e438a9
Showing 1 changed file with 60 additions and 21 deletions.
81 changes: 60 additions & 21 deletions test/e2e/network/service.go
Expand Up @@ -101,42 +101,81 @@ var (
// portsByPodName is a map that maps pod name to container ports.
type portsByPodName map[string][]int

// affinityCheckFromPod returns interval, timeout and function pinging the service and
// returning pinged hosts for pinging the service from execPod.
func affinityCheckFromPod(execPod *v1.Pod, serviceIP string, servicePort int) (time.Duration, time.Duration, func() []string) {
timeout := AffinityTimeout
// interval considering a maximum of 2 seconds per connection
interval := 2 * AffinityConfirmCount * time.Second

serviceIPPort := net.JoinHostPort(serviceIP, strconv.Itoa(servicePort))
curl := fmt.Sprintf(`curl -q -s --connect-timeout 2 http://%s/`, serviceIPPort)
cmd := fmt.Sprintf("for i in $(seq 0 %d); do echo; %s ; done", AffinityConfirmCount, curl)
getHosts := func() []string {
stdout, err := framework.RunHostCmd(execPod.Namespace, execPod.Name, cmd)
if err != nil {
framework.Logf("Failed to get response from %s. Retry until timeout", serviceIPPort)
return nil
}
return strings.Split(stdout, "\n")
}

return interval, timeout, getHosts
}

// affinityCheckFromTest returns interval, timeout and function pinging the service and
// returning pinged hosts for pinging the service from the test itself.
func affinityCheckFromTest(cs clientset.Interface, serviceIP string, servicePort int) (time.Duration, time.Duration, func() []string) {
interval := 2 * time.Second
timeout := e2eservice.GetServiceLoadBalancerPropagationTimeout(cs)

params := &e2enetwork.HTTPPokeParams{Timeout: 2 * time.Second}
getHosts := func() []string {
var hosts []string
for i := 0; i < AffinityConfirmCount; i++ {
result := e2enetwork.PokeHTTP(serviceIP, servicePort, "", params)
if result.Status == e2enetwork.HTTPSuccess {
hosts = append(hosts, string(result.Body))
}
}
return hosts
}

return interval, timeout, getHosts
}

// CheckAffinity function tests whether the service affinity works as expected.
// If affinity is expected, the test will return true once affinityConfirmCount
// number of same response observed in a row. If affinity is not expected, the
// test will keep observe until different responses observed. The function will
// return false only in case of unexpected errors.
func checkAffinity(cs clientset.Interface, execPod *v1.Pod, serviceIP string, servicePort int, shouldHold bool) bool {
serviceIPPort := net.JoinHostPort(serviceIP, strconv.Itoa(servicePort))
curl := fmt.Sprintf(`curl -q -s --connect-timeout 2 http://%s/`, serviceIPPort)
cmd := fmt.Sprintf("for i in $(seq 0 %d); do echo; %s ; done", AffinityConfirmCount, curl)
timeout := AffinityTimeout
if execPod == nil {
timeout = e2eservice.GetServiceLoadBalancerPropagationTimeout(cs)
var interval, timeout time.Duration
var getHosts func() []string
if execPod != nil {
interval, timeout, getHosts = affinityCheckFromPod(execPod, serviceIP, servicePort)
} else {
interval, timeout, getHosts = affinityCheckFromTest(cs, serviceIP, servicePort)
}

var tracker affinityTracker
// interval considering a maximum of 2 seconds per connection
interval := 2 * AffinityConfirmCount * time.Second
if pollErr := wait.PollImmediate(interval, timeout, func() (bool, error) {
if execPod != nil {
stdout, err := framework.RunHostCmd(execPod.Namespace, execPod.Name, cmd)
if err != nil {
framework.Logf("Failed to get response from %s. Retry until timeout", serviceIPPort)
return false, nil
}
hosts := strings.Split(stdout, "\n")
for _, host := range hosts {
hosts := getHosts()
for _, host := range hosts {
if len(host) > 0 {
tracker.recordHost(strings.TrimSpace(host))
}
} else {
rawResponse := GetHTTPContent(serviceIP, servicePort, timeout, "")
tracker.recordHost(rawResponse.String())
}

trackerFulfilled, affinityHolds := tracker.checkHostTrace(AffinityConfirmCount)
if !trackerFulfilled {
return false, nil
}

if !shouldHold && !affinityHolds {
return true, nil
}
if shouldHold && trackerFulfilled && affinityHolds {
if shouldHold && affinityHolds {
return true, nil
}
return false, nil
Expand All @@ -147,7 +186,7 @@ func checkAffinity(cs clientset.Interface, execPod *v1.Pod, serviceIP string, se
return false
}
if !trackerFulfilled {
checkAffinityFailed(tracker, fmt.Sprintf("Connection to %s timed out or not enough responses.", serviceIPPort))
checkAffinityFailed(tracker, fmt.Sprintf("Connection timed out or not enough responses."))
}
if shouldHold {
checkAffinityFailed(tracker, "Affinity should hold but didn't.")
Expand Down

0 comments on commit 3e438a9

Please sign in to comment.