cleanup: switching to stubserver in tests instead of testservice implementation #7708

janardhanvissa · 2024-10-08T14:00:45Z

Partially Addresses: #7291

RELEASE NOTES: None

codecov · 2024-10-08T14:04:51Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.26%. Comparing base (bdd444d) to head (dbcdf4d).
Report is 33 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #7708      +/-   ##
==========================================
- Coverage   81.82%   81.26%   -0.57%     
==========================================
  Files         361      368       +7     
  Lines       27828    36799    +8971     
==========================================
+ Hits        22771    29904    +7133     
- Misses       3857     5652    +1795     
- Partials     1200     1243      +43

see 322 files with indirect coverage changes

purnesh42H · 2024-10-09T19:11:36Z

Can you mention the tests in description you are modifying?

purnesh42H · 2024-10-09T19:18:44Z

@janardhanvissa can you split the PRs? 1) orca/, 2) test/xds, 3) rest of xds/

purnesh42H · 2024-10-09T19:12:32Z

orca/service_test.go

 	// will trigger the injection of custom backend metrics from the
-	// testServiceImpl.
+	// StubServer.


nit: stubServer

purnesh42H · 2024-10-09T19:12:52Z

orca/service_test.go

 	const numRequests = 20
-	ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)


why change the timeout?

Also, defaultTestTimeout is usually 10 secs

The default is 5 secs, getting context deadline issues. So, updated to 10 secs.

purnesh42H · 2024-10-09T19:14:17Z

orca/service_test.go

@@ -138,24 +136,25 @@ func (s) TestE2E_CustomBackendMetrics_OutOfBand(t *testing.T) {
 		t.Fatalf("Failed to create a stream for out-of-band metrics")
 	}

+	// Wait for the goroutine to finish before processing metrics.
+	if err := <-errCh; err != nil {


why is this moved out of for loop?

The test is passing after only a couple of counts, that the metrics might be sent before all the unary calls have been processed. I'm suspecting that the metrics are being flushed too early or there's a synchronization issue with the reporting of metrics. Instead of immediately checking for the expected metrics after sending the requests, we should wait for the goroutine that sends the requests to complete before processing the metrics.

purnesh42H · 2024-10-09T19:15:06Z

orca/service_test.go

 		default:
 		}

 		wantProto := &v3orcapb.OrcaLoadReport{
 			CpuUtilization:         50.0,
 			MemUtilization:         0.9,
 			ApplicationUtilization: 1.2,
-			Utilization:            map[string]float64{requestsMetricKey: numRequests * 0.01},
+			Utilization:            map[string]float64{requestsMetricKey: float64(numRequests) * 0.01},


is this change related? Let's avoid unrelated changes

test/xds/xds_server_certificate_providers_test.go

purnesh42H · 2024-10-18T05:38:12Z

test/xds/xds_server_integration_test.go

+			}
+		},
+	}
+	// Initialize an xDS-enabled gRPC server and use the helper to start the test service.


same comment here. Just modify the existing statement instead of writing a new line

test/xds/xds_server_serving_mode_test.go

purnesh42H · 2024-10-18T05:39:05Z

test/xds/xds_server_serving_mode_test.go

@@ -62,13 +63,21 @@ func (s) TestServerSideXDS_RedundantUpdateSuppression(t *testing.T) {
 		updateCh <- args.Mode
 	})

-	// Initialize an xDS-enabled gRPC server and register the stubServer on it.


purnesh42H · 2024-10-22T09:18:29Z

test/xds/xds_server_serving_mode_test.go

@@ -206,13 +214,20 @@ func (s) TestServerSideXDS_ServingModeChanges(t *testing.T) {
 		}
 	})

-	// Initialize an xDS-enabled gRPC server and register the stubServer on it.
+	// Initialize an xDS-enabled gRPC server and use the helper to start the test service.


s/Initialize an xDS-enabled gRPC server and use the helper to start the test service/Initialize an xDS-enabled gRPC server and sets it on stub server.

Updated the comments and pushed the changes.

purnesh42H

lgtm

purnesh42H · 2024-10-24T07:35:53Z

You need to rebase to latest main branch to unblock from vet check failure

purnesh42H · 2024-10-24T07:36:15Z

adding @easwars for second review

purnesh42H · 2024-10-24T07:43:01Z

test/xds/xds_server_certificate_providers_test.go

-	// credentials, and register the test service on it. Configure a mode change
-	// option that closes a channel when listener2 enter serving mode.
+	// Create an xDS-enabled gRPC server that is configured to use xDS
+	// credentials and sets it on a stub server, configuring a mode change


s/sets it on a stub server/assigned to a stub server

Addressed the comments and pushed the changes. Please re-review once.

Removing testservice impl and using stubserver support for RPC calls

4c0a321

janardhanvissa changed the title ~~Removing testservice impl and using stubserver support for RPC calls~~ stubserver: using stubserver support for RPC calls instead of testservice implementation Oct 8, 2024

janardhankrishna-sai added 2 commits October 8, 2024 14:10

Removing testservice impl and using stubserver support for RPC calls

9e741a6

revert test

2e3e591

janardhanvissa changed the title ~~stubserver: using stubserver support for RPC calls instead of testservice implementation~~ stubserver: using stubserver for RPC calls instead of testservice implementation Oct 8, 2024

janardhankrishna-sai added 2 commits October 8, 2024 17:27

Adding stubserver impl to TestE2E_CustomBackendMetrics_OutOfBand

0b5b9f7

Updating test

cd70477

purnesh42H changed the title ~~stubserver: using stubserver for RPC calls instead of testservice implementation~~ cleanup: switching to stubserver in tests instead of testservice implementation Oct 9, 2024

purnesh42H assigned janardhanvissa Oct 9, 2024

purnesh42H reviewed Oct 9, 2024

View reviewed changes

janardhankrishna-sai added 2 commits October 10, 2024 11:21

reverting numRequests type conversion

29da18f

reverting stubserver updates on xds and orca directories

8e937ad

purnesh42H added this to the 1.69 Release milestone Oct 16, 2024

janardhanvissa force-pushed the stub-server-support branch 2 times, most recently from 1cc0f68 to 8e937ad Compare October 16, 2024 05:49

Moving server.stop() to up

ab3f26e

purnesh42H reviewed Oct 18, 2024

View reviewed changes

purnesh42H added the Type: Testing label Oct 18, 2024

janardhankrishna-sai added 5 commits October 18, 2024 06:39

Updating the comments

b4077d5

Updating the comments

ee9857e

Updating the comments

ca55513

reverting empty line

7c5f1d8

re-trigger

2bb94e4

purnesh42H reviewed Oct 22, 2024

View reviewed changes

purnesh42H approved these changes Oct 24, 2024

View reviewed changes

purnesh42H assigned easwars Oct 24, 2024

purnesh42H unassigned janardhanvissa Oct 24, 2024

purnesh42H reviewed Oct 24, 2024

View reviewed changes

updating comments

fda79a8

janardhanvissa force-pushed the stub-server-support branch from 9a3b43e to fda79a8 Compare October 24, 2024 12:10

janardhankrishna-sai added 2 commits October 24, 2024 12:22

Updating comments

86c3271

updating the comments

5cd4830

easwars approved these changes Oct 24, 2024

View reviewed changes

easwars assigned purnesh42H and unassigned easwars Oct 24, 2024

re-trigger

dbcdf4d

purnesh42H merged commit ada6787 into grpc:master Oct 28, 2024
16 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

cleanup: switching to stubserver in tests instead of testservice implementation #7708

cleanup: switching to stubserver in tests instead of testservice implementation #7708

janardhanvissa commented Oct 8, 2024 •

edited by purnesh42H

Loading

codecov bot commented Oct 8, 2024 •

edited

Loading

purnesh42H commented Oct 9, 2024

purnesh42H commented Oct 9, 2024

purnesh42H Oct 9, 2024

purnesh42H Oct 9, 2024

purnesh42H Oct 9, 2024

janardhanvissa Oct 10, 2024

purnesh42H Oct 9, 2024

janardhanvissa Oct 10, 2024

purnesh42H Oct 9, 2024

purnesh42H Oct 18, 2024

purnesh42H Oct 18, 2024

purnesh42H Oct 22, 2024

janardhanvissa Oct 22, 2024

purnesh42H left a comment

purnesh42H commented Oct 24, 2024

purnesh42H commented Oct 24, 2024

purnesh42H Oct 24, 2024

janardhanvissa Oct 24, 2024

cleanup: switching to stubserver in tests instead of testservice implementation #7708

cleanup: switching to stubserver in tests instead of testservice implementation #7708

Conversation

janardhanvissa commented Oct 8, 2024 • edited by purnesh42H Loading

codecov bot commented Oct 8, 2024 • edited Loading

Codecov Report

purnesh42H commented Oct 9, 2024

purnesh42H commented Oct 9, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

purnesh42H left a comment

Choose a reason for hiding this comment

purnesh42H commented Oct 24, 2024

purnesh42H commented Oct 24, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

janardhanvissa commented Oct 8, 2024 •

edited by purnesh42H

Loading

codecov bot commented Oct 8, 2024 •

edited

Loading