{"action":"closed","number":23782,"pull_request":{"url":"https://api.github.com/repos/cockroachdb/cockroach/pulls/23782","id":174676226,"html_url":"https://github.com/cockroachdb/cockroach/pull/23782","diff_url":"https://github.com/cockroachdb/cockroach/pull/23782.diff","patch_url":"https://github.com/cockroachdb/cockroach/pull/23782.patch","issue_url":"https://api.github.com/repos/cockroachdb/cockroach/issues/23782","number":23782,"state":"closed","locked":false,"title":"backport-2.0: cli: actually retry retryable errors","user":{"login":"benesch","id":882976,"avatar_url":"https://avatars1.githubusercontent.com/u/882976?v=4","gravatar_id":"","url":"https://api.github.com/users/benesch","html_url":"https://github.com/benesch","followers_url":"https://api.github.com/users/benesch/followers","following_url":"https://api.github.com/users/benesch/following{/other_user}","gists_url":"https://api.github.com/users/benesch/gists{/gist_id}","starred_url":"https://api.github.com/users/benesch/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/benesch/subscriptions","organizations_url":"https://api.github.com/users/benesch/orgs","repos_url":"https://api.github.com/users/benesch/repos","events_url":"https://api.github.com/users/benesch/events{/privacy}","received_events_url":"https://api.github.com/users/benesch/received_events","type":"User","site_admin":false},"body":"Backport 1/1 commits from #23768.\r\n\r\n/cc @cockroachdb/release\r\n\r\n---\r\n\r\nsqlConn.ExecTxn was failing to retry transactions due to a bug in its\r\nretryable error detection. Specifically, pgerror.GetPGCause does not\r\nwork on errors that have been sent over pgwire.\r\n\r\nReplace sqlConn.ExecTxn with an implementation that calls\r\ncrdb.ExecuteInTxn; it was previously a copy/pasted and out-of-date\r\nversion of that function. This fixes the bug at hand and will prevent\r\nbugs caused by future divergence.\r\n\r\nAlso add a test to prevent regressions.\r\n\r\nRelease note (bug fix): `cockroach zone set` will now automatically\r\nretry if it encounters an error while setting zone configurations.\r\n\r\nFix #22839.\r\nFix #23752.\r\nFix #23765.\r\n","created_at":"2018-03-13T14:25:21Z","updated_at":"2018-03-13T19:38:26Z","closed_at":"2018-03-13T19:38:26Z","merged_at":"2018-03-13T19:38:26Z","merge_commit_sha":"94a99bdb9a16a04c36bfc9accadcca0b7763179b","assignee":null,"assignees":[],"requested_reviewers":[{"login":"tschottdorf","id":5076964,"avatar_url":"https://avatars1.githubusercontent.com/u/5076964?v=4","gravatar_id":"","url":"https://api.github.com/users/tschottdorf","html_url":"https://github.com/tschottdorf","followers_url":"https://api.github.com/users/tschottdorf/followers","following_url":"https://api.github.com/users/tschottdorf/following{/other_user}","gists_url":"https://api.github.com/users/tschottdorf/gists{/gist_id}","starred_url":"https://api.github.com/users/tschottdorf/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tschottdorf/subscriptions","organizations_url":"https://api.github.com/users/tschottdorf/orgs","repos_url":"https://api.github.com/users/tschottdorf/repos","events_url":"https://api.github.com/users/tschottdorf/events{/privacy}","received_events_url":"https://api.github.com/users/tschottdorf/received_events","type":"User","site_admin":false}],"requested_teams":[{"name":"cli-prs","id":2437980,"slug":"cli-prs","description":"Join this team for notifications about CLI PRs","privacy":"closed","url":"https://api.github.com/teams/2437980","members_url":"https://api.github.com/teams/2437980/members{/member}","repositories_url":"https://api.github.com/teams/2437980/repos","permission":"pull"}],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/cockroachdb/cockroach/pulls/23782/commits","review_comments_url":"https://api.github.com/repos/cockroachdb/cockroach/pulls/23782/comments","review_comment_url":"https://api.github.com/repos/cockroachdb/cockroach/pulls/comments{/number}","comments_url":"https://api.github.com/repos/cockroachdb/cockroach/issues/23782/comments","statuses_url":"https://api.github.com/repos/cockroachdb/cockroach/statuses/a45c687c7d928df045552ca2126e186803b6a5f1","head":{"label":"benesch:backport2.0-23768","ref":"backport2.0-23768","sha":"a45c687c7d928df045552ca2126e186803b6a5f1","user":{"login":"benesch","id":882976,"avatar_url":"https://avatars1.githubusercontent.com/u/882976?v=4","gravatar_id":"","url":"https://api.github.com/users/benesch","html_url":"https://github.com/benesch","followers_url":"https://api.github.com/users/benesch/followers","following_url":"https://api.github.com/users/benesch/following{/other_user}","gists_url":"https://api.github.com/users/benesch/gists{/gist_id}","starred_url":"https://api.github.com/users/benesch/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/benesch/subscriptions","organizations_url":"https://api.github.com/users/benesch/orgs","repos_url":"https://api.github.com/users/benesch/repos","events_url":"https://api.github.com/users/benesch/events{/privacy}","received_events_url":"https://api.github.com/users/benesch/received_events","type":"User","site_admin":false},"repo":{"id":78508291,"name":"cockroach","full_name":"benesch/cockroach","owner":{"login":"benesch","id":882976,"avatar_url":"https://avatars1.githubusercontent.com/u/882976?v=4","gravatar_id":"","url":"https://api.github.com/users/benesch","html_url":"https://github.com/benesch","followers_url":"https://api.github.com/users/benesch/followers","following_url":"https://api.github.com/users/benesch/following{/other_user}","gists_url":"https://api.github.com/users/benesch/gists{/gist_id}","starred_url":"https://api.github.com/users/benesch/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/benesch/subscriptions","organizations_url":"https://api.github.com/users/benesch/orgs","repos_url":"https://api.github.com/users/benesch/repos","events_url":"https://api.github.com/users/benesch/events{/privacy}","received_events_url":"https://api.github.com/users/benesch/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/benesch/cockroach","description":"A Scalable, Survivable, Strongly-Consistent SQL Database","fork":true,"url":"https://api.github.com/repos/benesch/cockroach","forks_url":"https://api.github.com/repos/benesch/cockroach/forks","keys_url":"https://api.github.com/repos/benesch/cockroach/keys{/key_id}","collaborators_url":"https://api.github.com/repos/benesch/cockroach/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/benesch/cockroach/teams","hooks_url":"https://api.github.com/repos/benesch/cockroach/hooks","issue_events_url":"https://api.github.com/repos/benesch/cockroach/issues/events{/number}","events_url":"https://api.github.com/repos/benesch/cockroach/events","assignees_url":"https://api.github.com/repos/benesch/cockroach/assignees{/user}","branches_url":"https://api.github.com/repos/benesch/cockroach/branches{/branch}","tags_url":"https://api.github.com/repos/benesch/cockroach/tags","blobs_url":"https://api.github.com/repos/benesch/cockroach/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/benesch/cockroach/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/benesch/cockroach/git/refs{/sha}","trees_url":"https://api.github.com/repos/benesch/cockroach/git/trees{/sha}","statuses_url":"https://api.github.com/repos/benesch/cockroach/statuses/{sha}","languages_url":"https://api.github.com/repos/benesch/cockroach/languages","stargazers_url":"https://api.github.com/repos/benesch/cockroach/stargazers","contributors_url":"https://api.github.com/repos/benesch/cockroach/contributors","subscribers_url":"https://api.github.com/repos/benesch/cockroach/subscribers","subscription_url":"https://api.github.com/repos/benesch/cockroach/subscription","commits_url":"https://api.github.com/repos/benesch/cockroach/commits{/sha}","git_commits_url":"https://api.github.com/repos/benesch/cockroach/git/commits{/sha}","comments_url":"https://api.github.com/repos/benesch/cockroach/comments{/number}","issue_comment_url":"https://api.github.com/repos/benesch/cockroach/issues/comments{/number}","contents_url":"https://api.github.com/repos/benesch/cockroach/contents/{+path}","compare_url":"https://api.github.com/repos/benesch/cockroach/compare/{base}...{head}","merges_url":"https://api.github.com/repos/benesch/cockroach/merges","archive_url":"https://api.github.com/repos/benesch/cockroach/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/benesch/cockroach/downloads","issues_url":"https://api.github.com/repos/benesch/cockroach/issues{/number}","pulls_url":"https://api.github.com/repos/benesch/cockroach/pulls{/number}","milestones_url":"https://api.github.com/repos/benesch/cockroach/milestones{/number}","notifications_url":"https://api.github.com/repos/benesch/cockroach/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/benesch/cockroach/labels{/name}","releases_url":"https://api.github.com/repos/benesch/cockroach/releases{/id}","deployments_url":"https://api.github.com/repos/benesch/cockroach/deployments","created_at":"2017-01-10T07:21:31Z","updated_at":"2017-01-10T07:21:39Z","pushed_at":"2018-03-13T19:37:34Z","git_url":"git://github.com/benesch/cockroach.git","ssh_url":"git@github.com:benesch/cockroach.git","clone_url":"https://github.com/benesch/cockroach.git","svn_url":"https://github.com/benesch/cockroach","homepage":"https://www.cockroachlabs.com","size":504469,"stargazers_count":0,"watchers_count":0,"language":"Go","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":0,"license":{"key":"other","name":"Other","spdx_id":null,"url":null},"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"cockroachdb:release-2.0","ref":"release-2.0","sha":"65bafd6dbb097af928c401a70d90a12b756d9ef6","user":{"login":"cockroachdb","id":6748139,"avatar_url":"https://avatars3.githubusercontent.com/u/6748139?v=4","gravatar_id":"","url":"https://api.github.com/users/cockroachdb","html_url":"https://github.com/cockroachdb","followers_url":"https://api.github.com/users/cockroachdb/followers","following_url":"https://api.github.com/users/cockroachdb/following{/other_user}","gists_url":"https://api.github.com/users/cockroachdb/gists{/gist_id}","starred_url":"https://api.github.com/users/cockroachdb/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cockroachdb/subscriptions","organizations_url":"https://api.github.com/users/cockroachdb/orgs","repos_url":"https://api.github.com/users/cockroachdb/repos","events_url":"https://api.github.com/users/cockroachdb/events{/privacy}","received_events_url":"https://api.github.com/users/cockroachdb/received_events","type":"Organization","site_admin":false},"repo":{"id":16563587,"name":"cockroach","full_name":"cockroachdb/cockroach","owner":{"login":"cockroachdb","id":6748139,"avatar_url":"https://avatars3.githubusercontent.com/u/6748139?v=4","gravatar_id":"","url":"https://api.github.com/users/cockroachdb","html_url":"https://github.com/cockroachdb","followers_url":"https://api.github.com/users/cockroachdb/followers","following_url":"https://api.github.com/users/cockroachdb/following{/other_user}","gists_url":"https://api.github.com/users/cockroachdb/gists{/gist_id}","starred_url":"https://api.github.com/users/cockroachdb/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cockroachdb/subscriptions","organizations_url":"https://api.github.com/users/cockroachdb/orgs","repos_url":"https://api.github.com/users/cockroachdb/repos","events_url":"https://api.github.com/users/cockroachdb/events{/privacy}","received_events_url":"https://api.github.com/users/cockroachdb/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/cockroachdb/cockroach","description":"CockroachDB - the open source, cloud-native SQL database.","fork":false,"url":"https://api.github.com/repos/cockroachdb/cockroach","forks_url":"https://api.github.com/repos/cockroachdb/cockroach/forks","keys_url":"https://api.github.com/repos/cockroachdb/cockroach/keys{/key_id}","collaborators_url":"https://api.github.com/repos/cockroachdb/cockroach/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/cockroachdb/cockroach/teams","hooks_url":"https://api.github.com/repos/cockroachdb/cockroach/hooks","issue_events_url":"https://api.github.com/repos/cockroachdb/cockroach/issues/events{/number}","events_url":"https://api.github.com/repos/cockroachdb/cockroach/events","assignees_url":"https://api.github.com/repos/cockroachdb/cockroach/assignees{/user}","branches_url":"https://api.github.com/repos/cockroachdb/cockroach/branches{/branch}","tags_url":"https://api.github.com/repos/cockroachdb/cockroach/tags","blobs_url":"https://api.github.com/repos/cockroachdb/cockroach/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/cockroachdb/cockroach/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/cockroachdb/cockroach/git/refs{/sha}","trees_url":"https://api.github.com/repos/cockroachdb/cockroach/git/trees{/sha}","statuses_url":"https://api.github.com/repos/cockroachdb/cockroach/statuses/{sha}","languages_url":"https://api.github.com/repos/cockroachdb/cockroach/languages","stargazers_url":"https://api.github.com/repos/cockroachdb/cockroach/stargazers","contributors_url":"https://api.github.com/repos/cockroachdb/cockroach/contributors","subscribers_url":"https://api.github.com/repos/cockroachdb/cockroach/subscribers","subscription_url":"https://api.github.com/repos/cockroachdb/cockroach/subscription","commits_url":"https://api.github.com/repos/cockroachdb/cockroach/commits{/sha}","git_commits_url":"https://api.github.com/repos/cockroachdb/cockroach/git/commits{/sha}","comments_url":"https://api.github.com/repos/cockroachdb/cockroach/comments{/number}","issue_comment_url":"https://api.github.com/repos/cockroachdb/cockroach/issues/comments{/number}","contents_url":"https://api.github.com/repos/cockroachdb/cockroach/contents/{+path}","compare_url":"https://api.github.com/repos/cockroachdb/cockroach/compare/{base}...{head}","merges_url":"https://api.github.com/repos/cockroachdb/cockroach/merges","archive_url":"https://api.github.com/repos/cockroachdb/cockroach/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/cockroachdb/cockroach/downloads","issues_url":"https://api.github.com/repos/cockroachdb/cockroach/issues{/number}","pulls_url":"https://api.github.com/repos/cockroachdb/cockroach/pulls{/number}","milestones_url":"https://api.github.com/repos/cockroachdb/cockroach/milestones{/number}","notifications_url":"https://api.github.com/repos/cockroachdb/cockroach/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/cockroachdb/cockroach/labels{/name}","releases_url":"https://api.github.com/repos/cockroachdb/cockroach/releases{/id}","deployments_url":"https://api.github.com/repos/cockroachdb/cockroach/deployments","created_at":"2014-02-06T00:18:47Z","updated_at":"2018-03-13T18:23:33Z","pushed_at":"2018-03-13T19:38:26Z","git_url":"git://github.com/cockroachdb/cockroach.git","ssh_url":"git@github.com:cockroachdb/cockroach.git","clone_url":"https://github.com/cockroachdb/cockroach.git","svn_url":"https://github.com/cockroachdb/cockroach","homepage":"https://www.cockroachlabs.com","size":972466,"stargazers_count":12773,"watchers_count":12773,"language":"Go","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1301,"mirror_url":null,"archived":false,"open_issues_count":1553,"license":{"key":"other","name":"Other","spdx_id":null,"url":null},"forks":1301,"open_issues":1553,"watchers":12773,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/cockroachdb/cockroach/pulls/23782"},"html":{"href":"https://github.com/cockroachdb/cockroach/pull/23782"},"issue":{"href":"https://api.github.com/repos/cockroachdb/cockroach/issues/23782"},"comments":{"href":"https://api.github.com/repos/cockroachdb/cockroach/issues/23782/comments"},"review_comments":{"href":"https://api.github.com/repos/cockroachdb/cockroach/pulls/23782/comments"},"review_comment":{"href":"https://api.github.com/repos/cockroachdb/cockroach/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/cockroachdb/cockroach/pulls/23782/commits"},"statuses":{"href":"https://api.github.com/repos/cockroachdb/cockroach/statuses/a45c687c7d928df045552ca2126e186803b6a5f1"}},"author_association":"OWNER","merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"benesch","id":882976,"avatar_url":"https://avatars1.githubusercontent.com/u/882976?v=4","gravatar_id":"","url":"https://api.github.com/users/benesch","html_url":"https://github.com/benesch","followers_url":"https://api.github.com/users/benesch/followers","following_url":"https://api.github.com/users/benesch/following{/other_user}","gists_url":"https://api.github.com/users/benesch/gists{/gist_id}","starred_url":"https://api.github.com/users/benesch/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/benesch/subscriptions","organizations_url":"https://api.github.com/users/benesch/orgs","repos_url":"https://api.github.com/users/benesch/repos","events_url":"https://api.github.com/users/benesch/events{/privacy}","received_events_url":"https://api.github.com/users/benesch/received_events","type":"User","site_admin":false},"comments":1,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":76,"deletions":44,"changed_files":2}}
{"actor":{"display_login":"benesch"}}