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

cli: replace SHA-1 with build commit ID #52249

Closed
dbist opened this issue Aug 3, 2020 · 2 comments · Fixed by #52263
Closed

cli: replace SHA-1 with build commit ID #52249

dbist opened this issue Aug 3, 2020 · 2 comments · Fixed by #52263
Assignees
Labels
C-enhancement Solution expected to add code/behavior + preserve backward-compat (pg compat issues are exception)

Comments

@dbist
Copy link
Contributor

dbist commented Aug 3, 2020

Is your feature request related to a problem? Please describe.
The current CLI displays git commit hash with build SHA-1 which may be confusing and raise additional questions.

Describe the solution you'd like
Replace with Build Commit ID instead.

Describe alternatives you've considered
N/A

Additional context

cockroach version
Build Tag:    v20.1.3
Build Time:   2020/06/23 08:38:34
Distribution: CCL
Platform:     darwin amd64 (x86_64-apple-darwin14)
Go Version:   go1.13.9
C Compiler:   4.2.1 Compatible Clang 3.8.0 (tags/RELEASE_380/final)
Build SHA-1:  7fd454f880f386cdd0eda6b21b12f6532c14f0db
Build Type:   release
@dbist dbist self-assigned this Aug 3, 2020
@blathers-crl
Copy link

blathers-crl bot commented Aug 3, 2020

Hi @dbist, I've guessed the C-ategory of your issue and suitably labeled it. Please re-label if inaccurate.

While you're here, please consider adding an A- label to help keep our repository tidy.

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan.

@blathers-crl blathers-crl bot added the C-enhancement Solution expected to add code/behavior + preserve backward-compat (pg compat issues are exception) label Aug 3, 2020
@dbist
Copy link
Contributor Author

dbist commented Aug 3, 2020

tests pass locally,

 cockroach git:(issue-52249) ✗ make test PKG=./pkg/cli
Running make with -j16
GOPATH set to /Users/artem/go
mkdir -p lib
rm -f lib/lib{geos,geos_c}.dylib
cp -L /Users/artem/go/native/x86_64-apple-darwin19.6.0/geos/lib/lib{geos,geos_c}.dylib lib
GOFLAGS= go test   -mod=vendor -tags ' make x86_64_apple_darwin19.6.0' -ldflags '-X github.com/cockroachdb/cockroach/pkg/build.typ=development -extldflags "" -X "github.com/cockroachdb/cockroach/pkg/build.tag=v20.2.0-alpha.1-1697-g470510ed00-dirty" -X "github.com/cockroachdb/cockroach/pkg/build.rev=470510ed00ee0261ecede8daf0b9392f0526a0a0" -X "github.com/cockroachdb/cockroach/pkg/build.cgoTargetTriple=x86_64-apple-darwin19.6.0"  ' -run "."  -timeout 30m ./pkg/cli
ok  	github.com/cockroachdb/cockroach/pkg/cli	240.110s

dbist added a commit that referenced this issue Aug 3, 2020
craig bot pushed a commit that referenced this issue Aug 4, 2020
50265: kvserver: prevent follower reads while a range is subsumed r=nvanbenschoten,andreimatei a=aayushshah15

Before this commit, during a merge, the RHS leaseholder’s store
could continue broadcasting (actionable) closed timestamp updates
even after it had been subsumed. This allowed the followers to be
able to serve follower reads past the subsumption time of RHS.
Additionally, after the merge, if the LHS had a lower closed timestamp
than the RHS, it could allow writes to the keyspan owned by RHS
at timestamps lower than the RHS’s max closed timestamp.

This commit fixes this bug by requiring that the followers catch up
to a LeaseAppliedIndex that belongs to the entry succeeding the
Subsume request.

Fixes #44878

Release note (bug fix): Fixed a rare bug that could cause actionable
closed timestamps to effectively regress over a given keyspan. This
could in turn lead to a serializability violation when using follower
reads. This was due to ill-defined interactions between range merges
and the closed timestamp subsystem.



52241: backupccl: direct spans after split and scatter r=pbardea a=pbardea

The AdminScatter request sent in the SplitAndScatterProcessor returns
the lease information of the range after the scatter requst has
completed. The SplitAndScatterProcessor now looks at this field to
properly direct the spans to the appropriate RestoreData processor.

Release note: None.

52263: cli: change label on printed build revision r=dt a=dbist

Fixes #52249 

Release note (cli change): update label used for commit ID in printed version info

Co-authored-by: Aayush Shah <[email protected]>
Co-authored-by: Paul Bardea <[email protected]>
Co-authored-by: Artem Ervits <[email protected]>
@craig craig bot closed this as completed in 0664a5d Aug 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-enhancement Solution expected to add code/behavior + preserve backward-compat (pg compat issues are exception)
Projects
None yet
Development

Successfully merging a pull request may close this issue.

1 participant