Skip to content

Merge v1.20 into v1.x #1447

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

Merged
merged 2 commits into from
Sep 24, 2024
Merged

Merge v1.20 into v1.x #1447

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
883a2ee
Retry once when disabling fail points (#1445)
jmikola Sep 24, 2024
d1c1344
Use non-capturing catch statement
alcaeus Sep 24, 2024
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
11 changes: 9 additions & 2 deletions tests/UnifiedSpecTests/ManagesFailPointsTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace MongoDB\Tests\UnifiedSpecTests;

use MongoDB\Driver\Exception\ConnectionException;
use MongoDB\Driver\Server;
use MongoDB\Operation\DatabaseCommand;
use stdClass;
Expand Down Expand Up @@ -31,8 +32,14 @@ public function configureFailPoint(stdClass $failPoint, Server $server): void
public function disableFailPoints(): void
{
foreach ($this->failPointsAndServers as [$failPoint, $server]) {
$operation = new DatabaseCommand('admin', ['configureFailPoint' => $failPoint, 'mode' => 'off']);
$operation->execute($server);
try {
$operation = new DatabaseCommand('admin', ['configureFailPoint' => $failPoint, 'mode' => 'off']);
$operation->execute($server);
} catch (ConnectionException) {
// Retry once in case the connection was dropped by the last operation
$operation = new DatabaseCommand('admin', ['configureFailPoint' => $failPoint, 'mode' => 'off']);
$operation->execute($server);
}
}

$this->failPointsAndServers = [];
Expand Down