[S] Change in asterixdb[ionic]: [NO ISSUE][TEST] wait for io before bufferCache clean

[AsterixDB Code Review]

>From Ritik Raj <ritik....@couchbase.com>:

Ritik Raj has uploaded this change for review. ( 
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20392?usp=email )


Change subject: [NO ISSUE][TEST] wait for io before bufferCache clean
......................................................................

[NO ISSUE][TEST] wait for io before bufferCache clean

Change-Id: Id852530a3fd1e4dd1bec88eb481c695e1da9a0e9
---
M 
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/cloud_storage/CloudStorageSparseTest.java
M 
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppSinglePartitionExecutionTest.java
2 files changed, 20 insertions(+), 0 deletions(-)



  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/92/20392/1

diff --git 
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/cloud_storage/CloudStorageSparseTest.java
 
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/cloud_storage/CloudStorageSparseTest.java
index b7a264b..b930b66 100644
--- 
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/cloud_storage/CloudStorageSparseTest.java
+++ 
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/cloud_storage/CloudStorageSparseTest.java
@@ -23,8 +23,10 @@
 import java.util.List;

 import org.apache.asterix.api.common.LocalCloudUtilAdobeMock;
+import org.apache.asterix.common.api.IDatasetLifecycleManager;
 import org.apache.asterix.common.api.INcApplicationContext;
 import org.apache.asterix.common.config.GlobalConfig;
+import org.apache.asterix.common.storage.StorageIOStats;
 import org.apache.asterix.test.common.TestExecutor;
 import org.apache.asterix.test.runtime.ExecutionTestUtil;
 import org.apache.asterix.test.runtime.LangExecutionUtil;
@@ -117,6 +119,14 @@
         List<TestCase.CompilationUnit> cu = 
tcCtx.getTestCase().getCompilationUnit();
         Assume.assumeTrue(cu.size() > 1 || 
!EXCLUDED_TESTS.equals(getText(cu.get(0).getDescription())));
         LangExecutionUtil.test(tcCtx);
+        for (NodeControllerService nc : ExecutionTestUtil.integrationUtil.ncs) 
{
+            IDatasetLifecycleManager lifecycleManager =
+                    ((INcApplicationContext) 
nc.getApplicationContext()).getDatasetLifecycleManager();
+            StorageIOStats stats = lifecycleManager.getDatasetsIOStats();
+            while (stats.getPendingFlushes() != 0 || stats.getPendingMerges() 
!= 0) {
+                stats = lifecycleManager.getDatasetsIOStats();
+            }
+        }
         IBufferCache bufferCache;
         for (NodeControllerService nc : ExecutionTestUtil.integrationUtil.ncs) 
{
             bufferCache = ((INcApplicationContext) 
nc.getApplicationContext()).getBufferCache();
diff --git 
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppSinglePartitionExecutionTest.java
 
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppSinglePartitionExecutionTest.java
index 6f19393..4b322dc 100644
--- 
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppSinglePartitionExecutionTest.java
+++ 
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppSinglePartitionExecutionTest.java
@@ -24,7 +24,9 @@
 import java.util.HashMap;
 import java.util.Map;

+import org.apache.asterix.common.api.IDatasetLifecycleManager;
 import org.apache.asterix.common.api.INcApplicationContext;
+import org.apache.asterix.common.storage.StorageIOStats;
 import org.apache.asterix.test.common.TestExecutor;
 import org.apache.asterix.testframework.context.TestCaseContext;
 import org.apache.hyracks.control.nc.NodeControllerService;
@@ -71,6 +73,14 @@
     @Test
     public void test() throws Exception {
         LangExecutionUtil.test(tcCtx);
+        for (NodeControllerService nc : ExecutionTestUtil.integrationUtil.ncs) 
{
+            IDatasetLifecycleManager lifecycleManager =
+                    ((INcApplicationContext) 
nc.getApplicationContext()).getDatasetLifecycleManager();
+            StorageIOStats stats = lifecycleManager.getDatasetsIOStats();
+            while (stats.getPendingFlushes() != 0 || stats.getPendingMerges() 
!= 0) {
+                stats = lifecycleManager.getDatasetsIOStats();
+            }
+        }
         IBufferCache bufferCache;
         for (NodeControllerService nc : ExecutionTestUtil.integrationUtil.ncs) 
{
             bufferCache = ((INcApplicationContext) 
nc.getApplicationContext()).getBufferCache();

--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20392?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://asterix-gerrit.ics.uci.edu/settings?usp=email

Gerrit-MessageType: newchange
Gerrit-Project: asterixdb
Gerrit-Branch: ionic
Gerrit-Change-Id: Id852530a3fd1e4dd1bec88eb481c695e1da9a0e9
Gerrit-Change-Number: 20392
Gerrit-PatchSet: 1
Gerrit-Owner: Ritik Raj <ritik....@couchbase.com>