Skip to content

Commit b9ad0b1

Browse files
feeblefakieKodaiD
andauthored
Backport to branch(3.16) : Add wait for cache expiry (#3062)
Co-authored-by: Kodai Doki <52027276+KodaiD@users.noreply.github.com>
1 parent e5fb7f9 commit b9ad0b1

11 files changed

+38
-0
lines changed

core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraEnv.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ public static Properties getProperties(@SuppressWarnings("unused") String testNa
3131
props.setProperty(DatabaseConfig.CROSS_PARTITION_SCAN, "true");
3232
props.setProperty(DatabaseConfig.CROSS_PARTITION_SCAN_FILTERING, "true");
3333
props.setProperty(DatabaseConfig.CROSS_PARTITION_SCAN_ORDERING, "false");
34+
35+
// Metadata cache expiration time
36+
props.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
37+
3438
return props;
3539
}
3640

core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosEnv.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ public static Properties getProperties(String testName) {
3232
CosmosConfig.TABLE_METADATA_DATABASE,
3333
DatabaseConfig.DEFAULT_SYSTEM_NAMESPACE_NAME + "_" + testName);
3434

35+
// Metadata cache expiration time
36+
props.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
37+
3538
return props;
3639
}
3740

core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoEnv.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ public static Properties getProperties(String testName) {
5252
DynamoConfig.TABLE_METADATA_NAMESPACE,
5353
DatabaseConfig.DEFAULT_SYSTEM_NAMESPACE_NAME + "_" + testName);
5454

55+
// Metadata cache expiration time
56+
properties.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
57+
5558
return properties;
5659
}
5760

core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcEnv.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ public static Properties getProperties(String testName) {
3737
JdbcConfig.TABLE_METADATA_SCHEMA,
3838
DatabaseConfig.DEFAULT_SYSTEM_NAMESPACE_NAME + "_" + testName);
3939

40+
// Metadata cache expiration time
41+
props.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
42+
4043
return props;
4144
}
4245

core/src/integration-test/java/com/scalar/db/storage/multistorage/ConsensusCommitNullMetadataIntegrationTestWithMultiStorage.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ protected Properties getProperties(String testName) {
4949
// The default storage is cassandra
5050
props.setProperty(MultiStorageConfig.DEFAULT_STORAGE, "cassandra");
5151

52+
// Metadata cache expiration time
53+
props.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
54+
5255
return ConsensusCommitTestUtils.loadConsensusCommitProperties(props);
5356
}
5457
}

core/src/integration-test/java/com/scalar/db/storage/multistorage/ConsensusCommitSpecificIntegrationTestWithMultiStorage.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ protected Properties getProperties(String testName) {
4949
// The default storage is cassandra
5050
props.setProperty(MultiStorageConfig.DEFAULT_STORAGE, "cassandra");
5151

52+
// Metadata cache expiration time
53+
props.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
54+
5255
return ConsensusCommitTestUtils.loadConsensusCommitProperties(props);
5356
}
5457
}

core/src/integration-test/java/com/scalar/db/storage/multistorage/MultiStorageAdminIntegrationTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,9 @@ private void initMultiStorageAdmin() {
136136
// The default storage is cassandra
137137
props.setProperty(MultiStorageConfig.DEFAULT_STORAGE, "cassandra");
138138

139+
// Metadata cache expiration time
140+
props.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
141+
139142
multiStorageAdmin = new MultiStorageAdmin(new DatabaseConfig(props));
140143
}
141144

core/src/integration-test/java/com/scalar/db/storage/multistorage/MultiStorageEnv.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ public static Properties getPropertiesForCassandra(@SuppressWarnings("unused") S
4343
properties.setProperty(DatabaseConfig.CROSS_PARTITION_SCAN, "true");
4444
properties.setProperty(DatabaseConfig.CROSS_PARTITION_SCAN_FILTERING, "false");
4545
properties.setProperty(DatabaseConfig.CROSS_PARTITION_SCAN_ORDERING, "false");
46+
47+
// Metadata cache expiration time
48+
properties.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
49+
4650
return properties;
4751
}
4852

@@ -65,6 +69,9 @@ public static Properties getPropertiesForJdbc(String testName) {
6569
JdbcConfig.TABLE_METADATA_SCHEMA,
6670
DatabaseConfig.DEFAULT_SYSTEM_NAMESPACE_NAME + "_" + testName);
6771

72+
// Metadata cache expiration time
73+
properties.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
74+
6875
return properties;
6976
}
7077
}

core/src/integration-test/java/com/scalar/db/storage/multistorage/MultiStorageIntegrationTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@ private void initMultiStorage() {
131131
// The default storage is cassandra
132132
props.setProperty(MultiStorageConfig.DEFAULT_STORAGE, "cassandra");
133133

134+
// Metadata cache expiration time
135+
props.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
136+
134137
multiStorage = new MultiStorage(new DatabaseConfig(props));
135138
}
136139

core/src/integration-test/java/com/scalar/db/storage/multistorage/MultiStorageMutationAtomicityUnitIntegrationTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ public Properties getProperties(String testName) {
4949
// The default storage is jdbc
5050
properties.setProperty(MultiStorageConfig.DEFAULT_STORAGE, "jdbc");
5151

52+
// Metadata cache expiration time
53+
properties.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
54+
5255
return properties;
5356
}
5457

0 commit comments

Comments
 (0)