Skip to content

On result2 resolution result have addresses or error #11330

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

Merged
merged 38 commits into from
Oct 7, 2024
Merged

On result2 resolution result have addresses or error #11330

Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
a4e92d6
Introducing NameResolver Listener2::onResult2 that returns Status of …
kannanjgithub Jun 24, 2024
8ac1581
Add comment for the deprecation.
kannanjgithub Jun 24, 2024
82dc9c5
Introducing NameResolver Listener2::onResult2 that returns Status of …
kannanjgithub Jun 24, 2024
a42e66e
Merge remote-tracking branch 'origin/onResult2' into onResult2
kannanjgithub Jun 24, 2024
5e8b3ea
Whitespace fix.
kannanjgithub Jun 24, 2024
7deb491
Combining passing name resolution result or error via ResolutionResult.
kannanjgithub Jun 26, 2024
fb39b62
Combining passing name resolution result or error via ResolutionResult.
kannanjgithub Jun 26, 2024
3a1f3eb
Merge remote-tracking branch 'origin/onResult2_resolutionResultHaveAd…
kannanjgithub Jun 26, 2024
7169585
nit.
kannanjgithub Jun 26, 2024
3aedd65
Test fixes.
kannanjgithub Jun 26, 2024
96a7612
Merge branch 'grpc:master' into onResult2_resolutionResultHaveAddress…
kannanjgithub Jul 20, 2024
8909812
Merge branch 'master' into onResult2_resolutionResultHaveAddressesOrE…
kannanjgithub Jul 26, 2024
96890d2
nit
kannanjgithub Jul 26, 2024
57ee8e2
Fix merge errors.
kannanjgithub Jul 27, 2024
b1e7802
Fix warnings.
kannanjgithub Jul 27, 2024
f2a7b32
Fix style issues.
kannanjgithub Jul 27, 2024
4c0742d
Fix style issues.
kannanjgithub Jul 27, 2024
7f83dee
Fix a failing test, and address review comments for StatusOr.java
kannanjgithub Jul 29, 2024
f725239
Fix style issues.
kannanjgithub Jul 29, 2024
5dc6cd9
Fix tests.
kannanjgithub Jul 29, 2024
3102374
Fix style.
kannanjgithub Jul 29, 2024
d6ee012
Fix tests
kannanjgithub Jul 30, 2024
c44fbc2
Remove the warning as error added in my previous commit since in koko…
kannanjgithub Jul 30, 2024
27af56b
Trigger Build to retry the Android test RetriableStreamTest that fail…
kannanjgithub Jul 30, 2024
d02e4aa
Implement equals and hashCode in StatusOr and other things discussed.
kannanjgithub Aug 12, 2024
49dffd5
Fix warning as error for unchecked cast
kannanjgithub Aug 12, 2024
fea7744
Add suppress unchecked cast
kannanjgithub Aug 12, 2024
ad34729
Fix copyright year.
kannanjgithub Aug 12, 2024
e7f7fda
Revert back of() in favor of fromValue(). Made getValue() throw Illeg…
kannanjgithub Sep 26, 2024
97cb232
Merge remote-tracking branch 'origin/onResult2_resolutionResultHaveAd…
kannanjgithub Sep 26, 2024
e136fe5
Add experimental API label. Allow null value.
kannanjgithub Sep 26, 2024
bcf8578
Merge branch 'grpc:master' into onResult2_resolutionResultHaveAddress…
kannanjgithub Oct 4, 2024
18681d1
Address review comments.
kannanjgithub Oct 4, 2024
b67a02b
Merge remote-tracking branch 'origin/onResult2_resolutionResultHaveAd…
kannanjgithub Oct 4, 2024
70056e4
Fix review comments.
kannanjgithub Oct 4, 2024
7dff20e
Address review comments.
kannanjgithub Oct 4, 2024
c80aafb
Fix code coverage by adding missing test cases.
kannanjgithub Oct 4, 2024
1706016
Fix new review comments.
kannanjgithub Oct 4, 2024
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
Fix tests.
  • Loading branch information
@kannanjgithub
kannanjgithub committed Jul 29, 2024
commit 5dc6cd9534d4364add76b4867830abcd26dd221d
8 changes: 4 additions & 4 deletions grpclb/src/test/java/io/grpc/grpclb/GrpclbNameResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,8 @@ public void resolve_nullResourceResolver_addressFailure() throws Exception {

resolver.start(mockListener);
assertThat(fakeClock.runDueTasks()).isEqualTo(1);
verify(mockListener).onError(errorCaptor.capture());
Status errorStatus = errorCaptor.getValue();
verify(mockListener).onResult2(resultCaptor.capture());
Status errorStatus = resultCaptor.getValue().getAddressesOrError().status();
assertThat(errorStatus.getCode()).isEqualTo(Code.UNAVAILABLE);
assertThat(errorStatus.getCause()).hasMessageThat().contains("no addr");
}
Expand Down Expand Up @@ -335,8 +335,8 @@ public void resolve_addressAndBalancersLookupFail_neverLookupServiceConfig() thr

resolver.start(mockListener);
assertThat(fakeClock.runDueTasks()).isEqualTo(1);
verify(mockListener).onError(errorCaptor.capture());
Status errorStatus = errorCaptor.getValue();
verify(mockListener).onResult2(resultCaptor.capture());
Status errorStatus = resultCaptor.getValue().getAddressesOrError().status();
assertThat(errorStatus.getCode()).isEqualTo(Code.UNAVAILABLE);
verify(mockAddressResolver).resolveAddress(hostName);
verify(mockResourceResolver, never()).resolveTxt("_grpc_config." + hostName);
Expand Down
Loading