Hi Kristoffer,
there are two patches, one for crmsh and one for parallax.
They make history commands work.
--- a/modules/crm_pssh.py 2015-01-19 11:42:02.000000000 +0000
+++ b/modules/crm_pssh.py 2015-01-19 12:17:46.328000847 +0000
@@ -85,14 +85,14 @@ def do_pssh(l, opts):
'-o', 'PasswordAuthentication=no',
'-o', 'SendEnv=PSSH_NODENUM',
'-o', 'StrictHostKeyChecking=no']
- if opts.options:
+ if hasattr(opts, 'options'):
for opt in opts.options:
cmd += ['-o', opt]
if user:
cmd += ['-l', user]
if port:
cmd += ['-p', port]
- if opts.extra:
+ if hasattr(opts, 'extra'):
cmd.extend(opts.extra)
if cmdline:
cmd.append(cmdline)
---
--- a/parallax/manager.py 2014-10-15 13:40:04.000000000 +0000
+++ b/parallax/manager.py 2015-01-19 12:15:47.911000236 +0000
@@ -47,11 +47,26 @@ class Manager(object):
# Backwards compatibility with old __init__
# format: Only argument is an options dict
if not isinstance(limit, int):
- self.limit = limit.par
- self.timeout = limit.timeout
- self.askpass = limit.askpass
- self.outdir = limit.outdir
- self.errdir = limit.errdir
+ if hasattr(limit, 'par'):
+ self.limit = limit.par
+ else:
+ self.limit = DEFAULT_PARALLELISM
+ if hasattr(limit, 'timeout'):
+ self.timeout = limit.timeout
+ else:
+ self.timeout = DEFAULT_TIMEOUT
+ if hasattr(limit, 'askpass'):
+ self.askpass = limit.askpass
+ else:
+ self.askpass = False
+ if hasattr(limit, 'outdir'):
+ self.outdir = limit.outdir
+ else:
+ self.outdir = None
+ if hasattr(limit, 'errdir'):
+ self.errdir = limit.errdir
+ else:
+ self.errdir = None
else:
self.limit = limit
self.timeout = timeout
---
Two more patches I use for ages in my builds are:
Fix transition start detection.
--- a/modules/constants.py 2014-12-22 08:48:26.000000000 +0000
+++ b/modules/constants.py 2014-12-22 13:07:43.945077805 +0000
@@ -272,7 +272,7 @@
# r.group(3) file number
transition_patt = [
# transition start
- "crmd.* do_te_invoke: Processing graph ([0-9]+) .*derived from
(.*/pe-[^-]+-(%%)[.]bz2)",
+ "pengine.* process_pe_message: Calculated Transition ([0-9]+):
(.*/pe-[^-]+-(%%)[.]bz2)",
# r.group(1) transition number (a different thing from file number)
# r.group(2) contains full path
# r.group(3) transition status
---
Make tar follow symlinks.
--- a/modules/crm_pssh.py 2013-08-12 12:52:11.000000000 +0000
+++ b/modules/crm_pssh.py 2013-08-12 12:53:32.666444069 +0000
@@ -170,7 +170,7 @@
dir = "/%s" % r.group(1)
red_pe_l = [x.replace("%s/" % r.group(1), "") for x in pe_l]
common_debug("getting new PE inputs %s from %s" % (red_pe_l, node))
- cmdline = "tar -C %s -cf - %s" % (dir, ' '.join(red_pe_l))
+ cmdline = "tar -C %s -chf - %s" % (dir, ' '.join(red_pe_l))
opts = parse_args(outdir, errdir)
l.append([node, cmdline])
if not l:
---
Best,
Vladislav
_______________________________________________
Linux-HA mailing list
Linux-HA@lists.linux-ha.org
http://lists.linux-ha.org/mailman/listinfo/linux-ha
See also: http://linux-ha.org/ReportingProblems
