Revision b2e8a4d9
| b/daemons/ganeti-masterd | ||
|---|---|---|
| 114 | 114 |
self.server = server |
| 115 | 115 |
|
| 116 | 116 |
def handle_message(self, message, _): |
| 117 |
self.server.request_workers.AddTask(self.server, message, self)
|
|
| 117 |
self.server.request_workers.AddTask((self.server, message, self))
|
|
| 118 | 118 |
|
| 119 | 119 |
|
| 120 | 120 |
class MasterServer(daemon.AsyncStreamServer): |
| b/lib/jqueue.py | ||
|---|---|---|
| 912 | 912 |
status = job.CalcStatus() |
| 913 | 913 |
|
| 914 | 914 |
if status in (constants.JOB_STATUS_QUEUED, ): |
| 915 |
self._wpool.AddTask(job)
|
|
| 915 |
self._wpool.AddTask((job, ))
|
|
| 916 | 916 |
|
| 917 | 917 |
elif status in (constants.JOB_STATUS_RUNNING, |
| 918 | 918 |
constants.JOB_STATUS_WAITLOCK, |
| ... | ... | |
| 1339 | 1339 |
|
| 1340 | 1340 |
""" |
| 1341 | 1341 |
job_id = self._NewSerialsUnlocked(1)[0] |
| 1342 |
self._wpool.AddTask(self._SubmitJobUnlocked(job_id, ops))
|
|
| 1342 |
self._wpool.AddTask((self._SubmitJobUnlocked(job_id, ops), ))
|
|
| 1343 | 1343 |
return job_id |
| 1344 | 1344 |
|
| 1345 | 1345 |
@locking.ssynchronized(_LOCK) |
| b/lib/workerpool.py | ||
|---|---|---|
| 189 | 189 |
# Notify a waiting worker |
| 190 | 190 |
self._pool_to_worker.notify() |
| 191 | 191 |
|
| 192 |
def AddTask(self, *args):
|
|
| 192 |
def AddTask(self, args): |
|
| 193 | 193 |
"""Adds a task to the queue. |
| 194 | 194 |
|
| 195 |
@type args: sequence |
|
| 195 | 196 |
@param args: arguments passed to L{BaseWorker.RunTask}
|
| 196 | 197 |
|
| 197 | 198 |
""" |
| b/test/ganeti.workerpool_unittest.py | ||
|---|---|---|
| 93 | 93 |
self._CheckWorkerCount(wp, 3) |
| 94 | 94 |
|
| 95 | 95 |
for i in range(10): |
| 96 |
wp.AddTask(ctx, "Hello world %s" % i)
|
|
| 96 |
wp.AddTask((ctx, "Hello world %s" % i))
|
|
| 97 | 97 |
|
| 98 | 98 |
wp.Quiesce() |
| 99 | 99 |
finally: |
| ... | ... | |
| 133 | 133 |
checksum = ChecksumContext.CHECKSUM_START |
| 134 | 134 |
for i in range(1, 100): |
| 135 | 135 |
checksum = ChecksumContext.UpdateChecksum(checksum, i) |
| 136 |
wp.AddTask(ctx, i)
|
|
| 136 |
wp.AddTask((ctx, i))
|
|
| 137 | 137 |
|
| 138 | 138 |
wp.Quiesce() |
| 139 | 139 |
|
| ... | ... | |
| 156 | 156 |
self._CheckWorkerCount(wp, 3) |
| 157 | 157 |
|
| 158 | 158 |
wp.AddManyTasks([(ctx, "Hello world %s" % i, ) for i in range(10)]) |
| 159 |
wp.AddTask(ctx, "A separate hello")
|
|
| 160 |
wp.AddTask(ctx, "Once more, hi!")
|
|
| 159 |
wp.AddTask((ctx, "A separate hello"))
|
|
| 160 |
wp.AddTask((ctx, "Once more, hi!"))
|
|
| 161 | 161 |
wp.AddManyTasks([(ctx, "Hello world %s" % i, ) for i in range(10)]) |
| 162 | 162 |
|
| 163 | 163 |
wp.Quiesce() |
| ... | ... | |
| 180 | 180 |
[i for i in range(10)]) |
| 181 | 181 |
|
| 182 | 182 |
wp.AddManyTasks([(ctx, "Hello world %s" % i, ) for i in range(10)]) |
| 183 |
wp.AddTask(ctx, "A separate hello")
|
|
| 183 |
wp.AddTask((ctx, "A separate hello"))
|
|
| 184 | 184 |
|
| 185 | 185 |
wp.Quiesce() |
| 186 | 186 |
|
| b/tools/move-instance | ||
|---|---|---|
| 819 | 819 |
try: |
| 820 | 820 |
# Add instance moves to workerpool |
| 821 | 821 |
for move in moves: |
| 822 |
wp.AddTask(rapi_factory, move)
|
|
| 822 |
wp.AddTask((rapi_factory, move))
|
|
| 823 | 823 |
|
| 824 | 824 |
# Wait for all moves to finish |
| 825 | 825 |
wp.Quiesce() |
Also available in: Unified diff