SUPPORT node: Compare node info during initial bootstrap properly #693

fyrchik · 2023-09-15T14:30:30Z

fyrchik commented

2023-09-15 14:30:30 +00:00

Close #691

Checked on dev-env

2023-09-15T14:23:03.476Z        info    frostfs-node/netmap.go:231      the node is already in candidate list with online state, skip initial bootstrap

Close #691 Checked on dev-env ``` 2023-09-15T14:23:03.476Z info frostfs-node/netmap.go:231 the node is already in candidate list with online state, skip initial bootstrap ```

fyrchik force-pushed fix-bootstrap from a60420886d to 31c065546e

2023-09-15 14:31:33 +00:00

Compare

fyrchik requested review from storage-core-committers 2023-09-15 14:31:53 +00:00

fyrchik requested review from storage-core-developers 2023-09-15 14:31:57 +00:00

aarifullin reviewed 2023-09-15 15:49:08 +00:00

cmd/frostfs-node/netmap.go

													
				@ -290,0 +329,4 @@

						return false

					})

					if len(esA) != len(esB) {

aarifullin commented

2023-09-15 15:49:08 +00:00

What about return slices.Equal?

What about `return slices.Equal`?

fyrchik commented

2023-09-15 15:53:16 +00:00

Poster

Is it present in go1.20?

aarifullin commented

2023-09-15 15:57:28 +00:00

I think it is presented since go1.17 as generics (or 18?) appeared. If it is not, let's keep like that

fyrchik commented

2023-09-15 16:06:32 +00:00

Poster

It was moved to stdlib in 1.21 https://tip.golang.org/doc/go1.21#slices, previously was in /x/exp

aarifullin commented

2023-09-15 16:07:36 +00:00

Ah, ok then

fyrchik marked this conversation as resolved

aarifullin approved these changes 2023-09-15 15:55:26 +00:00

acid-ant approved these changes 2023-09-17 07:34:12 +00:00

cmd/frostfs-node/netmap.go

													
				@ -290,0 +305,4 @@

						}

						count++

					})

					return allMatched && count == len(asA)

acid-ant commented

2023-09-17 07:31:56 +00:00

Should we take into account locode attributes in asA?

Should we take into account `locode` attributes in `asA`?

dstepanov-yadro commented

2023-09-18 07:06:31 +00:00

As I understand it, locode attributes are added from the locode database, so they are not in the local config.

As I understand it, `locode` attributes are added from the locode database, so they are not in the local config.

dstepanov-yadro approved these changes 2023-09-18 07:05:31 +00:00

cmd/frostfs-node/netmap.go

													
				@ -287,3 +285,1 @@

					rawA := a.Marshal()

					rawB := b.Marshal()

					return bytes.Equal(rawA, rawB)

				func needsUpdate(local, remote *netmapSDK.NodeInfo) bool {