[QE]monitor cpu usage in e2e test case

Author: lilyLuLiu

test/e2e/features/story_microshift.feature

@@ -7,10 +7,9 @@ Feature: Microshift test stories
 		And setting config property "persistent-volume-size" to value "20" succeeds
 		And ensuring network mode user
 		And executing single crc setup command succeeds
-		And get cpu data "Before start"
 		And get memory data "Before start"
+		And record timestamp "start"
 		And starting CRC with default bundle succeeds
-		And get cpu data "After start"
 		And get memory data "After start"
 		And ensuring oc command is available
 		And ensuring microshift cluster is fully operational
@@ -22,6 +21,7 @@ Feature: Microshift test stories
 
 	@microshift @testdata @linux @windows @darwin @cleanup
 	Scenario: Start and expose a basic HTTP service and check after restart
+		And record timestamp "deployment"
 		Given executing "oc create namespace testproj" succeeds
 		And executing "oc config set-context --current --namespace=testproj" succeeds
 		When executing "oc apply -f httpd-example.yaml" succeeds
@@ -40,9 +40,10 @@ Feature: Microshift test stories
 		And get memory data "After deployment"
 		Then executing "curl -s http://httpd-example-testproj.apps.crc.testing" succeeds
 		And stdout should contain "Hello CRC!"
+		And record timestamp "stop"
 		When executing "crc stop" succeeds
-		And get cpu data "After stop"
 		And get memory data "After stop"
+		And record timestamp "start again"
 		And starting CRC with default bundle succeeds
 		And checking that CRC is running
 		And with up to "4" retries with wait period of "1m" http response from "http://httpd-example-testproj.apps.crc.testing" has status code "200"

test/e2e/features/story_openshift.feature

@@ -3,17 +3,19 @@ Feature: 4 Openshift stories
 
 	Background:
 		Given setting config property "disk-size" to value "40" succeeds
+		And get memory data "Before start"
+		And record timestamp "start"
 		And ensuring CRC cluster is running
+		And get memory data "After start"
+		And record timestamp "deployment"
 		And ensuring oc command is available
 		And ensuring user is logged in succeeds
 
 	# End-to-end health check
 
-	@darwin @linux @windows @testdata @story_health @needs_namespace
+	@darwin @linux @windows @testdata @story_health @needs_namespace @performance
 	Scenario: Overall cluster health
 		Given executing "oc new-project testproj" succeeds
-		And get cpu data "After start"
-		And get memory data "After start"
 		When executing "oc apply -f httpd-example.yaml" succeeds
 		And executing "oc rollout status deployment httpd-example" succeeds
 		Then stdout should contain "successfully rolled out"
@@ -25,14 +27,14 @@ Feature: 4 Openshift stories
 		Then stdout should contain "httpd-example exposed"
 		When executing "oc expose svc httpd-example" succeeds
 		Then stdout should contain "httpd-example exposed"
-		And get cpu data "After deployment"
-		And get memory data "After deployment"
 		When with up to "20" retries with wait period of "5s" http response from "http://httpd-example-testproj.apps-crc.testing" has status code "200"
 		Then executing "curl -s http://httpd-example-testproj.apps-crc.testing" succeeds
 		And stdout should contain "Hello CRC!"
+		And get memory data "After deployment"
+		And record timestamp "stop"
 		When executing "crc stop" succeeds
-		And get cpu data "After stop"
 		And get memory data "After stop"
+		And record timestamp "start again"
 		And starting CRC with default bundle succeeds
 		And checking that CRC is running
 		And with up to "4" retries with wait period of "1m" http response from "http://httpd-example-testproj.apps-crc.testing" has status code "200"

test/e2e/testsuite/performace.go

@@ -0,0 +1,111 @@
+package testsuite
+
+import (
+	"context"
+	"fmt"
+	"time"
+	"os"
+	"path/filepath"
+	"github.com/crc-org/crc/v2/test/extended/util"
+	"github.com/shirou/gopsutil/v4/cpu"
+	//"github.com/shirou/gopsutil/v4/mem"
+)
+
+type Monitor struct {
+	// cancle flag of monitoring
+	cancelFunc context.CancelFunc
+	// running flag
+	isRunning bool
+	// interval time of gather data
+	interval time.Duration
+}
+
+func NewMonitor(interval time.Duration) *Monitor {
+	return &Monitor{
+		interval: interval,
+	}
+}
+
+func (m *Monitor) Start() error {
+	if m.isRunning {
+		return fmt.Errorf("The collector is running")
+	}
+
+	fmt.Printf("Attempt to start CPU collector, interval: %s", m.interval)
+
+	//  create a context.WithCancel
+	ctx, cancel := context.WithCancel(context.Background())
+	m.cancelFunc = cancel
+	m.isRunning = true
+
+	// stary goroutine
+	go m.collectLoop(ctx)
+
+	fmt.Println("CPU collector has been successfully started")
+	return nil
+}
+
+func (m *Monitor) Stop() error {
+	if !m.isRunning {
+		return fmt.Errorf("The collector is not running")
+	}
+
+	// call cancle function
+	if m.cancelFunc != nil {
+		m.cancelFunc()
+	}
+
+	// clear flag
+	m.isRunning = false
+	fmt.Println("CPU collector has sent a stop signal")
+	// may need wait a while to stop
+	return nil
+}
+
+func (m *Monitor) collectLoop(ctx context.Context) {
+	fmt.Println("--> collect goroutine start...")
+	calcInterval := m.interval
+
+	for {
+		// 1. check Context whether be cancled
+		select {
+		case <-ctx.Done():
+			fmt.Println("<-- collect goroutine receive stop signal")
+			return // exit goroutine
+		default:
+			// continue collect data
+		}
+
+		// 2. collect data
+		totalPercent, err := cpu.Percent(calcInterval, false)
+		// no need to sleep, calcInterval automatically do it
+
+		if err != nil {
+			fmt.Printf("Error: fail to collect CPU data: %v", err)
+			time.Sleep(1 * time.Second)
+			continue
+		}
+		
+		if len(totalPercent) > 0 {
+			data := fmt.Sprintf("[%s], cpu percent: %.2f%%\n",
+				time.Now().Format("15:04:05"), totalPercent[0])
+			wd, _ := os.Getwd()
+			file := filepath.Join(wd, "../test-results/cpu-consume.txt")
+			util.WriteToFile(data, file)
+		}
+		/*
+		vMem, err := mem.VirtualMemory()
+		if err != nil {
+			fmt.Printf("Error: failed to collect memory data: %v", err)
+			continue
+		}
+		memoryused := vMem.Used / 1024 / 1024		
+		data := fmt.Sprintf("[%s], MemoryUsed(MB): %d\n" ,
+				time.Now().Format("15:04:05"), memoryused)
+		wd, _ := os.Getwd()
+		file := filepath.Join(wd, "../test-results/memory-consume.txt")
+		util.WriteToFile(data, file)
+		*/
+	}
+}
+

test/e2e/testsuite/testsuite.go

@@ -28,7 +28,6 @@ import (
 	crcCmd "github.com/crc-org/crc/v2/test/extended/crc/cmd"
 	"github.com/crc-org/crc/v2/test/extended/util"
 	"github.com/cucumber/godog"
-	"github.com/shirou/gopsutil/v4/cpu"
 	"github.com/shirou/gopsutil/v4/mem"
 	"github.com/spf13/pflag"
 )
@@ -169,6 +168,7 @@ func InitializeTestSuite(tctx *godog.TestSuiteContext) {
 }
 
 func InitializeScenario(s *godog.ScenarioContext) {
+	monitor := NewMonitor(1 * time.Second)
 
 	s.Before(func(ctx context.Context, sc *godog.Scenario) (context.Context, error) {
 
@@ -264,12 +264,9 @@ func InitializeScenario(s *godog.ScenarioContext) {
 				}
 			}
 
-			if tag.Name == "@story_health" {
-				if err := getCPUdata("Before start"); err != nil {
-					fmt.Printf("Failed to collect CPU data: %v\n", err)
-				}
-				if err := getMemoryData("Before start"); err != nil {
-					fmt.Printf("Failed to collect memory data: %v\n", err)
+			if tag.Name == "@performance" {
+				if err := monitor.Start(); err != nil {
+					fmt.Println("Failed to start monitor: %v", err)
 				}
 			}
 		}
@@ -398,6 +395,13 @@ func InitializeScenario(s *godog.ScenarioContext) {
 				}
 			}
 
+			if tag.Name == "@performance" {
+				if err := monitor.Stop(); err != nil {
+					fmt.Println("Failed to stop monitoring: %v", err)
+				}
+				fmt.Println("Collection has stopped. Wait for 5 seconds to confirm that the collection task will no longer output data")
+				time.Sleep(5 * time.Second)
+			}
 		}
 
 		return ctx, nil
@@ -579,8 +583,8 @@ func InitializeScenario(s *godog.ScenarioContext) {
 		EnsureApplicationIsAccessibleViaNodePort)
 	s.Step(`^persistent volume of size "([^"]*)"GB exists$`,
 		EnsureVMPartitionSizeCorrect)
-	s.Step(`^get cpu data "([^"]*)"`,
-		getCPUdata)
+	s.Step(`^record timestamp "([^"]*)"`,
+		getTimestamp)
 	s.Step(`^get memory data "([^"]*)"`,
 		getMemoryData)
 
@@ -1320,20 +1324,6 @@ func deserializeListBlockDeviceCommandOutputToExtractPVSize(lsblkOutput string)
 	return diskSize - (lvmSize + 1), nil
 }
 
-func getCPUdata(content string) error {
-	cpuData, err := cpu.Percent(0, false)
-	if err != nil {
-		return fmt.Errorf("failed to get CPU data: %v", err)
-	}
-	if len(cpuData) == 0 {
-		return fmt.Errorf("no CPU data available")
-	}
-	data := fmt.Sprintf("%s: %.2f%%\n", content, cpuData)
-	wd, _ := os.Getwd()
-	file := filepath.Join(wd, "../test-results/cpu-consume.txt")
-	return util.WriteToFile(data, file)
-}
-
 func getMemoryData(content string) error {
 	v, err := mem.VirtualMemory()
 	if err != nil {
@@ -1351,3 +1341,16 @@ func getMemoryData(content string) error {
 	file := filepath.Join(wd, "../test-results/memory-consume.txt")
 	return util.WriteToFile(data, file)
 }
+
+
+
+func getTimestamp(content string) {
+	data := fmt.Sprintf("[%s], %s\n" ,
+				time.Now().Format("15:04:05"), content)
+	wd, err := os.Getwd()
+	if err != nil {
+		fmt.Println("failed to get working directory: %v", err)
+	}
+	file := filepath.Join(wd, "../test-results/time-stamp.txt")
+	util.WriteToFile(data, file)
+}