zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-25 20:18:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Re-enable flyway deadlock check (#2092)

Browse source 
Use a system property to specify whether this check should be executed.

We will update the presubmit test script to run this check only during
foss-pr.
This commit is contained in:
Weimin Yu 2023-08-03 15:34:30 -04:00 • committed by GitHub
parent 7a9668860b
commit 4db3968f85
2 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
db/build.gradle
View file

@ -179,6 +179,14 @@ dependencies {
testImplementation project(path: ':common', configuration: 'testing') testImplementation project(path: ':common', configuration: 'testing')
} }
test {
// When set, run FlywayDeadlockTest#validNewScript.
def deadlock_check = 'do_flyway_deadlock_check'
if (findProperty(deadlock_check)) {
systemProperty deadlock_check, findProperty(deadlock_check)
}
}
task generateFlywayIndex { task generateFlywayIndex {
def flywayBase = "$projectDir/src/main/resources/sql/flyway" def flywayBase = "$projectDir/src/main/resources/sql/flyway"
def filenamePattern = /V(\d+)__.*\.sql/ def filenamePattern = /V(\d+)__.*\.sql/

14
db/src/test/java/google/registry/sql/flyway/FlywayDeadlockTest.java
View file

@ -36,8 +36,8 @@ import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
/** /**
* Checks if new Flyway scripts may cause Database deadlock. * Checks if new Flyway scripts may cause Database deadlock.
@ -53,7 +53,6 @@ import org.junit.jupiter.api.Test;
* Therefore, we focus on 'alter' statements. However, 'create index' is a special case: if the * Therefore, we focus on 'alter' statements. However, 'create index' is a special case: if the
* 'concurrently' modifier is not present, the indexed table is locked. * 'concurrently' modifier is not present, the indexed table is locked.
*/ */
@Disabled() // TODO(b/223669973): breaks cloudbuild.
public class FlywayDeadlockTest { public class FlywayDeadlockTest {
private static final FluentLogger logger = FluentLogger.forEnclosingClass(); private static final FluentLogger logger = FluentLogger.forEnclosingClass();
@ -104,7 +103,18 @@ public class FlywayDeadlockTest {
CASE_INSENSITIVE), CASE_INSENSITIVE),
3); 3);
/**
* Validates that new flyway scripts (if exist) do not have deadlock-inducing patterns.
*
* <p>This test may break if not invoked in a cloned Nomulus repository, therefore it is disabled
* by default. User can enable it by setting the {@code do_flyway_deadlock_check} system property
* with arbitrary non-empty value.
*/
@Test @Test
@EnabledIfSystemProperty(
named = "do_flyway_deadlock_check",
matches = ".+",
disabledReason = "Not compatible with the release process on Cloud Build.")
public void validateNewFlywayScripts() { public void validateNewFlywayScripts() {
ImmutableList<Path> newScriptPaths = findChangedFlywayScripts(); ImmutableList<Path> newScriptPaths = findChangedFlywayScripts();
ImmutableList<String> scriptAndLockedElements = ImmutableList<String> scriptAndLockedElements =