Merge lp:~hloeung/ubuntu-repository-cache/cache-memory-tuning-2 into lp:ubuntu-repository-cache

[Haw Loeung]

Tune squid cache memory usage reducing from 33% to 30%

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

[lp:~hloeung/ubuntu-repository-cache/cache-memory-tuning-2]

292. By Haw Loeung on 2020-12-07

Tune squid cache memory usage reducing from 33% to 30%

=== modified file 'lib/ubuntu_repository_cache/squid.py'
--- lib/ubuntu_repository_cache/squid.py	2020-12-07 03:16:34 +0000
+++ lib/ubuntu_repository_cache/squid.py	2020-12-07 03:16:35 +0000
@@ -48,7 +48,8 @@
     memory = system_total_memory
     if not system_total_memory:
         memory = util.system_total_mem()
-    memory = memory / 3
+    # Set aside 30% of system memory for squid memory cache.
+    memory = memory * 0.30
     # Estimate of 100MB of overhead for squid
     memory = max(memory - 100, 0)
 

=== modified file 'lib/ubuntu_repository_cache/tests/test_squid.py'
--- lib/ubuntu_repository_cache/tests/test_squid.py	2020-12-07 03:16:34 +0000
+++ lib/ubuntu_repository_cache/tests/test_squid.py	2020-12-07 03:16:35 +0000
@@ -53,7 +53,7 @@
             'cache-memory-size': 0,
         }
         result = squid.cache_mem(13997)
-        self.assertEqual(result, 'cache_mem 3588 MB')
+        self.assertEqual(result, 'cache_mem 3122 MB')
 
         # 7GB per Azure D2_v2. 50GB cache, auto calculate memory usage.
         self.mock_config.return_value = {
@@ -61,7 +61,7 @@
             'cache-memory-size': 0,
         }
         result = squid.cache_mem(6954)
-        self.assertEqual(result, 'cache_mem 1241 MB')
+        self.assertEqual(result, 'cache_mem 1009 MB')
 
         # 7GB per Azure D2_v2. 50GB cache, fixed 1000 MB.
         self.mock_config.return_value = {
@@ -78,4 +78,4 @@
             'cache-memory-size': 0,
         }
         result = squid.cache_mem(6954)
-        self.assertEqual(result, 'cache_mem 1241 MB')
+        self.assertEqual(result, 'cache_mem 1009 MB')