disable rss eviction

Signed-off-by: adi_holden <[email protected]>

src/server/engine_shard.cc

@@ -229,14 +229,16 @@ size_t CalculateEvictionBytes() {
   size_t goal_bytes = CalculateHowManyBytesToEvictOnShard(max_memory_limit, global_used_memory,
                                                           shard_memory_budget_threshold);
 
+  // TODO: Eviction due to rss usage is not working well as it causes eviction
+  // of to many keys untill we finally see decrease in rss. We need to improve
+  // this logic before we enable it.
+  /*
   const double rss_oom_deny_ratio = ServerState::tlocal()->rss_oom_deny_ratio;
-
-  /* If rss_oom_deny_ratio is set, we should evict depending on rss memory too */
+  // If rss_oom_deny_ratio is set, we should evict depending on rss memory too
   if (rss_oom_deny_ratio > 0.0) {
     const size_t max_rss_memory = size_t(rss_oom_deny_ratio * max_memory_limit);
-    /* We start eviction when we have less than eviction_memory_budget_threshold * 100% of free rss
-     * memory */
-    const size_t shard_rss_memory_budget_threshold =
+    // We start eviction when we have less than eviction_memory_budget_threshold * 100% of free rss
+    memory const size_t shard_rss_memory_budget_threshold =
         size_t(max_rss_memory * eviction_memory_budget_threshold) / shards_count;
 
     // Calculate how much rss memory is used by all shards
@@ -247,6 +249,8 @@ size_t CalculateEvictionBytes() {
         goal_bytes, CalculateHowManyBytesToEvictOnShard(max_rss_memory, global_used_rss_memory,
                                                         shard_rss_memory_budget_threshold));
   }
+  */
+
   return goal_bytes;
 }
 

tests/dragonfly/memory_test.py

@@ -6,34 +6,6 @@
 from .instance import DflyInstance, DflyInstanceFactory
 
 
-async def calculate_estimated_connection_memory(
-    async_client: aioredis.Redis, df_server: DflyInstance
-):
-    memory_info = await async_client.info("memory")
-    already_used_rss_memory = memory_info["used_memory_rss"]
-
-    connections_number = 100
-    connections = []
-    for _ in range(connections_number):
-        conn = aioredis.Redis(port=df_server.port)
-        await conn.ping()
-        connections.append(conn)
-
-    await asyncio.sleep(1)  # Wait RSS update
-
-    memory_info = await async_client.info("memory")
-    estimated_connections_memory = memory_info["used_memory_rss"] - already_used_rss_memory
-
-    # Close test connection
-    for conn in connections:
-        await conn.close()
-
-    logging.info(
-        f"Estimated connection memory: {estimated_connections_memory // connections_number}."
-    )
-    return estimated_connections_memory // connections_number
-
-
 @pytest.mark.opt_only
 @pytest.mark.parametrize(
     "type, keys, val_size, elements",
@@ -191,6 +163,7 @@ async def test_eval_with_oom(df_factory: DflyInstanceFactory):
     assert rss_before_eval * 1.01 > info["used_memory_rss"]
 
 
+@pytest.mark.skip("rss eviction disabled")
 @pytest.mark.asyncio
 @dfly_args(
     {
@@ -203,7 +176,6 @@ async def test_eval_with_oom(df_factory: DflyInstanceFactory):
 )
 async def test_cache_eviction_with_rss_deny_oom(
     async_client: aioredis.Redis,
-    df_server: DflyInstance,
 ):
     """
     Test to verify that cache eviction is triggered even if used memory is small but rss memory is above limit