Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-3.5] etcdserver: add cluster id check for hashKVHandler #16637

Merged
merged 2 commits into from
Oct 17, 2023

Conversation

serathius
Copy link
Member

@serathius serathius commented Sep 25, 2023

Backport of #15924 to release-3.5

Signed-off-by: caojiamingalan <alan.c.19971111@gmail.com>
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
@serathius serathius force-pushed the check-cluster-id-release-3.5 branch 2 times, most recently from b3ecb90 to 277570f Compare October 17, 2023 12:20
…eady notification infinitely on startup"

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
Copy link
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Member

@ahrtr ahrtr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with a minor comment.

@@ -12,11 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build !cluster_proxy
// +build !cluster_proxy
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no such build tag in #15924.

Copy link
Member Author

@serathius serathius Oct 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Build tag change comes from 5b8150a commit, which also backports the test fix needed after #16677 changed the test.

@serathius serathius merged commit 31b7c58 into etcd-io:release-3.5 Oct 17, 2023
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants