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

Added code to allow snapshot inclusion of NodeMeta (#4527)

This commit is contained in:
nickmy9729 2018-08-16 15:33:35 -04:00 committed by Matt Keeler
parent 2f4f2f28da
commit 43a68822e3
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
agent/consul/fsm/snapshot_oss.go
View File

@ -75,6 +75,7 @@ func (s *snapshot) persistNodes(sink raft.SnapshotSink,
Node: n.Node, Node: n.Node,
Address: n.Address, Address: n.Address,
TaggedAddresses: n.TaggedAddresses, TaggedAddresses: n.TaggedAddresses,
NodeMeta: n.Meta,
} }
// Register the node itself // Register the node itself

4
agent/consul/fsm/snapshot_oss_test.go
View File

@ -28,7 +28,7 @@ func TestFSM_SnapshotRestore_OSS(t *testing.T) {
// Add some state // Add some state
fsm.state.EnsureNode(1, &structs.Node{Node: "foo", Address: "127.0.0.1"}) fsm.state.EnsureNode(1, &structs.Node{Node: "foo", Address: "127.0.0.1"})
fsm.state.EnsureNode(2, &structs.Node{Node: "baz", Address: "127.0.0.2", TaggedAddresses: map[string]string{"hello": "1.2.3.4"}}) fsm.state.EnsureNode(2, &structs.Node{Node: "baz", Address: "127.0.0.2", TaggedAddresses: map[string]string{"hello": "1.2.3.4"}, Meta: map[string]string{"testMeta": "testing123"}})
fsm.state.EnsureService(3, "foo", &structs.NodeService{ID: "web", Service: "web", Tags: nil, Address: "127.0.0.1", Port: 80}) fsm.state.EnsureService(3, "foo", &structs.NodeService{ID: "web", Service: "web", Tags: nil, Address: "127.0.0.1", Port: 80})
fsm.state.EnsureService(4, "foo", &structs.NodeService{ID: "db", Service: "db", Tags: []string{"primary"}, Address: "127.0.0.1", Port: 5000}) fsm.state.EnsureService(4, "foo", &structs.NodeService{ID: "db", Service: "db", Tags: []string{"primary"}, Address: "127.0.0.1", Port: 5000})
fsm.state.EnsureService(5, "baz", &structs.NodeService{ID: "web", Service: "web", Tags: nil, Address: "127.0.0.2", Port: 80}) fsm.state.EnsureService(5, "baz", &structs.NodeService{ID: "web", Service: "web", Tags: nil, Address: "127.0.0.2", Port: 80})
@ -166,6 +166,8 @@ func TestFSM_SnapshotRestore_OSS(t *testing.T) {
} }
if nodes[0].Node != "baz" || if nodes[0].Node != "baz" ||
nodes[0].Address != "127.0.0.2" || nodes[0].Address != "127.0.0.2" ||
len(nodes[0].Meta) != 1 ||
nodes[0].Meta["testMeta"] != "testing123" ||
len(nodes[0].TaggedAddresses) != 1 || len(nodes[0].TaggedAddresses) != 1 ||
nodes[0].TaggedAddresses["hello"] != "1.2.3.4" { nodes[0].TaggedAddresses["hello"] != "1.2.3.4" {
t.Fatalf("bad: %v", nodes[0]) t.Fatalf("bad: %v", nodes[0])