fix latest issue

registry/etcdv3/listener_test.go

@@ -41,6 +41,8 @@ type RegistryTestSuite struct {
 	etcd *embed.Etcd
 }
 
+const defaultEtcdV3WorkDir = "/tmp/default-dubbo-go-registry.etcd"
+
 // start etcd server
 func (suite *RegistryTestSuite) SetupSuite() {
 
@@ -48,7 +50,7 @@ func (suite *RegistryTestSuite) SetupSuite() {
 
 	cfg := embed.NewConfig()
 	// avoid conflict with default etcd work-dir
-	cfg.Dir = "/tmp/default-dubbo-go-registry.etcd"
+	cfg.Dir = defaultEtcdV3WorkDir
 	e, err := embed.StartEtcd(cfg)
 	if err != nil {
 		t.Fatal(err)
@@ -69,7 +71,7 @@ func (suite *RegistryTestSuite) SetupSuite() {
 func (suite *RegistryTestSuite) TearDownSuite() {
 	suite.etcd.Close()
 	// clean the etcd workdir
-	if err := exec.Command("rm", "-rf", "/tmp/default-dubbo-go-registry.etcd").Run(); err != nil {
+	if err := exec.Command("rm", "-rf", defaultEtcdV3WorkDir).Run(); err != nil {
 		suite.FailNow(err.Error())
 	}
 }

registry/kubernetes/registry.go

@@ -222,10 +222,12 @@ func (r *kubernetesRegistry) registerConsumer(svc common.URL) error {
 		logger.Errorf("kubernetes client create path %s: %v", consumersNode, err)
 		return perrors.WithMessage(err, "kubernetes create consumer nodes")
 	}
-	providersNode := fmt.Sprintf("/dubbo/%s/%s", svc.Service(), common.DubboNodes[common.PROVIDER])
-	if err := r.createDirIfNotExist(providersNode); err != nil {
-		return perrors.WithMessage(err, "create provider node")
-	}
+
+	// NOTICE kubernetes && etcdv3 not need create provider metadata dir in consumer logic
+	//providersNode := fmt.Sprintf("/dubbo/%s/%s", svc.Service(), common.DubboNodes[common.PROVIDER])
+	//if err := r.createDirIfNotExist(providersNode); err != nil {
+	//	return perrors.WithMessage(err, "create provider node")
+	//}
 
 	params := url.Values{}
 

remoting/etcdv3/client_test.go

@@ -37,6 +37,8 @@ import (
 	"google.golang.org/grpc/connectivity"
 )
 
+const defaultEtcdV3WorkDir = "/tmp/default-dubbo-go-remote.etcd"
+
 // tests dataset
 var tests = []struct {
 	input struct {
@@ -92,7 +94,7 @@ func (suite *ClientTestSuite) SetupSuite() {
 	cfg := embed.NewConfig()
 	cfg.LPUrls = []url.URL{*lpurl}
 	cfg.LCUrls = []url.URL{*lcurl}
-	cfg.Dir = "/tmp/default-dubbo-go-remote.etcd"
+	cfg.Dir = defaultEtcdV3WorkDir
 	e, err := embed.StartEtcd(cfg)
 	if err != nil {
 		t.Fatal(err)
@@ -112,7 +114,7 @@ func (suite *ClientTestSuite) SetupSuite() {
 // stop etcd server
 func (suite *ClientTestSuite) TearDownSuite() {
 	suite.etcd.Close()
-	if err := exec.Command("rm", "-rf", "/tmp/default-dubbo-go-remote.etcd").Run(); err != nil {
+	if err := exec.Command("rm", "-rf", defaultEtcdV3WorkDir).Run(); err != nil {
 		suite.FailNow(err.Error())
 	}
 }

remoting/kubernetes/client.go

@@ -216,8 +216,6 @@ func (c *Client) initStore() error {
 // try to watch kubernetes pods
 func (c *Client) maintenanceStatus() error {
 
-	c.wg.Add(1)
-
 	// try once
 	watcher, err := c.rawClient.CoreV1().Pods(c.ns).Watch(metav1.ListOptions{
 		LabelSelector: fields.OneTermEqualSelector(DubboIOLabelKey, DubboIOLabelValue).String(),
@@ -229,6 +227,7 @@ func (c *Client) maintenanceStatus() error {
 
 	watcher.Stop()
 
+	c.wg.Add(1)
 	// add wg, grace close the client
 	go c.maintenanceStatusLoop()
 	return nil