MB-28685: Expand ep_testsuite tests for compression active mode

As part of expanding ep_testsuite to work with all compression
modes, run the ep_testsuite tests for active compression mode

Change-Id: Ia61de4deefaa4d69abbbb18769ffb300c0abadb2
Reviewed-on: http://review.couchbase.org/95505
Well-Formed: Build Bot <[email protected]>
Tested-by: Build Bot <[email protected]>
Reviewed-by: Dave Rigby <[email protected]>

Author: Sriram Ganesan

engines/ep/CMakeLists.txt

@@ -591,16 +591,23 @@ if (COUCHBASE_KV_BUILD_UNIT_TESTS)
                  COMMAND ${_cmdline} -v -e "compression_mode=off$<SEMICOLON>dbname=./${name}.value_eviction.comp_off.db")
         ADD_TEST(NAME ${name}.value_eviction.comp_passive
                  COMMAND ${_cmdline} -v -e "compression_mode=passive$<SEMICOLON>dbname=./${name}.value_eviction.comp_passive.db")
+        ADD_TEST(NAME ${name}.value_eviction.comp_active
+                 COMMAND ${_cmdline} -v -e "compression_mode=active$<SEMICOLON>dbname=./${name}.value_eviction.comp_active.db")
         ADD_TEST(NAME ${name}.full_eviction.comp_off
                  COMMAND ${_cmdline} -v -e "compression_mode=off$<SEMICOLON>item_eviction_policy=full_eviction\
 $<SEMICOLON>dbname=./${name}.full_eviction.comp_off.db")
         ADD_TEST(NAME ${name}.full_eviction.comp_passive
                  COMMAND ${_cmdline} -v -e "compression_mode=passive$<SEMICOLON>item_eviction_policy=full_eviction\
 $<SEMICOLON>dbname=./${name}.full_eviction.comp_passive.db")
+        ADD_TEST(NAME ${name}.full_eviction.comp_active
+                 COMMAND ${_cmdline} -v -e "compression_mode=active$<SEMICOLON>item_eviction_policy=full_eviction\
+$<SEMICOLON>dbname=./${name}.full_eviction.comp_active.db")
         SET_TESTS_PROPERTIES(${name}.value_eviction.comp_off PROPERTIES TIMEOUT ${timeout})
         SET_TESTS_PROPERTIES(${name}.value_eviction.comp_passive PROPERTIES TIMEOUT ${timeout})
+        SET_TESTS_PROPERTIES(${name}.value_eviction.comp_active PROPERTIES TIMEOUT ${timeout})
         SET_TESTS_PROPERTIES(${name}.full_eviction.comp_off PROPERTIES TIMEOUT ${timeout})
         SET_TESTS_PROPERTIES(${name}.full_eviction.comp_passive PROPERTIES TIMEOUT ${timeout})
+        SET_TESTS_PROPERTIES(${name}.full_eviction.comp_active PROPERTIES TIMEOUT ${timeout})
 
         IF (NOT arg_SKIP_EPHEMERAL)
             ADD_TEST(NAME ${name}.ephemeral

engines/ep/tests/ep_test_apis.cc

@@ -1597,6 +1597,15 @@ void wait_for_flusher_to_settle(ENGINE_HANDLE *h, ENGINE_HANDLE_V1 *h1) {
     wait_for_stat_to_be(h, h1, "ep_flusher_todo", 0);
 }
 
+void wait_for_item_compressor_to_settle(ENGINE_HANDLE* h,
+                                        ENGINE_HANDLE_V1* h1) {
+    int visited_count = get_int_stat(h, h1, "ep_item_compressor_num_visited");
+
+    // We need to wait for at least one more run of the item compressor
+    wait_for_stat_to_be(
+            h, h1, "ep_item_compressor_num_visited", visited_count + 1);
+}
+
 void wait_for_rollback_to_finish(ENGINE_HANDLE *h, ENGINE_HANDLE_V1 *h1) {
     useconds_t sleepTime = 128;
     while (get_int_stat(h, h1, "ep_rollback_count") == 0) {

engines/ep/tests/ep_test_apis.h

@@ -444,6 +444,7 @@ void wait_for_expired_items_to_be(ENGINE_HANDLE *h, ENGINE_HANDLE_V1 *h1,
                                   const time_t max_wait_time_in_secs = 60);
 bool wait_for_warmup_complete(ENGINE_HANDLE *h, ENGINE_HANDLE_V1 *h1);
 void wait_for_flusher_to_settle(ENGINE_HANDLE *h, ENGINE_HANDLE_V1 *h1);
+void wait_for_item_compressor_to_settle(ENGINE_HANDLE* h, ENGINE_HANDLE_V1* h1);
 void wait_for_rollback_to_finish(ENGINE_HANDLE *h, ENGINE_HANDLE_V1 *h1);
 void wait_for_persisted_value(ENGINE_HANDLE *h, ENGINE_HANDLE_V1 *h1,
                               const char *key, const char *val,

engines/ep/tests/ep_testsuite.cc

@@ -2012,12 +2012,18 @@ static enum test_result test_mem_stats(ENGINE_HANDLE *h, ENGINE_HANDLE_V1 *h1) {
     if (isPersistentBucket(h, h1)) {
         wait_for_stat_change(h, h1, "ep_items_rm_from_checkpoints", itemsRemoved);
     }
+
+    if (isActiveCompressionEnabled(h, h1)) {
+        wait_for_item_compressor_to_settle(h, h1);
+    }
+
     int mem_used = get_int_stat(h, h1, "mem_used");
     int cache_size = get_int_stat(h, h1, "ep_total_cache_size");
     int overhead = get_int_stat(h, h1, "ep_overhead");
     int value_size = get_int_stat(h, h1, "ep_value_size");
     check((mem_used - overhead) > cache_size,
-          "ep_kv_size should be greater than the hashtable cache size due to the checkpoint overhead");
+          "ep_kv_size should be greater than the hashtable cache size due to "
+          "the checkpoint overhead");
 
     if (isPersistentBucket(h, h1)) {
         evict_key(h, h1, "key", 0, "Ejected.");
@@ -2029,10 +2035,15 @@ static enum test_result test_mem_stats(ENGINE_HANDLE *h, ENGINE_HANDLE_V1 *h1) {
 
         check_key_value(h, h1, "key", value, strlen(value), 0); // Load an item from disk again.
 
+        if (isActiveCompressionEnabled(h, h1)) {
+            wait_for_item_compressor_to_settle(h, h1);
+        }
+
         check(get_int_stat(h, h1, "mem_used") >= mem_used,
               "Expected mem_used to remain the same after an item is loaded from disk");
         check(get_int_stat(h, h1, "ep_value_size") == value_size,
-              "Expected ep_value_size to remain the same after item is loaded from disk");
+              "Expected ep_value_size to remain the same after item is "
+              "loaded from disk");
     }
 
     return SUCCESS;