cleanup: replace dial with newclient #7967

janardhanvissa · 2024-12-25T11:52:59Z

Partially address: #7049

RELEASE NOTES: None

codecov · 2024-12-25T11:57:55Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 82.35%. Comparing base (ae2a04f) to head (9dc0cfd).
Report is 7 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #7967      +/-   ##
==========================================
+ Coverage   82.29%   82.35%   +0.06%     
==========================================
  Files         387      387              
  Lines       38967    38942      -25     
==========================================
+ Hits        32066    32071       +5     
+ Misses       5586     5563      -23     
+ Partials     1315     1308       -7

see 33 files with indirect coverage changes

test/clientconn_state_transition_test.go

test/gracefulstop_test.go

xds/internal/balancer/cdsbalancer/cdsbalancer_security_test.go

xds/internal/balancer/cdsbalancer/cdsbalancer_test.go

test/xds/xds_server_serving_mode_test.go

This reverts commit 506fd98, reversing changes made to d520f73.

…pc-go" This reverts commit 0486355, reversing changes made to 7ddbe46.

…rpc-go" This reverts commit fd2860b.

This reverts commit f1ec518.

This reverts commit 506fd98, reversing changes made to d520f73.

arjan-bal · 2025-02-18T09:55:19Z

Please don't use git rebase and force push. This re-writes all the commits on the branch and Github can no longer track the diff since the last time a reviewer saw the PR. This means that I need to review the entire PR again, instead of just the diff since last review.

clientconn_test.go

xds/internal/balancer/cdsbalancer/cdsbalancer_security_test.go

test/gracefulstop_test.go

arjan-bal

LGTM, assigning a second reviewer.

arjan-bal · 2025-02-20T09:12:30Z

xds/internal/balancer/clusterresolver/e2e_test/eds_impl_test.go

Please revert this file, none of the changes are related to DIal to NewClient migration.

easwars · 2025-02-20T21:40:13Z

balancer_wrapper_test.go

 	if err != nil {
-		t.Fatal("Error dialing:", err)
+		t.Fatal("Failed to create a client for server:", err)


This doesn't seem to be a very useful test failure message. How about just saying t.Fatal("NewClient() failed: %v", err). Here and elsewhere in this PR. Thanks.

And wherever possible, include the target URI passed to NewClient in the error message.

easwars · 2025-02-20T21:43:53Z

test/gracefulstop_test.go

 	if err != nil {
-		t.Fatalf("grpc.DialContext(_, %q, _) = %v", lis.Addr().String(), err)
+		t.Fatalf("grpc.NewClient(_, %q, _) = %v", lis.Addr().String(), err)


This should be:

t.Fatalf("grpc.NewClient(%q) = %v", lis.Addr().String(), err)

easwars · 2025-02-20T21:46:18Z

test/xds/xds_server_serving_mode_test.go

+
+	_, err = testgrpc.NewTestServiceClient(cc1).FullDuplexCall(ctx)
+	if err == nil || status.Code(err) != codes.Unavailable {
+		t.Fatalf("Expected FullDuplexCall to fail with status code Unavailable, got: %v", err)


Git before want in error strings please. See: go/go-style/decisions#got-before-want

easwars · 2025-02-20T21:49:20Z

xds/internal/balancer/cdsbalancer/aggregate_cluster_test.go

@@ -817,7 +817,7 @@ func (s) TestAggregatedCluster_CycleWithNoLeafNode(t *testing.T) {
 func (s) TestAggregatedCluster_CycleWithLeafNode(t *testing.T) {
 	lbCfgCh, _, _, _ := registerWrappedClusterResolverPolicy(t)
 	mgmtServer, nodeID, cc, _, _, _, _ := setupWithManagementServer(t)
-
+	cc.Connect()


Do we really need to call Connect here? Can this be moved inside the helper function setupWithManagementServer?

easwars · 2025-02-20T21:50:46Z

xds/internal/balancer/cdsbalancer/cdsbalancer_security_test.go

@@ -393,7 +393,7 @@ func (s) TestSecurityConfigNotFoundInBootstrap(t *testing.T) {

 	// Create a grpc channel with xDS creds.
 	cc, _ := setupForSecurityTests(t, bootstrapContents, xdsClientCredsWithInsecureFallback(t), nil)
-
+	cc.Connect()


Same here. Do we need the call to Connect? Aren't we doing an RPC later on? Can/Should we move this to be inside the helper?

easwars · 2025-02-20T21:51:02Z

xds/internal/balancer/cdsbalancer/cdsbalancer_test.go

-	_, _, _, r, xdsClient, cdsResourceRequestedCh, _ := setupWithManagementServer(t)
-
+	_, _, cc, r, xdsClient, cdsResourceRequestedCh, _ := setupWithManagementServer(t)
+	cc.Connect()


Same comment as above regarding the call to Connect.

easwars · 2025-02-20T21:51:53Z

xds/internal/balancer/clusterresolver/e2e_test/balancer_test.go

@@ -250,7 +251,7 @@ func (s) TestErrorFromParentLB_ResourceNotFound(t *testing.T) {
 	// resolver, and dial the test backends.
 	cc, cleanup := setupAndDial(t, bootstrapContents)
 	defer cleanup()
-
+	cc.Connect()


Same comment about Connect for tests in this file too.

janardhanvissa · 2025-02-20T23:55:31Z

All the above comments are addressed. Please re-review once,

janardhankrishna-sai added 2 commits December 23, 2024 07:09

replace dial with newclient

7ddbe46

replace dial with newclient

71dacb1

janardhankrishna-sai and others added 18 commits December 26, 2024 11:58

updating error msg and replacing dial with newclient

88c3f0f

updating error mdg

ceb1204

revert TestFederation_UnknownAuthorityInDialTarget

6be3cf0

updating fatal msg

f6cb17c

replace dial with newclient

9f02ddd

updating error msg

7fa6e5e

Merge branch 'master' of https://github.com/janardhanvissa/grpc-go

0486355

updating error msg

aec4527

updating test

8ea1edd

updating fatal msg

c7e8c3e

updating newclient target

baec474

updating newclient target

36deff4

updating fatal msg

c58db07

updating fatal msg

973d28a

updating fatal msg

c07189f

error msg updating

1fc9c6b

updating fatal msg

d520f73

Merge branch 'grpc:master' into master

53fa9cd

arjan-bal reviewed Jan 9, 2025

View reviewed changes

arjan-bal assigned janardhanvissa Jan 9, 2025

arjan-bal reviewed Jan 9, 2025

View reviewed changes

test/xds/xds_server_serving_mode_test.go Outdated Show resolved Hide resolved

janardhankrishna-sai added 6 commits January 9, 2025 10:40

updating newclient err msg

506fd98

Revert "updating newclient err msg"

f1ec518

This reverts commit 506fd98, reversing changes made to d520f73.

Revert "Merge branch 'master' of https://github.com/janardhanvissa/gr…

fd2860b

…pc-go" This reverts commit 0486355, reversing changes made to 7ddbe46.

Reapply "Merge branch 'master' of https://github.com/janardhanvissa/g…

56c4730

…rpc-go" This reverts commit fd2860b.

Reapply "updating newclient err msg"

5c6eb74

This reverts commit f1ec518.

Revert "updating newclient err msg"

bf780fe

This reverts commit 506fd98, reversing changes made to d520f73.

Update comment

80d499f

janardhanvissa removed their assignment Feb 18, 2025

janardhanvissa requested a review from arjan-bal February 18, 2025 06:50

arjan-bal self-assigned this Feb 18, 2025

arjan-bal reviewed Feb 18, 2025

View reviewed changes

arjan-bal assigned janardhanvissa and unassigned arjan-bal Feb 18, 2025

addressing review comments

2358d64

janardhanvissa removed their assignment Feb 18, 2025

janardhanvissa requested a review from arjan-bal February 18, 2025 15:07

arjan-bal self-assigned this Feb 20, 2025

arjan-bal approved these changes Feb 20, 2025

View reviewed changes

arjan-bal added this to the 1.72 Release milestone Feb 20, 2025

arjan-bal added the Type: Internal Cleanup Refactors, etc label Feb 20, 2025

arjan-bal assigned easwars and janardhanvissa and unassigned arjan-bal Feb 20, 2025

arjan-bal requested a review from easwars February 20, 2025 09:13

revert fatal msg

57fe1bc

janardhanvissa removed their assignment Feb 20, 2025

easwars reviewed Feb 20, 2025

View reviewed changes

easwars assigned janardhanvissa and unassigned easwars Feb 20, 2025

updating error msg and moving cc.Connect() inside helper func

9dc0cfd

janardhanvissa requested a review from easwars February 20, 2025 23:55

janardhanvissa removed their assignment Feb 20, 2025

easwars self-assigned this Feb 21, 2025

removing explicit cc.Connect() call

7837056

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

cleanup: replace dial with newclient #7967

cleanup: replace dial with newclient #7967

janardhanvissa commented Dec 25, 2024

codecov bot commented Dec 25, 2024 •

edited

Loading

arjan-bal commented Feb 18, 2025

arjan-bal left a comment

arjan-bal Feb 20, 2025

janardhanvissa Feb 20, 2025

easwars Feb 20, 2025

easwars Feb 20, 2025

janardhanvissa Feb 20, 2025

easwars Feb 20, 2025

janardhanvissa Feb 20, 2025

easwars Feb 20, 2025

janardhanvissa Feb 20, 2025

easwars Feb 20, 2025

janardhanvissa Feb 20, 2025

easwars Feb 20, 2025

janardhanvissa Feb 20, 2025

easwars Feb 20, 2025

janardhanvissa Feb 20, 2025

easwars Feb 20, 2025

janardhanvissa Feb 20, 2025

janardhanvissa commented Feb 20, 2025

cleanup: replace dial with newclient #7967

Are you sure you want to change the base?

cleanup: replace dial with newclient #7967

Conversation

janardhanvissa commented Dec 25, 2024

codecov bot commented Dec 25, 2024 • edited Loading

Codecov Report

arjan-bal commented Feb 18, 2025

arjan-bal left a 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

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

janardhanvissa commented Feb 20, 2025

codecov bot commented Dec 25, 2024 •

edited

Loading