Revision 2d6bdcc5

b/NEWS
87 87
- Instance renames of LVM-based instances will now update the LV tags
88 88
  (which can be used to recover the instance-to-LV mapping in case of
89 89
  emergencies)
90
- ``hbal`` will now exit with status 0 if, during job execution over
91
  LUXI, early exit has been requested and all jobs are successful;
92
  before, exit status 1 was used, which cannot be differentiated from
93
  "job error" case
90 94

  
91 95

  
92 96
Version 2.6.2
b/man/hbal.rst
400 400

  
401 401
- by sending a ``SIGINT`` (``^C``), hbal will register the termination
402 402
  request, and will wait until the currently submitted jobs finish, at
403
  which point it will exit (with exit code 1)
403
  which point it will exit (with exit code 0 if all jobs finished
404
  correctly, otherwise with exit code 1 as usual)
405

  
404 406
- by sending a ``SIGTERM``, hbal will immediately exit (with exit code
405
  2); it is the responsibility of the user to follow up with Ganeti the
406
  result of the currently-executing jobs
407
  2\); it is the responsibility of the user to follow up with Ganeti
408
  and check the result of the currently-executing jobs
407 409

  
408 410
Note that in any situation, it's perfectly safe to kill hbal, either via
409 411
the above signals or via any other signal (e.g. ``SIGQUIT``,
410 412
``SIGKILL``), since the jobs themselves are processed by Ganeti whereas
411 413
hbal (after submission) only watches their progression. In this case,
412
the use will again have to query Ganeti for job results.
414
the user will have to query Ganeti for job results.
413 415

  
414 416
EXIT STATUS
415 417
-----------
b/src/Ganeti/HTools/Program/Hbal.hs
186 186
execCancelWrapper anno master nl il cref alljss = do
187 187
  cancel <- readIORef cref
188 188
  if cancel > 0
189
    then return . Bad $ "Exiting early due to user request, " ++
190
                        show (length alljss) ++ " jobset(s) remaining."
189
    then do
190
      putStrLn $ "Exiting early due to user request, " ++
191
               show (length alljss) ++ " jobset(s) remaining."
192
      return $ Ok ()
191 193
    else execJobSet anno master nl il cref alljss
192 194

  
193 195
-- | Execute an entire jobset.

Also available in: Unified diff