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

*: log format for release-2.1 #1625

Merged
merged 12 commits into from
Jul 17, 2019
Merged

*: log format for release-2.1 #1625

merged 12 commits into from
Jul 17, 2019

Conversation

nolouch
Copy link
Contributor

@nolouch nolouch commented Jul 10, 2019 •
edited
Loading

Signed-off-by: nolouch nolouch@gmail.com

What problem does this PR solve?

cherry-pick
https://github.com/pingcap/pd/pulls?q=is%3Apr+label%3Aarea%2Flog+is%3Aclosed

Check List

Tests

  • Unit test
  • Integration test

@nolouch
Copy link
Contributor Author

nolouch commented Jul 10, 2019

/run-all-tests

@nolouch
*:Start swithing to the zap logger (tikv#1422)
e6e164a 
Signed-off-by: nolouch <nolouch@gmail.com>
rleungx and others added 2 commits July 10, 2019 12:21
@rleungx @nolouch
*: log format for schedule, scheduler, syncer, api (tikv#1423)
47de2cd 
* log format for schedule, scheduler, syncer, api

Signed-off-by: rleungx <rleungx@gmail.com>
@disksing @nolouch
pdctl, api: support hex format keys (tikv#1309)
a0c97bc 
pdctl, api: support hex format keys

Signed-off-by: disksing <i@disksing.com>
@nolouch nolouch added the component/log Log. label Jul 10, 2019
rleungx and others added 5 commits July 10, 2019 14:21
@rleungx @nolouch
*: log format for tools, client, pkg, table (tikv#1424)
579610e 
* log format for tools, client, pkg, table, simulator

Signed-off-by: rleungx <rleungx@gmail.com>
@nolouch
*: log format for server (tikv#1431)
a627c78 
* *: log format for server

Signed-off-by: nolouch <nolouch@gmail.com>
@nolouch
*: log format for logutil, server/core (tikv#1438)
f54984e 
* *: log format for logutil,server/core
@rleungx @nolouch
*: improve some logs (tikv#1516)
9831615 
* improve some logs

Signed-off-by: Ryan Leung <rleungx@gmail.com>
@nolouch
log: do not add stack to error log (tikv#1532)
e3bf84d
@nolouch
Copy link
Contributor Author

nolouch commented Jul 10, 2019

/run-all-tests tidb=release-2.1 tikv=release-2.1 tidb-test=release-2.1

@nolouch
Copy link
Contributor Author

nolouch commented Jul 10, 2019

/run-integration-ddl-test tidb=release-2.1 tikv=release-2.1 tidb-test=release-2.1

@disksing
Copy link
Contributor

Why do we need this? Should we only cherry-pick bug fixes to release branches?

@nolouch
Copy link
Contributor Author

nolouch commented Jul 10, 2019

Because 2.1 will still exist for a long time, so our business version needs it, and TiDB already does it.

shafreeck
shafreeck suggested changes Jul 11, 2019
View reviewed changes
pkg/etcdutil/etcdutil.go Outdated Show resolved Hide resolved
pkg/logutil/log_test.go Show resolved Hide resolved
pkg/tempurl/tempurl.go Outdated Show resolved Hide resolved
server/api/redirector.go Outdated Show resolved Hide resolved
tools/pd-tso-bench/main.go Show resolved Hide resolved
nolouch and others added 2 commits July 15, 2019 18:19
@nolouch
pkg, tools: improve the log message (tikv#1636)
3d780c0 
* pkg,tools: improve the log message

Signed-off-by: nolouch <nolouch@gmail.com>
@rleungx @nolouch
core: use hex format for region meta key (tikv#1627)
e4b0b7f 
Signed-off-by: Ryan Leung <rleungx@gmail.com>=
@nolouch
Copy link
Contributor Author

nolouch commented Jul 15, 2019

/run-all-tests tidb=release-2.1 tikv=release-2.1 tidb-test=release-2.1

@mahjonp
Copy link

mahjonp commented Jul 15, 2019

/run-integration-ddl-test tidb=release-2.1 tikv=release-2.1 tidb-test=release-2.1

disksing
disksing reviewed Jul 16, 2019
View reviewed changes
tools/pd-simulator/simulator/task.go Outdated Show resolved Hide resolved
tools/pd-simulator/simulator/node.go Outdated Show resolved Hide resolved
tools/pd-simulator/simulator/drive.go Outdated Show resolved Hide resolved
tools/pd-simulator/simulator/client.go Outdated Show resolved Hide resolved
tools/pd-simulator/simulator/cases/hot_write.go Outdated Show resolved Hide resolved
tools/pd-ctl/pdctl/command/region_command.go Outdated Show resolved Hide resolved
server/testutil.go Outdated Show resolved Hide resolved
server/config.go

// TODO: update etcd
// cfg.ZapLoggerBuilder = embed.NewZapCoreLoggerBuilder(c.logger, c.logger.Core(), c.logSyncer)
// cfg.Logger = "zap"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2.1 will not print any etcd log after this PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as before.

@nolouch
address comments
989686b 
Signed-off-by: nolouch <nolouch@gmail.com>
@nolouch
Copy link
Contributor Author

nolouch commented Jul 17, 2019

PTAL @disksing @shafreeck

@nolouch
Copy link
Contributor Author

nolouch commented Jul 17, 2019

/run-all-tests tidb=release-2.1 tikv=release-2.1 tidb-test=release-2.1

AndreMouche
AndreMouche reviewed Jul 17, 2019
View reviewed changes
Copy link
Member

@AndreMouche AndreMouche left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why there is some logic not related to log format?

server/testutil.go Outdated Show resolved Hide resolved
tools/pd-ctl/pdctl/command/region_command.go Outdated
}
buf = append(buf, c)
}
}
return string(buf), nil
}

// NewRegionsWithStartKeyCommand returns regions from startkey subcommand of regionCmd.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not know why cherry-pick will contain it, maybe I miss it when I resolve conflict it.

@nolouch
address comments
113f157 
Signed-off-by: nolouch <nolouch@gmail.com>
@nolouch
Copy link
Contributor Author

nolouch commented Jul 17, 2019

/run-all-tests tidb=release-2.1 tikv=release-2.1 tidb-test=release-2.1

@youjiali1995 youjiali1995 merged commit 165e4cb into tikv:release-2.1 Jul 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AndreMouche AndreMouche AndreMouche left review comments

@rleungx rleungx rleungx approved these changes

@disksing disksing disksing approved these changes

@shafreeck shafreeck shafreeck approved these changes

Assignees
No one assigned
Labels
component/log Log.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@nolouch @disksing @mahjonp @shafreeck @AndreMouche @rleungx @youjiali1995