Revision fce5efd1 lib/rpc.py
| b/lib/rpc.py | ||
|---|---|---|
| 240 | 240 |
raise ec(*args) # pylint: disable=W0142 |
| 241 | 241 |
|
| 242 | 242 |
|
| 243 |
def _SsconfResolver(node_list, |
|
| 243 |
def _SsconfResolver(node_list, _,
|
|
| 244 | 244 |
ssc=ssconf.SimpleStore, |
| 245 | 245 |
nslookup_fn=netutils.Hostname.GetIP): |
| 246 | 246 |
"""Return addresses for given node names. |
| ... | ... | |
| 277 | 277 |
""" |
| 278 | 278 |
self._addresses = addresses |
| 279 | 279 |
|
| 280 |
def __call__(self, hosts): |
|
| 280 |
def __call__(self, hosts, _):
|
|
| 281 | 281 |
"""Returns static addresses for hosts. |
| 282 | 282 |
|
| 283 | 283 |
""" |
| ... | ... | |
| 304 | 304 |
return (name, ip) |
| 305 | 305 |
|
| 306 | 306 |
|
| 307 |
def _NodeConfigResolver(single_node_fn, all_nodes_fn, hosts): |
|
| 307 |
def _NodeConfigResolver(single_node_fn, all_nodes_fn, hosts, _):
|
|
| 308 | 308 |
"""Calculate node addresses using configuration. |
| 309 | 309 |
|
| 310 | 310 |
""" |
| ... | ... | |
| 391 | 391 |
|
| 392 | 392 |
return results |
| 393 | 393 |
|
| 394 |
def __call__(self, hosts, procedure, body, read_timeout, |
|
| 394 |
def __call__(self, hosts, procedure, body, read_timeout, resolver_opts,
|
|
| 395 | 395 |
_req_process_fn=http.client.ProcessRequests): |
| 396 | 396 |
"""Makes an RPC request to a number of nodes. |
| 397 | 397 |
|
| ... | ... | |
| 409 | 409 |
"Missing RPC read timeout for procedure '%s'" % procedure |
| 410 | 410 |
|
| 411 | 411 |
(results, requests) = \ |
| 412 |
self._PrepareRequests(self._resolver(hosts), self._port, procedure,
|
|
| 413 |
body, read_timeout) |
|
| 412 |
self._PrepareRequests(self._resolver(hosts, resolver_opts), self._port,
|
|
| 413 |
procedure, body, read_timeout)
|
|
| 414 | 414 |
|
| 415 | 415 |
_req_process_fn(requests.values(), lock_monitor_cb=self._lock_monitor_cb) |
| 416 | 416 |
|
| ... | ... | |
| 469 | 469 |
pnbody = dict((n, serializer.DumpJson(prep_fn(n, enc_args))) |
| 470 | 470 |
for n in node_list) |
| 471 | 471 |
|
| 472 |
result = self._proc(node_list, procedure, pnbody, read_timeout) |
|
| 472 |
result = self._proc(node_list, procedure, pnbody, read_timeout, |
|
| 473 |
req_resolver_opts) |
|
| 473 | 474 |
|
| 474 | 475 |
if postproc_fn: |
| 475 | 476 |
return dict(map(lambda (key, value): (key, postproc_fn(value)), |
Also available in: Unified diff