Skip to content
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

Jump to bottom

fix: update the accounting of partial batch mutations #2149

Merged
merged 32 commits into from
Mar 27, 2024
Merged

fix: update the accounting of partial batch mutations #2149

Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
7de3aba
Fixed retrying of partial errors
ron-gal Mar 6, 2024
aec1125
Minor changes
ron-gal Mar 6, 2024
e6485ee
fix tests
ron-gal Mar 6, 2024
e370774
fix tests
ron-gal Mar 7, 2024
f0f4e07
fix tests
ron-gal Mar 7, 2024
4c0f12f
fix tests
ron-gal Mar 7, 2024
bc486e5
fix callable order
ron-gal Mar 12, 2024
dcd6d15
Merge branch 'googleapis:main' into retry
ron-gal Mar 13, 2024
bcb98d7
Fixed PR comments
ron-gal Mar 14, 2024
9d225a3
reverted irrelevant changes
ron-gal Mar 14, 2024
64da251
reverted irrelevant changes
ron-gal Mar 14, 2024
7362b10
add tests
ron-gal Mar 14, 2024
3bf1b6f
add tests
ron-gal Mar 14, 2024
7c66089
add tests
ron-gal Mar 14, 2024
7515f29
add tests
ron-gal Mar 14, 2024
35d4c67
fix lint
ron-gal Mar 15, 2024
08bcd36
Some PR fixes
ron-gal Mar 19, 2024
3386f1d
more PR fixes
ron-gal Mar 19, 2024
ccb0a49
more PR fixes
ron-gal Mar 19, 2024
feb4985
fix lint
ron-gal Mar 19, 2024
3f6c60a
fix test
ron-gal Mar 20, 2024
d57e50f
fix lint
ron-gal Mar 20, 2024
820d877
add test
ron-gal Mar 21, 2024
6543543
add tests
ron-gal Mar 21, 2024
3f32cb5
add tests
ron-gal Mar 21, 2024
a7fa3dc
add tests
ron-gal Mar 21, 2024
13f9c92
remove LOCAL_STATUS
ron-gal Mar 21, 2024
2637e95
fix lint
ron-gal Mar 21, 2024
c263e51
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Mar 27, 2024
a0b6f88
fix clirr warning
ron-gal Mar 27, 2024
ae9b8c0
fix comment
ron-gal Mar 27, 2024
1570035
Merge branch 'googleapis:main' into retry
ron-gal Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
fix test
  • Loading branch information
@ron-gal
ron-gal committed Mar 20, 2024
commit 3f6c60a97fe2945587422c4f483ebb19b60a05e7
23 changes: 16 additions & 7 deletions ...gtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@
package com.google.cloud.bigtable.data.v2.stub;

import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertThrows;

import com.google.api.client.json.gson.GsonFactory;
import com.google.api.client.json.webtoken.JsonWebSignature;
import com.google.api.gax.batching.Batcher;
import com.google.api.gax.batching.BatcherImpl;
import com.google.api.gax.batching.BatchingException;
import com.google.api.gax.batching.BatchingSettings;
import com.google.api.gax.batching.FlowControlSettings;
import com.google.api.gax.batching.FlowController.LimitExceededBehavior;
Expand Down Expand Up @@ -120,7 +122,7 @@ public class EnhancedBigtableStubTest {
public void setUp() throws IOException, IllegalAccessException, InstantiationException {
metadataInterceptor = new MetadataInterceptor();
contextInterceptor = new ContextInterceptor();
fakeDataService = new FakeDataService();
fakeDataService = Mockito.spy(new FakeDataService());

server =
FakeServiceBuilder.create(fakeDataService)
Expand Down Expand Up @@ -595,7 +597,7 @@ public void testReadChangeStreamWaitTimeoutIsSet() throws Exception {
}

@Test
public void testBatchMutationsPartialFailure() throws InterruptedException {
public void testBatchMutationsPartialFailure() {
Batcher<RowMutationEntry, Void> batcher =
enhancedBigtableStub.newMutateRowsBatcher("table1", GrpcCallContext.createDefault());

Expand All @@ -621,13 +623,16 @@ public void testBatchMutationsPartialFailure() throws InterruptedException {
observer.onCompleted();
return null;
})
.when(Mockito.mock(FakeDataService.class))
.when(fakeDataService)
.mutateRows(Mockito.any(MutateRowsRequest.class), Mockito.any(StreamObserver.class));
batcher.close();
BatchingException batchingException =
assertThrows(BatchingException.class, () -> batcher.close());
assertThat(batchingException.getMessage())
.contains("Batching finished with 1 partial failures. The 1 partial failures contained 1 entries that failed with: 1 ApiException(1 PERMISSION_DENIED).");
}

@Test
public void testBatchMutationRPCErrorCode() throws InterruptedException {
public void testBatchMutationRPCErrorCode() {
Batcher<RowMutationEntry, Void> batcher =
enhancedBigtableStub.newMutateRowsBatcher("table1", GrpcCallContext.createDefault());

Expand All @@ -637,11 +642,15 @@ public void testBatchMutationRPCErrorCode() throws InterruptedException {
observer.onError(io.grpc.Status.PERMISSION_DENIED.asException());
return null;
})
.when(Mockito.mock(FakeDataService.class))
.when(fakeDataService)
.mutateRows(Mockito.any(MutateRowsRequest.class), Mockito.any(StreamObserver.class));

batcher.add(RowMutationEntry.create("key0").deleteRow());
batcher.close();
BatchingException batchingException =
assertThrows(BatchingException.class, () -> batcher.close());
assertThat(batchingException.getMessage())
.contains(
"Batching finished with 1 batches failed to apply due to: 1 ApiException(1 INTERNAL) and 0 partial failures");
}

igorbernstein2 marked this conversation as resolved.
Show resolved Hide resolved
private static class MetadataInterceptor implements ServerInterceptor {
Expand Down