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

Merge branch 'master' into ca-snapshot-fix

This commit is contained in:
Kyle Havlovitz 2018-08-16 13:00:54 -07:00 committed by GitHub
parent af4b037c52 c48e18df23
commit 26a21df014
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -4,6 +4,7 @@ BUG FIXES:
* catalog: Allow renaming nodes with IDs. [[GH-3974](https://github.com/hashicorp/consul/issues/3974)],[[GH-4413](https://github.com/hashicorp/consul/issues/4413)],[[GH-4415](https://github.com/hashicorp/consul/pull/4415)] * catalog: Allow renaming nodes with IDs. [[GH-3974](https://github.com/hashicorp/consul/issues/3974)],[[GH-4413](https://github.com/hashicorp/consul/issues/4413)],[[GH-4415](https://github.com/hashicorp/consul/pull/4415)]
* server: Fixed a memory leak in blocking queries against /event/list. [[GH-4482](https://github.com/hashicorp/consul/issues/4482)] * server: Fixed a memory leak in blocking queries against /event/list. [[GH-4482](https://github.com/hashicorp/consul/issues/4482)]
* snapshot: Fixed a bug where node metadata wasn't being included in or restored from the snapshots. [[GH-4524](https://github.com/hashicorp/consul/issues/4524)]
## 1.2.2 (July 30, 2018) ## 1.2.2 (July 30, 2018)

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

@ -79,6 +79,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"}})
// Add a service instance with Connect config. // Add a service instance with Connect config.
connectConf := structs.ServiceConnect{ connectConf := structs.ServiceConnect{
@ -198,6 +198,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])