luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Revert PR 4294 - Catalog Register: Generate UUID for services registered without one 

UUID auto-generation here causes trouble in a few cases. The biggest being older
nodes reregistering will fail when the UUIDs are different and the names match

This reverts commit 0f700340828f464449c2e0d5a82db0bc5456d385.
This reverts commit d1a8f9cb3f6f48dd9c8d0bc858031ff6ccff51d0.
This reverts commit cf69ec42a418ab6594a6654e9545e12160f30970.
This commit is contained in:
Matt Keeler 2018-07-12 10:05:20 -04:00
parent a3c92217e2
commit d63c5807cf
3 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
agent/consul/catalog_endpoint.go
View File

@ -37,13 +37,6 @@ func (c *Catalog) Register(args *structs.RegisterRequest, reply *struct{}) error
if _, err := uuid.ParseUUID(string(args.ID)); err != nil { if _, err := uuid.ParseUUID(string(args.ID)); err != nil {
return fmt.Errorf("Bad node ID: %v", err) return fmt.Errorf("Bad node ID: %v", err)
} }
} else {
id, err := uuid.GenerateUUID()
if err != nil {
return fmt.Errorf("Failed to generate ID: %v", err)
}
args.ID = types.NodeID(id)
} }
// Fetch the ACL token, if any. // Fetch the ACL token, if any.

31
agent/consul/catalog_endpoint_test.go
View File

@ -50,37 +50,6 @@ func TestCatalog_Register(t *testing.T) {
} }
} }
func TestCatalog_RegisterNoID(t *testing.T) {
t.Parallel()
dir1, s1 := testServer(t)
defer os.RemoveAll(dir1)
defer s1.Shutdown()
codec := rpcClient(t, s1)
defer codec.Close()
arg := structs.RegisterRequest{
Datacenter: "dc1",
Node: "foo",
Address: "127.0.0.1",
Service: &structs.NodeService{
Service: "db",
Tags: []string{"master"},
Port: 8000,
},
}
var out struct{}
require.NoError(t, msgpackrpc.CallWithCodec(codec, "Catalog.Register", &arg, &out))
var ns structs.IndexedNodeServices
nodeArgs := structs.NodeSpecificRequest{
Datacenter: "dc1",
Node: "foo",
}
require.NoError(t, msgpackrpc.CallWithCodec(codec, "Catalog.NodeServices", &nodeArgs, &ns))
require.NotEqual(t, types.NodeID(""), ns.NodeServices.Node.ID)
}
func TestCatalog_RegisterService_InvalidAddress(t *testing.T) { func TestCatalog_RegisterService_InvalidAddress(t *testing.T) {
t.Parallel() t.Parallel()
dir1, s1 := testServer(t) dir1, s1 := testServer(t)