fix(sessions): resolve async deadlock in multiplexed session manager … · googleapis/google-cloud-python@c8f936b

@@ -162,7 +162,7 @@ def rollback(self) -> None:

162162163163

def wrapped_method(*args, **kwargs):

164164

attempt.increment()

165-

(call_metadata, error_augmenter) = database.with_error_augmentation(

165+

call_metadata, error_augmenter = database.with_error_augmentation(

166166

nth_request, attempt.value, metadata, span

167167

)

168168

rollback_method = functools.partial(

@@ -269,7 +269,7 @@ def wrapped_method(*args, **kwargs):

269269

is_multiplexed = getattr(self._session, "is_multiplexed", False)

270270

if is_multiplexed and self._precommit_token is not None:

271271

commit_request_args["precommit_token"] = self._precommit_token

272-

(call_metadata, error_augmenter) = database.with_error_augmentation(

272+

call_metadata, error_augmenter = database.with_error_augmentation(

273273

nth_request, attempt.value, metadata, span

274274

)

275275

commit_method = functools.partial(

@@ -300,7 +300,7 @@ def before_next_retry(nth_retry, delay_in_seconds):

300300

if commit_response_pb._pb.HasField("precommit_token"):

301301

add_span_event(span, commit_retry_event_name)

302302

nth_request = database._next_nth_request

303-

(call_metadata, error_augmenter) = database.with_error_augmentation(

303+

call_metadata, error_augmenter = database.with_error_augmentation(

304304

nth_request, 1, metadata, span

305305

)

306306

with error_augmenter:

@@ -338,7 +338,7 @@ def _make_params_pb(params, param_types):

338338

If ``params`` is None but ``param_types`` is not None."""

339339

if params:

340340

return Struct(

341-

fields={key: _make_value_pb(value) for (key, value) in params.items()}

341+

fields={key: _make_value_pb(value) for key, value in params.items()}

342342

)

343343

return {}

344344

@@ -417,7 +417,7 @@ def execute_update(

417417

metadata.append(

418418

_metadata_with_leader_aware_routing(database._route_to_leader_enabled)

419419

)

420-

(seqno, self._execute_sql_request_count) = (

420+

seqno, self._execute_sql_request_count = (

421421

self._execute_sql_request_count,

422422

self._execute_sql_request_count + 1,

423423

)

@@ -454,7 +454,7 @@ def execute_update(

454454455455

def wrapped_method(*args, **kwargs):

456456

attempt.increment()

457-

(call_metadata, error_augmenter) = database.with_error_augmentation(

457+

call_metadata, error_augmenter = database.with_error_augmentation(

458458

nth_request, attempt.value, metadata

459459

)

460460

execute_sql_method = functools.partial(

@@ -544,7 +544,7 @@ def batch_update(

544544

if isinstance(statement, str):

545545

parsed.append(ExecuteBatchDmlRequest.Statement(sql=statement))

546546

else:

547-

(dml, params, param_types) = statement

547+

dml, params, param_types = statement

548548

params_pb = self._make_params_pb(params, param_types)

549549

parsed.append(

550550

ExecuteBatchDmlRequest.Statement(

@@ -556,7 +556,7 @@ def batch_update(

556556

metadata.append(

557557

_metadata_with_leader_aware_routing(database._route_to_leader_enabled)

558558

)

559-

(seqno, self._execute_sql_request_count) = (

559+

seqno, self._execute_sql_request_count = (

560560

self._execute_sql_request_count,

561561

self._execute_sql_request_count + 1,

562562

)

@@ -590,7 +590,7 @@ def batch_update(

590590591591

def wrapped_method(*args, **kwargs):

592592

attempt.increment()

593-

(call_metadata, error_augmenter) = database.with_error_augmentation(

593+

call_metadata, error_augmenter = database.with_error_augmentation(

594594

nth_request, attempt.value, metadata

595595

)

596596

execute_batch_dml_method = functools.partial(