Skip to content
This repository has been archived by the owner on Sep 12, 2022. It is now read-only.

Merge upstream 2020-05-14 #1

Merged
merged 1,053 commits into from
May 26, 2020
Merged

Conversation

dongsupark
Copy link
Member

Merge upstream origin/master to flatcar-master, to keep it in sync with recent changes.

jingyih and others added 30 commits January 20, 2020 02:05
clientv3/integration: fix a typo in "TestLeasingTxnRangeCmp"
doc: update required go version for master
…on system

Signed-off-by: lucperkins <lucperkins@gmail.com>
Co-authored-by: yutedz <54038175+yutedz@users.noreply.github.com>
Signed-off-by: lucperkins <lucperkins@gmail.com>
clientv3: simplify grpc dialer usage.
Set zap as default logger. Remove capnslog and deprecated logging
flags.
*: set zap as default logger, remove capnslog
etcdserver/api/v2v3: use testing.T instead of log in tests
etcdserver/api/v2v3: fix dropped test error
This changes have started at etcdctl under auth.go, and make changes to stub out everything down into the internal raft.  Made changes to the .proto files and regenerated them so that the local version would build successfully.
gyuho and others added 27 commits April 28, 2020 23:27
wal: close the directory when Fsync() encounters error
Use UID instead of ID in Grafana dashboard
to make redirection possible. Changed undercore to dash.
.github/ISSUE_TEMPLATE: fix of a broken link
etcdctl, etcdmain: warn about --insecure-skip-tls-verify options
emails here can be an unnecessary maintainance. The provided
GitHub IDs have the latest emails and also the process has
security@etcd.io mentioned in this doc as a contact email.
doc: remove Product Security Committee individual emails
Signed-off-by: Ted Yu <yuzhihong@gmail.com>
Documentation: note on the policy of insecure by default
Currently, watch cancel requests are only sent to the server after a
message comes through on a watch where the client has cancelled. This
means that cancelled watches that don't receive any new messages are
never cancelled; they persist for the lifetime of the client stream.
This has negative connotations for locking applications where a watch
may observe a key which might never change again after cancellation,
leading to many accumulating watches on the server.

By cancelling proactively, in most cases we simply move the cancel
request to happen earlier, and additionally we solve the case where the
cancel request would never be sent.

Fixes #9416
Heavy inspiration drawn from the solutions proposed there.
clientv3: cancel watches proactively on client context cancellation
…11817

CHANGELOG: update 3.4/3.3 changelog for 11817
Signed-off-by: Ted Yu <yuzhihong@gmail.com>
Signed-off-by: Ted Yu <yuzhihong@gmail.com>
mvcc: Obtain tx Lock once in readTx#UnsafeRange
raft: break out of nested loop when raft id is found
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
@dongsupark dongsupark requested a review from a team May 14, 2020 16:23
@dongsupark dongsupark merged commit b4051cc into flatcar-master May 26, 2020
@dongsupark dongsupark deleted the dongsu/merge-upstream-20200514 branch May 26, 2020 07:12
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.