-
Notifications
You must be signed in to change notification settings - Fork 61
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
fix: improve information on CancellationException for LROs #2236
Changes from 21 commits
624660c
a4483ee
fa781ea
937e4e6
9f17544
27d2240
383b42d
a9245ba
fa774a2
f245e1f
f4fd1c0
a899a89
e28c03f
2328c01
7f0a751
e603ba7
b8ad027
8f60925
0e53559
2c33515
152fc5b
81a978c
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
@@ -0,0 +1,114 @@ | ||||||||||
/* | ||||||||||
* Copyright 2023 Google LLC | ||||||||||
* | ||||||||||
* Redistribution and use in source and binary forms, with or without | ||||||||||
* modification, are permitted provided that the following conditions are | ||||||||||
* met: | ||||||||||
* | ||||||||||
* * Redistributions of source code must retain the above copyright | ||||||||||
* notice, this list of conditions and the following disclaimer. | ||||||||||
* * Redistributions in binary form must reproduce the above | ||||||||||
* copyright notice, this list of conditions and the following disclaimer | ||||||||||
* in the documentation and/or other materials provided with the | ||||||||||
* distribution. | ||||||||||
* * Neither the name of Google LLC nor the names of its | ||||||||||
* contributors may be used to endorse or promote products derived from | ||||||||||
* this software without specific prior written permission. | ||||||||||
* | ||||||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||||||||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||||||||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||||||||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||||||||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||||||||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||||||||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||||||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||||||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||||||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||||||||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||||||||||
*/ | ||||||||||
package com.google.api.gax.longrunning; | ||||||||||
|
||||||||||
import static org.junit.Assert.assertThrows; | ||||||||||
import static org.junit.Assert.assertTrue; | ||||||||||
import static org.junit.Assert.fail; | ||||||||||
|
||||||||||
import com.google.api.gax.core.FakeApiClock; | ||||||||||
import com.google.api.gax.retrying.RetrySettings; | ||||||||||
import com.google.api.gax.retrying.TimedAttemptSettings; | ||||||||||
import com.google.api.gax.util.FakeLogHandler; | ||||||||||
import java.util.concurrent.CancellationException; | ||||||||||
import org.junit.After; | ||||||||||
import org.junit.Before; | ||||||||||
import org.junit.Test; | ||||||||||
import org.threeten.bp.Duration; | ||||||||||
|
||||||||||
public class OperationTimedPollAlgorithmTest { | ||||||||||
|
||||||||||
private static final RetrySettings FAST_RETRY_SETTINGS = | ||||||||||
RetrySettings.newBuilder() | ||||||||||
.setInitialRetryDelay(Duration.ofMillis(1L)) | ||||||||||
.setRetryDelayMultiplier(1) | ||||||||||
.setMaxRetryDelay(Duration.ofMillis(1L)) | ||||||||||
.setInitialRpcTimeout(Duration.ofMillis(1L)) | ||||||||||
.setMaxAttempts(0) | ||||||||||
.setJittered(false) | ||||||||||
.setRpcTimeoutMultiplier(1) | ||||||||||
.setMaxRpcTimeout(Duration.ofMillis(1L)) | ||||||||||
.setTotalTimeout(Duration.ofMillis(5L)) | ||||||||||
.build(); | ||||||||||
private static TimedAttemptSettings timedAttemptSettings; | ||||||||||
private static FakeApiClock clock; | ||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. By making these static and initializing them in an instance method (
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ah, good catch. thanks. I didn't think through the need for static in this test class. I just switched them as instance variables edit: I didn't notice this comment had a suggestion but I added the same change in another commit |
||||||||||
|
||||||||||
private FakeLogHandler logHandler; | ||||||||||
|
||||||||||
@Before | ||||||||||
public void setUp() { | ||||||||||
logHandler = new FakeLogHandler(); | ||||||||||
OperationTimedPollAlgorithm.LOGGER.addHandler(logHandler); | ||||||||||
clock = new FakeApiClock(System.nanoTime()); | ||||||||||
timedAttemptSettings = | ||||||||||
TimedAttemptSettings.newBuilder() | ||||||||||
.setGlobalSettings(FAST_RETRY_SETTINGS) | ||||||||||
.setRetryDelay(Duration.ofMillis(1l)) | ||||||||||
.setRpcTimeout(Duration.ofMillis(1l)) | ||||||||||
.setRandomizedRetryDelay(Duration.ofMillis(1l)) | ||||||||||
.setAttemptCount(0) | ||||||||||
.setFirstAttemptStartTimeNanos(clock.nanoTime()) | ||||||||||
.build(); | ||||||||||
} | ||||||||||
|
||||||||||
@After | ||||||||||
public void tearDown() { | ||||||||||
OperationTimedPollAlgorithm.LOGGER.removeHandler(logHandler); | ||||||||||
// redundant null assignment for readability - a new log handler will be used | ||||||||||
logHandler = null; | ||||||||||
} | ||||||||||
|
||||||||||
@Test | ||||||||||
public void testAlgorithmThatShouldRetry_doesNotLogTimeoutHelpMessage() { | ||||||||||
OperationTimedPollAlgorithm algorithm = | ||||||||||
OperationTimedPollAlgorithm.create(FAST_RETRY_SETTINGS, clock); | ||||||||||
try { | ||||||||||
algorithm.shouldRetry(timedAttemptSettings); | ||||||||||
} catch (CancellationException ex) { | ||||||||||
fail("Unexpected unsuccessful shouldRetry()"); | ||||||||||
} | ||||||||||
assertTrue( | ||||||||||
logHandler.getAllMessages().stream() | ||||||||||
.noneMatch( | ||||||||||
entry -> entry.contains(OperationTimedPollAlgorithm.LRO_TROUBLESHOOTING_LINK))); | ||||||||||
} | ||||||||||
|
||||||||||
@Test | ||||||||||
public void testAlgorithmThatShouldNotRetry_logsTimeoutHelpMessage() { | ||||||||||
OperationTimedPollAlgorithm algorithm = | ||||||||||
OperationTimedPollAlgorithm.create(FAST_RETRY_SETTINGS, clock); | ||||||||||
clock.incrementNanoTime(1 * 1000 * 1000 * 1000); // force rpc timeout | ||||||||||
assertThrows(CancellationException.class, () -> algorithm.shouldRetry(timedAttemptSettings)); | ||||||||||
assertTrue( | ||||||||||
logHandler.getAllMessages().stream() | ||||||||||
.anyMatch( | ||||||||||
entry -> entry.contains(OperationTimedPollAlgorithm.LRO_TROUBLESHOOTING_LINK))); | ||||||||||
} | ||||||||||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
/* | ||
* Copyright 2023 Google LLC | ||
* | ||
* Redistribution and use in source and binary forms, with or without | ||
* modification, are permitted provided that the following conditions are | ||
* met: | ||
* | ||
* * Redistributions of source code must retain the above copyright | ||
* notice, this list of conditions and the following disclaimer. | ||
* * Redistributions in binary form must reproduce the above | ||
* copyright notice, this list of conditions and the following disclaimer | ||
* in the documentation and/or other materials provided with the | ||
* distribution. | ||
* * Neither the name of Google LLC nor the names of its | ||
* contributors may be used to endorse or promote products derived from | ||
* this software without specific prior written permission. | ||
* | ||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
*/ | ||
package com.google.api.gax.util; | ||
|
||
import java.util.ArrayList; | ||
import java.util.List; | ||
import java.util.logging.Handler; | ||
import java.util.logging.LogRecord; | ||
import java.util.stream.Collectors; | ||
|
||
/* | ||
* Convenience class that stores the log entries produced by any logger | ||
* It can then be inspected - its entries are a list log records | ||
*/ | ||
public class FakeLogHandler extends Handler { | ||
List<LogRecord> records = new ArrayList<>(); | ||
|
||
@Override | ||
public void publish(LogRecord record) { | ||
records.add(record); | ||
} | ||
|
||
@Override | ||
public void flush() {} | ||
|
||
@Override | ||
public void close() throws SecurityException {} | ||
|
||
public List<String> getAllMessages() { | ||
return records.stream().map(LogRecord::getMessage).collect(Collectors.toList()); | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: I don't think the logger needs a VisibleForTesting annotation.