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: add exponential backoff to ResumableStream #7664

Merged
merged 7 commits into from
Sep 16, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
20 changes: 20 additions & 0 deletions Bigtable/src/ResumableStream.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ class ResumableStream implements \IteratorAggregate
*/
private $callOptions;

/**
* @var callable
*/
private $delayFunction;

/**
* Constructs a resumable stream.
*
Expand Down Expand Up @@ -116,6 +121,17 @@ public function __construct(
$this->callOptions['retrySettings'] = [
'retriesEnabled' => false
];

$this->delayFunction = function (int $backoffCount) {

Choose a reason for hiding this comment

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

why does this need to be closure?

Copy link
Contributor Author

@bshaffer bshaffer Sep 11, 2024

Choose a reason for hiding this comment

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

It's a closure so that we can test its accuracy in the test (see this line).

Choose a reason for hiding this comment

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

I think it would be better to use the mock framework to create a spy for this method:
prophesize(

Copy link
Contributor Author

@bshaffer bshaffer Sep 11, 2024

Choose a reason for hiding this comment

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

AFAIK, It's not possible to do what you're asking with Prophecy.

You're asking to mock a method in ResumableStream, but we are not mocking the ResumableStream class, and partial mocks are not supported in Prophecy.

$initialDelayMillis = 100;
$initialDelayMultiplier = 1.3;
$maxDelayMillis = 60000;
bshaffer marked this conversation as resolved.
Show resolved Hide resolved

$delayMultiplier = $initialDelayMultiplier ** $backoffCount;
$delayMs = min($initialDelayMillis * $delayMultiplier, $maxDelayMillis);
bshaffer marked this conversation as resolved.
Show resolved Hide resolved
$delay = 1000 * $delayMs; // convert ms to µs
usleep((int) $delay);
};
}

/**
Expand All @@ -127,6 +143,7 @@ public function __construct(
public function readAll()
{
$attempt = 0;
$delayFactor = 0;
bshaffer marked this conversation as resolved.
Show resolved Hide resolved
do {
$ex = null;
list($this->request, $this->callOptions) =
Expand All @@ -139,6 +156,7 @@ public function readAll()
$headers = $this->callOptions['headers'] ?? [];
if ($attempt > 0) {
$headers['bigtable-attempt'] = [(string) $attempt];
($this->delayFunction)($delayFactor);
}
$attempt++;

Expand All @@ -150,8 +168,10 @@ public function readAll()
try {
foreach ($stream->readAll() as $item) {
yield $item;
$delayFactor = 0; // reset delay factor on successful read.
}
} catch (\Exception $ex) {
$delayFactor++;
}
}
} while ((!$this->retryFunction || ($this->retryFunction)($ex)) && $attempt <= $this->retries);
Expand Down
86 changes: 86 additions & 0 deletions Bigtable/tests/Unit/ResumableStreamTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<?php
/**
* Copyright 2024, Google LLC All rights reserved.
*
* 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.
*/

namespace Google\Cloud\Bigtable\Tests\Unit;

use Google\Cloud\Bigtable\ResumableStream;
use Google\Cloud\Bigtable\V2\Client\BigtableClient;
use Google\Cloud\Bigtable\V2\ReadRowsRequest;
use Google\Cloud\Bigtable\V2\ReadRowsResponse;
use PHPUnit\Framework\TestCase;
use Prophecy\PhpUnit\ProphecyTrait;
use Prophecy\Argument;
use Google\ApiCore\ServerStream;

/**
* @group bigtable
* @group bigtabledata
*/
class ResumableStreamTest extends TestCase
{
use ProphecyTrait;

const RETRYABLE_CODE = 1234;

public function testRetryDelayIsResetWhenRowReceived()
{
$stream = $this->prophesize(ServerStream::class);
$generator1 = function () {
yield new ReadRowsResponse();
throw new \Exception('This too is retryable!', self::RETRYABLE_CODE);
};
$generator2 = fn () => yield new ReadRowsResponse();
$count = 0;
$stream->readAll()
->will(function () use (&$count, $generator1, $generator2) {
// Simlate a call to readRows where the server throws 2 exceptions, reads a row
// successfuly, throws another exception, and reads one more row successfully.
return match ($count++) {
0 => throw new \Exception('This is retryable!', self::RETRYABLE_CODE),
1 => throw new \Exception('This is also retryable!', self::RETRYABLE_CODE),
2 => $generator1(),
3 => $generator2(),
};
});
$bigtable = $this->prophesize(BigtableClient::class);
$bigtable->readRows(Argument::type(ReadRowsRequest::class), Argument::type('array'))
->shouldBeCalledTimes(4)
->willReturn($stream->reveal());
$resumableStream = new ResumableStream(
$bigtable->reveal(),
'readRows',
$this->prophesize(ReadRowsRequest::class)->reveal(),
fn ($request, $callOptions) => [$request, $callOptions],
fn ($exception) => $exception && $exception->getCode() === self::RETRYABLE_CODE
);

$retries = 0;
$delayFunction = function ($delayFactor) use (&$retries) {
$this->assertEquals(match (++$retries) {
1 => 1, // initial delay
2 => 2, // increment by 1
3 => 1, // the delay is reset by the successful call
}, $delayFactor);
};
$refl = new \ReflectionObject($resumableStream);
$refl->getProperty('delayFunction')->setValue($resumableStream, $delayFunction);

$rows = iterator_to_array($resumableStream->readAll());
$this->assertEquals(2, count($rows));
$this->assertEquals(3, $retries);
}
}
Loading