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.

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

Fix output on short version flag #5348

Merged
merged 2 commits into from
Aug 28, 2019
Merged

Conversation

lucklove
Copy link
Member

@lucklove lucklove commented Aug 28, 2019

Keep -V behavior same with v2.x

Signed-off-by: lucklove gnu.crazier@gmail.com

What have you changed?

The -V output format of tikv-server and tikv-ctl.
The output of -V in v2.x is something like:

TiKV
Release Version: 2.1.14
Git Commit Hash: 32ca82bc067f7529dc07bf8ddb594b8c060b7f49
Git Commit Branch: HEAD
UTC Build Time: 2019-07-04 10:32:40
Rust Version: rustc 1.29.0-nightly (4f3c7a472 2018-07-17)

However, in v3.x, it's something like:

TiKV 3.0.2

And in the newest master, it's:

TiKV 0.0.1

We should keep the output format same with v2.x, because the tidb and pd's output format is that. I think they should have a unified behavior.

What is the type of the changes?

  • Bugfix (a change which fixes an issue)

How is the PR tested?

manual test

Does this PR affect documentation (docs) or should it be mentioned in the release notes?

No

Does this PR affect tidb-ansible?

No

Refer to a related PR or issue link (optional)

Benchmark result if necessary (optional)

Any examples? (optional)

Keep -V behavior same with v2.x

Signed-off-by: lucklove <gnu.crazier@gmail.com>
@lucklove lucklove force-pushed the bugfix/revert-short-version-behavior branch from b424913 to 0dd3b16 Compare August 28, 2019 02:24
Copy link
Member

@Connor1996 Connor1996 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@sticnarf sticnarf left a comment

Choose a reason for hiding this comment

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

LGTM
Actually just removing the version(...) is the same :)

@sticnarf sticnarf added the status/can-merge Indicates a PR has been approved by a committer. label Aug 28, 2019
@sre-bot
Copy link
Contributor

sre-bot commented Aug 28, 2019

/run-all-tests

@sticnarf sticnarf added the type/bugfix This PR fixes a bug. label Aug 28, 2019
@sre-bot sre-bot merged commit 3c49ba8 into master Aug 28, 2019
@overvenus overvenus deleted the bugfix/revert-short-version-behavior branch August 28, 2019 05:37
YangKeao added a commit to YangKeao/tikv that referenced this pull request Sep 5, 2019
@lucklove lucklove added needs-cherry-pick-release-3.0 Type: Need cherry pick to release 3.0 needs-cherry-pick-release-3.1 Type: Need cherry pick to release 3.1 labels Sep 23, 2019
@lucklove
Copy link
Member Author

/run-cherry-picker

@sre-bot
Copy link
Contributor

sre-bot commented Sep 23, 2019

cherry pick to release-3.0 failed

@sre-bot
Copy link
Contributor

sre-bot commented Sep 23, 2019

cherry pick to release-3.1 failed

lucklove added a commit that referenced this pull request Sep 23, 2019
Signed-off-by: lucklove <gnu.crazier@gmail.com>
lucklove added a commit that referenced this pull request Sep 23, 2019
Signed-off-by: lucklove <gnu.crazier@gmail.com>
Conflicts:
	src/bin/tikv-server.rs
sre-bot pushed a commit that referenced this pull request Sep 23, 2019
Signed-off-by: lucklove <gnu.crazier@gmail.com>
lucklove added a commit that referenced this pull request Sep 24, 2019
Signed-off-by: lucklove <gnu.crazier@gmail.com>
sticnarf pushed a commit to sticnarf/tikv that referenced this pull request Oct 27, 2019
Signed-off-by: lucklove <gnu.crazier@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-3.0 Type: Need cherry pick to release 3.0 needs-cherry-pick-release-3.1 Type: Need cherry pick to release 3.1 status/can-merge Indicates a PR has been approved by a committer. type/bugfix This PR fixes a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants