andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

geo-rep: Fix CPU utilization 100% with Popen

Browse Source 
Errorstore is maintained by Geo-rep to collect errors from
the child processes opened using Popen. If Popen.communicate
is used then it closes stderr. When stderr is not available
errorstore.tailer() will enter into infinite loop without gap.

With this patch, sleep time added when stderr of Child process
is already closed.

Change-Id: Ic36aabd6de35b259467d0bab7952468432867a94
BUG: 1315601
Signed-off-by: Aravinda VK <avishwan@redhat.com>
Reviewed-on: http://review.gluster.org/13637
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
This commit is contained in:
Aravinda VK 2016-03-08 13:41:58 +05:30 committed by Jeff Darcy
parent 325e62cc01
commit 4318354aac
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
geo-replication/syncdaemon/resource.py
View File

@ -152,6 +152,9 @@ class Popen(subprocess.Popen):
poe, _, _ = select(
[po.stderr for po in errstore], [], [], 1)
except (ValueError, SelectError):
# stderr is already closed wait for some time before
# checking next error
time.sleep(0.5)
continue
for po in errstore:
if po.stderr not in poe:
@ -164,6 +167,7 @@ class Popen(subprocess.Popen):
try:
fd = po.stderr.fileno()
except ValueError: # file is already closed
time.sleep(0.5)
continue
l = os.read(fd, 1024)
if not l: