Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,851 Commits 15 Branches 491 Tags 148 MiB
Commit Graph

15851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Wang
c2c9e7de01
Merge pull request #14075 from lavacat/release-3.4-go1.15.15-tests 
tests: fixing dependencies that brake tests in go.1.15.15
 2022-05-31 05:52:21 +08:00
Bogdan Kanivets
ceed023f7c tests: fixing dependencies that brake tests in go.1.15.15 
- retry_interceptor_test causes:
clientv3/naming/grpc.go:25:2: module google.golang.org/grpc@latest found (v1.46.0),
but does not contain package google.golang.org/grpc/naming
https://github.com/etcd-io/etcd/issues/12124
 2022-05-30 12:08:47 -07:00
Benjamin Wang
5505d7a95b
Merge pull request #13206 from cfz/cherry-pick-#13172-r34 
[backport 3.4]: server/auth: enable tokenProvider if recoved store enables auth
 2022-05-07 06:59:33 +08:00
Piotr Tabor
76147c9c79
Merge pull request #13999 from mitake/backport-13308-to-3.4 
Backport PR 13308 to release 3.4
 2022-05-06 13:03:05 +02:00
cfz
23e79dbf19
[backport 3.4]: server/auth: enable tokenProvider if recoved store enables auth 
this is a manual backport of #13172
 2022-05-06 12:26:55 +08:00
Hitoshi Mitake
757a8e8f5b *: implement a retry logic for auth old revision in the client 2022-04-29 23:46:24 +09:00
Ashish Ranjan
9bbdeb4a64 client/v3: refresh the token when ErrUserEmpty is received while retrying 
To fix a bug in the retry logic caused when the auth token is cleared after receiving `ErrInvalidAuthToken` from the server and the subsequent call to `getToken` also fails due to some reason (eg. context deadline exceeded).
This leaves the client without a token and the retry will continue to fail with `ErrUserEmpty` unless the token is refreshed.
 2022-04-29 23:43:36 +09:00
Marek Siarkowicz
c50b7260cc
Merge pull request #13713 from lavacat/defrag-bopts-fix-3.4 
mvcc/backend: restore original bolt db options after defrag
 2022-02-18 10:54:21 +01:00
Bogdan Kanivets
d30a4fbf0c mvcc/backend: restore original bolt db options after defrag 
Problem: Defrag was implemented before custom bolt options were added.
Currently defrag doesn't restore backend options.
For example BackendFreelistType will be unset after defrag.

Solution: save bolt db options and use them in defrag.
 2022-02-17 15:33:05 -08:00
richkun
a905430d27
embed: only log stream error with debug level (#13656) 
Co-authored-by: tangcong <tangcong506@gmail.com>
 2022-01-30 12:24:22 -08:00
Sam Batschelet
161bf7e7be
Merge pull request #13475 from chaochn47/backport-release-3.4 
backport 3.4 from #13467 exclude the same alarm type activated by multiple peers
 2021-11-13 22:10:38 -05:00
Chao Chen
04d47a93f9 backport from #13467 exclude the same alarm type activated by multiple peers 2021-11-12 14:17:14 -08:00
Sam Batschelet
72d3e382e7 version: 3.4.18 
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
v3.4.18 		2021-10-15 09:47:08 -04:00
Piotr Tabor
eb9cee9ee3
Merge pull request #13397 from geetasg/release-3.4 
storage/backend: Add a gauge to indicate if defrag is active (backport)
 2021-10-07 19:08:31 +02:00
Geeta Gharpure
85abf6e46d storage/backend: Add a gauge to indicate if defrag is active (backport from 3.6) 2021-10-06 11:04:47 -07:00
Piotr Tabor
1eac258f58
Merge pull request #13385 from hexfusion/cp-13376-release-3.4 
[release-3.4] Dockerfile: bump debian bullseye-20210927
 2021-10-04 08:40:32 +02:00
Sam Batschelet
91da298560 Dockerfile: bump debian bullseye-20210927 
fixes: CVE-2021-3711, CVE-2021-35942, CVE-2019-9893

Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
 2021-10-04 00:32:23 -04:00
Sam Batschelet
19e2e70e4f version: 3.4.17 
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
v3.4.17 		2021-10-03 22:30:27 -04:00
Sam Batschelet
8ea187e2cf
Merge pull request #13378 from ysksuzuki/replace-jwt-go 
Replace github.com/dgrijalva/jwt-go with github.com/golang-jwt/jwt
 2021-10-03 21:48:32 -04:00
Yusuke Suzuki
e63d058247 test: update go to 1.15.15 
Update go to 1.15.15 which is the latest of 1.15 because linux-amd64-fmt fails with go 1.15.13.

Signed-off-by: Yusuke Suzuki <yusuke-suzuki@cybozu.co.jp>
 2021-10-02 10:04:22 +09:00
Yusuke Suzuki
1558ede7f8 go.mod,go.sum: Replace github.com/dgrijalva/jwt-go with github.com/golang-jwt/jwt 
github.com/dgrijalva/jwt-go has CVE https://github.com/advisories/GHSA-w73w-5m7g-f7qc
and is already archived. etcd v3.4 should use a community maintained fork
github.com/golang-jwt/jwt which provides the fixed version of the CVE.

Signed-off-by: Yusuke Suzuki <yusuke-suzuki@cybozu.co.jp>
 2021-10-02 10:01:52 +09:00
Sam Batschelet
41061e56ad
Merge pull request #13139 from hexfusion/bp-12727 
[release-3.4]: ClientV3: Ordering: Fix TestEndpointSwitchResolvesViolation test
 2021-06-24 10:38:10 -04:00
Sam Batschelet
501d8f01ea [release-3.4]: ClientV3: Ordering: Fix TestEndpointSwitchResolvesViolation test 
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
 2021-06-23 21:26:55 -04:00
Sam Batschelet
38669a0709
Merge pull request #13137 from hexfusion/track-modules 
vendor: track vendor/modules.txt
 2021-06-23 14:52:10 -04:00
Sam Batschelet
7489911d51
Merge pull request #13135 from serathius/actions-3.4 
Migrate PR testing from travis to GitHub actions
 2021-06-23 14:03:37 -04:00
Sam Batschelet
15b7954d03 vendor: track vendor/modules.txt 
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
 2021-06-23 13:56:39 -04:00
Marek Siarkowicz
6cc1345a0b Migrate PR testing from travis to GitHub actions 2021-06-23 18:25:29 +02:00
Sam Batschelet
589a6993b8
Merge pull request #13101 from mrueg/backport-12864 
[backport 3.4]  fix check datascale command for https endpoints
 2021-06-14 08:19:22 -04:00
Saeid Bostandoust
4bacd21e20 fix check datascale command for https endpoints 2021-06-11 11:58:20 +02:00
Sam Batschelet
0ecc337028
Merge pull request #13100 from tangcong/automated-cherry-pick-of-#13077-origin-release-3.4 
[backport 3.4] embed: unlimit the recv msg size of grpc-gateway
 2021-06-10 21:29:34 -04:00
spacewander
628fa1818e embed: unlimit the recv msg size of grpc-gateway 
Ensure the client which access etcd via grpc-gateway won't
be limited by the MaxCallRecvMsgSize. Here we choose the same
default value of etcdcli as grpc-gateway's MaxCallRecvMsgSize.

Fix https://github.com/etcd-io/etcd/issues/12576
 2021-06-11 08:07:28 +08:00
Gyuho Lee
d19fbe541b version: 3.4.16 
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
v3.4.16 		2021-05-12 01:52:43 +00:00
Piotr Tabor
6bbc85827b
Merge pull request #12917 from chaochn47/2021-05-03-backport-#12880 
Backport-3.4 exclude alarms from health check conditionally
 2021-05-06 10:21:09 +02:00
Chao Chen
dbde4f2d5e Backport-3.4 exclude alarms from health check conditionally 2021-05-04 10:37:12 -07:00
Gyuho Lee
15715dcf1a
Merge pull request #12902 from MakDon/release-3.4 
[Backport-3.4] etcdserver/mvcc: update trace.Step condition
 2021-04-28 11:05:35 -07:00
makdon
963d3b9369 etcdserver/mvcc: update trace.Step condition 
backport PR #12894 to release-3.4
 2021-04-28 11:35:49 +08:00
Piotr Tabor
ba829044f5
Merge pull request #12888 from chaochn47/2021-04-22-cherry-pick-12871 
Backport-3.4 etcdserver/util.go: reduce memory when logging range requests
 2021-04-23 00:45:20 +02:00
Chao Chen
c4eb81af99 Backport-3.4 etcdserver/util.go: reduce memory when logging range requests 2021-04-22 15:07:44 -07:00
Piotr Tabor
ceafa1b33e
Merge pull request #12882 from lilic/bump-go-12 
.travis,Makefile,functional: Bump go 1.12 version to v1.12.17
 2021-04-20 23:33:23 +02:00
Lili Cosic
5890bc8bd6 .travis,Makefile,functional: Bump go 1.12 version to v1.12.17 
This version was already used to build the release v3.4.15.
 2021-04-20 14:00:44 +02:00
Piotr Tabor
c274aa5ea4
Merge pull request #12849 from lilic/test-go-1-15 
[release-3.4]: .travis.yml: Test with go v1.15.11
 2021-04-19 18:17:05 +02:00
Piotr Tabor
276ee962ec integration: Fix 'go test --tags cluster_proxy --timeout=30m -v ./integration/...' 
grpc proxy opens additional 2 watching channels. The metric is shared
between etcd-server & grpc_proxy, so all assertions on number of open
watch channels need to take in consideration the additional "2"
channels.
 2021-04-19 16:41:28 +02:00
Lili Cosic
8d1b8335e3 pkg/tlsutil: Adjust cipher suites for go 1.12 
Cherry-pick of 60e44286fa3c0c0 from master branch does not work due to
missing `tls.CipherSuites()` function. We work around by using go build
tags for both the building and tests.
 2021-04-19 11:49:13 +02:00
Piotr Tabor
c3f447a698 Fix pkg/tlsutil (test) to not fail on 386. 
In fact this commit rewrites the functionality to use upstream list of
ciphers instead of checking whether the lists are in sync using ast
analysis.
 2021-04-19 11:49:13 +02:00
Lili Cosic
85e037d9c6 bill-of-materials.json: Update golang.org/x/sys 2021-04-19 11:49:13 +02:00
Lili Cosic
a1691be1bd .travis,test: Turn race off in Travis for go version 1.15 
Currently with race it fails, we can enable this at a later point.
 2021-04-19 11:49:13 +02:00
Vimal K
df35086b6a integration : fix TestTLSClientCipherSuitesMismatch in go1.13 
In go1.13, the TLS13 is enablled by default, and as per go1.13 release notes :
TLS 1.3 cipher suites are not configurable. All supported cipher suites are safe,
and if PreferServerCipherSuites is set in Config the preference order is based
on the available hardware.

Fixing the test case for go1.13 by limiting the TLS version to TLS12
 2021-04-19 11:18:14 +02:00
Lili Cosic
eeefd614c8 vendor: Run go mod vendor 2021-04-19 11:18:14 +02:00
Lili Cosic
4276c33026 go.mod,go.sum: Bump github.com/creack/pty that includes patch 
This patch is needed due to go 1.15 erroring on:

"Setctty set but Ctty not valid in child".
 2021-04-19 11:18:13 +02:00
Lili Cosic
cfc08e5f06 go.mod,go.sum: Comply with go v1.15 2021-04-19 11:18:13 +02:00