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

CASSANDRA-17753: Include GitSHA in nodetool version output #1729

Closed
wants to merge 2 commits into from
Closed

CASSANDRA-17753: Include GitSHA in nodetool version output #1729

wants to merge 2 commits into from

Conversation

aratno
Copy link
Contributor

@aratno aratno commented Jul 13, 2022 •
edited

Jira: https://issues.apache.org/jira/browse/CASSANDRA-17753
CircleCI: https://app.circleci.com/pipelines/github/aratno/cassandra?branch=CASSANDRA-17753-nodetool-version-gitsha

# When Cassandra is built with a clean Git index
$ ./bin/nodetool version
ReleaseVersion: 4.1-alpha2-SNAPSHOT
GitSHA: 5fce07e2f1e2e0b9cf7d82adfd8c0b21993f8672

# When Cassandra is built with a dirty Git index
$ ./bin/nodetool version
ReleaseVersion: 4.1-alpha2-SNAPSHOT
GitSHA: 5fce07e2f1e2e0b9cf7d82adfd8c0b21993f8672-dirty

frankgh
frankgh approved these changes Jul 13, 2022
View reviewed changes
Copy link
Contributor

@frankgh frankgh left a comment

Choose a reason for hiding this comment

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

+1

@aratno aratno changed the base branch from cassandra-4.1 to trunk July 13, 2022 23:07
@aratno aratno force-pushed the CASSANDRA-17753-nodetool-version-gitsha branch 2 times, most recently from 32d0402 to d09951f Compare July 13, 2022 23:35
michaelsembwever
michaelsembwever reviewed Jul 14, 2022
View reviewed changes
CHANGES.txt Outdated Show resolved Hide resolved
@michaelsembwever
Copy link
Member

suggestions/requests raised in the ticket

michaelsembwever
michaelsembwever reviewed Jul 16, 2022
View reviewed changes
NEWS.txt Outdated Show resolved Hide resolved
michaelsembwever
michaelsembwever approved these changes Jul 16, 2022
View reviewed changes
Copy link
Member

@michaelsembwever michaelsembwever left a comment

Choose a reason for hiding this comment

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

two small nit comments, otherwise looking great and +1. thanks @aratno

@aratno aratno force-pushed the CASSANDRA-17753-nodetool-version-gitsha branch 2 times, most recently from 1450466 to efa31b0 Compare July 17, 2022 18:42
@aratno
Copy link
Contributor Author

aratno commented Jul 17, 2022 •
edited

Thanks @michaelsembwever - all changes requested are now addressed. Do you want me to merge in trunk and resolve conflicts, squash, or anything else to make this easier to commit?

@michaelsembwever
Copy link
Member

michaelsembwever commented Jul 17, 2022 •
edited

Yes, please squash to one commit. Are you familiar with our commit message format? (if not, the committer will adjust it accordingly)

There's also one minor edit to make, the CHANGES.txt line need to finish with (CASSANDRA-17753)

@aratno aratno force-pushed the CASSANDRA-17753-nodetool-version-gitsha branch from efa31b0 to 67d591d Compare July 18, 2022 03:28
@aratno
Copy link
Contributor Author

aratno commented Jul 18, 2022

Should be all good now - did I do it right @michaelsembwever?

@michaelsembwever
Copy link
Member

michaelsembwever commented Jul 19, 2022 •
edited

ci-cassandra: https://ci-cassandra.apache.org/job/Cassandra-devbranch-artifacts/1749/

LGTM 👍

@michaelsembwever
Copy link
Member

latest changed LGTM! thanks!

https://ci-cassandra.apache.org/job/Cassandra-devbranch/1886/

@michaelsembwever
Copy link
Member

https://ci-cassandra.apache.org/job/Cassandra-devbranch/1886/

something is up with the dtest-upgrade… (took a re-run of it here too: https://ci-cassandra.apache.org/job/Cassandra-devbranch-dtest-upgrade/1177/ )
haven't had time to investigate it… but wondering if this patch needs to be rebased off latest trunk…

@aratno
Include GitSHA in nodetool version --verbose output
120e1fb 
Patch by Abe Ratnofsky; review by Caleb Rackliffe, Francisco Guerrero, and Michael Semb Wever for CASSANDRA-17753
@aratno
Handle situations where git is not available, like gzipped -src artifact
f4490b3
@aratno aratno force-pushed the CASSANDRA-17753-nodetool-version-gitsha branch from 843a835 to f4490b3 Compare August 23, 2022 04:32
@aratno
Copy link
Contributor Author

aratno commented Aug 23, 2022

Just rebased, looks like the Paxos state issue impacting test clean-up across the board.

Unexpected error found in node logs (see stdout for full details). Errors: [[node1] 'ERROR [main] 2022-08-20 10:40:54,861 CassandraDaemon.java:896 - Exception encountered during startup\njava.lang.ExceptionInInitializerError: null\n\tat org.apache.cassandra.service.paxos.PaxosState.initializeTrackers(PaxosState.java:116)

@michaelsembwever
Copy link
Member

new round: https://ci-cassandra.apache.org/blue/organizations/jenkins/Cassandra-devbranch/detail/Cassandra-devbranch/1900/pipeline

@aratno
Copy link
Contributor Author

aratno commented Sep 6, 2022

Another CircleCI run: https://app.circleci.com/pipelines/github/aratno/cassandra?status=none&status=running&branch=CASSANDRA-17753-nodetool-version-gitsha

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michaelsembwever michaelsembwever michaelsembwever approved these changes

@maedhroz maedhroz maedhroz approved these changes

@frankgh frankgh frankgh approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@aratno @michaelsembwever @maedhroz @frankgh @smiklosovic