sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

netrender: draft code for cluster usage per job calculations. Eventually, this will be used for load balancing

Browse Source
This commit is contained in:
Martin Poirier 2009-09-24 19:52:32 +00:00
parent 2a63c4ab7b
commit ddb46e12f9
4 changed files with 86 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/io/netrender/balancing.py
View File

@ -91,4 +91,4 @@ class ExcludeSlavesLimit(ExclusionRule):
self.limit = limit
def test(self, job):
return not ( self.count_jobs() == 1 or self.count_slaves() == 1 or float(job.countSlaves() + 1) / self.count_slaves() <= self.limit )
return not ( self.count_jobs() == 1 or self.count_slaves() <= 1 or float(job.countSlaves() + 1) / self.count_slaves() <= self.limit )

78
release/io/netrender/master.py
View File

@ -29,7 +29,7 @@ class MRenderSlave(netrender.model.RenderSlave):
self.last_seen = time.time()
self.job = None
self.frame = None
self.job_frames = []
netrender.model.RenderSlave._slave_map[self.id] = self
@ -50,6 +50,7 @@ class MRenderJob(netrender.model.RenderJob):
self.last_dispatched = time.time()
# special server properties
self.usage = 0.0
self.last_update = 0
self.save_path = ""
self.files_map = {path: MRenderFile(path, start, end) for path, start, end in files}
@ -300,6 +301,9 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
f.status = DISPATCHED
f.slave = slave
slave.job = job
slave.job_frames = [f.number for f in frames]
self.send_head(headers={"job-id": job.id})
message = job.serialize(frames)
@ -537,6 +541,10 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
# blacklist slave on this job on error
job.blacklist.append(slave.id)
slave.job_frames.remove(job_frame)
if not slave.job_frames:
slave.job = None
frame.status = job_result
frame.time = job_time
@ -590,6 +598,10 @@ class RenderMasterServer(http.server.HTTPServer):
self.job_id = 0
self.path = path + "master_" + str(os.getpid()) + os.sep
self.slave_timeout = 2
self.first_usage = True
self.balancer = netrender.balancing.Balancer()
self.balancer.addRule(netrender.balancing.RatingCredit())
self.balancer.addException(netrender.balancing.ExcludeQueuedEmptyJob())
@ -611,6 +623,10 @@ class RenderMasterServer(http.server.HTTPServer):
return slave.id
def removeSlave(self, slave):
self.slaves.remove(slave)
self.slaves_map.pop(slave.id)
def getSlave(self, slave_id):
return self.slaves_map.get(slave_id, None)
@ -621,9 +637,46 @@ class RenderMasterServer(http.server.HTTPServer):
return slave
def timeoutSlaves(self):
removed = []
t = time.time()
for slave in self.slaves:
if (t - slave.last_seen) / 60 > self.slave_timeout:
removed.append(slave)
if slave.job:
for f in slave.job_frames:
slave.job[f].status = ERROR
for slave in removed:
self.removeSlave(slave)
def updateUsage(self):
m = 1.0
if not self.first_usage:
for job in self.jobs:
job.usage *= 0.5
m = 0.5
else:
self.first_usage = False
if self.slaves:
slave_usage = m / self.countSlaves()
for slave in self.slaves:
if slave.job:
slave.job.usage += slave_usage
def clear(self):
self.jobs_map = {}
self.jobs = []
removed = self.jobs[:]
for job in removed:
self.removeJob(job)
def update(self):
for job in self.jobs:
@ -647,6 +700,11 @@ class RenderMasterServer(http.server.HTTPServer):
if job:
self.jobs.remove(job)
for slave in self.slaves:
if slave.job == job:
slave.job = None
slave.job_frames = []
def addJob(self, job):
self.jobs.append(job)
self.jobs_map[job.id] = job
@ -687,8 +745,12 @@ def runMaster(address, broadcast, path, update_stats, test_break):
while not test_break():
httpd.handle_request()
if broadcast:
if time.time() - start_time >= 10: # need constant here
print("broadcasting address")
s.sendto(bytes("%i" % address[1], encoding='utf8'), 0, ('<broadcast>', 8000))
start_time = time.time()
if time.time() - start_time >= 10: # need constant here
httpd.timeoutSlaves()
httpd.updateUsage()
if broadcast:
print("broadcasting address")
s.sendto(bytes("%i" % address[1], encoding='utf8'), 0, ('<broadcast>', 8000))
start_time = time.time()

17
release/io/netrender/master_html.py
View File

@ -42,23 +42,32 @@ def get(handler):
output("<h2>Slaves</h2>")
startTable()
headerTable("id", "name", "address", "stats")
headerTable("name", "address", "last seen", "stats", "job")
for slave in handler.server.slaves:
rowTable(slave.id, slave.name, slave.address[0], slave.stats)
rowTable(slave.name, slave.address[0], time.ctime(slave.last_seen), slave.stats, link(slave.job.name, "/html/job" + slave.job.id) if slave.job else "None")
endTable()
output("<h2>Jobs</h2>")
startTable()
headerTable("id", "name", "credits", "time since last", "length", "done", "dispatched", "error", "priority", "exception")
headerTable("name", "credits", "usage", "time since last", "length", "done", "dispatched", "error", "priority", "exception")
handler.server.update()
for job in handler.server.jobs:
results = job.framesStatus()
rowTable(link(job.id, "/html/job" + job.id), job.name, round(job.credits, 1), int(time.time() - job.last_dispatched), len(job), results[DONE], results[DISPATCHED], results[ERROR], handler.server.balancer.applyPriorities(job), handler.server.balancer.applyExceptions(job))
rowTable( link(job.name, "/html/job" + job.id),
round(job.credits, 1),
"%0.1f%%" % (job.usage * 100),
int(time.time() - job.last_dispatched),
len(job),
results[DONE],
results[DISPATCHED],
results[ERROR],
handler.server.balancer.applyPriorities(job), handler.server.balancer.applyExceptions(job)
)
endTable()

2
release/io/netrender/ui.py
View File

@ -165,7 +165,7 @@ class SCENE_PT_network_jobs(RenderButtonsPanel):
subcol = col.column(align=True)
subcol.itemO("render.netclientstatus", icon="ICON_FILE_REFRESH", text="")
subcol.itemO("render.netclientcancel", icon="ICON_ZOOMOUT", text="")
subcol.itemO("render.netclientcancelall", icon="ICON_ZOOMOUT", text="")
subcol.itemO("render.netclientcancelall", icon="ICON_PANEL_CLOSE", text="")
subcol.itemO("render.netclientdownload", icon='ICON_RENDER_ANIMATION', text="")
if len(bpy.data.netrender_jobs) == 0 and len(netsettings.jobs) > 0: