Revision e07f7f7a lib/server/masterd.py
| b/lib/server/masterd.py | ||
|---|---|---|
| 255 | 255 |
self.server = server |
| 256 | 256 |
|
| 257 | 257 |
def handle_request(self, method, args): # pylint: disable=R0911 |
| 258 |
queue = self.server.context.jobqueue |
|
| 258 |
context = self.server.context |
|
| 259 |
queue = context.jobqueue |
|
| 259 | 260 |
|
| 260 | 261 |
# TODO: Parameter validation |
| 261 | 262 |
if not isinstance(args, (tuple, list)): |
| ... | ... | |
| 308 | 309 |
elif req.what == constants.QR_LOCK: |
| 309 | 310 |
if req.qfilter is not None: |
| 310 | 311 |
raise errors.OpPrereqError("Lock queries can't be filtered")
|
| 311 |
return self.server.context.glm.QueryLocks(req.fields) |
|
| 312 |
return context.glm.QueryLocks(req.fields) |
|
| 313 |
elif req.what == constants.QR_JOB: |
|
| 314 |
return queue.QueryJobs(req.fields, req.qfilter) |
|
| 312 | 315 |
elif req.what in constants.QR_VIA_LUXI: |
| 313 | 316 |
raise NotImplementedError |
| 314 | 317 |
else: |
| ... | ... | |
| 336 | 339 |
else: |
| 337 | 340 |
msg = str(job_ids) |
| 338 | 341 |
logging.info("Received job query request for %s", msg)
|
| 339 |
return queue.QueryJobs(job_ids, fields) |
|
| 342 |
return queue.OldStyleQueryJobs(job_ids, fields)
|
|
| 340 | 343 |
|
| 341 | 344 |
elif method == luxi.REQ_QUERY_INSTANCES: |
| 342 | 345 |
(names, fields, use_locking) = args |
Also available in: Unified diff