Skip to content

core: Added changes to DelayedStream.setStream() should cancel the provided stream if not using it #11969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Sangamesh1997 wants to merge 33 commits into from
Closed

core: Added changes to DelayedStream.setStream() should cancel the provided stream if not using it #11969

Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
270567d
core: Added changes to DelayedStream.setStream() should cancel the pr…
Sangamesh1997 Mar 19, 2025
072d033
Merge branch 'grpc:master' into Issue_fixed_1537
Sangamesh1997 Mar 19, 2025
8ac9678
core: Added changes to DelayedStream.setStream() should cancel the pr…
Sangamesh1997 Mar 20, 2025
cac52d4
core: Fixed internal review points
Sangamesh1997 Mar 21, 2025
00eb166
xds: Include XdsConfig as a CallOption
ejona86 Mar 18, 2025
8cd4d5a
xds: Assert XdsNR's cluster ref counting is consistent
ejona86 Mar 5, 2025
2295bbe
xds: Expose filter names to filter instances (#11971)
ejona86 Mar 21, 2025
9e6ece3
Replace usages of deprecated ExpectedException in grpc-api and grpc-c…
panchenko Mar 21, 2025
77216bf
otel tracing: fix span names (#11974)
YifeiZhuang Mar 21, 2025
d28fcb2
xds: add support for custom per-target credentials on the transport (…
AshZhang Mar 21, 2025
eeded6f
core: Log any exception during panic because of exception
ejona86 Mar 24, 2025
036cd41
services: Avoid cancellation exceptions when notifying watchers that …
JoeCqupt Mar 25, 2025
61bb878
fix: cleans up FileWatcherCertificateProvider in XdsSecurityClientSer…
AgraVator Mar 26, 2025
3a35a76
core: Use java.time.Time.getNano in InstantTimeProvider without refle…
panchenko Mar 26, 2025
fa77210
util: Graceful switch to new LB when leaving CONNECTING
ejona86 Mar 27, 2025
129e747
util: Replace BUFFER_PICKER with FixedResultPicker
ejona86 Mar 28, 2025
f828a3c
Start 1.73.0 development cycle (#11987)
AgraVator Apr 1, 2025
8c7cf53
okhttp: Per-rpc call option authority verification (#11754)
kannanjgithub Apr 2, 2025
8879e94
core: Delete stale SuppressWarnings("deprecated") for ATTR_LOAD_BALAN…
ejona86 Apr 2, 2025
920c384
core: Delete the long-deprecated GRPC_PROXY_EXP (#11988)
ejona86 Apr 2, 2025
0ab9e11
xds: propagate audience from cluster resource in gcp auth filter (#11…
shivaspeaks Apr 2, 2025
b7df168
core: Fixed internal review points
Sangamesh1997 Apr 3, 2025
58f39fa
core: Added changes to DelayedStream.setStream() should cancel the pr…
Sangamesh1997 Mar 19, 2025
013948d
core: Added changes to DelayedStream.setStream() should cancel the pr…
Sangamesh1997 Mar 20, 2025
a2220eb
core: Fixed internal review points
Sangamesh1997 Mar 21, 2025
67b2f3a
core: Fixed internal review points
Sangamesh1997 Apr 3, 2025
696dd52
Revert "core: Fixed internal review points"
Sangamesh1997 Apr 3, 2025
6beb245
Merge remote-tracking branch 'origin/Issue_fixed_1537' into Issue_fix…
Sangamesh1997 Apr 3, 2025
17e6b41
Merge branch 'master' into Issue_fixed_1537
Sangamesh1997 Apr 3, 2025
d1602ad
core: Fixed internal review points
Sangamesh1997 Apr 3, 2025
163c958
Merge branch 'grpc:master' into Issue_fixed_1537
Sangamesh1997 Apr 9, 2025
11adf6f
Merge branch 'grpc:master' into Issue_fixed_1537
Sangamesh1997 Apr 19, 2025
529a75e
Merge branch 'grpc:master' into Issue_fixed_1537
Sangamesh1997 Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
core: Fixed internal review points
  • Loading branch information
@Sangamesh1997
Sangamesh1997 committed Mar 21, 2025
commit cac52d4e9e6e5e4252ae0bb81622e94d36b29f0f
2 changes: 0 additions & 2 deletions core/src/main/java/io/grpc/internal/DelayedStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,9 @@ final Runnable setStream(ClientStream stream) {
if (oldStream != null && !cancelOldStream) {
return null;
}

if (cancelOldStream) {
oldStream.cancel(Status.CANCELLED.withDescription("Replaced by a new Stream"));
Copy link
Member

@ejona86 ejona86 Apr 28, 2025

Choose a reason for hiding this comment

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

No. We've already chosen a stream. We can't change to a different stream now. I don't understand why this is being done this way, especially since #1537 said that the stream passed into this function would be the one cancelled.

}

setRealStream(checkNotNull(stream, "stream"));
savedListener = listener;
if (savedListener == null) {
Expand Down
Loading