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.

Sign up for GitHub

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

Jump to bottom

functional: run tests with embedded etcd, add logger field #9572

Merged
merged 34 commits into from
Apr 17, 2018
Merged

functional: run tests with embedded etcd, add logger field #9572

merged 34 commits into from
Apr 17, 2018

Conversation

gyuho
Copy link
Contributor

@gyuho gyuho commented Apr 16, 2018 •
edited
Loading

Use logger flag as a way to specify logoutput, and add an optional logger to use structured logging #9438. capnslog will still be default. Still need implement journald format when zap is used. Will document changes.

Also SetupLogging was not called when configuration file was loaded from file. Now, it's called automatically.

@gyuho gyuho force-pushed the eee branch 13 times, most recently from 54ee22b to e68bf1e Compare April 16, 2018 22:02
gyuho added 14 commits April 16, 2018 17:36
@gyuho
functional/rpcpb: add "*Etcd.EmbedConfig", and logger fields
575cf94 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
functional/agent: handle "embed.Etcd", logger sync
3312810 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
pkg/logutil: add "NewGRPCLoggerV2FromZap", "NewRaftLogger"
82e84a0 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
*: configure server logger
041b906 
- Add/Document "logger" to support structured logging.
  - This makes functional tests run easier, since zap logger
    provides built-in log redirect to files.
  - "etcd --logger-option=zap" to enable structured logging.
- Current "capnslog" will still be used as "default".
  - We may switch the default or deprecate "capnslog" in v3.5.
  - Either way, will clearly be documented.

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
CHANGELOG-3.4: highlight logger change
d5d4025 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
integration: use default logger "capnslog"
f879c1d 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
etcdserver: support structured logging
bdbed26 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
pkg: support structured logger
0dad8ab 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
mvcc: support structured logger
c00c6cb 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
wal: support structured logger
fdbedac 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
rafthttp: support structured logger
c68f625 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
raftsnap: support structured logger
ce8348e 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
auth: support structured logger
f57fa6a 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
snapshot: support structured logger
d1c7d40 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
gyuho added 16 commits April 16, 2018 17:36
@gyuho
clientv3,etcdctl: support structured logger
6dbce6b 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
contrib/tools: support structured logger
9063805 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
integration: support structured logger
a7fd274 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
embed,etcdmain: support structured logger
c712e08 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
functional/agent: support embedded etcd
677894b 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
functional/tester: run tests with embedded etcd
f34c5dc 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
pkg/transport: check nil logger
2bd88e3 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
snapshot: ignore server logs
38e32a1 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
embed: support "io-discard" for logging, fix racey logging setup
cc77874 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
integration,embed: ignore embed log output
35a80bc 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
functional/tester: handle "raft.ErrProposalDropped"
d1c2ae8 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
functional/tester: use binary for tests for now
2ee2a96 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
functional/agent: fix etcd exec path check
f63b5c1 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
CHANGELOG-3.4: highlight WAL changes
c716bea 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
Documentation/upgrades: highlight wal, embed changes
b7ce6b7 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
etcdctl/ctlv3: fix snapshot command e2e tests
ae9ccd8 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
gyuho added 4 commits April 16, 2018 18:01
@gyuho
tests/e2e: fix TestIssue6361
92c3274 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
tests/e2e: fix gateway tests
a3b9d82 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
tests/e2e: comment out TestEtcdCorruptHash debugging lines
1c44293 
No need

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
*: support --log-output=discard
18b3e45 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho gyuho merged commit 46e19d2 into etcd-io:master Apr 17, 2018
@gyuho gyuho deleted the eee branch April 17, 2018 02:09
@nolouch nolouch mentioned this pull request Jun 4, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
area/functional-testing
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@gyuho