From ee84c6ae78b55fc097cd586129f2d94eef22ab0a Mon Sep 17 00:00:00 2001 From: Petr Spacek Date: Fri, 26 Jun 2015 15:55:12 +0200 Subject: Rate-limit while loop in SystemdService.is_active(). Previously is_active() was frenetically calling systemctl is_active in tight loop which in fact made the process slower. Reviewed-By: Martin Basti --- ipaplatform/base/services.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ipaplatform') diff --git a/ipaplatform/base/services.py b/ipaplatform/base/services.py index 24d7a73df..11fa27357 100644 --- a/ipaplatform/base/services.py +++ b/ipaplatform/base/services.py @@ -25,6 +25,7 @@ interacting with system services. import os import json +import time import ipalib from ipapython import ipautil @@ -53,6 +54,8 @@ wellknownports = { 'pki-tomcatd': [8080, 8443], # used if the incoming instance name is blank } +SERVICE_POLL_INTERVAL = 0.1 # seconds + class KnownServices(MagicDict): """ @@ -303,11 +306,13 @@ class SystemdService(PlatformService): ) except ipautil.CalledProcessError as e: if e.returncode == 3 and 'activating' in str(e.output): + time.sleep(SERVICE_POLL_INTERVAL) continue return False else: # activating if rcode == 3 and 'activating' in str(sout): + time.sleep(SERVICE_POLL_INTERVAL) continue # active if rcode == 0: -- cgit