From 59a3e7d4f496bec0bd2ff5c31e479a1063d8d062 Mon Sep 17 00:00:00 2001 From: Asim Aslam Date: Thu, 10 Oct 2019 19:16:31 +0100 Subject: [PATCH] Use etcd serializable option --- registry/etcd/etcd.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/registry/etcd/etcd.go b/registry/etcd/etcd.go index 9f01de8d..ed4fec1c 100644 --- a/registry/etcd/etcd.go +++ b/registry/etcd/etcd.go @@ -8,6 +8,7 @@ import ( "errors" "net" "path" + "sort" "strings" "sync" "time" @@ -20,7 +21,7 @@ import ( ) var ( - prefix = "/micro/registry" + prefix = "/micro/registry/" ) type etcdRegistry struct { @@ -148,7 +149,7 @@ func (e *etcdRegistry) registerNode(s *registry.Service, node *registry.Node, op defer cancel() // look for the existing key - rsp, err := e.client.Get(ctx, nodePath(s.Name, node.Id)) + rsp, err := e.client.Get(ctx, nodePath(s.Name, node.Id), clientv3.WithSerializable()) if err != nil { return err } @@ -310,7 +311,7 @@ func (e *etcdRegistry) GetService(name string) ([]*registry.Service, error) { ctx, cancel := context.WithTimeout(context.Background(), e.options.Timeout) defer cancel() - rsp, err := e.client.Get(ctx, servicePath(name)+"/", clientv3.WithPrefix(), clientv3.WithSort(clientv3.SortByKey, clientv3.SortDescend)) + rsp, err := e.client.Get(ctx, servicePath(name)+"/", clientv3.WithPrefix(), clientv3.WithSerializable()) if err != nil { return nil, err } @@ -344,6 +345,7 @@ func (e *etcdRegistry) GetService(name string) ([]*registry.Service, error) { for _, service := range serviceMap { services = append(services, service) } + return services, nil } @@ -354,7 +356,7 @@ func (e *etcdRegistry) ListServices() ([]*registry.Service, error) { ctx, cancel := context.WithTimeout(context.Background(), e.options.Timeout) defer cancel() - rsp, err := e.client.Get(ctx, prefix, clientv3.WithPrefix(), clientv3.WithSort(clientv3.SortByKey, clientv3.SortDescend)) + rsp, err := e.client.Get(ctx, prefix, clientv3.WithPrefix(), clientv3.WithSerializable()) if err != nil { return nil, err } @@ -381,6 +383,9 @@ func (e *etcdRegistry) ListServices() ([]*registry.Service, error) { services = append(services, service) } + // sort the services + sort.Slice(services, func(i, j int) bool { return services[i].Name < services[j].Name }) + return services, nil }