From 02f1b5387256c28d6e0e460a9be4073f8f62ed50 Mon Sep 17 00:00:00 2001 From: Mattie Fu Date: Mon, 9 Nov 2026 15:34:00 +0000 Subject: [PATCH 1/2] fix(bigtable): detect missing MutateRows response entries and report non-OK proxy status Synthesize an INTERNAL status for any request entry omitted from a MutateRows response stream in RowsMutator, and propagate non-OK entry statuses to the top-level MutateRowsResult status in the conformance test proxy. --- .../conformance/test_proxy/test_proxy.rb | 21 +++++------ .../lib/google/cloud/bigtable/rows_mutator.rb | 23 +++++++++++- .../cloud/bigtable/table/mutate_rows_test.rb | 35 +++++++++++++++++++ 3 files changed, 68 insertions(+), 11 deletions(-) diff --git a/google-cloud-bigtable/conformance/test_proxy/test_proxy.rb b/google-cloud-bigtable/conformance/test_proxy/test_proxy.rb index 29f0023de1ef..baa64a06c08e 100644 --- a/google-cloud-bigtable/conformance/test_proxy/test_proxy.rb +++ b/google-cloud-bigtable/conformance/test_proxy/test_proxy.rb @@ -265,19 +265,20 @@ def bulk_mutate_rows req, _call end results = table.mutate_rows entries + failed_entries = results.reject { |r| r.status.code.zero? }.map do |result| + Google::Cloud::Bigtable::V2::MutateRowsResponse::Entry.new( + index: result.index, + status: Google::Rpc::Status.new( + code: result.status.code, + message: result.status.message + ) + ) + end Google::Bigtable::Testproxy::MutateRowsResult.new( - status: ok_status, + status: failed_entries.empty? ? ok_status : failed_entries.first.status, # Entries should include only the failed rows, where status != 0 (OK) - entries: results.reject { |r| r.status.code.zero? }.map do |result| - Google::Cloud::Bigtable::V2::MutateRowsResponse::Entry.new( - index: result.index, - status: Google::Rpc::Status.new( - code: result.status.code, - message: result.status.message - ) - ) - end + entries: failed_entries ) rescue Google::Cloud::Error => e LOGGER.info "BulkMutateRows failed: Caught #{e}" diff --git a/google-cloud-bigtable/lib/google/cloud/bigtable/rows_mutator.rb b/google-cloud-bigtable/lib/google/cloud/bigtable/rows_mutator.rb index 7c42749c950a..89b85b3323b1 100644 --- a/google-cloud-bigtable/lib/google/cloud/bigtable/rows_mutator.rb +++ b/google-cloud-bigtable/lib/google/cloud/bigtable/rows_mutator.rb @@ -98,7 +98,7 @@ def mutate_rows entries, cookies = {} app_profile_id: @table.app_profile_id, call_options: call_options ) - [response.flat_map(&:entries), nil, cookies] + [normalize_entries(response, entries.length), nil, cookies] rescue GRPC::BadStatus => e info = e.status_details.find { |d| d.is_a? Google::Rpc::RetryInfo } delay = if info&.retry_delay @@ -117,6 +117,27 @@ def mutate_rows entries, cookies = {} [statuses, delay, cookies] end + def normalize_entries response, count + by_index = {} + response.each do |res| + res.entries.each { |e| by_index[e.index] = e if e.status } + end + Array.new count do |i| + by_index[i] || missing_entry(i) + end + end + + def missing_entry index + status = Google::Rpc::Status.new( + code: Google::Rpc::Code::INTERNAL, + message: "Missing entry result in MutateRows response" + ) + Google::Cloud::Bigtable::V2::MutateRowsResponse::Entry.new( + index: index, + status: status + ) + end + ## # Collects failed entries, retries mutation, and updates status. # diff --git a/google-cloud-bigtable/test/google/cloud/bigtable/table/mutate_rows_test.rb b/google-cloud-bigtable/test/google/cloud/bigtable/table/mutate_rows_test.rb index bdfeffecddeb..befbdaa6ebdb 100644 --- a/google-cloud-bigtable/test/google/cloud/bigtable/table/mutate_rows_test.rb +++ b/google-cloud-bigtable/test/google/cloud/bigtable/table/mutate_rows_test.rb @@ -264,4 +264,39 @@ def mock.mutate_rows request, call_options _(responses[1].status.message).must_equal "success" _(responses[1].status.details).must_equal [] end + + it "marks missing response entries as INTERNAL error without retrying" do + req_entries = req_entries_grpc + res = Google::Cloud::Bigtable::V2::MutateRowsResponse.new( + entries: [ + { index: 0, status: { code: Google::Rpc::Code::OK, message: "success", details: [] } } + ] + ) + + mock = Minitest::Mock.new + req = { + table_name: table_path(instance_id, table_id), + entries: req_entries, + app_profile_id: app_profile_id + } + mock.expect :mutate_rows, [res], [req, nil] + + bigtable.service.mocked_client = mock + + mutation_entries = req_entries.map do |r| + entry = Google::Cloud::Bigtable::MutationEntry.new(r.row_key) + entry.mutations.concat(r.mutations) + entry + end + responses = table.mutate_rows(mutation_entries) + + mock.verify + _(responses.length).must_equal 2 + _(responses[0].index).must_equal 0 + _(responses[0].status.code).must_equal Google::Rpc::Code::OK + _(responses[1].index).must_equal 1 + _(responses[1].status.code).must_equal Google::Rpc::Code::INTERNAL + _(responses[1].status.description).must_equal "INTERNAL" + _(responses[1].status.message).must_equal "Missing entry result in MutateRows response" + end end From 2825f9ce3bc659b296d1f2882ecd4aeb7ff819ce Mon Sep 17 00:00:00 2001 From: Mattie Fu Date: Mon, 9 Nov 2026 15:45:04 +0000 Subject: [PATCH 2/2] fix(bigtable): support negative increment_amount in conformance test proxy --- google-cloud-bigtable/conformance/test_proxy/test_proxy.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-bigtable/conformance/test_proxy/test_proxy.rb b/google-cloud-bigtable/conformance/test_proxy/test_proxy.rb index baa64a06c08e..c5fa06a65380 100644 --- a/google-cloud-bigtable/conformance/test_proxy/test_proxy.rb +++ b/google-cloud-bigtable/conformance/test_proxy/test_proxy.rb @@ -365,7 +365,7 @@ def read_modify_write_row req, _call result = table.read_modify_write_row(req.request.row_key, req.request.rules.map do |r| rule = Google::Cloud::Bigtable::ReadModifyWriteRule.new r.family_name, r.column_qualifier rule.append r.append_value if r.append_value && r.append_value != "" - rule.increment r.increment_amount if r.increment_amount&.positive? + rule.increment r.increment_amount if r.increment_amount&.nonzero? rule end)