Revision 4b5e8271
| b/lib/mcpu.py | ||
|---|---|---|
| 117 | 117 |
""" |
| 118 | 118 |
write_count = self.context.cfg.write_count |
| 119 | 119 |
lu.CheckPrereq() |
| 120 |
hm = HooksMaster(self.rpc.call_hooks_runner, self, lu)
|
|
| 120 |
hm = HooksMaster(self.rpc.call_hooks_runner, lu) |
|
| 121 | 121 |
h_results = hm.RunPhase(constants.HOOKS_PHASE_PRE) |
| 122 | 122 |
lu.HooksCallBack(constants.HOOKS_PHASE_PRE, h_results, |
| 123 | 123 |
self._feedback_fn, None) |
| ... | ... | |
| 282 | 282 |
which behaves the same works. |
| 283 | 283 |
|
| 284 | 284 |
""" |
| 285 |
def __init__(self, callfn, proc, lu):
|
|
| 285 |
def __init__(self, callfn, lu): |
|
| 286 | 286 |
self.callfn = callfn |
| 287 |
self.proc = proc |
|
| 288 | 287 |
self.lu = lu |
| 289 | 288 |
self.op = lu.op |
| 290 | 289 |
self.env, node_list_pre, node_list_post = self._BuildEnv() |
| ... | ... | |
| 361 | 360 |
continue |
| 362 | 361 |
msg = res.RemoteFailMsg() |
| 363 | 362 |
if msg: |
| 364 |
self.proc.LogWarning("Communication failure to node %s: %s",
|
|
| 365 |
node_name, msg)
|
|
| 363 |
self.lu.LogWarning("Communication failure to node %s: %s",
|
|
| 364 |
node_name, msg) |
|
| 366 | 365 |
continue |
| 367 | 366 |
for script, hkr, output in res.payload: |
| 368 | 367 |
if hkr == constants.HKR_FAIL: |
| b/test/ganeti.hooks_unittest.py | ||
|---|---|---|
| 240 | 240 |
|
| 241 | 241 |
def testTotalFalse(self): |
| 242 | 242 |
"""Test complete rpc failure""" |
| 243 |
hm = mcpu.HooksMaster(self._call_false, FakeProc(), self.lu)
|
|
| 243 |
hm = mcpu.HooksMaster(self._call_false, self.lu) |
|
| 244 | 244 |
self.failUnlessRaises(errors.HooksFailure, |
| 245 | 245 |
hm.RunPhase, constants.HOOKS_PHASE_PRE) |
| 246 | 246 |
hm.RunPhase(constants.HOOKS_PHASE_POST) |
| 247 | 247 |
|
| 248 | 248 |
def testIndividualFalse(self): |
| 249 | 249 |
"""Test individual node failure""" |
| 250 |
hm = mcpu.HooksMaster(self._call_nodes_false, FakeProc(), self.lu)
|
|
| 250 |
hm = mcpu.HooksMaster(self._call_nodes_false, self.lu) |
|
| 251 | 251 |
hm.RunPhase(constants.HOOKS_PHASE_PRE) |
| 252 | 252 |
#self.failUnlessRaises(errors.HooksFailure, |
| 253 | 253 |
# hm.RunPhase, constants.HOOKS_PHASE_PRE) |
| ... | ... | |
| 255 | 255 |
|
| 256 | 256 |
def testScriptFalse(self): |
| 257 | 257 |
"""Test individual rpc failure""" |
| 258 |
hm = mcpu.HooksMaster(self._call_script_fail, FakeProc(), self.lu)
|
|
| 258 |
hm = mcpu.HooksMaster(self._call_script_fail, self.lu) |
|
| 259 | 259 |
self.failUnlessRaises(errors.HooksAbort, |
| 260 | 260 |
hm.RunPhase, constants.HOOKS_PHASE_PRE) |
| 261 | 261 |
hm.RunPhase(constants.HOOKS_PHASE_POST) |
| 262 | 262 |
|
| 263 | 263 |
def testScriptSucceed(self): |
| 264 | 264 |
"""Test individual rpc failure""" |
| 265 |
hm = mcpu.HooksMaster(self._call_script_succeed, FakeProc(), self.lu)
|
|
| 265 |
hm = mcpu.HooksMaster(self._call_script_succeed, self.lu) |
|
| 266 | 266 |
for phase in (constants.HOOKS_PHASE_PRE, constants.HOOKS_PHASE_POST): |
| 267 | 267 |
hm.RunPhase(phase) |
| 268 | 268 |
|
Also available in: Unified diff