Revision 72737a7f lib/jqueue.py
| b/lib/jqueue.py | ||
|---|---|---|
| 45 | 45 |
from ganeti import jstore |
| 46 | 46 |
from ganeti import rpc |
| 47 | 47 |
|
| 48 |
from ganeti.rpc import RpcRunner |
|
| 48 | 49 |
|
| 49 | 50 |
JOBQUEUE_THREADS = 25 |
| 50 | 51 |
|
| ... | ... | |
| 404 | 405 |
assert node_name != self._my_hostname |
| 405 | 406 |
|
| 406 | 407 |
# Clean queue directory on added node |
| 407 |
rpc.call_jobqueue_purge(node_name)
|
|
| 408 |
RpcRunner.call_jobqueue_purge(node_name)
|
|
| 408 | 409 |
|
| 409 | 410 |
# Upload the whole queue excluding archived jobs |
| 410 | 411 |
files = [self._GetJobPath(job_id) for job_id in self._GetJobIDsUnlocked()] |
| ... | ... | |
| 420 | 421 |
finally: |
| 421 | 422 |
fd.close() |
| 422 | 423 |
|
| 423 |
result = rpc.call_jobqueue_update([node_name], file_name, content)
|
|
| 424 |
result = RpcRunner.call_jobqueue_update([node_name], file_name, content)
|
|
| 424 | 425 |
if not result[node_name]: |
| 425 | 426 |
logging.error("Failed to upload %s to %s", file_name, node_name)
|
| 426 | 427 |
|
| ... | ... | |
| 459 | 460 |
""" |
| 460 | 461 |
utils.WriteFile(file_name, data=data) |
| 461 | 462 |
|
| 462 |
result = rpc.call_jobqueue_update(self._nodes, file_name, data)
|
|
| 463 |
result = RpcRunner.call_jobqueue_update(self._nodes, file_name, data)
|
|
| 463 | 464 |
self._CheckRpcResult(result, self._nodes, |
| 464 | 465 |
"Updating %s" % file_name) |
| 465 | 466 |
|
| 466 | 467 |
def _RenameFileUnlocked(self, old, new): |
| 467 | 468 |
os.rename(old, new) |
| 468 | 469 |
|
| 469 |
result = rpc.call_jobqueue_rename(self._nodes, old, new)
|
|
| 470 |
result = RpcRunner.call_jobqueue_rename(self._nodes, old, new)
|
|
| 470 | 471 |
self._CheckRpcResult(result, self._nodes, |
| 471 | 472 |
"Moving %s to %s" % (old, new)) |
| 472 | 473 |
|
Also available in: Unified diff