mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-01-08 07:11:44 +00:00
Code Issues Releases Wiki Activity

Stop saving BSA empty refresh changes (#2307)

Browse Source 
* Stop saving BSA empty refresh changes

We thought that as a way to verify the refresh job to be running, browsing
the GCS bucket with empty files is easier than quering the DB or go to GCP
logging dashboard, but there are too many of them to be useful.
This commit is contained in:
Weimin Yu
2024-01-25 16:02:04 -05:00
committed by GitHub
parent f9e0908022
commit 58ec0f826d
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/google/registry/bsa/BsaRefreshAction.java
View File

@@ -117,13 +117,12 @@ public class BsaRefreshAction implements Runnable {
case CHECK_FOR_CHANGES:
ImmutableList<UnblockableDomainChange> blockabilityChanges =
refresher.checkForBlockabilityChanges();
// Always write even if no change. Easier for manual inspection of GCS bucket.
gcsClient.writeRefreshChanges(schedule.jobName(), blockabilityChanges.stream());
if (blockabilityChanges.isEmpty()) {
logger.atInfo().log("No change to Unblockable domains found.");
schedule.updateJobStage(RefreshStage.DONE);
return null;
}
gcsClient.writeRefreshChanges(schedule.jobName(), blockabilityChanges.stream());
schedule.updateJobStage(RefreshStage.APPLY_CHANGES);
// Fall through
case APPLY_CHANGES:

16
core/src/test/java/google/registry/bsa/BsaRefreshFunctionalTest.java
View File

@@ -30,6 +30,7 @@ import static google.registry.testing.DatabaseHelper.deleteTestDomain;
import static google.registry.testing.DatabaseHelper.persistActiveDomain;
import static google.registry.testing.DatabaseHelper.persistResource;
import static google.registry.util.DateTimeUtils.START_OF_TIME;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
@@ -54,6 +55,7 @@ import google.registry.request.Response;
import google.registry.testing.FakeClock;
import google.registry.testing.FakeLockHandler;
import google.registry.testing.FakeResponse;
import java.io.UncheckedIOException;
import java.util.Optional;
import org.joda.time.DateTime;
import org.joda.time.Duration;
@@ -293,7 +295,12 @@ class BsaRefreshFunctionalTest {
action.run();
assertThat(queryUnblockableDomains())
.containsExactly(UnblockableDomain.of("blocked1.app", Reason.REGISTERED));
assertThat(gcsClient.readRefreshChanges(jobName)).isEmpty();
// Verify that refresh change file does not exist (404 error) since there is no change.
assertThat(
assertThrows(
UncheckedIOException.class, () -> gcsClient.readRefreshChanges(jobName).findAny()))
.hasMessageThat()
.contains("404");
verifyNoInteractions(bsaReportSender);
}
@@ -313,7 +320,12 @@ class BsaRefreshFunctionalTest {
action.run();
assertThat(queryUnblockableDomains())
.containsExactly(UnblockableDomain.of("blocked1.app", Reason.REGISTERED));
assertThat(gcsClient.readRefreshChanges(jobName)).isEmpty();
// Verify that refresh change file does not exist (404 error) since there is no change.
assertThat(
assertThrows(
UncheckedIOException.class, () -> gcsClient.readRefreshChanges(jobName).findAny()))
.hasMessageThat()
.contains("404");
verifyNoInteractions(bsaReportSender);
}
}