Skip to content

Commit e4db745

Browse files
authored
fix: check that all bulk mutation entries are accounted for (#1907) (#1923)
port of #1907
1 parent 7ec5dd5 commit e4db745

File tree

7 files changed

+83
-5
lines changed

7 files changed

+83
-5
lines changed

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsAttemptCallable.java

+24
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import com.google.common.base.Preconditions;
3636
import com.google.common.collect.ImmutableList;
3737
import com.google.common.collect.Lists;
38+
import com.google.common.primitives.Ints;
3839
import com.google.common.util.concurrent.MoreExecutors;
3940
import com.google.rpc.Code;
4041
import java.util.List;
@@ -263,9 +264,12 @@ private void handleAttemptSuccess(List<MutateRowsResponse> responses) {
263264

264265
Builder builder = lastRequest.toBuilder().clearEntries();
265266
List<Integer> newOriginalIndexes = Lists.newArrayList();
267+
boolean[] seenIndices = new boolean[currentRequest.getEntriesCount()];
266268

267269
for (MutateRowsResponse response : responses) {
268270
for (Entry entry : response.getEntriesList()) {
271+
seenIndices[Ints.checkedCast(entry.getIndex())] = true;
272+
269273
if (entry.getStatus().getCode() == Code.OK_VALUE) {
270274
continue;
271275
}
@@ -288,6 +292,26 @@ private void handleAttemptSuccess(List<MutateRowsResponse> responses) {
288292
}
289293
}
290294

295+
// Handle missing mutations
296+
for (int i = 0; i < seenIndices.length; i++) {
297+
if (seenIndices[i]) {
298+
continue;
299+
}
300+
301+
int origIndex = getOriginalIndex(i);
302+
FailedMutation failedMutation =
303+
FailedMutation.create(
304+
origIndex,
305+
ApiExceptionFactory.createException(
306+
"Missing entry response for entry " + origIndex,
307+
null,
308+
GrpcStatusCode.of(io.grpc.Status.Code.INTERNAL),
309+
false));
310+
311+
allFailures.add(failedMutation);
312+
permanentFailures.add(failedMutation);
313+
}
314+
291315
currentRequest = builder.build();
292316
originalIndexes = newOriginalIndexes;
293317

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/BigtableTracerCallableTest.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,11 @@ public void mutateRow(MutateRowRequest request, StreamObserver<MutateRowResponse
404404

405405
@Override
406406
public void mutateRows(MutateRowsRequest request, StreamObserver<MutateRowsResponse> observer) {
407-
observer.onNext(MutateRowsResponse.getDefaultInstance());
407+
MutateRowsResponse.Builder builder = MutateRowsResponse.newBuilder();
408+
for (int i = 0; i < request.getEntriesCount(); i++) {
409+
builder.addEntries(MutateRowsResponse.Entry.newBuilder().setIndex(i));
410+
}
411+
observer.onNext(builder.build());
408412
observer.onCompleted();
409413
}
410414

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsTracerTest.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,11 @@ public void mutateRows(
639639
Thread.sleep(SERVER_LATENCY);
640640
} catch (InterruptedException e) {
641641
}
642-
responseObserver.onNext(MutateRowsResponse.getDefaultInstance());
642+
MutateRowsResponse.Builder builder = MutateRowsResponse.newBuilder();
643+
for (int i = 0; i < request.getEntriesCount(); i++) {
644+
builder.addEntriesBuilder().setIndex(i);
645+
}
646+
responseObserver.onNext(builder.build());
643647
responseObserver.onCompleted();
644648
}
645649

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/MetricsTracerTest.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -445,10 +445,15 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
445445
new Answer() {
446446
@Override
447447
public Object answer(InvocationOnMock invocation) {
448+
MutateRowsRequest request = (MutateRowsRequest) invocation.getArguments()[0];
448449
@SuppressWarnings("unchecked")
449450
StreamObserver<MutateRowsResponse> observer =
450451
(StreamObserver<MutateRowsResponse>) invocation.getArguments()[1];
451-
observer.onNext(MutateRowsResponse.getDefaultInstance());
452+
MutateRowsResponse.Builder builder = MutateRowsResponse.newBuilder();
453+
for (int i = 0; i < request.getEntriesCount(); i++) {
454+
builder.addEntriesBuilder().setIndex(i);
455+
}
456+
observer.onNext(builder.build());
452457
observer.onCompleted();
453458
return null;
454459
}

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/StatsHeadersCallableTest.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,11 @@ public void mutateRows(MutateRowsRequest request, StreamObserver<MutateRowsRespo
223223
observer.onError(new StatusRuntimeException(Status.UNAVAILABLE));
224224
return;
225225
}
226-
observer.onNext(MutateRowsResponse.getDefaultInstance());
226+
MutateRowsResponse.Builder builder = MutateRowsResponse.newBuilder();
227+
for (int i = 0; i < request.getEntriesCount(); i++) {
228+
builder.addEntriesBuilder().setIndex(i);
229+
}
230+
observer.onNext(builder.build());
227231
observer.onCompleted();
228232
}
229233

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsAttemptCallableTest.java

+33
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
import java.util.List;
4242
import java.util.Set;
4343
import java.util.concurrent.Callable;
44+
import java.util.concurrent.ExecutionException;
45+
import org.junit.Assert;
4446
import org.junit.Before;
4547
import org.junit.Test;
4648
import org.junit.runner.RunWith;
@@ -92,6 +94,37 @@ public void singleEntrySuccessTest() throws Exception {
9294
assertThat(innerCallable.lastRequest).isEqualTo(request);
9395
}
9496

97+
@Test
98+
public void missingEntry() {
99+
MutateRowsRequest request =
100+
MutateRowsRequest.newBuilder()
101+
.addEntries(Entry.getDefaultInstance())
102+
.addEntries(Entry.getDefaultInstance())
103+
.build();
104+
innerCallable.response.add(
105+
MutateRowsResponse.newBuilder()
106+
.addEntries(MutateRowsResponse.Entry.newBuilder().setIndex(0))
107+
.build());
108+
109+
MutateRowsAttemptCallable attemptCallable =
110+
new MutateRowsAttemptCallable(innerCallable, request, callContext, retryCodes);
111+
attemptCallable.setExternalFuture(parentFuture);
112+
attemptCallable.call();
113+
114+
ExecutionException executionException =
115+
Assert.assertThrows(ExecutionException.class, () -> parentFuture.attemptFuture.get());
116+
assertThat(executionException).hasCauseThat().isInstanceOf(MutateRowsException.class);
117+
MutateRowsException e = (MutateRowsException) executionException.getCause();
118+
119+
assertThat(e).hasMessageThat().contains("Some mutations failed to apply");
120+
assertThat(e.getFailedMutations()).hasSize(1);
121+
FailedMutation failedMutation = e.getFailedMutations().get(0);
122+
assertThat(failedMutation.getIndex()).isEqualTo(1);
123+
assertThat(failedMutation.getError())
124+
.hasMessageThat()
125+
.contains("Missing entry response for entry 1");
126+
}
127+
95128
@Test
96129
public void testNoRpcTimeout() {
97130
parentFuture.timedAttemptSettings =

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsRetryTest.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,11 @@ public void mutateRows(
107107
MutateRowsRequest request, StreamObserver<MutateRowsResponse> responseObserver) {
108108
attemptCounter.incrementAndGet();
109109
if (expectations.isEmpty()) {
110-
responseObserver.onNext(MutateRowsResponse.getDefaultInstance());
110+
MutateRowsResponse.Builder builder = MutateRowsResponse.newBuilder();
111+
for (int i = 0; i < request.getEntriesCount(); i++) {
112+
builder.addEntriesBuilder().setIndex(i);
113+
}
114+
responseObserver.onNext(builder.build());
111115
responseObserver.onCompleted();
112116
} else {
113117
Exception expectedRpc = expectations.poll();

0 commit comments

Comments
 (0)