Project

General

Profile

Gerrit » History » Version 86

neels, 09/17/2018 11:21 AM

1 1 zecke
h1. Contributing using Gerrit
2 1 zecke
3 11 laforge
{{>toc}}
4 11 laforge
5 10 laforge
At [[OpenBSC:OsmoDevCon2016]] we discussed problems with our past contribution / patch submission process using mails on the mailing list as well as patchwork.  The result is that we want to give Gerrit a try for some time and see if it helps us to have a better process
6 1 zecke
7 10 laforge
Gerrit is a review tool that integrates nicely with git and ssh. You can find general information about Gerrit at https://www.gerritcodereview.com/
8 1 zecke
9 10 laforge
The advantages of Gerrit are:
10 10 laforge
* patch submission status is automatically tracked, also with several revisions for a patch set.
11 10 laforge
* patches are build-tested (and possibly even further tested) by jenkins before they are applied
12 10 laforge
* developers + maintainers can formally vote on a patch (developer: -1/0/+1, maintainer: -2/0/+2)
13 10 laforge
* once a patch has +2 score, it can be (automatically) merged into master
14 10 laforge
* patch sumissions not via git send-email but direcly from git
15 10 laforge
16 10 laforge
h2. Osmocom Subprojects using Gerrit
17 10 laforge
18 73 laforge
The majority of Osmocom sub-projects have chosen to use Gerrit for patch review.  In order to check if a given program uses Gerrit, please check the auto-generated list at https://gerrit.osmocom.org/#/admin/projects/
19 1 zecke
20 75 laforge
If the project is listed there, then it uses Gerrit.   If the project is not listed there, please send patches by e-mail to the respective project [[Mailing_Lists]] instead.
21 30 neels
22 1 zecke
h2. Configuring Gerrit/Account
23 1 zecke
24 54 neels
You will need to sign-up at https://gerrit.osmocom.org/login/. If you have an Osmocom Redmine account you can use https://osmocom.org/openid as OpenID provider.
25 1 zecke
26 68 neels
* first sign in on https://osmocom.org. Do this before logging in on gerrit (the redmine login process loses the gerrit login data and you'd have to do the same thing twice if not logged in on osmocom.org already).
27 55 neels
* go to https://gerrit.osmocom.org and click the "Sign in" link.
28 68 neels
* click the "Sign in with Osmocom":https://gerrit.osmocom.org/login/%23%2Fq%2Fstatus%3Aopen?id=https://osmocom.org/openid link (can be bookmarked). -- This is the same as entering https://osmocom.org/openid as OpenID provider and hitting the "Sign in" button.
29 61 neels
30 61 neels
*careful:* enter 'https' to ensure that your openid credentials are passed on encryptedly.
31 68 neels
*pitfall:* if you're logged in on 'projects.osmocom.org' (including the 'projects.' part), you should also use the openid provider: https://projects.osmocom.org/openid; the 'projects.' part may be omitted, what's important is that redmine login and OpenID URLs match. Also, decide for one of those URLs once, because when picking a different OpenID URL next time, you will create a new user instead of logging in as yourself.
32 61 neels
*note:* gerrit will create a distinct user for each openid URL you pass. If you logged in successfully but your user seems to have lost permissions, you may have created an evil twin user: contact us on the mailing list so we can fix it in the user database.
33 54 neels
34 54 neels
If you have no Osmocom redmine account, you can simply create one online at the "Register" link in the upper right corner.
35 10 laforge
Even without an existing or new redmine account, you should also be able to use any other OpenID provider to authenticate against gerrit (untested).
36 10 laforge
37 10 laforge
After the initial sign-up you will need to:
38 1 zecke
39 1 zecke
* Pick a username (can not be changed)
40 1 zecke
* Add your public ssh key(s)
41 1 zecke
* Add email addresses you intend to use as author/comitter
42 30 neels
43 30 neels
If you would like to push private branches to the Gerrit repository, you also need to be added to the "known users" group.
44 30 neels
Please send a short requesting email to openbsc@lists.osmocom.org.
45 1 zecke
46 1 zecke
h2. Setting up Gerrit for commits and pushing
47 1 zecke
48 33 neels
*Note:* it is easiest to work with gerrit when gerrit is the only remote in your git clone.
49 33 neels
When you clone from git.osmocom.org and add the gerrit remote, git will have two remotes,
50 36 neels
so when you first checkout a branch you have to supply the remote explicitly (cumbersome).
51 34 neels
The gerrit repositories and git.osmocom.org are constantly synced, so it is sufficient
52 34 neels
to clone from gerrit only.
53 33 neels
54 33 neels
h3. Simplest: new clone
55 33 neels
56 35 neels
* Create a new clone from gerrit
57 35 neels
* Fetch the commit hook that adds Change-Id to each commit to uniquely identify a commit
58 42 neels
59 33 neels
<pre>
60 33 neels
git clone ssh://$USERNAME@gerrit.osmocom.org:29418/$PROJECT.git
61 33 neels
scp -P 29418 $USERNAME@gerrit.osmocom.org:hooks/commit-msg $PROJECT/.git/hooks/
62 33 neels
</pre>
63 33 neels
64 33 neels
h3. SSH config
65 33 neels
66 33 neels
In '~/.ssh/config', add these lines:
67 33 neels
<pre>
68 52 neels
Host go
69 33 neels
Hostname gerrit.osmocom.org
70 33 neels
Port 29418
71 33 neels
User $USERNAME
72 33 neels
</pre>
73 52 neels
('go' means gerrit.osmocom, replace with your favorite shortcut name,
74 33 neels
replace '$USERNAME' with your user name as used on the gerrit website)
75 33 neels
76 33 neels
Then you can shorten above commands to
77 1 zecke
<pre>
78 52 neels
git clone ssh://go/$PROJECT.git
79 51 neels
cd $PROJECT
80 51 neels
scp go:hooks/commit-msg .git/hooks/
81 33 neels
</pre>
82 33 neels
83 46 neels
h3. Committer must match
84 46 neels
85 47 neels
Your email address on gerrit and the email address git places in your
86 46 neels
commits must match, or you will get rejected with an error message like
87 46 neels
"invalid commiter". You can add email addresses on the gerrit web UI.
88 46 neels
89 33 neels
h3. Add gerrit to an existing clone
90 33 neels
91 7 neels
* Add the remote to be able to fetch and push to gerrit
92 7 neels
* Fetch the commit hook that adds Change-Id to each commit to uniquely identify a commit
93 7 neels
94 7 neels
<pre>
95 7 neels
USERNAME=gerrit_user_name
96 7 neels
PROJECT=$(basename $PWD)
97 1 zecke
git remote add gerrit ssh://$USERNAME@gerrit.osmocom.org:29418/$PROJECT.git
98 1 zecke
scp -P 29418 $USERNAME@gerrit.osmocom.org:hooks/commit-msg .git/hooks/
99 44 neels
</pre>
100 44 neels
101 33 neels
h2. Push for review
102 1 zecke
103 81 neels
Prerequisites:
104 81 neels
105 81 neels
* your user on gerrit has an SSH public key
106 81 neels
* your patch is committed in your local clone
107 82 neels
* the commit log message has a Change-Id (see 'commit-msg' hook above, and 'Tips and Tricks' below to add a Change-Id to a commit that lacks one.)
108 81 neels
109 77 neels
<pre>
110 77 neels
git push $REMOTE $GITHASH:refs/for/$BRANCH/$TOPIC
111 77 neels
</pre>
112 77 neels
113 77 neels
$REMOTE: from above instructions, that's either 'origin' (cloned from gerrit) or 'gerrit' (if you added a second remote).
114 77 neels
$GITHASH: the committed patch to push, typically you're on your branch and simply push 'HEAD'.
115 77 neels
$BRANCH: you will typically intend a patch to go to 'master'.
116 77 neels
$TOPIC: an optional name you may choose.
117 77 neels
118 77 neels
For example, checkout the revision or branch that you want to submit for review,
119 77 neels
i.e. the one where your patch or several patches are committed on top of the current master, then:
120 1 zecke
121 76 neels
If you cloned directly from gerrit:
122 76 neels
123 1 zecke
<pre>
124 76 neels
git push origin HEAD:refs/for/master
125 76 neels
</pre>
126 76 neels
127 76 neels
If you added 'gerrit' as a second remote to an existing clone:
128 76 neels
129 76 neels
<pre>
130 1 zecke
git push gerrit HEAD:refs/for/master
131 38 neels
</pre>
132 1 zecke
133 40 neels
You can optionally add a topic name with
134 1 zecke
135 40 neels
<pre>
136 76 neels
git push origin HEAD:refs/for/master/my_topic
137 38 neels
</pre>
138 38 neels
139 57 neels
h2. Merge patch to master
140 57 neels
141 57 neels
A patch can be merged when it has CR+2 and V+1 votes, and if, in case of a
142 57 neels
series of patches pushed from a branch, when its ancestor patches can also be
143 57 neels
merged.
144 57 neels
145 57 neels
Sometimes the reviewer that gives CR+2 also hits the "Submit" button right away 
146 57 neels
to merge the patch to master. Sometimes it is left up to the owner of the patch
147 59 neels
to decide when to hit "Submit" (who needs to be in the "Known Users" group).
148 57 neels
149 57 neels
The V+1 vote means "build is verified" and is usually given by our jenkins
150 59 neels
gerrit builds: https://jenkins.osmocom.org/jenkins/view/Jenkins-Gerrit/
151 57 neels
152 57 neels
The CR+2 vote means "code reviewed and ready for merge to master branch".
153 57 neels
Accounts with the "Reviewer" role for a given project are allowed to give CR+2
154 57 neels
votes. Others are allowed to give CR+1 (and CR-1). CR votes _don't_ add up.
155 57 neels
156 67 neels
_Fixed by gerrit 2.12.6, see https://bugs.chromium.org/p/gerrit/issues/detail?id=4158:_
157 67 neels
-Sometimes hitting the "Submit" button results in an error message saying
158 57 neels
"Change is New", which is a bug related to a private branch with the same
159 65 neels
patches being present. Can be fixed e.g. by an admin's manual push to master.-
160 1 zecke
161 84 neels
h2. Manage private branches
162 1 zecke
163 84 neels
Use a sub-directory with your name to group your own branches, please.
164 1 zecke
*Note* that you must be a member of the "known users" group, see above.
165 1 zecke
166 85 neels
To share / backup local branches to git.osmocom.org, without starting a code review process on gerrit.osmocom.org, just push them as usual to gerrit.
167 84 neels
168 84 neels
* Note that the git repository must be cloned from the gerrit SSH URL -- all pushing goes to gerrit ("pushurl" as described below also works).
169 84 neels
* All private branches are automatically synced to git.osmocom.org in a matter of minutes.
170 86 neels
* Private branches do not kick off patch sets for review, they are just branches. To kick off review for all patches on your branch, you'd use a 'refs/for/master' URL, as shown in the example below.
171 84 neels
172 84 neels
The typical transcript for "Fred" developing feature "Kazoo" looks like this:
173 84 neels
174 1 zecke
<pre>
175 84 neels
# Set up ~/.ssh/config so that 'go' points at gerrit.osmocom.org
176 84 neels
git clone ssh://go/libosmocore
177 84 neels
178 84 neels
cd libosmocore
179 84 neels
git checkout -b fred/kazoo   # create local branch
180 84 neels
181 84 neels
$EDITOR
182 84 neels
git add kazoo.c
183 84 neels
git commit -m "implement kazoo"
184 84 neels
185 84 neels
# just invoke 'git push' and git tells you how to create the branch once-off:
186 1 zecke
git push
187 84 neels
|fatal: The current branch asdf has no upstream branch.
188 84 neels
|To push the current branch and set the remote as upstream, use
189 84 neels
|
190 84 neels
|    git push --set-upstream origin fred/kazoo
191 1 zecke
192 84 neels
git push --set-upstream origin fred/kazoo
193 84 neels
# Now the branch exists on gerrit, very soon will also exist on git.osmocom.org
194 84 neels
195 84 neels
# Further tweaks
196 84 neels
$EDITOR
197 84 neels
git add kazoo.h
198 84 neels
git commit --amend
199 84 neels
200 84 neels
# You are free to force-push private branches
201 84 neels
git push -f
202 84 neels
203 84 neels
# origin/master has changed? Rebase onto the latest.
204 84 neels
git fetch
205 84 neels
git rebase -i origin/master
206 84 neels
# resolve conflicts...
207 84 neels
git push -f
208 84 neels
209 84 neels
# Feature is ready
210 84 neels
git push origin HEAD:refs/for/master/kazoo
211 39 neels
</pre>
212 7 neels
213 48 ahuemer
h2. List changesets in gerrit
214 2 zecke
215 12 msuraev
<pre>
216 17 neels
git ls-remote gerrit changes/*
217 1 zecke
</pre>
218 80 neels
219 80 neels
h1. Tips and Tricks
220 80 neels
221 80 neels
h2. A commit lacks a Change-Id
222 80 neels
223 80 neels
once you added the commit hook as above, just re-edit the commit log message, e.g. with
224 80 neels
225 80 neels
<pre>
226 80 neels
git commit --amend
227 80 neels
</pre>
228 80 neels
229 80 neels
or by
230 80 neels
231 80 neels
<pre>
232 80 neels
git rebase -i
233 80 neels
</pre>
234 80 neels
235 80 neels
and in the upcoming editor replacing 'pick' with 'r' in front of the commit to edit.
236 74 neels
237 74 neels
No need to change the commit log if you don't want to, just exit the editor and the commit hook will add a Change-Id.
238 79 neels
239 79 neels
h2. Fetch fast from git.osmocom.org, push to gerrit
240 79 neels
241 1 zecke
Gerrit has moved to a faster host, so this should no longer be necessary. Anyway...
242 74 neels
243 74 neels
Adding a second remote forces you to often pass the remote on the command line ("origin").
244 79 neels
It is possible to have only one remote for cmdline convenience, with differing push and pull URLs:
245 79 neels
246 74 neels
<pre>
247 1 zecke
git remote set-url origin git://git.osmocom.org/$PROJECT
248 74 neels
git remote set-url --push origin ssh://$USERNAME@gerrit.osmocom.org:29418/$PROJECT
249 74 neels
</pre>
250 79 neels
251 74 neels
With above .ssh config you can also use the shorter ssh:// URL:
252 74 neels
<pre>
253 79 neels
git remote set-url --push origin ssh://go/$PROJECT
254 74 neels
</pre>
255 74 neels
256 74 neels
The resulting .git/config in libosmocore would look something like:
257 74 neels
<pre>
258 74 neels
[remote "origin"]
259 74 neels
        url = git://git.osmocom.org/libosmocore
260 74 neels
        pushurl = ssh://go/libosmocore
261 74 neels
        fetch = +refs/heads/*:refs/remotes/origin/*
262 74 neels
</pre>
263 17 neels
264 17 neels
Now you're fetching from git.osmocom.org, which is lightning fast, while pushing patches will still go to gerrit as usual.
265 17 neels
266 45 neels
h2. Throw-away branch
267 13 neels
268 56 neels
If you need to adjust and re-submit patches, it may be handy to create a throw-away branch ("R D" in magit-gerrit in emacs for example),
269 56 neels
make your changes/amendments and then send patch(es) back to gerrit while removing temporary branch automatically with "git review -f".
270 56 neels
271 56 neels
h2. Fetch a patch from gerrit
272 56 neels
273 56 neels
This script (I called it @P@) makes fetching a patch set from gerrit a breeze:
274 56 neels
<pre>
275 56 neels
#!/bin/sh
276 56 neels
# fetch gerrit patch into new branch named like the patch number.
277 56 neels
#
278 56 neels
# Usage: go to a git clone and pass a patch number:
279 56 neels
#
280 56 neels
#   cd openbsc
281 56 neels
#   P 973
282 56 neels
# or
283 56 neels
#   P 973/2
284 56 neels
#
285 56 neels
# Will create new local branches '973_4' (if 4 is the latest patch set)
286 56 neels
# or '973_2', respectively.
287 56 neels
288 56 neels
patch="$1"
289 56 neels
290 56 neels
if [ -z "$patch" ]; then
291 56 neels
  echo "Usage: P 1234[/5]"
292 56 neels
  exit 1
293 56 neels
fi
294 56 neels
295 56 neels
if [ -z "$(echo "$patch" | grep '/')" ]; then
296 56 neels
  patch="/$patch/"
297 56 neels
fi
298 56 neels
299 56 neels
if [ -z "$(echo "$patch" | grep '^/')" ]; then
300 56 neels
  patch="/$patch"
301 56 neels
fi
302 56 neels
303 56 neels
last_set="$(git ls-remote origin "changes/*" | grep "$patch" | sed 's#.*/\([^/]*\)$#\1 &#' | sort -n | tail -n 1)"
304 56 neels
if [ -z "$last_set" ]; then
305 56 neels
  echo "Not found: $patch"
306 56 neels
  exit 1
307 56 neels
fi
308 56 neels
309 56 neels
change_name="$(echo "$last_set" | sed 's/.*\(refs.*\)/\1/')"
310 56 neels
branch_name="$(echo "$change_name" | sed 's#refs/changes/../\([0-9]*\)/\([0-9]*\)#\1_\2#')"
311 56 neels
312 56 neels
set -x
313 56 neels
git fetch origin "$change_name"
314 25 neels
git co -b "$branch_name" FETCH_HEAD
315 13 neels
</pre>
316 1 zecke
317 58 neels
h2. Re-submit a Branch with Amended Commits
318 58 neels
319 22 neels
On a feature branch, one typically has numerous commits that depend on their preceding commits.
320 58 neels
Often, some of the branch commits need to be amended for fixes. You can re-submit changes to
321 58 neels
patches on your branch by pushing in the same way that you first submitted the branch.
322 58 neels
323 29 neels
Note: if you modify the Change-Ids in the commit logs, your push would open entirely new
324 58 neels
review entries and you would have to abandon your previous submission. Comments on the first
325 58 neels
submission are "lost" and you cannot diff between patch sets.
326 29 neels
327 29 neels
(There used to be a bug in gerrit that required editing the first patch to be able to
328 29 neels
re-submit a branch, but that's fixed.)
329 26 neels
330 1 zecke
331 1 zecke
332 1 zecke
h2. Re-submit Previously Abandoned Changes
333 1 zecke
334 1 zecke
You have to edit the Change-Ids, on a branch that would be every single commit log message.
335 1 zecke
336 1 zecke
<pre>
337 1 zecke
cd openbsc
338 1 zecke
git co my-branch
339 1 zecke
git rebase -i master
340 1 zecke
# replace all 'pick' with 'r' (or 'reword'), exit your editor
341 1 zecke
# git presents each commit log message for editing
342 1 zecke
</pre>
343 1 zecke
344 78 neels
h2. 502 Bad Gateway
345 78 neels
346 78 neels
When getting a "Bad Gateway" error message upon trying to login on gerrit, you probably just need to restart your web browser. The reason is not clear.
347 78 neels
348 78 neels
349 78 neels
h2. Commit hook: Always put Change-Id at the bottom of the log message
350 78 neels
351 78 neels
The commit-msg hook places a Change-Id tag in the footer, often above other tags like 'Depends:' or 'Related:'. Since the Change-Id is an implementation detail for Gerrit, I personally prefer it always placed right at the bottom. This simple edit changes the commit-msg hook to add Change-Id at the bottom unconditionally:
352 78 neels
353 78 neels
<pre>
354 78 neels
cd $PROJECT
355 78 neels
sed -i 's/if (unprinted /if (0 \&\& unprinted /' .git/hooks/commit-msg
356 78 neels
</pre>
357 78 neels
358 78 neels
The goal is to disable the condition in line 163 with an 'if (0...':
359 78 neels
360 78 neels
<pre>
361 78 neels
                        if (0 && unprinted && match(tolower(footer[line]), changeIdAfter) != 1) {
362 78 neels
                                unprinted = 0
363 78 neels
                                print "Change-Id: I'"$id"'"
364 78 neels
                        }
365 60 neels
</pre>
366 16 neels
367 13 neels
Then the Change-Id will be placed by line 170 instead.
368 16 neels
369 16 neels
h1. Reasons for Particular Configuration
370 16 neels
371 13 neels
h2. Rebase if necessary
372 13 neels
373 13 neels
There are different merge strategies that Gerrit performs to accept patches.
374 13 neels
Each project can be configured to a specific merge strategy, but unfortunately you can't
375 13 neels
decide on a strategy per patch submission.
376 13 neels
377 13 neels
It seems that the "Merge if Necessary" strategy is best supported, but it creates non-linear
378 13 neels
history with numerous merge commits that are usually not at all necessary.
379 13 neels
380 13 neels
Instead, the "Cherry Pick" strategy puts each patch onto current master's HEAD to create
381 1 zecke
linear history. However, this will cause merge failures as soon as one patch depends on
382 13 neels
another submitted patch, as typical for a feature branch submission.
383 13 neels
384 1 zecke
So we prefer the "Rebase if Necessary" strategy, which always tries to apply your patches to
385 13 neels
the current master HEAD, in sequence with the previous patches on the same branch.
386 13 neels
However, some problems still remain, including some bugs in "Rebase if Necessary".
387 13 neels
388 1 zecke
There's a problem with "Rebase if Necessary": If your branch sits at master's HEAD, Gerrit
389 1 zecke
refuses to accept the submission, because it thinks that no new changes are submitted.
390 1 zecke
This is a bug in Gerrit, which holger has fixed manually in our Gerrit installation:
391 1 zecke
392 16 neels
https://bugs.chromium.org/p/gerrit/issues/detail?id=4158
393 1 zecke
394 13 neels
395 13 neels
h2. Private Branches: Create a new change for every commit...
396 16 neels
397 13 neels
Say you have an extensive feature in development, and you want to keep it on the
398 13 neels
upstream git repository to a) keep it safe and b) collaborate with other devs on it.
399 13 neels
So, of course, you have regularly pushed to refs/heads/yoyodyne/feature.
400 13 neels
401 13 neels
Since you have the gerrit commit hook installed, your feature branch already has
402 13 neels
Change-Id tags in all commit log messages.
403 13 neels
404 13 neels
Now your feature is complete and you would like to submit it to master.
405 16 neels
Alas, Gerrit refuses to accept your patch submission for master, because it
406 16 neels
knows the Change-Ids are also on a different branch.
407 16 neels
408 16 neels
Gerrit by default enforces that a Change-Id must be unique across all branches,
409 16 neels
so that each submission for review is separate for each branch. Instead, we
410 13 neels
want to handle Change-Ids per-branch, so that you can have the same change
411 16 neels
submitted to different branches, as separate patch submissions, without having
412 16 neels
to cosmetically adjust the Change-Id.
413 13 neels
414 20 neels
Solution: set the option 
415 14 neels
_Create a new change for every commit not in the target branch_ to _TRUE_
416 14 neels
417 14 neels
h2. Allow content merges
418 14 neels
419 14 neels
By default, gerrit compares patches only by the files' paths. If two paths are the same,
420 14 neels
it immediately shows them as conflicts (path conflicts).
421 14 neels
422 23 neels
In software development, a conflict usually means an actual content conflict, so if the
423 14 neels
edits are in two entirely separate places in the file, we don't consider this a conflict.
424 14 neels
425 32 neels
By setting _Allow content merges_ to _TRUE_ in the git project config, we tell Gerrit to
426 32 neels
perform text merges of the submitted patches and only complain about actual content
427 32 neels
conflicts, in the usual software engineering sense.
428 72 laforge
429 72 laforge
h1. Admin
430 72 laforge
431 72 laforge
h2. Adding a new repository
432 72 laforge
433 72 laforge
* create the repository in the Gerrit Ui, inherit from "All-Projects"
434 72 laforge
* create an empty git repository using gitosis on git.osmcoom.org
435 72 laforge
* configure a jenkins build testing job for this project, cloning/copying from any osmo-*-gerrit projects
436 72 laforge
437 32 neels
git replication to gerrit.osmocom.org is enabled automatically, nothing to be done here.  In case of doubt, try
438 32 neels
@ssh -p 29418 gerrit.osmocom.org replication start --all --wait@
439 32 neels
440 32 neels
h2. Adding users to groups
441 32 neels
442 32 neels
Normally, the gerrit UI auto-completes a user name in the edit field. It has happened
443 32 neels
though that an existing user is not auto-completed, as if it didn't exist. In that case,
444 32 neels
find out the user ID (seven digit number like 1000123) and just enter that.
445 32 neels
446 32 neels
The user ID can be found on the user's "Settings" page, or in the database (s.b.).
447 32 neels
448 32 neels
h2. Querying the database directly
449 32 neels
450 32 neels
If your user has permission to access the database, you can place SQL queries using the
451 71 neels
'gerrit gsql' commands over ssh:
452 71 neels
453 1 zecke
<pre>
454 53 neels
ssh go "gerrit gsql -c \"show tables\""
455 53 neels
ssh go "gerrit gsql -c \"select full_name,account_id from accounts\""
456 1 zecke
</pre>
457 1 zecke
458 71 neels
(see ~/.ssh/config above for the 'go' shortcut)
459 71 neels
460 62 neels
This seems to be the MySQL dialect.
461 62 neels
462 62 neels
The "...\"...\"" quoting allows including single-quotes in the SQL statements.
463 62 neels
464 62 neels
h2. Fix evil twin users
465 62 neels
466 64 neels
If differing openid URLs have lead to evil twin users shadowing the same email address just without the permissions, you can fix it like this:
467 62 neels
468 62 neels
<pre>
469 62 neels
ssh go "gerrit gsql -c \"select * from account_external_ids where email_address like '%foo%'\""
470 62 neels
# ACCOUNT_ID | EMAIL_ADDRESS   | PASSWORD | EXTERNAL_ID
471 62 neels
# -----------+-----------------+----------+----------------------------------
472 64 neels
# 100004     | foo@example.com | NULL     | https://osmocom.org/openid/user/777
473 62 neels
# 100021     | foo@example.com | NULL     | https://projects.osmocom.org/openid/user/777
474 64 neels
475 62 neels
ssh go "gerrit gsql -c \"update account_external_ids set account_id = 100004 where email_address like '%foo%'\""
476 62 neels
477 62 neels
ssh go "gerrit gsql -c \"select * from account_external_ids where email_address like '%foo%'\""
478 62 neels
# ACCOUNT_ID | EMAIL_ADDRESS   | PASSWORD | EXTERNAL_ID
479 62 neels
# -----------+-----------------+----------+----------------------------------
480 1 zecke
# 100004     | foo@example.com | NULL     | https://osmocom.org/openid/user/777
481 1 zecke
# 100004     | foo@example.com | NULL     | https://projects.osmocom.org/openid/user/777
482 1 zecke
</pre>
Add picture from clipboard (Maximum size: 48.8 MB)