Removed routers UUID (#59)

README.md

@@ -39,7 +39,6 @@ clusters:
     routers:
       - name: 'my_cluster_router_1'
         addr: 'localhost:3301'
-        uuid: 'my_cluster_router_1'
 ```
 
 You might override default connection settings for each cluster.
@@ -56,7 +55,6 @@ clusters:
     routers:
       - name: 'my_cluster_router_1'
         addr: 'localhost:3301'
-        uuid: 'my_cluster_router_1'
 ```
 
 For a sample vshard configuration, 

example/qumomf.yml

@@ -49,5 +49,4 @@ clusters:
 
     routers:
       - name: 'router_1'
-        uuid: 'router_1_uuid'
-        addr: '127.0.0.1:9301'
+        addr: '127.0.0.1:9301'

internal/config/config.go

@@ -114,7 +114,6 @@ type ClusterConfig struct {
 type RouterConfig struct {
 	Name string `yaml:"name"`
 	Addr string `yaml:"addr"`
-	UUID string `yaml:"uuid"`
 }
 
 func Setup(path string) (*Config, error) {

internal/config/config_test.go

@@ -77,12 +77,10 @@ func TestSetup_ValidPath(t *testing.T) {
 				{
 					Name: "sandbox1-router1",
 					Addr: "127.0.0.1:9301",
-					UUID: "a94e7310-13f0-4690-b136-169599e87ba0",
 				},
 				{
 					Name: "sandbox1-router2",
 					Addr: "127.0.0.1:9302",
-					UUID: "a3ef657e-eb9a-4730-b420-7ea78d52797d",
 				},
 			},
 		},
@@ -104,7 +102,6 @@ func TestSetup_ValidPath(t *testing.T) {
 				{
 					Name: "sandbox2-router1",
 					Addr: "127.0.0.1:7301",
-					UUID: "38dbe90b-9bca-4766-a98c-f02e56ddf986",
 				},
 			},
 		},

internal/vshard/cluster.go

@@ -122,8 +122,7 @@ func NewCluster(name string, cfg config.ClusterConfig) *Cluster {
 	routers := make([]Router, 0, len(cfg.Routers))
 	for _, r := range cfg.Routers {
 		uri := r.Addr
-		uuid := RouterUUID(r.UUID)
-		routers = append(routers, NewRouter(uri, uuid))
+		routers = append(routers, NewRouter(uri))
 	}
 	c.snapshot.Routers = routers
 
@@ -281,7 +280,7 @@ func (c *Cluster) Discover() {
 		c.logger.Error().Msg("There is no router in the cluster to discover its topology")
 		return
 	}
-	c.logger.Debug().Str("uuid", string(router.UUID)).Str("uri", router.URI).Msgf("Picked up the router in the cluster to discover its topology")
+	c.logger.Debug().Str("uri", router.URI).Msgf("Picked up the router in the cluster to discover its topology")
 
 	// Read the topology configuration from the selected router.
 	conn := c.Connector(router.URI)
@@ -291,7 +290,6 @@ func (c *Cluster) Discover() {
 		c.logger.
 			Err(resp.Error).
 			Str("URI", router.URI).
-			Str("UUID", string(router.UUID)).
 			Msgf("Failed to discover the topology of the cluster. Error code: %d", resp.ErrorCode)
 		return
 	}
@@ -301,7 +299,6 @@ func (c *Cluster) Discover() {
 		metrics.RecordDiscoveryError(router.URI)
 		c.logger.Err(err).
 			Str("URI", router.URI).
-			Str("UUID", string(router.UUID)).
 			Msg("Failed to discover the topology of the cluster using router")
 		return
 	}
@@ -359,7 +356,7 @@ func (c *Cluster) Discover() {
 	}
 	for i := range ns.Routers {
 		r := &ns.Routers[i]
-		if r.UUID == router.UUID {
+		if r.URI == router.URI {
 			r.Info = updatedRI
 			break
 		}

internal/vshard/cluster_test.go

@@ -40,7 +40,6 @@ func TestCluster_Discover(t *testing.T) {
 	routers := c.Routers()
 	require.Len(t, routers, 1)
 	r := routers[0]
-	assert.Equal(t, RouterUUID("router_uuid_1"), r.UUID)
 	assert.Equal(t, "127.0.0.1:9301", r.URI)
 
 	sets := c.ReplicaSets()

internal/vshard/mock.go

@@ -31,7 +31,6 @@ func MockCluster() *Cluster {
 			{
 				Name: "router_1",
 				Addr: "127.0.0.1:9301",
-				UUID: "router_uuid_1",
 			},
 		},
 	})

internal/vshard/orchestrator/failover.go

@@ -273,12 +273,10 @@ func (f *failover) promoteFollowerToMaster(ctx context.Context, analysis *Replic
 		if resp.Error == nil {
 			logger.Info().
 				Str("URI", r.URI).
-				Str("UUID", string(r.UUID)).
 				Msg("Configuration was updated on router")
 		} else {
 			logger.Err(resp.Error).
 				Str("URI", r.URI).
-				Str("UUID", string(r.UUID)).
 				Msg("Failed to update configuration on router")
 		}
 	}

internal/vshard/router.go

@@ -1,6 +1,5 @@
 package vshard
 
-type RouterUUID string
 type InstanceStatus string
 
 const (
@@ -11,14 +10,12 @@ const (
 
 type Router struct {
 	URI  string     `json:"uri"`
-	UUID RouterUUID `json:"uuid"`
 	Info RouterInfo `json:"info"`
 }
 
-func NewRouter(uri string, uuid RouterUUID) Router {
+func NewRouter(uri string) Router {
 	return Router{
-		URI:  uri,
-		UUID: uuid,
+		URI: uri,
 		Info: RouterInfo{
 			Status: -1,
 		},