Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Collection of patches for crmsh #77

Merged
merged 3 commits into from
Jan 20, 2015
Merged

Collection of patches for crmsh #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6187a54
medium: crm_pssh: Handle incomplete Option argument
bubble75 Jan 19, 2015
9c2d395
medium: constants: Fix transition start detection
bubble75 Jan 19, 2015
e92224f
medium: crm_pssh: Make tar follow symlinks
bubble75 Jan 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions modules/crm_pssh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -173,7 +173,7 @@ def next_peinputs(node_pe_l, outdir, errdir):
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:
Expand Down