Skip to content

Commit 1db9757

Browse files
test(spanner): unflake ITBatchReadTest by skipping DataBoost tests on… (#14473)
… cloud-devel and cloud-staging Skip dataBoostRead and dataBoostQuery in ITBatchReadTest when running against cloud-devel (staging-wrenchworks.sandbox.googleapis.com) or cloud-staging (preprod-spanner.sandbox.googleapis.com) while DataBoost backend capacity adjustments roll out.
1 parent f89d3a1 commit 1db9757

3 files changed

Lines changed: 48 additions & 1 deletion

File tree

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTestEnv.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,22 @@ protected void initializeConfig()
123123
config = configClass.newInstance();
124124
}
125125

126-
boolean isCloudDevel() {
126+
public boolean isCloudDevel() {
127127
return Objects.equals(
128128
System.getProperty("spanner.gce.config.server_url"),
129129
"https://staging-wrenchworks.sandbox.googleapis.com");
130130
}
131131

132+
public boolean isCloudStaging() {
133+
return Objects.equals(
134+
System.getProperty("spanner.gce.config.server_url"),
135+
"https://preprod-spanner.sandbox.googleapis.com");
136+
}
137+
138+
public boolean isCloudDevelOrStaging() {
139+
return isCloudDevel() || isCloudStaging();
140+
}
141+
132142
@Override
133143
protected void before() throws Throwable {
134144
this.initializeConfig();

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTestEnvTest.java

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,39 @@ public void testIsRetryableResourceExhaustedException() {
5858
"Could not create instance. Quota exceeded for quota metric 'Instance create"
5959
+ " requests' and limit 'Instance create requests per minute'")));
6060
}
61+
62+
@Test
63+
public void testCloudDevelAndStagingDetection() {
64+
IntegrationTestEnv env = new IntegrationTestEnv();
65+
String originalServerUrl = System.getProperty("spanner.gce.config.server_url");
66+
try {
67+
System.clearProperty("spanner.gce.config.server_url");
68+
assertFalse(env.isCloudDevel());
69+
assertFalse(env.isCloudStaging());
70+
assertFalse(env.isCloudDevelOrStaging());
71+
72+
System.setProperty(
73+
"spanner.gce.config.server_url", "https://staging-wrenchworks.sandbox.googleapis.com");
74+
assertTrue(env.isCloudDevel());
75+
assertFalse(env.isCloudStaging());
76+
assertTrue(env.isCloudDevelOrStaging());
77+
78+
System.setProperty(
79+
"spanner.gce.config.server_url", "https://preprod-spanner.sandbox.googleapis.com");
80+
assertFalse(env.isCloudDevel());
81+
assertTrue(env.isCloudStaging());
82+
assertTrue(env.isCloudDevelOrStaging());
83+
84+
System.setProperty("spanner.gce.config.server_url", "https://spanner.googleapis.com");
85+
assertFalse(env.isCloudDevel());
86+
assertFalse(env.isCloudStaging());
87+
assertFalse(env.isCloudDevelOrStaging());
88+
} finally {
89+
if (originalServerUrl == null) {
90+
System.clearProperty("spanner.gce.config.server_url");
91+
} else {
92+
System.setProperty("spanner.gce.config.server_url", originalServerUrl);
93+
}
94+
}
95+
}
6196
}

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ public void readUsingIndex() {
250250
@Test
251251
public void dataBoostRead() {
252252
assumeFalse("data boost is not supported on Spanner Omni yet", isSpannerOmni());
253+
assumeFalse("Skipping the test due to a known bug b/557058207", env.isCloudDevelOrStaging());
253254
BitSet seenRows = new BitSet(numRows);
254255
TimestampBound bound = getRandomBound();
255256
PartitionOptions partitionParams = getRandomPartitionOptions();
@@ -303,6 +304,7 @@ private PartitionOptions getRandomPartitionOptions() {
303304
@Test
304305
public void dataBoostQuery() {
305306
assumeFalse("data boost is not supported on Spanner Omni yet", isSpannerOmni());
307+
assumeFalse("Skipping the test due to a known bug b/557058207", env.isCloudDevelOrStaging());
306308
BitSet seenRows = new BitSet(numRows);
307309
TimestampBound bound = getRandomBound();
308310
PartitionOptions partitionParams = getRandomPartitionOptions();

0 commit comments

Comments
 (0)