From 4c651eda23d0bc60edc6c932ce60f1246a2a2034 Mon Sep 17 00:00:00 2001
From: Menghan Li <menghanl@google.com>
Date: Wed, 16 Jun 2021 11:04:33 -0700
Subject: [PATCH] xds: move eds package to cluster_resolver (#4545)

---
 xds/internal/balancer/balancer.go             | 12 ++--
 .../balancer/cdsbalancer/cdsbalancer.go       |  4 +-
 .../balancer/cdsbalancer/cdsbalancer_test.go  |  4 +-
 .../clusterresolver.go}                       | 60 +++++++++----------
 .../clusterresolver_test.go}                  | 26 ++++----
 .../config.go                                 |  2 +-
 .../configbuilder.go                          |  2 +-
 .../configbuilder_test.go                     |  2 +-
 .../eds_impl_test.go                          | 14 ++---
 .../eds_watcher.go                            |  4 +-
 .../logging.go                                |  6 +-
 .../priority_test.go}                         |  2 +-
 .../testutil_test.go}                         |  2 +-
 13 files changed, 68 insertions(+), 72 deletions(-)
 rename xds/internal/balancer/{edsbalancer/eds.go => clusterresolver/clusterresolver.go} (86%)
 rename xds/internal/balancer/{edsbalancer/eds_test.go => clusterresolver/clusterresolver_test.go} (97%)
 rename xds/internal/balancer/{edsbalancer => clusterresolver}/config.go (99%)
 rename xds/internal/balancer/{edsbalancer => clusterresolver}/configbuilder.go (98%)
 rename xds/internal/balancer/{edsbalancer => clusterresolver}/configbuilder_test.go (99%)
 rename xds/internal/balancer/{edsbalancer => clusterresolver}/eds_impl_test.go (99%)
 rename xds/internal/balancer/{edsbalancer => clusterresolver}/eds_watcher.go (97%)
 rename xds/internal/balancer/{edsbalancer => clusterresolver}/logging.go (84%)
 rename xds/internal/balancer/{edsbalancer/eds_impl_priority_test.go => clusterresolver/priority_test.go} (99%)
 rename xds/internal/balancer/{edsbalancer/eds_testutil_test.go => clusterresolver/testutil_test.go} (99%)

diff --git a/xds/internal/balancer/balancer.go b/xds/internal/balancer/balancer.go
index 0da15b9b9db..86656736a61 100644
--- a/xds/internal/balancer/balancer.go
+++ b/xds/internal/balancer/balancer.go
@@ -20,10 +20,10 @@
 package balancer
 
 import (
-	_ "google.golang.org/grpc/xds/internal/balancer/cdsbalancer"    // Register the CDS balancer
-	_ "google.golang.org/grpc/xds/internal/balancer/clusterimpl"    // Register the xds_cluster_impl balancer
-	_ "google.golang.org/grpc/xds/internal/balancer/clustermanager" // Register the xds_cluster_manager balancer
-	_ "google.golang.org/grpc/xds/internal/balancer/edsbalancer"    // Register the EDS balancer
-	_ "google.golang.org/grpc/xds/internal/balancer/priority"       // Register the priority balancer
-	_ "google.golang.org/grpc/xds/internal/balancer/weightedtarget" // Register the weighted_target balancer
+	_ "google.golang.org/grpc/xds/internal/balancer/cdsbalancer"     // Register the CDS balancer
+	_ "google.golang.org/grpc/xds/internal/balancer/clusterimpl"     // Register the xds_cluster_impl balancer
+	_ "google.golang.org/grpc/xds/internal/balancer/clustermanager"  // Register the xds_cluster_manager balancer
+	_ "google.golang.org/grpc/xds/internal/balancer/clusterresolver" // Register the xds_cluster_resolver balancer
+	_ "google.golang.org/grpc/xds/internal/balancer/priority"        // Register the priority balancer
+	_ "google.golang.org/grpc/xds/internal/balancer/weightedtarget"  // Register the weighted_target balancer
 )
diff --git a/xds/internal/balancer/cdsbalancer/cdsbalancer.go b/xds/internal/balancer/cdsbalancer/cdsbalancer.go
index cb97353ff46..b04d150a311 100644
--- a/xds/internal/balancer/cdsbalancer/cdsbalancer.go
+++ b/xds/internal/balancer/cdsbalancer/cdsbalancer.go
@@ -34,7 +34,7 @@ import (
 	"google.golang.org/grpc/internal/pretty"
 	"google.golang.org/grpc/resolver"
 	"google.golang.org/grpc/serviceconfig"
-	"google.golang.org/grpc/xds/internal/balancer/edsbalancer"
+	"google.golang.org/grpc/xds/internal/balancer/clusterresolver"
 	"google.golang.org/grpc/xds/internal/xdsclient"
 )
 
@@ -314,7 +314,7 @@ func (b *cdsBalancer) handleWatchUpdate(update clusterHandlerUpdate) {
 	// is updated to cluster_resolver, which has the fallback functionality, we
 	// will fix this to handle all the clusters in list.
 	cds := update.chu[0]
-	lbCfg := &edsbalancer.EDSConfig{
+	lbCfg := &clusterresolver.EDSConfig{
 		ClusterName:           cds.ClusterName,
 		EDSServiceName:        cds.EDSServiceName,
 		MaxConcurrentRequests: cds.MaxRequests,
diff --git a/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go b/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go
index f36117620e6..206918a37d9 100644
--- a/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go
+++ b/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go
@@ -35,7 +35,7 @@ import (
 	"google.golang.org/grpc/internal/testutils"
 	"google.golang.org/grpc/resolver"
 	"google.golang.org/grpc/serviceconfig"
-	"google.golang.org/grpc/xds/internal/balancer/edsbalancer"
+	"google.golang.org/grpc/xds/internal/balancer/clusterresolver"
 	xdstestutils "google.golang.org/grpc/xds/internal/testutils"
 	"google.golang.org/grpc/xds/internal/testutils/fakeclient"
 	"google.golang.org/grpc/xds/internal/xdsclient"
@@ -197,7 +197,7 @@ func cdsCCS(cluster string, xdsC xdsclient.XDSClient) balancer.ClientConnState {
 // edsCCS is a helper function to construct a good update passed from the
 // cdsBalancer to the edsBalancer.
 func edsCCS(service string, countMax *uint32, enableLRS bool) balancer.ClientConnState {
-	lbCfg := &edsbalancer.EDSConfig{
+	lbCfg := &clusterresolver.EDSConfig{
 		ClusterName:           service,
 		MaxConcurrentRequests: countMax,
 	}
diff --git a/xds/internal/balancer/edsbalancer/eds.go b/xds/internal/balancer/clusterresolver/clusterresolver.go
similarity index 86%
rename from xds/internal/balancer/edsbalancer/eds.go
rename to xds/internal/balancer/clusterresolver/clusterresolver.go
index cc486fe7b8c..f61b56b9a2c 100644
--- a/xds/internal/balancer/edsbalancer/eds.go
+++ b/xds/internal/balancer/clusterresolver/clusterresolver.go
@@ -16,8 +16,8 @@
  *
  */
 
-// Package edsbalancer contains EDS balancer implementation.
-package edsbalancer
+// Package clusterresolver contains EDS balancer implementation.
+package clusterresolver
 
 import (
 	"encoding/json"
@@ -38,7 +38,8 @@ import (
 	"google.golang.org/grpc/xds/internal/xdsclient"
 )
 
-const edsName = "eds_experimental"
+// Name is the name of the cluster_resolver balancer.
+const Name = "eds_experimental"
 
 var (
 	errBalancerClosed = errors.New("cdsBalancer is closed")
@@ -66,7 +67,7 @@ func (bb) Build(cc balancer.ClientConn, opts balancer.BuildOptions) balancer.Bal
 		return nil
 	}
 
-	b := &edsBalancer{
+	b := &clusterResolverBalancer{
 		cc:       cc,
 		bOpts:    opts,
 		updateCh: buffer.NewUnbounded(),
@@ -88,7 +89,7 @@ func (bb) Build(cc balancer.ClientConn, opts balancer.BuildOptions) balancer.Bal
 }
 
 func (bb) Name() string {
-	return edsName
+	return Name
 }
 
 func (bb) ParseConfig(c json.RawMessage) (serviceconfig.LoadBalancingConfig, error) {
@@ -113,11 +114,9 @@ type scUpdate struct {
 	state   balancer.SubConnState
 }
 
-// edsBalancer manages xdsClient and the actual EDS balancer implementation that
-// does load balancing.
-//
-// It currently has only an edsBalancer. Later, we may add fallback.
-type edsBalancer struct {
+// clusterResolverBalancer manages xdsClient and the actual EDS balancer
+// implementation that does load balancing.
+type clusterResolverBalancer struct {
 	cc         balancer.ClientConn
 	bOpts      balancer.BuildOptions
 	updateCh   *buffer.Unbounded // Channel for updates from gRPC.
@@ -134,23 +133,24 @@ type edsBalancer struct {
 	xdsClient       xdsclient.XDSClient    // xDS client to watch EDS resource.
 	attrsWithClient *attributes.Attributes // Attributes with xdsClient attached to be passed to the child policies.
 
-	child           balancer.Balancer
-	edsResp         xdsclient.EndpointsUpdate
-	edsRespReceived bool
+	child               balancer.Balancer
+	edsResp             xdsclient.EndpointsUpdate
+	watchUpdateReceived bool
 }
 
 // handleClientConnUpdate handles a ClientConnUpdate received from gRPC. Good
 // updates lead to registration of an EDS watch. Updates with error lead to
 // cancellation of existing watch and propagation of the same error to the
 // child balancer.
-func (b *edsBalancer) handleClientConnUpdate(update *ccUpdate) {
+func (b *clusterResolverBalancer) handleClientConnUpdate(update *ccUpdate) {
 	// We first handle errors, if any, and then proceed with handling the
 	// update, only if the status quo has changed.
 	if err := update.err; err != nil {
 		b.handleErrorFromUpdate(err, true)
+		return
 	}
 
-	b.logger.Infof("Receive update from resolver, balancer config: %+v", update.state.BalancerConfig)
+	b.logger.Infof("Receive update from resolver, balancer config: %v", pretty.ToJSON(update.state.BalancerConfig))
 	cfg, _ := update.state.BalancerConfig.(*EDSConfig)
 	if cfg == nil {
 		b.logger.Warningf("xds: unexpected LoadBalancingConfig type: %T", update.state.BalancerConfig)
@@ -161,8 +161,8 @@ func (b *edsBalancer) handleClientConnUpdate(update *ccUpdate) {
 	b.configRaw = update.state.ResolverState.ServiceConfig
 	b.edsWatcher.updateConfig(cfg)
 
-	if !b.edsRespReceived {
-		// If eds resp was not received, wait for it.
+	if !b.watchUpdateReceived {
+		// If update was not received, wait for it.
 		return
 	}
 	// If eds resp was received before this, the child policy was created. We
@@ -175,15 +175,15 @@ func (b *edsBalancer) handleClientConnUpdate(update *ccUpdate) {
 
 // handleWatchUpdate handles a watch update from the xDS Client. Good updates
 // lead to clientConn updates being invoked on the underlying child balancer.
-func (b *edsBalancer) handleWatchUpdate(update *watchUpdate) {
+func (b *clusterResolverBalancer) handleWatchUpdate(update *watchUpdate) {
 	if err := update.err; err != nil {
 		b.logger.Warningf("Watch error from xds-client %p: %v", b.xdsClient, err)
 		b.handleErrorFromUpdate(err, false)
 		return
 	}
 
-	b.logger.Infof("Watch update from xds-client %p, content: %+v", b.xdsClient, pretty.ToJSON(update.eds))
-	b.edsRespReceived = true
+	b.logger.Infof("resource update: %+v", pretty.ToJSON(update.eds))
+	b.watchUpdateReceived = true
 	b.edsResp = update.eds
 
 	// A new EDS update triggers new child configs (e.g. different priorities
@@ -199,7 +199,7 @@ func (b *edsBalancer) handleWatchUpdate(update *watchUpdate) {
 // generates the addresses, because the endpoints come from the EDS resp.
 //
 // If child balancer doesn't already exist, one will be created.
-func (b *edsBalancer) updateChildConfig() error {
+func (b *clusterResolverBalancer) updateChildConfig() error {
 	// Child was build when the first EDS resp was received, so we just build
 	// the config and addresses.
 	if b.child == nil {
@@ -237,7 +237,7 @@ func (b *edsBalancer) updateChildConfig() error {
 // - If it's from xds client, it means EDS resource were removed. The EDS
 // watcher should keep watching.
 // In both cases, the sub-balancers will be receive the error.
-func (b *edsBalancer) handleErrorFromUpdate(err error, fromParent bool) {
+func (b *clusterResolverBalancer) handleErrorFromUpdate(err error, fromParent bool) {
 	b.logger.Warningf("Received error: %v", err)
 	if fromParent && xdsclient.ErrType(err) == xdsclient.ErrorTypeResourceNotFound {
 		// This is an error from the parent ClientConn (can be the parent CDS
@@ -260,7 +260,7 @@ func (b *edsBalancer) handleErrorFromUpdate(err error, fromParent bool) {
 // run is a long-running goroutine which handles all updates from gRPC and
 // xdsClient. All methods which are invoked directly by gRPC or xdsClient simply
 // push an update onto a channel which is read and acted upon right here.
-func (b *edsBalancer) run() {
+func (b *clusterResolverBalancer) run() {
 	for {
 		select {
 		case u := <-b.updateCh.Get():
@@ -302,9 +302,9 @@ func (b *edsBalancer) run() {
 // UpdateClientConnState receives the serviceConfig (which contains the
 // clusterName to watch for in CDS) and the xdsClient object from the
 // xdsResolver.
-func (b *edsBalancer) UpdateClientConnState(state balancer.ClientConnState) error {
+func (b *clusterResolverBalancer) UpdateClientConnState(state balancer.ClientConnState) error {
 	if b.closed.HasFired() {
-		b.logger.Warningf("xds: received ClientConnState {%+v} after edsBalancer was closed", state)
+		b.logger.Warningf("xds: received ClientConnState {%+v} after clusterResolverBalancer was closed", state)
 		return errBalancerClosed
 	}
 
@@ -322,25 +322,25 @@ func (b *edsBalancer) UpdateClientConnState(state balancer.ClientConnState) erro
 }
 
 // ResolverError handles errors reported by the xdsResolver.
-func (b *edsBalancer) ResolverError(err error) {
+func (b *clusterResolverBalancer) ResolverError(err error) {
 	if b.closed.HasFired() {
-		b.logger.Warningf("xds: received resolver error {%v} after edsBalancer was closed", err)
+		b.logger.Warningf("xds: received resolver error {%v} after clusterResolverBalancer was closed", err)
 		return
 	}
 	b.updateCh.Put(&ccUpdate{err: err})
 }
 
 // UpdateSubConnState handles subConn updates from gRPC.
-func (b *edsBalancer) UpdateSubConnState(sc balancer.SubConn, state balancer.SubConnState) {
+func (b *clusterResolverBalancer) UpdateSubConnState(sc balancer.SubConn, state balancer.SubConnState) {
 	if b.closed.HasFired() {
-		b.logger.Warningf("xds: received subConn update {%v, %v} after edsBalancer was closed", sc, state)
+		b.logger.Warningf("xds: received subConn update {%v, %v} after clusterResolverBalancer was closed", sc, state)
 		return
 	}
 	b.updateCh.Put(&scUpdate{subConn: sc, state: state})
 }
 
 // Close closes the cdsBalancer and the underlying child balancer.
-func (b *edsBalancer) Close() {
+func (b *clusterResolverBalancer) Close() {
 	b.closed.Fire()
 	<-b.done.Done()
 }
diff --git a/xds/internal/balancer/edsbalancer/eds_test.go b/xds/internal/balancer/clusterresolver/clusterresolver_test.go
similarity index 97%
rename from xds/internal/balancer/edsbalancer/eds_test.go
rename to xds/internal/balancer/clusterresolver/clusterresolver_test.go
index 15cc10ba89d..ea8ac4e419f 100644
--- a/xds/internal/balancer/edsbalancer/eds_test.go
+++ b/xds/internal/balancer/clusterresolver/clusterresolver_test.go
@@ -18,7 +18,7 @@
  *
  */
 
-package edsbalancer
+package clusterresolver
 
 import (
 	"bytes"
@@ -177,7 +177,7 @@ func (*fakeSubConn) UpdateAddresses([]resolver.Address) { panic("implement me")
 func (*fakeSubConn) Connect()                           { panic("implement me") }
 
 // waitForNewChildLB makes sure that a new child LB is created by the top-level
-// edsBalancer.
+// clusterResolverBalancer.
 func waitForNewChildLB(ctx context.Context, ch *testutils.Channel) (*fakeChildBalancer, error) {
 	val, err := ch.Receive(ctx)
 	if err != nil {
@@ -205,17 +205,17 @@ func setup(childLBCh *testutils.Channel) (*fakeclient.Client, func()) {
 	}
 }
 
-// TestSubConnStateChange verifies if the top-level edsBalancer passes on
+// TestSubConnStateChange verifies if the top-level clusterResolverBalancer passes on
 // the subConnState to appropriate child balancer.
 func (s) TestSubConnStateChange(t *testing.T) {
 	edsLBCh := testutils.NewChannel()
 	xdsC, cleanup := setup(edsLBCh)
 	defer cleanup()
 
-	builder := balancer.Get(edsName)
+	builder := balancer.Get(Name)
 	edsB := builder.Build(newNoopTestClientConn(), balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}})
 	if edsB == nil {
-		t.Fatalf("builder.Build(%s) failed and returned nil", edsName)
+		t.Fatalf("builder.Build(%s) failed and returned nil", Name)
 	}
 	defer edsB.Close()
 
@@ -258,10 +258,10 @@ func (s) TestErrorFromXDSClientUpdate(t *testing.T) {
 	xdsC, cleanup := setup(edsLBCh)
 	defer cleanup()
 
-	builder := balancer.Get(edsName)
+	builder := balancer.Get(Name)
 	edsB := builder.Build(newNoopTestClientConn(), balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}})
 	if edsB == nil {
-		t.Fatalf("builder.Build(%s) failed and returned nil", edsName)
+		t.Fatalf("builder.Build(%s) failed and returned nil", Name)
 	}
 	defer edsB.Close()
 
@@ -303,7 +303,7 @@ func (s) TestErrorFromXDSClientUpdate(t *testing.T) {
 		t.Fatalf("want resolver error, got %v", err)
 	}
 
-	resourceErr := xdsclient.NewErrorf(xdsclient.ErrorTypeResourceNotFound, "edsBalancer resource not found error")
+	resourceErr := xdsclient.NewErrorf(xdsclient.ErrorTypeResourceNotFound, "clusterResolverBalancer resource not found error")
 	xdsC.InvokeWatchEDSCallback(xdsclient.EndpointsUpdate{}, resourceErr)
 	// Even if error is resource not found, watch shouldn't be canceled, because
 	// this is an EDS resource removed (and xds client actually never sends this
@@ -346,10 +346,10 @@ func (s) TestErrorFromResolver(t *testing.T) {
 	xdsC, cleanup := setup(edsLBCh)
 	defer cleanup()
 
-	builder := balancer.Get(edsName)
+	builder := balancer.Get(Name)
 	edsB := builder.Build(newNoopTestClientConn(), balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}})
 	if edsB == nil {
-		t.Fatalf("builder.Build(%s) failed and returned nil", edsName)
+		t.Fatalf("builder.Build(%s) failed and returned nil", Name)
 	}
 	defer edsB.Close()
 
@@ -392,7 +392,7 @@ func (s) TestErrorFromResolver(t *testing.T) {
 		t.Fatalf("want resolver error, got %v", err)
 	}
 
-	resourceErr := xdsclient.NewErrorf(xdsclient.ErrorTypeResourceNotFound, "edsBalancer resource not found error")
+	resourceErr := xdsclient.NewErrorf(xdsclient.ErrorTypeResourceNotFound, "clusterResolverBalancer resource not found error")
 	edsB.ResolverError(resourceErr)
 	if err := xdsC.WaitForCancelEDSWatch(ctx); err != nil {
 		t.Fatalf("want watch to be canceled, waitForCancel failed: %v", err)
@@ -448,10 +448,10 @@ func (s) TestClientWatchEDS(t *testing.T) {
 	xdsC, cleanup := setup(edsLBCh)
 	defer cleanup()
 
-	builder := balancer.Get(edsName)
+	builder := balancer.Get(Name)
 	edsB := builder.Build(newNoopTestClientConn(), balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}})
 	if edsB == nil {
-		t.Fatalf("builder.Build(%s) failed and returned nil", edsName)
+		t.Fatalf("builder.Build(%s) failed and returned nil", Name)
 	}
 	defer edsB.Close()
 
diff --git a/xds/internal/balancer/edsbalancer/config.go b/xds/internal/balancer/clusterresolver/config.go
similarity index 99%
rename from xds/internal/balancer/edsbalancer/config.go
rename to xds/internal/balancer/clusterresolver/config.go
index d1583e2bf27..0741d6586ae 100644
--- a/xds/internal/balancer/edsbalancer/config.go
+++ b/xds/internal/balancer/clusterresolver/config.go
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package edsbalancer
+package clusterresolver
 
 import (
 	"encoding/json"
diff --git a/xds/internal/balancer/edsbalancer/configbuilder.go b/xds/internal/balancer/clusterresolver/configbuilder.go
similarity index 98%
rename from xds/internal/balancer/edsbalancer/configbuilder.go
rename to xds/internal/balancer/clusterresolver/configbuilder.go
index 7418a9de802..3dd3b530924 100644
--- a/xds/internal/balancer/edsbalancer/configbuilder.go
+++ b/xds/internal/balancer/clusterresolver/configbuilder.go
@@ -16,7 +16,7 @@
  *
  */
 
-package edsbalancer
+package clusterresolver
 
 import (
 	internalserviceconfig "google.golang.org/grpc/internal/serviceconfig"
diff --git a/xds/internal/balancer/edsbalancer/configbuilder_test.go b/xds/internal/balancer/clusterresolver/configbuilder_test.go
similarity index 99%
rename from xds/internal/balancer/edsbalancer/configbuilder_test.go
rename to xds/internal/balancer/clusterresolver/configbuilder_test.go
index b9e76dc1cb0..31f17fde7a7 100644
--- a/xds/internal/balancer/edsbalancer/configbuilder_test.go
+++ b/xds/internal/balancer/clusterresolver/configbuilder_test.go
@@ -16,7 +16,7 @@
  *
  */
 
-package edsbalancer
+package clusterresolver
 
 import (
 	"fmt"
diff --git a/xds/internal/balancer/edsbalancer/eds_impl_test.go b/xds/internal/balancer/clusterresolver/eds_impl_test.go
similarity index 99%
rename from xds/internal/balancer/edsbalancer/eds_impl_test.go
rename to xds/internal/balancer/clusterresolver/eds_impl_test.go
index 79d34bf8af9..fa2d26cb08c 100644
--- a/xds/internal/balancer/edsbalancer/eds_impl_test.go
+++ b/xds/internal/balancer/clusterresolver/eds_impl_test.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package edsbalancer
+package clusterresolver
 
 import (
 	"context"
@@ -62,10 +62,10 @@ func init() {
 func setupTestEDS(t *testing.T) (balancer.Balancer, *testutils.TestClientConn, *fakeclient.Client, func()) {
 	xdsC := fakeclient.NewClientWithName(testBalancerNameFooBar)
 	cc := testutils.NewTestClientConn(t)
-	builder := balancer.Get(edsName)
+	builder := balancer.Get(Name)
 	edsb := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}})
 	if edsb == nil {
-		t.Fatalf("builder.Build(%s) failed and returned nil", edsName)
+		t.Fatalf("builder.Build(%s) failed and returned nil", Name)
 	}
 	ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
 	defer cancel()
@@ -74,10 +74,12 @@ func setupTestEDS(t *testing.T) (balancer.Balancer, *testutils.TestClientConn, *
 		BalancerConfig: &EDSConfig{ClusterName: testClusterName},
 	}); err != nil {
 		edsb.Close()
+		xdsC.Close()
 		t.Fatal(err)
 	}
 	if _, err := xdsC.WaitForWatchEDS(ctx); err != nil {
 		edsb.Close()
+		xdsC.Close()
 		t.Fatalf("xdsClient.WatchEndpoints failed with error: %v", err)
 	}
 	return edsb, cc, xdsC, func() {
@@ -480,7 +482,6 @@ func (s) TestEDS_UpdateSubBalancerName(t *testing.T) {
 	}); err != nil {
 		t.Fatal(err)
 	}
-
 	// Two localities, each with one backend.
 	clab1 := testutils.NewClusterLoadAssignmentBuilder(testClusterNames[0], nil)
 	clab1.AddLocality(testSubZones[0], 1, 0, testEndpointAddrs[:1], nil)
@@ -502,7 +503,6 @@ func (s) TestEDS_UpdateSubBalancerName(t *testing.T) {
 	}); err != nil {
 		t.Fatal(err)
 	}
-
 	for i := 0; i < 2; i++ {
 		<-cc.RemoveSubConnCh
 	}
@@ -524,7 +524,6 @@ func (s) TestEDS_UpdateSubBalancerName(t *testing.T) {
 	}); err != nil {
 		t.Fatal(err)
 	}
-
 	for i := 0; i < 2; i++ {
 		scToRemove := <-cc.RemoveSubConnCh
 		if !cmp.Equal(scToRemove, sc1, cmp.AllowUnexported(testutils.TestSubConn{})) &&
@@ -549,7 +548,6 @@ func (s) TestEDS_UpdateSubBalancerName(t *testing.T) {
 	}); err != nil {
 		t.Fatal(err)
 	}
-
 	for i := 0; i < 2; i++ {
 		<-cc.RemoveSubConnCh
 	}
@@ -580,7 +578,6 @@ func (s) TestEDS_CircuitBreaking(t *testing.T) {
 	}); err != nil {
 		t.Fatal(err)
 	}
-
 	// One locality with one backend.
 	clab1 := testutils.NewClusterLoadAssignmentBuilder(testClusterNames[0], nil)
 	clab1.AddLocality(testSubZones[0], 1, 0, testEndpointAddrs[:1], nil)
@@ -641,7 +638,6 @@ func (s) TestEDS_CircuitBreaking(t *testing.T) {
 	}); err != nil {
 		t.Fatal(err)
 	}
-
 	// Picks with drops.
 	dones = []func(){}
 	p2 := <-cc.NewPickerCh
diff --git a/xds/internal/balancer/edsbalancer/eds_watcher.go b/xds/internal/balancer/clusterresolver/eds_watcher.go
similarity index 97%
rename from xds/internal/balancer/edsbalancer/eds_watcher.go
rename to xds/internal/balancer/clusterresolver/eds_watcher.go
index 447c040580f..02186702c0e 100644
--- a/xds/internal/balancer/edsbalancer/eds_watcher.go
+++ b/xds/internal/balancer/clusterresolver/eds_watcher.go
@@ -16,7 +16,7 @@
  *
  */
 
-package edsbalancer
+package clusterresolver
 
 import (
 	"google.golang.org/grpc/xds/internal/xdsclient"
@@ -34,7 +34,7 @@ type watchUpdate struct {
 // edsWatcher takes an EDS balancer config, and use the xds_client to watch EDS
 // updates. The EDS updates are passed back to the balancer via a channel.
 type edsWatcher struct {
-	parent *edsBalancer
+	parent *clusterResolverBalancer
 
 	updateChannel chan *watchUpdate
 
diff --git a/xds/internal/balancer/edsbalancer/logging.go b/xds/internal/balancer/clusterresolver/logging.go
similarity index 84%
rename from xds/internal/balancer/edsbalancer/logging.go
rename to xds/internal/balancer/clusterresolver/logging.go
index be4d0a512d1..728f1f709c2 100644
--- a/xds/internal/balancer/edsbalancer/logging.go
+++ b/xds/internal/balancer/clusterresolver/logging.go
@@ -16,7 +16,7 @@
  *
  */
 
-package edsbalancer
+package clusterresolver
 
 import (
 	"fmt"
@@ -25,10 +25,10 @@ import (
 	internalgrpclog "google.golang.org/grpc/internal/grpclog"
 )
 
-const prefix = "[eds-lb %p] "
+const prefix = "[xds-cluster-resolver-lb %p] "
 
 var logger = grpclog.Component("xds")
 
-func prefixLogger(p *edsBalancer) *internalgrpclog.PrefixLogger {
+func prefixLogger(p *clusterResolverBalancer) *internalgrpclog.PrefixLogger {
 	return internalgrpclog.NewPrefixLogger(logger, fmt.Sprintf(prefix, p))
 }
diff --git a/xds/internal/balancer/edsbalancer/eds_impl_priority_test.go b/xds/internal/balancer/clusterresolver/priority_test.go
similarity index 99%
rename from xds/internal/balancer/edsbalancer/eds_impl_priority_test.go
rename to xds/internal/balancer/clusterresolver/priority_test.go
index 5674411159b..c7c648a2c0f 100644
--- a/xds/internal/balancer/edsbalancer/eds_impl_priority_test.go
+++ b/xds/internal/balancer/clusterresolver/priority_test.go
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-package edsbalancer
+package clusterresolver
 
 import (
 	"context"
diff --git a/xds/internal/balancer/edsbalancer/eds_testutil_test.go b/xds/internal/balancer/clusterresolver/testutil_test.go
similarity index 99%
rename from xds/internal/balancer/edsbalancer/eds_testutil_test.go
rename to xds/internal/balancer/clusterresolver/testutil_test.go
index c8be545d8b5..0025846c07c 100644
--- a/xds/internal/balancer/edsbalancer/eds_testutil_test.go
+++ b/xds/internal/balancer/clusterresolver/testutil_test.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package edsbalancer
+package clusterresolver
 
 import (
 	"fmt"