Skip to content

sql: don't double call ConsumerClosed in wrapped local plans#35126

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
jordanlewis:rstpn-no-double-close
Feb 27, 2019
Merged

sql: don't double call ConsumerClosed in wrapped local plans#35126
craig[bot] merged 1 commit intocockroachdb:masterfrom
jordanlewis:rstpn-no-double-close

Conversation

@jordanlewis
Copy link
Copy Markdown
Member

Previously, if someone double-closed a planNode tree containing a
wrapped distsql plan, that might double close a RowChannel, which is
illegal. Add a protection against that.

Release note: None

Previously, if someone double-closed a planNode tree containing a
wrapped distsql plan, that might double close a RowChannel, which is
illegal. Add a protection against that.

Release note: None
@jordanlewis jordanlewis requested review from a team and asubiotto February 21, 2019 18:28
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Contributor

@asubiotto asubiotto left a comment

Choose a reason for hiding this comment

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

LGTM

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @asubiotto)

@jordanlewis
Copy link
Copy Markdown
Member Author

bors r+

craig bot pushed a commit that referenced this pull request Feb 27, 2019
35126: sql: don't double call ConsumerClosed in wrapped local plans r=jordanlewis a=jordanlewis

Previously, if someone double-closed a planNode tree containing a
wrapped distsql plan, that might double close a RowChannel, which is
illegal. Add a protection against that.

Release note: None

35234: ccl: debug encryption-active-key command to show active store key ID. r=mberhault a=mberhault

Given a data directory, this displays the active store key ID and
encryption algorithm in use.

Unlike `debug encryption-status`, this command does not open the
rocksdb instance and therefore does not require knowing the encryption
key. This makes it useful to determine the encryption status with zero
knowledge.

Sample outputs:
```
$ cockroach debug encryption-active-key foobar
Error: data directory foobar does not exist: stat foobar: no such file or directory
Failed running "debug encryption-active-key"

$ cockroach debug encryption-active-key cockroach-noencryption/
Plaintext:

$ cockroach debug encryption-active-key cockroach-plain/
Plaintext:

$ cockroach debug encryption-active-key cockroach-data
AES128_CTR:be235c29239aa84a48e5e1874d76aebf7fb3c1bdc438cec2eb98de82f06a57a0
```

Release note (enterprise change): add debug encryption-active-key
command

Co-authored-by: Jordan Lewis <jordanthelewis@gmail.com>
Co-authored-by: marc <marc@cockroachlabs.com>
@craig
Copy link
Copy Markdown
Contributor

craig bot commented Feb 27, 2019

Build succeeded

@craig craig bot merged commit 4027930 into cockroachdb:master Feb 27, 2019
@jordanlewis jordanlewis deleted the rstpn-no-double-close branch March 15, 2019 15:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants