Permalink
Newer
Older
100644 246 lines (193 sloc) 9.66 KB
1
# Contributing to Cockroach
2
3
- [Prerequisites](#prerequisites)
4
- [Getting and Building](#getting-and-building)
5
- [Style Guide](#style-guide)
6
- [Commit Messages](#commit-messages)
7
- [Code Review Workflow](#code-review-workflow)
8
- [Debugging](#debugging)
9
12
Before you start contributing, review these [basic
13
guidelines](https://www.cockroachlabs.com/docs/stable/contribute-to-cockroachdb.html)
14
on finding a project, determining its complexity, and learning what to
15
expect in your collaboration with the Cockroach Labs team.
17
If you *really* want to dig deep into our processes and mindset, you may also
18
want to peruse our extensive [first PR guide], which is part of our on-boarding for
19
new engineers.
20
21
## Getting and Building
23
1. Install the following prerequisites, as necessary:
24
25
- Either a working Docker install able to run GNU/Linux binaries
26
(e.g. Docker on Linux, macOS, Windows), so you can reuse our
27
pre-populated Docker image with all necessary development
28
dependencies; or
29
30
- The tools needed to build CockroachDB from scratch:
31
32
- A C++ compiler that supports C++11. Note that GCC prior to 6.0 doesn't
33
work due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48891
34
- The standard C/C++ development headers on your system.
35
- On GNU/Linux, the terminfo development libraries, which may be
36
part of a ncurses development package (e.g. `libtinfo-dev` on
37
Debian/Ubuntu, but `ncurses-devel` on CentOS).
38
- A Go environment with a recent 64-bit version of the toolchain. Note that
39
the Makefile enforces the specific version required, as it is updated
40
frequently.
41
- Git 1.9+
42
- Bash (4+ is preferred)
43
- GNU Make (3.81+ is known to work)
44
- CMake 3.1+
45
- Autoconf 2.68+
46
- NodeJS 6.x and Yarn 1.0+
48
Note that at least 4GB of RAM is required to build from source and run tests.
50
2. Get the CockroachDB code:
53
go get -d github.com/cockroachdb/cockroach
54
cd $GOPATH/src/github.com/cockroachdb/cockroach
55
```
56
57
3. Run `make build`, `make test`, or anything else our Makefile offers.
59
If you wish to reuse our builder image instead of installing all the
60
dependencies manually, prefix the `make` command with
61
`build/builder.sh`; for example `build/builder.sh make build`.
62
63
Note that the first time you run `make`, it can take some time to
64
download and install various dependencies. After running `make build`,
65
the `cockroach` executable will be in your current directory and can
66
be run as shown in the [README](README.md).
68
### Other Considerations
70
- The default binary contains core open-source functionally covered by
71
the Apache License 2 (APL2) and enterprise functionality covered by
72
the CockroachDB Community License (CCL). To build a pure open-source
73
(APL2) version excluding enterprise functionality, use `make
74
buildoss`. See this [blog post] for more details.
75
76
[blog post]: https://www.cockroachlabs.com/blog/how-were-building-a-business-to-last/
78
- If you edit a `.proto` or `.ts` file, you will need to manually
79
regenerate the associated `.pb.{go,cc,h}` or `.js` files using `make
80
generate`.
82
- You can also run `build/builder.sh make generate` from the
83
repository root to get the intended result.
85
- If you plan on working on the UI, check out [the UI README](pkg/ui).
87
- To add or update a Go dependency:
88
- See [`build/README.md`](build/README.md) for details on adding or updating
89
dependencies.
90
- Run `make generate` to update generated files.
91
- Create a PR with all the changes.
95
See our separate [style guide](STYLE.md) document.
97
## Commit Messages
98
99
When you're ready to commit, be sure to write a Good Commit Message™. Consult
100
https://github.com/erlang/otp/wiki/Writing-good-commit-messages if you're
101
not sure what constitutes a Good Commit Message™.
102
In addition to the general rules referenced above, please also observe the
103
following guidelines:
104
105
- Prefix your commit subject line with the affected package, if one can easily
106
be chosen. For example, the subject line of a commit mostly affecting the
107
`server` package might read: "server: use net.Pipe instead of TCP HTTP/gRPC connections".
108
Commits which affect many packages as a result of a shared dependency change
109
should probably begin their subjects with the name of the shared dependency.
110
Finally, some commits may need to affect many packages in a way which does
111
not point to a specific package; those commits may begin with "\*:" or "all:"
112
to indicate their reach.
113
114
- We publish detailed [release notes](https://www.cockroachlabs.com/docs/releases/)
115
describing most non-test changes. To facilitate this, at least one commit in every
116
PR (preferably the PR message/merge commit) should contain a brief description of
117
the change in terms that a user would recognize. This description should be prefixed
118
with "Release note (category):", where the "category" is one of the following:
119
- cli change
120
- sql change
122
- performance improvement
123
- bug fix
124
- general change (e.g., change of required Go version)
125
- build change (e.g., compatibility with older CPUs)
126
- enterprise change (e.g., change to backup/restore)
127
- backwards-incompatible change
128
129
For example, a commit like ["distsql: pre-reserve memory needed
130
to mark rows in HashJoiner build phase"](https://github.com/cockroachdb/cockroach/pull/18975)
131
might say, "Release note (bug fix): Fixed a panic in queries with `JOIN` using the
132
distributed SQL engine."
133
134
When a commit falls into more than one category, choose the category that matches best
135
or is most affected from a user's perspective.
136
137
## Code Review Workflow
138
139
- All contributors need to sign the [Contributor License
140
Agreement](https://cla-assistant.io/cockroachdb/cockroach).
142
- Create a local feature branch to do work on, ideally on one thing at
143
a time. If you are working on your own fork, see [this
144
tip](http://blog.campoy.cat/2014/03/github-and-go-forking-pull-requests-and.html)
145
on forking in Go, which ensures that Go import paths will be
146
correct.
147
148
```shell
149
git checkout -b update-readme
150
```
151
152
- Hack away and commit your changes locally using `git add` and `git commit`.
153
Remember to write tests! The following are helpful for running specific
154
subsets of tests:
156
```shell
157
make test
158
# Run all tests in ./pkg/storage
159
make test PKG=./pkg/storage
160
# Run all kv tests matching '^TestFoo' with a timeout of 10s
161
make test PKG=./pkg/kv TESTS='^TestFoo' TESTTIMEOUT=10s
162
# Run the sql logic tests
163
make test PKG=./pkg/sql TESTS='TestLogic$$'
164
# or, using a shortcut,
165
make testlogic
166
# Run a specific sql logic subtest
167
make test PKG=./pkg/sql TESTS='TestLogic$$/select$$'
168
# or, using a shortcut,
169
make testlogic FILES=select
170
```
171
172
Logs are disabled during tests by default. To enable them, include
173
`TESTFLAGS="-v -show-logs"` as an argument the test command:
174
175
```shell
176
make test ... TESTFLAGS="-v -show-logs"
177
```
178
179
- Run the linters, code generators, and unit test suites locally:
182
make pre-push
183
````
184
185
This will take several minutes.
186
187
- When you’re ready for review, groom your work: each commit should pass tests
188
and contain a substantial (but not overwhelming) unit of work. You may also
189
want to `git fetch origin` and run
190
`git rebase -i --exec "make lint test" origin/master` to make sure you're
191
submitting your changes on top of the newest version of our code. Next, push
192
to your fork:
193
194
```shell
195
git push -u <yourfork> update-readme
196
```
Sep 10, 2014
197
198
- Then [create a pull request using GitHub’s
199
UI](https://help.github.com/articles/creating-a-pull-request). If
200
you know of another GitHub user particularly suited to reviewing
201
your pull request, be sure to mention them in the pull request
202
body. If you possess the necessary GitHub privileges, please also
203
[assign them to the pull request using GitHub's
204
UI](https://help.github.com/articles/assigning-issues-and-pull-requests-to-other-github-users/).
205
This will help focus and expedite the code review process.
Sep 10, 2014
206
207
- Address test failures and feedback by amending your commits. If your
208
change contains multiple commits, address each piece of feedback by
209
amending that commit to which the particular feedback is aimed. Wait
210
(or ask) for new feedback on those commits if they are not
211
straightforward. An `LGTM` ("looks good to me") by someone qualified
212
is usually posted when you're free to go ahead and merge. Most new
213
contributors aren't allowed to merge themselves; in that case, we'll
214
do it for you.
Oct 28, 2015
215
Oct 28, 2015
217
218
Peeking into a running cluster can be done in several ways:
219
220
- the [net/trace](https://godoc.org/golang.org/x/net/trace) endpoint
221
at `/debug/requests`. It has a breakdown of the recent traced
222
requests, in particularly slow ones. Two families are traced: `node`
223
and `coord`, the former (and likely more interesting one) containing
224
what happens inside of `Node`/`Store`/`Replica` and the other inside
225
of the coordinator (`TxnCoordSender`).
226
- [pprof](https://golang.org/pkg/net/http/pprof/) gives us (among
227
other things) heap and cpu profiles; [this golang blog
228
post](http://blog.golang.org/profiling-go-programs) explains it
229
extremely well and [this one by Dmitry
230
Vuykov](https://software.intel.com/en-us/blogs/2014/05/10/debugging-performance-issues-in-go-programs)
231
goes into even more detail.
Oct 28, 2015
232
233
An easy way to locally run a workload against a cluster are the acceptance
234
tests. For example,
Oct 28, 2015
235
236
```shell
Oct 28, 2015
237
make acceptance TESTS='TestPut$$' TESTFLAGS='-v -d 1200s -l .' TESTTIMEOUT=1210s
238
```
239
240
runs the `Put` acceptance test for 20 minutes with logging (useful to look at
241
the stack trace in case of a node dying). When it starts, all the relevant
242
commands for `pprof`, `trace` and logs are logged to allow for convenient
243
inspection of the cluster.
244
245
[first PR guide]: docs/first-pr.md