MB-40915: Reactivate disabled tests for magma

Change-Id: I928231129c2b87b8b0a5c88341bf813d04798a8f
Reviewed-on: http://review.couchbase.org/c/kv_engine/+/156543
Reviewed-by: Dave Rigby <[email protected]>
Tested-by: Richard de Mellow <[email protected]>

Author: rdemellow

engines/ep/tests/ep_testsuite.cc

@@ -8431,7 +8431,7 @@ BaseTestCase testsuite_testcases[] = {
                  "chk_max_items=500;"
                  "chk_remover_stime=1;"
                  "max_num_shards=4;"
-                 "max_size=6291456",
+                 "max_size=10000000",
                  // TODO RDB: This test requires full control and accurate
                  // tracking on how memory is allocated by the underlying
                  // store. We do not have that yet for RocksDB. Depending
@@ -8442,8 +8442,7 @@ BaseTestCase testsuite_testcases[] = {
                  // 'vb_active_perc_mem_resident' stat never goes below the
                  // threshold we expect. Needs to resize 'max_size' to consider
                  // RocksDB pre-allocations.
-                 // TODO magma: similar issue with magma
-                 prepare_skip_broken_under_rocks_and_magma,
+                 prepare_skip_broken_under_rocks,
                  cleanup),
         TestCase("test set_param message",
                  test_set_param_message,
@@ -9035,7 +9034,7 @@ BaseTestCase testsuite_testcases[] = {
                  teardown,
                  nullptr,
                  // TODO RDB: Implement RocksDBKVStore::getNumPersistedDeletes
-                 // TODO magma: need to add support for persisted deletes
+                 // Magma: no plans to support persisted deletes
                  prepare_skip_broken_under_rocks_and_magma,
                  cleanup),
 
@@ -9280,7 +9279,7 @@ BaseTestCase testsuite_testcases[] = {
                  test_setup,
                  teardown,
                  nullptr,
-                 // magma has no support for upgrades
+                 // magma has no support for upgrades at this time
                  prepare_skip_broken_under_magma,
                  cleanup),
 
@@ -9291,7 +9290,7 @@ BaseTestCase testsuite_testcases[] = {
                  // Set a fixed number of shards for stats checking.
                  "max_num_shards=4",
                  // TODO RDB: Needs to fix some missing/unexpected stats
-                 // magma has no support for upgrades
+                 // Magma has no support for upgrades at this time
                  prepare_skip_broken_under_rocks_and_magma,
                  cleanup),
 
@@ -9320,8 +9319,8 @@ BaseTestCase testsuite_testcases[] = {
                  teardown,
                  nullptr,
                  // TODO RDB: Needs the 'ep_item_commit_failed' stat
-                 // TODO magma: Need to add magma functionality similar
-                 // to couchstore specific functionality used by test
+                 // Magma: This test does not apply to magma because magma
+                 // does not close/reopen files while an instance is active.
                  prepare_ep_bucket_skip_broken_under_rocks_and_magma,
                  cleanup),
         TestCase("test_MB-test_mb20943_remove_pending_ops_on_vbucket_delete",
@@ -9337,8 +9336,8 @@ BaseTestCase testsuite_testcases[] = {
                  teardown,
                  nullptr,
                  // TODO RDB: Needs the 'vb_active_ops_reject' stat
-                 // TODO magma: Need to add magma functionality similar
-                 // to couchstore specific functionality used by test
+                 // Magma: Error injection for magma is done as part of
+                 // the magma unit tests.
                  prepare_ep_bucket_skip_broken_under_rocks_and_magma,
                  cleanup),
 
@@ -9362,8 +9361,8 @@ BaseTestCase testsuite_testcases[] = {
                  test_setup,
                  teardown,
                  nullptr,
-                 // TODO magma: Need to add magma functionality similar
-                 // to couchstore specific functionality used by test
+                 // TODO Magma: Magma does not support updating the
+                 // data store without going through magma instance.
                  prepare_ep_bucket_skip_broken_under_rocks_and_magma,
                  cleanup),
 
@@ -9373,7 +9372,7 @@ BaseTestCase testsuite_testcases[] = {
                  teardown,
                  nullptr,
                  // couchstore only issue - so skip magma and rocks
-                 prepare_ep_bucket_skip_broken_under_rocks_and_magma,
+                 prepare_ep_bucket_skip_broken_under_rocks,
                  cleanup),
 
         TestCase("test_mb38031_illegal_json_throws",
@@ -9390,7 +9389,8 @@ BaseTestCase testsuite_testcases[] = {
                  test_setup,
                  teardown,
                  nullptr,
-                 // The test logic assumes that the KV BloomFilter is enabled,
+                 // TODO: The test logic assumes that the KV BloomFilter is
+                 // enabled,
                  // but it is currently disabled for Magma
                  prepare_ep_bucket_skip_broken_under_magma,
                  cleanup),

engines/ep/tests/ep_testsuite_dcp.cc

@@ -8534,8 +8534,7 @@ BaseTestCase testsuite_testcases[] = {
                  // TODO RDB: Cannot store any item
                  // (cb::engine_errc::no_memory). Needs to resize 'max_size' to
                  // consider RocksDB pre-allocations.
-                 // TODO magma: Need to recalc for magma
-                 prepare_skip_broken_under_rocks_and_magma,
+                 prepare_skip_broken_under_rocks,
                  cleanup),
         TestCase("test dcp cursor dropping (replication)",
                  test_dcp_cursor_dropping_replication,
@@ -8561,8 +8560,7 @@ BaseTestCase testsuite_testcases[] = {
                  // TODO RDB: Cannot store any item
                  // (cb::engine_errc::no_memory). Needs to resize 'max_size' to
                  // consider RocksDB pre-allocations.
-                 // TODO magma: Need to recalc for magma
-                 prepare_skip_broken_under_rocks_and_magma,
+                 prepare_skip_broken_under_rocks,
                  cleanup),
         TestCase("test dcp cursor dropping backfill",
                  test_dcp_cursor_dropping_backfill,
@@ -8574,7 +8572,7 @@ BaseTestCase testsuite_testcases[] = {
                  "cursor_dropping_lower_mark=60;cursor_dropping_upper_mark=70;"
                  "chk_remover_stime=1;max_size=6291456;chk_max_items=8000;"
                  "chk_period=1;max_num_shards=4",
-                 prepare_skip_broken_under_rocks_and_magma,
+                 prepare_skip_broken_under_rocks,
                  cleanup),
         TestCase("test dcp stream takeover",
                  test_dcp_takeover,
@@ -8679,8 +8677,7 @@ BaseTestCase testsuite_testcases[] = {
                  // TODO RDB: Intermittently failing with SegFault.
                  // Probably we have to implement getItemCount. Needs the
                  // 'vb_replica_curr_items' stat.
-                 // TODO: magma needs collections support
-                 prepare_skip_broken_under_rocks_and_magma,
+                 prepare_skip_broken_under_rocks,
                  cleanup),
         TestCase("test partial rollback on consumer",
                  test_partialrollback_for_consumer,