17246 Commits

Author SHA1 Message Date
Piotr Tabor
73080a7166
Merge pull request #13501 from ahrtr/reset_ci_after_reload_db_3.5
[3.5] Set the backend again after recovering v3 backend from snapshot
2021-12-06 13:22:22 +01:00
Piotr Tabor
e84c61104c
Merge pull request #13515 from serathius/checkpoints-fix-3.5
Backport Lease Checkpoints fix to release-3.5
2021-12-03 12:21:02 +01:00
Marek Siarkowicz
d00e89db2e server: Require either cluster version v3.6 or --experimental-enable-lease-checkpoint-persist to persist lease remainingTTL
To avoid inconsistant behavior during cluster upgrade we are feature
gating persistance behind cluster version. This should ensure that
all cluster members are upgraded to v3.6 before changing behavior.

To allow backporting this fix to v3.5 we are also introducing flag
--experimental-enable-lease-checkpoint-persist that will allow for
smooth upgrade in v3.5 clusters with this feature enabled.
2021-12-02 16:54:10 +01:00
Michał Jasionowski
eddfb4232f etcdserver,integration: Store remaining TTL on checkpoint
To extend lease checkpointing mechanism to cases when the whole etcd
cluster is restarted.
2021-12-02 16:42:20 +01:00
Michał Jasionowski
21634a98c6 lease,integration: add checkpoint scheduling after leader change
Current checkpointing mechanism is buggy. New checkpoints for any lease
are scheduled only until the first leader change. Added fix for that
and a test that will check it.
2021-12-02 16:40:14 +01:00
ahrtr
8c81598455 set the backend again after recovering v3 backend from snapshot 2021-11-25 05:45:20 +08:00
Sam Batschelet
eac7f98699
Merge pull request #13477 from mitake/backport-13308-to-3.5
Backport PR 13308 to release-3.5
2021-11-21 14:45:15 -05:00
Hitoshi Mitake
dec6f72d68 *: implement a retry logic for auth old revision in the client 2021-11-15 00:09:16 +09:00
Ashish Ranjan
79bbc8fdb7 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.
2021-11-15 00:09:09 +09:00
Sam Batschelet
77d760bf1b
Merge pull request #13476 from chaochn47/backport-release-3.5
cherry-pick to 3.5 from #13467 exclude the same alarm type activated by multiple peers
2021-11-13 22:10:19 -05:00
Chao Chen
7d44a7cd6e server/etcdserver/api/etcdhttp: exclude the same alarm type activated by multiple peers 2021-11-12 14:21:14 -08:00
Piotr Tabor
e8732fb5f3
Merge pull request #13395 from geetasg/release-3.5
storage/backend: Add a gauge to indicate if defrag is active (backport)
2021-10-07 18:16:21 +02:00
Geeta Gharpure
446f7d6b6e storage/backend: Add a gauge to indicate if defrag is active (backport from 3.6) 2021-10-06 11:01:31 -07:00
Sam Batschelet
d42e8589e1 version: 3.5.1
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
v3.5.1 tests/v3.5.1 etcdctl/v3.5.1 etcdutl/v3.5.1 server/v3.5.1 client/v3.5.1 client/v2.305.1 client/pkg/v3.5.1 raft/v3.5.1 pkg/v3.5.1 api/v3.5.1
2021-10-03 11:47:37 -04:00
Sam Batschelet
ec562294f7
Merge pull request #13380 from hexfusion/cp-13376
[release-3.5] Dockerfile: bump debian bullseye-20210927
2021-10-01 13:23:50 -04:00
Sam Batschelet
bad9a52c4c 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-01 12:48:57 -04:00
Piotr Tabor
edb3b5a794
Merge pull request #13375 from serathius/authority-3.5
Cherry pick "Fix http2 authority header in single endpoint scenario" to release-3.5
2021-09-30 13:56:33 +02:00
Marek Siarkowicz
79f9a45574 client: Use first endpoint as http2 authority header 2021-09-30 12:15:33 +02:00
Marek Siarkowicz
7f25a500e3 tests: Add grpc authority e2e tests 2021-09-30 12:15:33 +02:00
Marek Siarkowicz
58d2b12a50 client: Add grpc authority header integration tests 2021-09-30 12:15:32 +02:00
Marek Siarkowicz
6e04e8ae42 tests: Allow configuring integration tests to use TCP 2021-09-30 12:05:25 +02:00
Marek Siarkowicz
7272a9585d test: Use unique number for grpc port 2021-09-30 12:05:15 +02:00
Marek Siarkowicz
0bac49bda4 tests: Cleanup member interface by exposing Bridge directly 2021-09-30 12:05:10 +02:00
Marek Siarkowicz
f324894e8f tests: Make using bridge optional 2021-09-30 12:05:04 +02:00
Marek Siarkowicz
994bd08723 tests: Rename grpcAddr to grpcURL to imply that it includes schema 2021-09-30 12:04:57 +02:00
Marek Siarkowicz
c1f48d8077 tests: Remove bridge dependency on unix 2021-09-30 12:04:50 +02:00
Arda Güçlü
6e2fe84ebd Decouple prefixArgs from os.Env dependency
prefixArgs uses os.Setenv in e2e tests instead envMap.
This creates overwrites in some test cases and have an impact
on test quality and isolation between tests.
This PR uses ctlcontext envMap in each tests with high priority
and merges os environment variables with low priority.
2021-09-30 12:04:31 +02:00
Piotr Tabor
4312298b73
Merge pull request #13348 from serathius/sync
Fix for v3.5 Ensure that cluster members stored in v2store and backend are in sync
2021-09-25 17:33:55 +02:00
Marek Siarkowicz
e68c7ab4bc server: Ensure that adding and removing members handle storev2 and backend out of sync 2021-09-15 14:36:41 +02:00
Sam Batschelet
d7eeda09f7
Merge pull request #13349 from serathius/tip-3.5
Stop using tip golang version in CI
2021-09-15 08:04:37 -04:00
Marek Siarkowicz
921f78d56f Stop using tip golang version in CI 2021-09-15 10:29:06 +02:00
Sam Batschelet
2fe94b19d3
Merge pull request #13257 from tangcong/automated-cherry-pick-of-#13145-#13237-origin-release-3.5
[backport 3.5]: Automated cherry pick of #13145 #13237
2021-08-06 09:01:14 -04:00
tangcong
627d91c89d fix self-signed-cert-validity parameter cannot be specified in the config file 2021-07-30 07:53:43 +08:00
tangcong
dfd2fea4c5 fix health endpoint not usable when authentication is enabled 2021-07-30 07:53:40 +08:00
Gyuho Lee
beae2e1801 workflows: remove ARM64 job for maintenance
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
2021-07-03 13:01:37 -07:00
Sam Batschelet
946a5a6f25 version: 3.5.0
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
v3.5.0 tests/v3.5.0 etcdctl/v3.5.0 etcdutl/v3.5.0 server/v3.5.0 client/v3.5.0 client/v2.305.0 client/pkg/v3.5.0 raft/v3.5.0 pkg/v3.5.0 api/v3.5.0
2021-06-15 17:34:52 -04:00
Sam Batschelet
1e2cab929c
Merge pull request #13099 from tangcong/automated-cherry-pick-of-#13077-origin-release-3.5
[backport 3.5] embed: unlimit the recv msg size of grpc-gateway
2021-06-10 21:28:31 -04:00
spacewander
53e04b2615 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 07:53:49 +08:00
Sam Batschelet
8139dd3e55 version: 3.5.0-rc.1
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
v3.5.0-rc.1 tests/v3.5.0-rc.1 etcdctl/v3.5.0-rc.1 etcdutl/v3.5.0-rc.1 server/v3.5.0-rc.1 client/v3.5.0-rc.1 client/v2.305.0-rc.1 client/pkg/v3.5.0-rc.1 raft/v3.5.0-rc.1 pkg/v3.5.0-rc.1 api/v3.5.0-rc.1
2021-06-09 17:57:52 -04:00
Sam Batschelet
5d52faec47
Merge pull request #13095 from hexfusion/cp-13049
[release-3.5]: [Fix] --log-outputs relative path are not supported when --log-rotate-config-json is defined
2021-06-09 15:01:09 -04:00
Mr-Mu
98bbc0107f TestLogRotation add log output relative path
TestLogRotation add test log output relative path test
2021-06-09 14:12:07 -04:00
Mr-Mu
fed3bc3084 [Fix]滚动日志路径解析不正确
例如  rotate:test.log 路径解析不正确
2021-06-09 14:12:07 -04:00
Sam Batschelet
b327edf521
Merge pull request #13092 from lilic/bump-client-golang-3.5
[release-3.5]: Update client_golang dependency to v1.11.0
2021-06-07 20:52:09 -04:00
Lili Cosic
9fee8bf95e Update client_golang dependency to v1.11.0 2021-06-07 15:54:57 +02:00
Gyuho Lee
e721e4eb10
Merge pull request #13088 from gyuho/c
[backport 3.5] etcdserver: don't attempt to grant nil permission to a role
2021-06-04 16:22:03 -07:00
J. David Lowe
e27effa250 etcdserver: don't attempt to grant nil permission to a role
Prevent etcd from crashing when given a bad grant payload, e.g.:

$ curl -d '{"name": "foo"}' http://localhost:2379/v3/auth/role/add
{"header":{"cluster_id":"14841639068965178418", ...
$ curl -d '{"name": "foo"}' http://localhost:2379/v3/auth/role/grant
curl: (52) Empty reply from server

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
2021-06-04 15:34:22 -07:00
Gyuho Lee
abe57c1aed
Merge pull request #13085 from gyuho/c
[backport 3.5] etcdserver: don't activate alarm w/missing AlarmType
2021-06-04 15:12:28 -07:00
J. David Lowe
ae194c1470 etcdserver: don't activate alarm w/missing AlarmType
Narrowly prevent etcd from crashing when given a bad ACTIVATE payload, e.g.:

$ curl -d "{\"action\":\"ACTIVATE\"}" ${ETCD}/v3/maintenance/alarm
curl: (52) Empty reply from server
2021-06-04 14:21:04 -07:00
Sam Batschelet
ab20aa29a0 version: 3.5.0-rc.0
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
v3.5.0-rc.0 tests/v3.5.0-rc.0 etcdctl/v3.5.0-rc.0 etcdutl/v3.5.0-rc.0 server/v3.5.0-rc.0 client/v3.5.0-rc.0 client/v2.305.0-rc.0 client/pkg/v3.5.0-rc.0 raft/v3.5.0-rc.0 pkg/v3.5.0-rc.0 api/v3.5.0-rc.0
2021-06-03 21:39:37 -04:00
Gyuho Lee
a6b37e2642
Merge pull request #13081 from wilsonwang371/20210603-backport13075
backport-3.5: server: skip unnecessary sprintf which executes proto.Size()
2021-06-03 13:53:49 -07:00