Skip to content

Commit c7cdd79

Browse files
committed
fix(BigTable): Fix TestReadRow_Generic_DeadlineExceeded test by making DeadlineExceeded non transient
1 parent fe2a58f commit c7cdd79

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

apis/Google.Cloud.Bigtable.V2/Google.Cloud.Bigtable.V2.ConformanceTests/Services/CloudBigtableV2TestProxyImpl.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,13 @@ void MaybeOverrideTimeoutSetting(BigtableServiceApiSettings settings)
7575
settings.ReadModifyWriteRowSettings = callSettings;
7676
settings.SampleRowKeysSettings = callSettings;
7777
settings.CallSettings = callSettings;
78+
// same as default ReadRowsRetrySettings except DeadlineExceeded is not in the retryFilter
79+
settings.ReadRowsRetrySettings = RetrySettings.FromExponentialBackoff(
80+
maxAttempts: 5,
81+
initialBackoff: TimeSpan.FromMilliseconds(10),
82+
maxBackoff: TimeSpan.FromMinutes(1),
83+
backoffMultiplier: 2,
84+
retryFilter: RetrySettings.FilterForStatusCodes(StatusCode.Unavailable, StatusCode.Aborted));
7885
}
7986
}
8087

@@ -146,7 +153,7 @@ public override async Task<RowsResult> ReadRows(Google.Cloud.Bigtable.V2.Conform
146153
{
147154
rowsResult.Rows.Add(row);
148155
}
149-
string message = rowsResult.Rows.Count == 0 ? $"ReadRows didn't find rows or deadline exceeded" : "ReadRows succeeded";
156+
string message = rowsResult.Rows.Count == 0 ? $"ReadRows didn't find rows" : "ReadRows succeeded";
150157
rowsResult.Status = SetSuccessStatus(message);
151158
return rowsResult;
152159
}

apis/Google.Cloud.Bigtable.V2/Google.Cloud.Bigtable.V2.ConformanceTests/bigtable-conformance.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ cd cloud-bigtable-clients-test/tests
3434
# Cookie, RetryInfo, ExecuteQuery, ReverseScans and FeatureGap are known failures of new features that we don't yet support.
3535
# CloseClient we don't support as expected, but we support it in a valid manner.
3636
# For the others we have issues to investigate, see comments in b/372509076 .
37-
eval "go test -v -proxy_addr=:7238 -skip _Retry_WithRoutingCookie\|_Retry_WithRetryInfo\|_CloseClient\|_ReverseScans\|TestFeatureGap\|TestExecuteQuery\|TestReadRows_Retry_LastScannedRow_Reverse\|TestReadRow_Generic_DeadlineExceeded"
37+
eval "go test -v -proxy_addr=:7238 -skip _Retry_WithRoutingCookie\|_Retry_WithRetryInfo\|_CloseClient\|_ReverseScans\|TestFeatureGap\|TestExecuteQuery\|TestReadRows_Retry_LastScannedRow_Reverse"
3838
returnCode=$?
3939
popd
4040

0 commit comments

Comments
 (0)