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,908 Commits 15 Branches 491 Tags 148 MiB
Commit Graph

15908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marek Siarkowicz
6025355ce0 tests: Allow configuring progress notify interval in e2e tests 
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
 2023-03-14 10:26:43 +01:00
Benjamin Wang
4cdb91db15
Merge pull request #15429 from jmhbnz/release-3.4-backport 
[3.4] Backport update to latest go 1.19.7 release
 2023-03-08 19:07:44 +08:00
James Blair
51ea1c0abe
Updated go to 1.19.7. 
Mitigates CVE-2023-24532.

Signed-off-by: James Blair <mail@jamesblair.net>
 2023-03-08 22:46:34 +13:00
Piotr Tabor
20eee55557
Merge pull request #15333 from jmhbnz/release-3.4 
[3.4] Backport bump to go 1.19.6 and golang.org/x/net to v0.7.0
 2023-03-03 11:11:04 +01:00
James Blair
a91bacf567
Formatted source code for go 1.19.6. 
Signed-off-by: James Blair <mail@jamesblair.net>
 2023-02-20 12:44:14 +13:00
James Blair
7318f5dd0c
Bump golang.org/x/net to v0.7.0 to address CVE GO-2023-1571. 
Signed-off-by: James Blair <mail@jamesblair.net>
 2023-02-20 11:41:25 +13:00
James Blair
9570978e93
Bump to go 1.19.6 
Signed-off-by: James Blair <mail@jamesblair.net>
 2023-02-20 11:41:01 +13:00
Benjamin Wang
6d1bfe4f99 bump version to 3.4.24 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
v3.4.24 		2023-02-16 09:39:00 +08:00
Benjamin Wang
9c81b86e90 test: enhance the test case TestV3WatchProgressOnMemberRestart 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
 2023-02-10 21:03:53 +08:00
Benjamin Wang
ed529ab0e5 clientv3: correct the nextRev on receving progress notification response 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
 2023-02-10 16:47:56 +08:00
James Blair
d32dceb8a6 Fix regression in timestamp resolution 
Historic capnslog timestamps are in microsecond resolution. We need to match that when we migrate to the zap logger.

Signed-off-by: James Blair <mail@jamesblair.net>
 2023-02-10 04:35:24 +08:00
Marek Siarkowicz
fb7a8973bd
Merge pull request #15265 from ahrtr/3.4_walSync_failpoint_20230209 
[3.4] etctserver: add failpoints walBeforeSync and walAfterSync
 2023-02-09 09:10:19 +01:00
Benjamin Wang
109873dcb6 etctserver: add failpoints walBeforeSync and walAfterSync 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
 2023-02-09 07:06:46 +08:00
Benjamin Wang
b4e3ed72e3 bump bbolt to v1.3.7 for release-3.4 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
 2023-02-02 03:47:21 +08:00
Wilson Wang
2f8158650f server: set multiple concurrentReadTx instances share one txReadBuffer. 
(cherry picked from commit 9c82e8c72b96eec1e7667a0e139a07b944c33b75)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-01-30 11:43:19 +08:00
kidsan
c5347cb0c6 netutil: consistently format ipv6 addresses 
This formats ipv6 addresses to ensure they can be compared safely

Signed-off-by: kidsan <8798449+Kidsan@users.noreply.github.com>
 2023-01-27 06:49:26 +08:00
Iavael
d2fc8dbeeb docker: remove nsswitch.conf 
Signed-off-by: Iavael <905853+iavael@users.noreply.github.com>
 2023-01-25 02:45:52 +08:00
Benjamin Wang
e4b154231c
Merge pull request #15137 from fuweid/backport-11990-to-3.4 
[3.4] mvcc: push down RangeOptions.limit argv into index tree to reduce memory overhead
 2023-01-20 06:23:32 +08:00
Wei Fu
931cf9a814 mvcc: update ut for Revisions/CountRevisions 
It is kind of backport from etcd-io#14124.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-01-18 10:18:57 +08:00
Marek Siarkowicz
1246c52d04 etcdserver: Fix invalid count returned on Range with Limit 
(cherry picked from commit 182aef6e6b28d2f62cd7281f38c12899d8006a15)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-01-18 10:02:10 +08:00
tangcong
d48f7ad7c1 mvcc: push down RangeOptions.limit argv into index tree 
(cherry picked from commit 26c930f27d46776da5fedae69267ba0b69c31185)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-01-18 10:01:20 +08:00
Benjamin Wang
a1d1af5774
Merge pull request #15099 from fuweid/backport-11771-11743-pr-to-3.4 
[3.4] mvcc: reduce count-only range overhead
 2023-01-18 08:48:29 +08:00
Piotr Tabor
4be8c0e5a5
Merge pull request #15097 from ahrtr/3.4_promote_non_exist_id_20230113 
[3.4] etcdserver: return membership.ErrIDNotFound when the memberID not found
 2023-01-17 09:15:02 +01:00
Benjamin Wang
00b31512a1 etcdserver: return membership.ErrIDNotFound when the memberID not found 
Backport https://github.com/etcd-io/etcd/pull/15095 to 3.4.

When promoting a learner, we need to wait until the leader's applied ID
catches up to the commitId. Afterwards, check whether the learner ID
exist or not, and return `membership.ErrIDNotFound` directly in the API
if the member ID not found, to avoid the request being unnecessarily
delivered to raft.

Signed-off-by: Benjamin Wang <wachao@vmware.com>
 2023-01-17 06:27:31 +08:00
Wei Fu
10c080dc5e mvcc: Add ut for Revisions/CountRevisions 
It is kind of backport from #14124.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-01-16 15:15:34 +08:00
tangcong
2070f55aab e2e: add getCountOnlyTest testcase 
(cherry picked from commit 3594ab94cfefa7488993ac14e7b410ee63b25d3d)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-01-13 16:33:56 +08:00
tangcong
00a005c300 mvcc: reduce count-only range overhead 
(cherry picked from commit 730f3f1d783fc1159a4c2e258713e5b1fe3ec5b4)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-01-13 16:32:35 +08:00
mlmhl
841f3bd2be etcdctl: support query count only of specified prefix 
(cherry picked from commit aa7b056a7706a55054e94380382cbc1948a3edcc)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-01-13 16:31:23 +08:00
Benjamin Wang
a577940b4e
Merge pull request #15088 from fuweid/3.4-fix-flaky-testcase 
[3.4] grpc-gateway: update version to v1.11.0
 2023-01-13 10:39:28 +08:00
Wei Fu
c320f75a15 grpc-gateway: update version to v1.11.0 
The issue is caused by hand-crafted protobuf message. The runtime.errorBody
defines two protobuf fields with same number. We need to upgrade the
version to fix it. Otherwise, the client side won't receive any errors
from server side because of panic.

```
mismatching field: runtime.errorBody.error, want runtime.errorBody.message
```

It can fix the cases

PASSES="build grpcproxy" CPU=4 RACE=true ./test -run TestV3CurlLeaseRevokeNoTLS

The original error is like:

```
v3_curl_lease_test.go:109: testV3CurlLeaseRevoke: prefix (/v3) endpoint (/kv/lease/revoke): error (read /dev/ptmx: input/output error (expected "etcdserver: requested lease not found", got ["curl: (52) Empty reply from server\r\n"])), wanted etcdserver: requested lease not found
    v3_curl_lease_test.go:109: testV3CurlLeaseRevoke: prefix (/v3beta) endpoint (/kv/lease/revoke): error (read /dev/ptmx: input/output error (expected "etcdserver: requested lease not found", got ["curl: (52) Empty reply from server\r\n"])), wanted etcdserver: requested lease not found
```

The `Empty reply from server` is caused by panic and server recover it
but it doesn't have chance to reply to client.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-01-12 17:06:00 +08:00
Benjamin Wang
46511ab96e
Merge pull request #15042 from ahrtr/update_nsswitch_3.4 
[3.4] Update nsswitch.conf for 3.4
 2022-12-24 07:13:34 +08:00
Benjamin Wang
58c2f5f228 update nsswitch.conf for 3.4 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
 2022-12-23 20:31:45 +08:00
Benjamin Wang
283e447df5
Merge pull request #15038 from ahrtr/remove_busybox_3.4_20221223 
3.4: remove the dependency on busybox
 2022-12-23 19:27:41 +08:00
Benjamin Wang
8aace73c77 3.4: remove the dependency on busybox 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
 2022-12-23 18:43:44 +08:00
Benjamin Wang
c8b7831967 bump version to 3.4.23 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
v3.4.23 		2022-12-21 14:11:16 +08:00
Benjamin Wang
8119eb3951
Merge pull request #15019 from ahrtr/deps_3.4_20221219 
[3.4] Security: address HIGH Vulnerabilities
 2022-12-19 19:33:56 +08:00
Benjamin Wang
5413ce46dc bump go version to 1.17.3 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
 2022-12-19 18:34:04 +08:00
Benjamin Wang
86479c5ba9 deps: bump golang.org/x/net to v0.4.0 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
 2022-12-19 17:43:43 +08:00
Benjamin Wang
68a55439e1 deps: bump golang.org/x/net to 0.0.0-20220906165146-f3363e06e74c to address CVE CVE-2021-44716 and CVE-2022-27664 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
 2022-12-19 16:34:06 +08:00
Benjamin Wang
40566d943a deps: bump github.com/prometheus/client_golang to 1.11.1 to address CVE CVE-2022-21698 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
 2022-12-19 16:32:23 +08:00
Benjamin Wang
fcb048dd67 deps: bump github.com/gogo/protobuf to 1.3.2 to address CVE CVE-2021-3121 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
 2022-12-19 16:30:53 +08:00
Benjamin Wang
f318a39998
Merge pull request #15017 from ahrtr/use_distroless_3.4_20221219 
[3.4] Security: use distroless base image to address critical Vulnerabilities
 2022-12-19 16:23:30 +08:00
Benjamin Wang
c1bec6bd97 security: use distroless base image to address critical Vulnerabilities 
Command:
trivy image --severity CRITICAL gcr.io/etcd-development/etcd:v3.4.22  -f json -o 3.4.22_image_critical.json

Signed-off-by: Benjamin Wang <wachao@vmware.com>
 2022-12-19 08:04:47 +08:00
Benjamin Wang
9d37e7626a
Merge pull request #15011 from MukulKolpe/specify_branch_release-3.4 
fix: specify the branch name of release-3.4 in the workflow
 2022-12-17 18:09:47 +08:00
Mukul Kolpe
fb07cf843a fix: specify the branch name of release-3.4 in the workflow 
Signed-off-by: Mukul Kolpe <mukulkolpe45@gmail.com>
 2022-12-17 14:40:24 +05:30
Benjamin Wang
e03c62d5e7
Merge pull request #15007 from ArkaSaha30/trivy-release-3-4 
Add trivy nightly scan for `release-3.4`
 2022-12-16 13:59:40 +08:00
ArkaSaha30
7450bcfc49
Add trivy nightly scan for release-3.4 
Signed-off-by: ArkaSaha30 <arkasaha30@gmail.com>
 2022-12-16 11:06:58 +05:30
Benjamin Wang
593711848e
Merge pull request #14900 from ahrtr/fix_readyonly_txn_panic_3.4_20221206 
[3.4] etcdserver: fix nil pointer panic for readonly txn
 2022-12-06 19:25:12 +08:00
Benjamin Wang
acca4fa93e etcdserver: fix nil pointer panic for readonly txn 
Backporting https://github.com/etcd-io/etcd/pull/14895

Signed-off-by: Benjamin Wang <wachao@vmware.com>
 2022-12-06 18:09:47 +08:00
Benjamin Wang
c619e2705e
Merge pull request #14853 from ahrtr/remove_memberid_alarm_3.4_20221125 
[3.4] etcdserver: intentionally set the memberID as 0 in corruption alarm
 2022-11-25 17:01:02 +08:00