Revision cffbbae7 lib/jqueue.py
| b/lib/jqueue.py | ||
|---|---|---|
| 60 | 60 |
from ganeti import query |
| 61 | 61 |
from ganeti import qlang |
| 62 | 62 |
from ganeti import pathutils |
| 63 |
from ganeti import vcluster |
|
| 63 | 64 |
|
| 64 | 65 |
|
| 65 | 66 |
JOBQUEUE_THREADS = 25 |
| ... | ... | |
| 85 | 86 |
return utils.SplitTime(time.time()) |
| 86 | 87 |
|
| 87 | 88 |
|
| 89 |
def _CallJqUpdate(runner, names, file_name, content): |
|
| 90 |
"""Updates job queue file after virtualizing filename. |
|
| 91 |
|
|
| 92 |
""" |
|
| 93 |
virt_file_name = vcluster.MakeVirtualPath(file_name) |
|
| 94 |
return runner.call_jobqueue_update(names, virt_file_name, content) |
|
| 95 |
|
|
| 96 |
|
|
| 88 | 97 |
class _SimpleJobQuery: |
| 89 | 98 |
"""Wrapper for job queries. |
| 90 | 99 |
|
| ... | ... | |
| 1690 | 1699 |
# Read file content |
| 1691 | 1700 |
content = utils.ReadFile(file_name) |
| 1692 | 1701 |
|
| 1693 |
result = self._GetRpc(addrs).call_jobqueue_update([node_name], file_name,
|
|
| 1694 |
content)
|
|
| 1702 |
result = _CallJqUpdate(self._GetRpc(addrs), [node_name],
|
|
| 1703 |
file_name, content)
|
|
| 1695 | 1704 |
msg = result[node_name].fail_msg |
| 1696 | 1705 |
if msg: |
| 1697 | 1706 |
logging.error("Failed to upload file %s to node %s: %s",
|
| ... | ... | |
| 1775 | 1784 |
|
| 1776 | 1785 |
if replicate: |
| 1777 | 1786 |
names, addrs = self._GetNodeIp() |
| 1778 |
result = self._GetRpc(addrs).call_jobqueue_update(names, file_name, data)
|
|
| 1787 |
result = _CallJqUpdate(self._GetRpc(addrs), names, file_name, data)
|
|
| 1779 | 1788 |
self._CheckRpcResult(result, self._nodes, "Updating %s" % file_name) |
| 1780 | 1789 |
|
| 1781 | 1790 |
def _RenameFilesUnlocked(self, rename): |
Also available in: Unified diff