Permalink
Browse files

Merge pull request #1265 from kgaillot/fixes

Minor test and documentation fixes
  • Loading branch information...
kgaillot committed Apr 26, 2017
2 parents 0ea7a77 + c4be389 commit 7547c140bfc59dff41a80d7be8c5fcf5e04e3616
View
@@ -31,9 +31,6 @@
#include <crmd_callbacks.h>
#include <tengine.h>
#define STORM_INTERVAL 2 /* in seconds */
#define STORM_MULTIPLIER 5 /* multiplied by the number of nodes */
/* A_ELECTION_VOTE */
void
do_election_vote(long long action,
View
@@ -267,12 +267,14 @@ tengine_stonith_notify(stonith_t * st, stonith_event_t * st_event)
}
}
crm_notice("Peer %s was%s terminated (%s) by %s for %s: %s (ref=%s) by client %s",
crm_notice("Peer %s was%s terminated (%s) by %s on behalf of %s: %s "
CRM_XS " initiator=%s ref=%s",
st_event->target, st_event->result == pcmk_ok ? "" : " not",
st_event->action,
st_event->executioner ? st_event->executioner : "<anyone>",
st_event->origin, pcmk_strerror(st_event->result), st_event->id,
st_event->client_origin ? st_event->client_origin : "<unknown>");
(st_event->client_origin? st_event->client_origin : "<unknown>"),
pcmk_strerror(st_event->result),
st_event->origin, st_event->id);
#if SUPPORT_CMAN
if (st_event->result == pcmk_ok && is_cman_cluster()) {
View
@@ -162,7 +162,7 @@ gboolean
is_timer_started(fsa_timer_t * timer)
{
if (timer->period_ms > 0) {
if (transition_timer->source_id == 0) {
if (timer->source_id == 0) {
return FALSE;
} else {
return TRUE;
View
@@ -62,7 +62,7 @@ def __init__(self, name):
"Pat:RscOpOK" : r"crmd.*:\s+Result of %s operation for %s.*: (0 \()?ok",
"Pat:RscRemoteOpOK" : r"crmd.*:\s+Result of %s operation for %s on %s: (0 \()?ok",
"Pat:NodeFenced" : r"crmd.*:\s*Peer\s+%s\s+was\s+terminated\s+\(.*\)\s+by\s+.*\s+for\s+.*:\s+OK",
"Pat:NodeFenced" : r"crmd.*:\s* Peer %s was terminated \(.*\) by .* on behalf of .*: OK",
"Pat:FenceOpOK" : "Operation .* for host '%s' with device .* returned: 0",
}
@@ -286,25 +286,21 @@ def __init__(self, name):
r"error:.*Child process cib .* exited: Invalid argument",
r"error:.*Child process attrd .* exited: Transport endpoint is not connected",
r"error:.*Child process crmd .* exited: Link has been severed",
r"lrmd.*error:.*Connection to stonith-ng failed",
r"lrmd.*error:.*Connection to stonith-ng.* closed",
r"lrmd.*error:.*Connection to stonith-ng.* (failed|closed)",
r"lrmd.*error:.*LRMD lost STONITH connection",
r"crmd.*State transition .* S_RECOVERY",
r"crmd.*error:.*Input I_ERROR .*received in state",
r"crmd.*error:.*Input I_TERMINATE .*received in state",
r"crmd.*error:.*Input (I_ERROR|I_TERMINATE ) .*received in state",
r"crmd.*error:.*Connection to cman failed",
r"crmd.*error:.*Could not recover from internal error",
r"error:.*Connection to cib_shm failed",
r"error:.*Connection to cib_shm.* closed",
r"error:.*Connection to cib_(shm|rw).* (failed|closed)",
r"error:.*STONITH connection failed",
r"error: Connection to stonith-ng failed",
r"error: Connection to stonith-ng.* (failed|closed)",
r"crit: Fencing daemon connection failed",
r"error: Connection to stonith-ng.* closed",
]
self.components["corosync"] = [
r"pacemakerd.*error:.*Connection destroyed",
r"attrd.*:\s*crit:.*Lost connection to Corosync service",
r"attrd.*:\s*(crit|error):.*Lost connection to (Corosync|CIB) service",
r"stonith.*:\s*(Corosync connection terminated|Shutting down)",
r"cib.*:\s*Corosync connection lost!\s+Exiting.",
r"crmd.*:\s*(connection terminated|Disconnected from Corosync)",
@@ -97,9 +97,10 @@ indexterm:[Constraints,Location,node]
|score
|
|Positive values indicate the resource should run on this
node. Negative values indicate the resource should not run on this node.
Values of \+/- +INFINITY+ change "should"/"should not" to "must"/"must not".
|Positive values indicate a preference for running the affected resource(s) on
this node -- the higher the value, the stronger the preference. Negative values
indicate the resource(s) should avoid this node (a value of +-INFINITY+
changes "should" to "must").
indexterm:[score,Location Constraints]
indexterm:[Constraints,Location,score]
@@ -237,6 +237,7 @@ immediately re-attempt it. '(since 1.1.17)'
indexterm:[concurrent-fencing,Cluster Option]
indexterm:[Cluster,Option,concurrent-fencing]
Is the cluster allowed to initiate multiple fence actions concurrently?
'(since 1.1.15)'
| cluster-delay | 60s |
indexterm:[cluster-delay,Cluster Option]
@@ -148,6 +148,7 @@ indexterm:[Fencing,Property,pcmk_delay_max]
|1
|The maximum number of actions that can be performed in parallel on this
device, if the cluster option +concurrent-fencing+ is +true+. -1 is unlimited.
'(since 1.1.15)'
indexterm:[pcmk_action_limit,Fencing]
indexterm:[Fencing,Property,pcmk_action_limit]
View
@@ -19,7 +19,6 @@
#include <crm/crm.h>
#define STORM_INTERVAL 2 /* in seconds */
#define STORM_MULTIPLIER 5 /* multiplied by the number of nodes */
struct election_s
{
View
@@ -29,28 +29,26 @@
}
{
Bash leak in cli regression testing
Bash leak in cli regression testing on epel-6-i386
Memcheck:Leak
fun:malloc
fun:xmalloc
obj:/usr/bin/bash
obj:*/bash
fun:execute_command_internal
obj:/usr/bin/bash
...
fun:execute_command_internal
fun:parse_and_execute
fun:command_substitute
obj:/usr/bin/bash
obj:/usr/bin/bash
obj:/usr/bin/bash
obj:*/bash
obj:*/bash
obj:*/bash
fun:expand_string_assignment
obj:/usr/bin/bash
obj:/usr/bin/bash
obj:/usr/bin/bash
obj:/usr/bin/bash
fun:execute_command_internal
fun:execute_command_internal
fun:execute_command
obj:*/bash
obj:*/bash
obj:*/bash
obj:*/bash
fun:execute_command_internal
...
}
{

0 comments on commit 7547c14

Please sign in to comment.