Improve HT detection

This commit is contained in:
Szymon Scharmach 2017-09-25 15:26:06 +02:00
parent b188868fd9
commit c76ae27ffb

View File

@ -19,6 +19,8 @@ package e2e_node
import ( import (
"fmt" "fmt"
"os/exec" "os/exec"
"strconv"
"strings"
"time" "time"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
@ -115,11 +117,13 @@ func waitForContainerRemoval(ctnPartName string) {
} }
func isHTEnabled() bool { func isHTEnabled() bool {
err := exec.Command("/bin/sh", "-c", "if [[ $(lscpu | grep \"Thread(s) per core:\" | cut -c24) != \"2\" ]]; then exit 1; fi").Run() outData, err := exec.Command("/bin/sh", "-c", "lscpu | grep \"Thread(s) per core:\" | cut -d \":\" -f 2").Output()
if err != nil { framework.ExpectNoError(err)
return false
} threadsPerCore, err := strconv.Atoi(strings.TrimSpace(string(outData)))
return true framework.ExpectNoError(err)
return threadsPerCore > 1
} }
func getCPUSiblingList(cpuRes int64) string { func getCPUSiblingList(cpuRes int64) string {