Backport to branch(3.16) : Add wait for cache expiry

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

@@ -31,6 +31,10 @@ public static Properties getProperties(@SuppressWarnings("unused") String testNa
     props.setProperty(DatabaseConfig.CROSS_PARTITION_SCAN, "true");
     props.setProperty(DatabaseConfig.CROSS_PARTITION_SCAN_FILTERING, "true");
     props.setProperty(DatabaseConfig.CROSS_PARTITION_SCAN_ORDERING, "false");
+
+    // Metadata cache expiration time
+    props.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
+
     return props;
   }
 

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

@@ -32,6 +32,9 @@ public static Properties getProperties(String testName) {
         CosmosConfig.TABLE_METADATA_DATABASE,
         DatabaseConfig.DEFAULT_SYSTEM_NAMESPACE_NAME + "_" + testName);
 
+    // Metadata cache expiration time
+    props.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
+
     return props;
   }
 

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

@@ -52,6 +52,9 @@ public static Properties getProperties(String testName) {
         DynamoConfig.TABLE_METADATA_NAMESPACE,
         DatabaseConfig.DEFAULT_SYSTEM_NAMESPACE_NAME + "_" + testName);
 
+    // Metadata cache expiration time
+    properties.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
+
     return properties;
   }
 

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

@@ -37,6 +37,9 @@ public static Properties getProperties(String testName) {
         JdbcConfig.TABLE_METADATA_SCHEMA,
         DatabaseConfig.DEFAULT_SYSTEM_NAMESPACE_NAME + "_" + testName);
 
+    // Metadata cache expiration time
+    props.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
+
     return props;
   }
 

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

@@ -49,6 +49,9 @@ protected Properties getProperties(String testName) {
     // The default storage is cassandra
     props.setProperty(MultiStorageConfig.DEFAULT_STORAGE, "cassandra");
 
+    // Metadata cache expiration time
+    props.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
+
     return ConsensusCommitTestUtils.loadConsensusCommitProperties(props);
   }
 }

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

@@ -49,6 +49,9 @@ protected Properties getProperties(String testName) {
     // The default storage is cassandra
     props.setProperty(MultiStorageConfig.DEFAULT_STORAGE, "cassandra");
 
+    // Metadata cache expiration time
+    props.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
+
     return ConsensusCommitTestUtils.loadConsensusCommitProperties(props);
   }
 }

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

@@ -136,6 +136,9 @@ private void initMultiStorageAdmin() {
     // The default storage is cassandra
     props.setProperty(MultiStorageConfig.DEFAULT_STORAGE, "cassandra");
 
+    // Metadata cache expiration time
+    props.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
+
     multiStorageAdmin = new MultiStorageAdmin(new DatabaseConfig(props));
   }
 

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

@@ -43,6 +43,10 @@ public static Properties getPropertiesForCassandra(@SuppressWarnings("unused") S
     properties.setProperty(DatabaseConfig.CROSS_PARTITION_SCAN, "true");
     properties.setProperty(DatabaseConfig.CROSS_PARTITION_SCAN_FILTERING, "false");
     properties.setProperty(DatabaseConfig.CROSS_PARTITION_SCAN_ORDERING, "false");
+
+    // Metadata cache expiration time
+    properties.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
+
     return properties;
   }
 
@@ -65,6 +69,9 @@ public static Properties getPropertiesForJdbc(String testName) {
         JdbcConfig.TABLE_METADATA_SCHEMA,
         DatabaseConfig.DEFAULT_SYSTEM_NAMESPACE_NAME + "_" + testName);
 
+    // Metadata cache expiration time
+    properties.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
+
     return properties;
   }
 }

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

@@ -131,6 +131,9 @@ private void initMultiStorage() {
     // The default storage is cassandra
     props.setProperty(MultiStorageConfig.DEFAULT_STORAGE, "cassandra");
 
+    // Metadata cache expiration time
+    props.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
+
     multiStorage = new MultiStorage(new DatabaseConfig(props));
   }
 

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

@@ -49,6 +49,9 @@ public Properties getProperties(String testName) {
     // The default storage is jdbc
     properties.setProperty(MultiStorageConfig.DEFAULT_STORAGE, "jdbc");
 
+    // Metadata cache expiration time
+    properties.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
+
     return properties;
   }
 

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

@@ -47,6 +47,9 @@ protected Properties getProperties(String testName) {
     // The default storage is cassandra
     props.setProperty(MultiStorageConfig.DEFAULT_STORAGE, "cassandra");
 
+    // Metadata cache expiration time
+    props.setProperty(DatabaseConfig.METADATA_CACHE_EXPIRATION_TIME_SECS, "1");
+
     return props;
   }