Skip to content

Revert "streamingccl: hang processors on losing connection with sinkless stream client"#68918

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
adityamaru:revert-client-conn
Aug 16, 2021
Merged

Revert "streamingccl: hang processors on losing connection with sinkless stream client"#68918
craig[bot] merged 1 commit intocockroachdb:masterfrom
adityamaru:revert-client-conn

Conversation

@adityamaru
Copy link
Copy Markdown
Contributor

This reverts commit f5244f4.

@adityamaru adityamaru requested review from a team, annezhu98 and pbardea August 13, 2021 21:54
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@adityamaru adityamaru removed the request for review from a team August 13, 2021 21:54
@adityamaru adityamaru force-pushed the revert-client-conn branch 2 times, most recently from ceac2e6 to b123cc2 Compare August 16, 2021 14:30
@adityamaru
Copy link
Copy Markdown
Contributor Author

bors r=arulajmani

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Aug 16, 2021

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Aug 16, 2021

Build succeeded:

@craig craig bot merged commit 852934c into cockroachdb:master Aug 16, 2021
@adityamaru adityamaru deleted the revert-client-conn branch August 16, 2021 21:12
adityamaru pushed a commit to adityamaru/cockroach that referenced this pull request Aug 24, 2021
In cockroachdb#68918 we reverted
a change that taught stream ingestion processors to wait for a cutover
on losing connection to the client. This was the first part of introducing
the concept of generations to c2c streaming. The change was reverted due
to a leaked goroutine during stress testing.

This change does not alter any of the core logic but simply makes the test
more reliable by adding a `Streaming` testing knob. This allows us to intercept
when the stream ingestion processor receives an Event and perform the necessaery
testing.

Release justification: non-production code changes. Revert a revert
of previously checked in logic by fixing the testing infrastructure
that was leaking the goroutine.
craig bot pushed a commit that referenced this pull request Aug 29, 2021
69262: streamingccl: unrevert graceful cutover of stream ingestion r=pbardea a=adityamaru

In #68918 we reverted
a change that taught stream ingestion processors to wait for a cutover
on losing connection to the client. This was the first part of introducing
the concept of generations to c2c streaming. The change was reverted due
to a leaked goroutine during stress testing.

This change does not alter any of the core logic but simply makes the test
more reliable by adding a `Streaming` testing knob. This allows us to intercept
when the stream ingestion processor receives an Event and perform the necessary
testing.

Fixes: #68701
Fixes: #68795

Release justification (non-production code changes): Revert a revert
of previously checked in logic by fixing the testing infrastructure
that was leaking the goroutine.

69470: sql: Fix SHOW ZONE CONFIGURATIONS with very long constraints r=arulajmani a=ajstorm

Previously, in the presence of very long constraints fields, SHOW ZONE
CONFIGURATIONS would output the constraints with `\n` characters mixed in. This
was due to the fact that the yaml.v2 library contained an 80 character line
limit. We recently pulled in some commits to our fork of the yaml library which
allows the line length to be configurable. With that change, we can now
configure the line length to be unlimited in the case where we're showing the
zone configuration, and get around the ugliness of the `\n` characters.

Release note (sql change): Fixes a bug in SHOW ZONE CONFIGURATIONS where long
constraints fields may show `\n` characters.

Release justification: Low risk change to existing functionality.

Co-authored-by: Anne Zhu <anne.zhu@cockroachlabs.com>
Co-authored-by: Adam Storm <storm@cockroachlabs.com>
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