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.

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

feat: implement mutate rows #769

Merged
merged 73 commits into from
Jun 6, 2023
Merged
Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
1d02154
added initial implementation of mutate_rows
daniel-sanche Apr 24, 2023
ab63cba
implemented mutation models
daniel-sanche Apr 24, 2023
cf9daa5
added retries to mutate_row
daniel-sanche Apr 24, 2023
1247da4
return exception group if possible
daniel-sanche Apr 24, 2023
3b3ed8c
check for idempotence
daniel-sanche Apr 24, 2023
5d20037
initial implementation for bulk_mutations
daniel-sanche Apr 24, 2023
3d322a1
include successes in bulk mutation error message
daniel-sanche Apr 24, 2023
a31232b
fixed style checks
daniel-sanche Apr 24, 2023
8da2d65
added basic system tests
daniel-sanche Apr 24, 2023
2b89d9c
added unit tests for mutate_row
daniel-sanche Apr 25, 2023
47c5985
ran blacken
daniel-sanche Apr 25, 2023
38fdcd7
improved exceptions
daniel-sanche Apr 25, 2023
504d2d8
added bulk_mutate_rows unit tests
daniel-sanche Apr 25, 2023
b16067f
ran blacken
daniel-sanche Apr 25, 2023
3ab1405
support __new___ for exceptions for python3.11+
daniel-sanche Apr 25, 2023
0a6c0c6
added exception unit tests
daniel-sanche Apr 25, 2023
ec043cf
makde exceptions tuple
daniel-sanche Apr 26, 2023
518530e
got exceptions to print consistently across versions
daniel-sanche Apr 26, 2023
9624729
added test for 311 rich traceback
daniel-sanche Apr 27, 2023
3087081
moved retryable row mutations to new file
daniel-sanche Apr 27, 2023
9df588f
use index map
daniel-sanche Apr 27, 2023
7ed8be3
added docstring
daniel-sanche Apr 27, 2023
2536cc4
added predicate check to failed mutations
daniel-sanche Apr 27, 2023
1f6875c
added _mutate_rows tests
daniel-sanche Apr 27, 2023
1ea24e6
improved client tests
daniel-sanche Apr 27, 2023
25ca2d2
refactored to loop by raising exception
daniel-sanche Apr 28, 2023
c0787db
refactored retry deadline logic into shared wrapper
daniel-sanche Apr 28, 2023
3ed5c3d
ran black
daniel-sanche Apr 28, 2023
a91fbcb
pulled in table default timeouts
daniel-sanche Apr 28, 2023
df8a058
added tests for shared deadline parsing function
daniel-sanche Apr 28, 2023
b866b57
added tests for mutation models
daniel-sanche Apr 28, 2023
54a4d43
fixed linter errors
daniel-sanche Apr 28, 2023
bd51dc4
added tests for BulkMutationsEntry
daniel-sanche Apr 28, 2023
921b05a
improved mutations documentation
daniel-sanche Apr 28, 2023
82ea61f
refactored mutate_rows logic into helper function
daniel-sanche May 2, 2023
fa42b86
implemented callbacks for mutate_rows
daniel-sanche May 2, 2023
01a16f3
made exceptions into a tuple
daniel-sanche May 5, 2023
6140acb
remove aborted from retryable errors
daniel-sanche May 22, 2023
36ba2b6
improved SetCell mutation
daniel-sanche May 22, 2023
b3c9017
fixed mutations tests
daniel-sanche May 22, 2023
cac9e2d
SetCell timestamps use millisecond precision
daniel-sanche May 22, 2023
34b051f
renamed BulkMutationsEntry to RowMutationEntry
daniel-sanche May 22, 2023
63ac35c
Merge branch 'v3' into mutate_rows
daniel-sanche May 24, 2023
a51201c
added metadata to mutate rows and bulk mutate rows
daniel-sanche May 25, 2023
a21bebf
moved _convert_retry_deadline wrapper from exceptions into _helpers
daniel-sanche May 25, 2023
4ca89d9
fixed system tests
daniel-sanche May 25, 2023
b240ee1
only handle precision adjustment when creating timestamp
daniel-sanche May 26, 2023
cb0e951
added _from_dict for mutation models
daniel-sanche May 26, 2023
a9cf385
rpc timeouts adjust when approaching operation_timeout
daniel-sanche May 26, 2023
eddc1c9
pass table instead of request dict
daniel-sanche May 26, 2023
f8b26aa
refactoring mutate rows
daniel-sanche May 27, 2023
5b80dc5
made on_terminal_state into coroutine
daniel-sanche May 27, 2023
9e5b80a
fixed style issues
daniel-sanche May 27, 2023
f7539f6
moved callback rewriting into retryable attempt
daniel-sanche May 27, 2023
e77a4fa
fixed tests
daniel-sanche May 27, 2023
4e19ed0
pop successful mutations from error dict
daniel-sanche May 30, 2023
920e4b7
removed unneeded check
daniel-sanche May 30, 2023
725f5ff
refactoring
daniel-sanche May 30, 2023
1054bc4
pass list of exceptions in callback
daniel-sanche May 30, 2023
f39a891
raise error in unexpected state
daniel-sanche May 30, 2023
1d97135
removed callback
daniel-sanche May 31, 2023
88e2bf5
refactoring mutation attempt into class
daniel-sanche May 31, 2023
a3c0166
use partial function
daniel-sanche May 31, 2023
70c35ef
renamed class
daniel-sanche May 31, 2023
e00f592
added comments
daniel-sanche Jun 1, 2023
18af78a
added tests
daniel-sanche Jun 1, 2023
23e84f5
improved helpers
daniel-sanche Jun 1, 2023
56fdf7c
refactored operation into class only
daniel-sanche Jun 5, 2023
aca31f0
restructured how remaining indices are tracked
daniel-sanche Jun 5, 2023
5a5d541
fixed tests
daniel-sanche Jun 5, 2023
afed731
added docstrings
daniel-sanche Jun 5, 2023
2396ec8
moved index deletion to end of block
daniel-sanche Jun 6, 2023
3d441a2
added comment to exception types
daniel-sanche Jun 6, 2023
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
216 changes: 216 additions & 0 deletions google/cloud/bigtable/_mutate_rows.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,216 @@
# Copyright 2023 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
from __future__ import annotations

from typing import Callable, Any, TYPE_CHECKING

from google.api_core import exceptions as core_exceptions
from google.api_core import retry_async as retries
import google.cloud.bigtable.exceptions as bt_exceptions

if TYPE_CHECKING:
from google.cloud.bigtable_v2.services.bigtable.async_client import (
BigtableAsyncClient,
)
from google.cloud.bigtable.mutations import BulkMutationsEntry


class _MutateRowsIncomplete(RuntimeError):
"""
Exception raised when a mutate_rows call has unfinished work.
"""

pass


async def _mutate_rows_operation(
gapic_client: "BigtableAsyncClient",
igorbernstein2 marked this conversation as resolved.
Show resolved Hide resolved
request: dict[str, Any],
mutation_entries: list["BulkMutationsEntry"],
operation_timeout: float,
per_request_timeout: float | None,
on_terminal_state: Callable[["BulkMutationsEntry", Exception | None], None]
| None = None,
):
"""
Helper function for managing a single mutate_rows operation, end-to-end.

Args:
- gapic_client: the client to use for the mutate_rows call
- request: A request dict containing table name, app profile id, and other details to inclide in the request
daniel-sanche marked this conversation as resolved.
Show resolved Hide resolved
- mutation_entries: a list of BulkMutationsEntry objects to send to the server
- operation_timeout: the timeout to use for the entire operation, in seconds.
- per_request_timeout: the timeout to use for each mutate_rows attempt, in seconds.
If not specified, the request will run until operation_timeout is reached.
- on_terminal_state: If given, this function will be called as soon as a mutation entry
reaches a terminal state (success or failure).
igorbernstein2 marked this conversation as resolved.
Show resolved Hide resolved
"""
mutations_dict: dict[int, BulkMutationsEntry | None] = {
idx: mut for idx, mut in enumerate(mutation_entries)
}
error_dict: dict[int, list[Exception]] = {idx: [] for idx in mutations_dict.keys()}

predicate = retries.if_exception_type(
core_exceptions.DeadlineExceeded,
core_exceptions.ServiceUnavailable,
core_exceptions.Aborted,
Copy link
Contributor

Choose a reason for hiding this comment

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

We don't retry Aborted for mutate rows (see go/cbt-client-debugging-steps#client-retry-settings)

_MutateRowsIncomplete,
)

def on_error_fn(exc):
if predicate(exc) and not isinstance(exc, _MutateRowsIncomplete):
# add this exception to list for each active mutation
for idx in error_dict.keys():
if mutations_dict[idx] is not None:
error_dict[idx].append(exc)
# remove non-idempotent mutations from mutations_dict, so they are not retried
for idx, mut in mutations_dict.items():
if mut is not None and not mut.is_idempotent():
mutations_dict[idx] = None

retry = retries.AsyncRetry(
predicate=predicate,
on_error=on_error_fn,
timeout=operation_timeout,
initial=0.01,
multiplier=2,
maximum=60,
)
# wrap attempt in retry logic
retry_wrapped = retry(_mutate_rows_retryable_attempt)
# convert RetryErrors from retry wrapper into DeadlineExceeded errors
deadline_wrapped = bt_exceptions._convert_retry_deadline(
retry_wrapped, operation_timeout
)
try:
# trigger mutate_rows
await deadline_wrapped(
gapic_client,
request,
per_request_timeout,
mutations_dict,
error_dict,
predicate,
on_terminal_state,
)
except Exception as exc:
# exceptions raised by retryable are added to the list of exceptions for all unprocessed mutations
for idx in error_dict.keys():
if mutations_dict[idx] is not None:
error_dict[idx].append(exc)
finally:
# raise exception detailing incomplete mutations
all_errors = []
for idx, exc_list in error_dict.items():
if exc_list:
if len(exc_list) == 1:
cause_exc = exc_list[0]
else:
cause_exc = bt_exceptions.RetryExceptionGroup(exc_list)
entry = mutation_entries[idx]
all_errors.append(
bt_exceptions.FailedMutationEntryError(idx, entry, cause_exc)
)
# call on_terminal_state for each unreported failed mutation
if on_terminal_state and mutations_dict[idx] is not None:
on_terminal_state(entry, cause_exc)
if all_errors:
raise bt_exceptions.MutationsExceptionGroup(
all_errors, len(mutation_entries)
)


async def _mutate_rows_retryable_attempt(
gapic_client: "BigtableAsyncClient",
request: dict[str, Any],
per_request_timeout: float | None,
mutation_dict: dict[int, "BulkMutationsEntry" | None],
error_dict: dict[int, list[Exception]],
predicate: Callable[[Exception], bool],
on_terminal_state: Callable[["BulkMutationsEntry", Exception | None], None]
| None = None,
):
"""
Helper function for managing a single mutate_rows attempt.

If one or more retryable mutations remain incomplete at the end of the function,
_MutateRowsIncomplete will be raised to trigger a retry

This function is intended to be wrapped in an api_core.retry.AsyncRetry object, which will handle
timeouts and retrying raised exceptions.

Args:
- gapic_client: the client to use for the mutate_rows call
- request: the request to send to the server, populated with table name and app profile id
- per_request_timeout: the timeout to use for each mutate_rows attempt
- mutation_dict: a dictionary tracking which entries are outstanding
(stored as BulkMutationsEntry), and which have reached a terminal state (stored as None).
At the start of the request, all entries are outstanding.
- error_dict: a dictionary tracking errors associated with each entry index.
Each retry will append a new error. Successful mutations will clear the error list.
- predicate: a function that takes an exception and returns True if the exception is retryable.
- on_terminal_state: If given, this function will be called as soon as a mutation entry
reaches a terminal state (success or failure).
Raises:
- _MutateRowsIncomplete: if one or more retryable mutations remain incomplete at the end of the function
- GoogleAPICallError: if the server returns an error on the grpc call
"""
new_request = request.copy()
# keep map between sub-request indices and global entry indices
index_map: dict[int, int] = {}
# continue to retry until timeout, or all mutations are complete (success or failure)
request_entries: list[dict[str, Any]] = []
for index, entry in mutation_dict.items():
if entry is not None:
index_map[len(request_entries)] = index
request_entries.append(entry._to_dict())
new_request["entries"] = request_entries
async for result_list in await gapic_client.mutate_rows(
new_request, timeout=per_request_timeout
):
for result in result_list.entries:
# convert sub-request index to global index
idx = index_map[result.index]
entry = mutation_dict[idx]
terminal_state = False
exc = None
if entry is None:
# this entry has already reached a terminal state
continue
if result.status.code == 0:
# mutation succeeded
error_dict[idx] = []
terminal_state = True
else:
# mutation failed
exc = core_exceptions.from_grpc_status(
result.status.code,
result.status.message,
details=result.status.details,
)
error_dict[idx].append(exc)
# if mutation is non-idempotent or the error is not retryable,
# mark the mutation as terminal
if not predicate(exc) or not entry.is_idempotent():
terminal_state = True
# if the mutation is terminal and won't be retried, remove it from the mutation_dict
if terminal_state:
mutation_dict[idx] = None
if on_terminal_state is not None:
on_terminal_state(entry, exc)
# check if attempt succeeded, or needs to be retried
if any(mutation is not None for mutation in mutation_dict.values()):
# unfinished work; raise exception to trigger retry
raise _MutateRowsIncomplete()
Loading