vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

perf: Skip loading EPS if not enabled (#31099)

Browse source 
It's disabled by default 🤷
This commit is contained in:
Ankush Menat 2025-02-04 12:58:29 +05:30 • committed by GitHub
parent 84f9c5d48a
commit 429dab759d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
frappe/commands/test_commands.py
View file

@ -1059,12 +1059,12 @@ class TestGunicornWorker(IntegrationTestCase):
return sum(c.cpu_percent(1.0) for c in process.children(True)) + process.cpu_percent(1.0)
self.spawn_gunicorn(["--threads=2"])
self.assertLessEqual(get_total_usage(), 0.02)
self.assertLessEqual(get_total_usage(), 2)
# Wake up at least one thread, go idle and check again
path = f"http://{self.TEST_SITE}:{self.port}/api/method/ping"
self.assertEqual(requests.get(path).status_code, 200)
self.assertLessEqual(get_total_usage(), 0.02)
self.assertLessEqual(get_total_usage(), 2)
class TestRQWorker(IntegrationTestCase):
@ -1088,18 +1088,18 @@ class TestRQWorker(IntegrationTestCase):
def test_rq_idle_cpu_usage(self):
self.spawn_rq()
self.assertLessEqual(self.get_total_usage(), 0.02)
self.assertLessEqual(self.get_total_usage(), 2)
for _ in range(3):
frappe.enqueue("frappe.ping")
time.sleep(1)
self.assertLessEqual(self.get_total_usage(), 0.02)
self.assertLessEqual(self.get_total_usage(), 2)
def test_rq_pool_idle_cpu_usage(self):
self.spawn_rq(pool=True)
self.assertLessEqual(self.get_total_usage(), 0.02)
self.assertLessEqual(self.get_total_usage(), 2)
for _ in range(3):
frappe.enqueue("frappe.ping")
time.sleep(1)
self.assertLessEqual(self.get_total_usage(), 0.02)
self.assertLessEqual(self.get_total_usage(), 2)

5
frappe/desk/form/load.py
View file

@ -247,6 +247,11 @@ def get_comments(doctype: str, name: str, comment_type: str | list[str] = "Comme
def get_point_logs(doctype, docname):
from frappe.social.doctype.energy_point_settings.energy_point_settings import is_energy_point_enabled
if not is_energy_point_enabled():
return []
return frappe.get_all(
"Energy Point Log",
filters={"reference_doctype": doctype, "reference_name": docname, "type": ["!=", "Review"]},

2
frappe/social/doctype/energy_point_settings/energy_point_settings.py
View file

@ -29,7 +29,7 @@ class EnergyPointSettings(Document):
def is_energy_point_enabled():
return frappe.db.get_single_value("Energy Point Settings", "enabled", True)
return frappe.client_cache.get_doc("Energy Point Settings").enabled
def allocate_review_points():

2
frappe/tests/test_perf.py
View file

@ -237,7 +237,7 @@ class TestPerformance(IntegrationTestCase):
def test_idle_cpu_utilization_redis_pubsub(self):
pid = frappe.client_cache.invalidator_thread.native_id
process = psutil.Process(pid)
self.assertLess(process.cpu_percent(interval=1.0), 0.02)
self.assertLess(process.cpu_percent(interval=1.0), 2)
def test_cpu_allocation(self):
from frappe._optimizations import assign_core