Permalink
Browse files

Merge pull request #1050 from jnpkrn/fix-typos

Fix typos
  • Loading branch information...
kgaillot committed Jun 8, 2016
2 parents 61a000d + aa28ccf commit 9e10977f389602d1ccfef61953a738d8d58a8221
View
@@ -1516,7 +1516,7 @@
+ crmd: Bug lf#2120 - All transient node attribute updates need to go via attrd
+ crmd: Correctly calculate how long an FSA action took to avoid spamming the logs with errors
+ crmd: Fix another large memory leak affecting Heartbeat based clusters
+ lha: Restore compatability with older versions
+ lha: Restore compatibility with older versions
+ pengine: Bug bnc#495687 - Filesystem is not notified of successful STONITH under some conditions
+ pengine: Make running a cluster with STONITH enabled but no STONITH resources an error and provide details on resolutions
+ pengine: Prevent use-ofNULL when using resource ordering sets
@@ -2091,7 +2091,7 @@
+ Core: XML memory corruption - catch, and handle, cases where we are overwriting an attribute value with itself
+ Core: The xml ID type does not allow UUIDs that start with a number
+ Core: Implement XPath based versions of query/delete/replace/modify
+ Core: Remove some HA2.0.(3,4) compatability code
+ Core: Remove some HA2.0.(3,4) compatibility code
+ crmd: Overhaul the detection of nodes that are starting vs. failed
+ pengine: Bug LF:1459 - Allow failures to expire
+ pengine: Have the PE do non-persistent configuration upgrades before performing calculations
@@ -2219,10 +2219,10 @@
+ Medium: Build: Re-instate a better default for LCRSODIR
+ Medium: CIB: Bug LF-1861 - Filter irrelvant error status from synchronous CIB clients
+ Medium: Core: Bug 1849 - Invalid conversion of ordinal leap year to gregorian date
+ Medium: Core: Drop compataibility code for 2.0.4 and 2.0.5 clusters
+ Medium: Core: Drop compatibility code for 2.0.4 and 2.0.5 clusters
+ Medium: crmd: Bug LF-1860 - Automatically cancel recurring ops before demote and promote operations (not only stops)
+ Medium: crmd: Save the current CIB contents if we detect the PE crashed
+ Medium: pengine: Bug LF:1866 - Fix version check when applying compatability handling for failed start operations
+ Medium: pengine: Bug LF:1866 - Fix version check when applying compatibility handling for failed start operations
+ Medium: pengine: Bug LF:1866 - Restore the ability to have start failures not be fatal
+ Medium: pengine: Bug PM1 - Failcount applies to all instances of non-unique clone
+ Medium: pengine: Correctly set the state of partially active master/slave groups
View
@@ -1266,7 +1266,7 @@ cib_process_command(xmlNode * request, xmlNode ** reply, xmlNode ** cib_diff, gb
if (manage_counters == FALSE) {
int format = 1;
/* Legacy code
* If the diff is NULL at this point, its because nothing changed
* If the diff is NULL at this point, it's because nothing changed
*/
if (*cib_diff) {
crm_element_value_int(*cib_diff, "format", &format);
View
@@ -1062,7 +1062,7 @@ dnl ========================================================================
dnl Cluster infrastructure - Heartbeat / LibQB
dnl ========================================================================
dnl Compatability checks
dnl Compatibility checks
AC_CHECK_MEMBERS([struct lrm_ops.fail_rsc],,,[[#include <lrm/lrm_api.h>]])
if test x${enable_no_stack} = xyes; then
View
@@ -50,8 +50,8 @@ do_cl_join_query(long long action,
/* A_CL_JOIN_ANNOUNCE */
/* this is kind of a workaround for the fact that we may not be around
* or are otherwise unable to reply when the DC sends out A_WELCOME_ALL
/* this is kind of a workaround for the fact that we may not be around or
* are otherwise unable to reply when the DC sends out A_DC_JOIN_OFFER_ALL
*/
void
do_cl_join_announce(long long action,
View
@@ -169,7 +169,7 @@ do_dc_join_offer_all(long long action,
enum crmd_fsa_state cur_state,
enum crmd_fsa_input current_input, fsa_data_t * msg_data)
{
/* reset everyones status back to down or in_ccm in the CIB
/* reset everyone's status back to down or in_ccm in the CIB
*
* any nodes that are active in the CIB but not in the CCM list
* will be seen as offline by the PE anyway
View
@@ -61,7 +61,7 @@ do_timer_control(long long action,
/* timer_op_ok = crm_timer_stop(election_timeout); */
}
/* don't start a timer that wasnt already running */
/* don't start a timer that wasn't already running */
if (action & A_DC_TIMER_START && timer_op_ok) {
crm_timer_start(election_trigger);
if (AM_I_DC) {
View
@@ -37,7 +37,7 @@ cluster-helper --list bullet $target
if [ $kill != 0 ]; then
echo "Cleaning processes"
# Bah. Force systemd to actually look at the process and realize its dead"
# Bah. Force systemd to actually look at the process and realize it's dead"
cluster-helper $target -- "service corosync stop" &> /dev/null &
cluster-helper $target -- "service pacemaker stop" &> /dev/null &
View
@@ -313,7 +313,7 @@ o2cb_stop() {
return $OCF_ERR_GENERIC
fi
# Don't unmount configfs - its always in use by libdlm
# Don't unmount configfs - it's always in use by libdlm
}
o2cb_monitor() {
View
@@ -124,7 +124,7 @@ enum crm_ais_msg_class {
crm_class_quorum = 5,
};
/* order here matters - its used to index into the crm_children array */
/* order here matters - it's used to index into the crm_children array */
enum crm_ais_msg_types {
crm_msg_none = 0,
crm_msg_ais = 1,
@@ -77,7 +77,7 @@ struct crm_ais_quorum_resp_s {
enum crm_proc_flag {
crm_proc_none = 0x00000001,
/* These values are sent over the network by the legacy plugin
* Therefor changing any of these values is going to break compatability
* Therefor changing any of these values is going to break compatibility
*
* So don't
*/
@@ -161,7 +161,7 @@ slist_basic_destroy(GListPtr list)
# define crm_free(free_obj) do { free(free_obj); free_obj=NULL; } while(0)
/* These two child iterator macros are no longer to be used
* They exist for compatability reasons and will be removed in a
* They exist for compatibility reasons and will be removed in a
* future release
*/
# define xml_child_iter(parent, child, code) do { \
@@ -227,7 +227,7 @@ slist_basic_destroy(GListPtr list)
# define zap_xml_from_parent(parent, xml_obj) free_xml(xml_obj); xml_obj = NULL
/* For ABI compatability with version < 1.1.4 */
/* For ABI compatibility with version < 1.1.4 */
static inline char *
calculate_xml_digest(xmlNode * input, gboolean sort, gboolean do_filter)
{
View
@@ -88,15 +88,15 @@
#undef SUPPORT_UPSTART
/****** Compatability ******/
/****** Compatibility ******/
/* Does corosync use libqb for its ipc */
#undef CS_USES_LIBQB
/* Compatability alias for SUPPORT_COROSYNC */
/* Compatibility alias for SUPPORT_COROSYNC */
#undef SUPPORT_AIS
/* Compatability alias for SUPPORT_COROSYNC */
/* Compatibility alias for SUPPORT_COROSYNC */
#undef AIS_COROSYNC
#endif /* CRM_CONFIG__H__IN */
View
@@ -392,8 +392,8 @@ pcmk_cpg_membership(cpg_handle_t handle,
(peer? peer->uname : "<none>"), counter, i);
/* Anyone that is sending us CPG messages must also be a _CPG_ member.
* But its _not_ safe to assume its in the quorum membership.
* We may have just found out its dead and are processing the last couple of messages it sent
* But it's _not_ safe to assume it's in the quorum membership.
* We may have just found out it's dead and are processing the last couple of messages it sent
*/
peer = crm_update_peer_proc(__FUNCTION__, peer, crm_proc_cpg, ONLINESTATUS);
if(peer && peer->state && crm_is_peer_active(peer) == FALSE) {
@@ -679,7 +679,7 @@ text2msg_type(const char *text)
int scan_rc = sscanf(text, "%d", &type);
if (scan_rc != 1 || type <= crm_msg_stonith_ng) {
/* Ensure its sane */
/* Ensure it's sane */
type = crm_msg_none;
}
}
View
@@ -162,7 +162,7 @@ convert_ha_message(xmlNode * parent, HA_Message * msg, const char *field)
tag = field;
} else if (parent && safe_str_neq(field, tag)) {
/* For compatability with 0.6.x */
/* For compatibility with 0.6.x */
crm_debug("Creating intermediate parent %s between %s and %s", field,
crm_element_name(parent), tag);
parent = create_xml_node(parent, field);
View
@@ -393,7 +393,7 @@ cman_event_callback(cman_handle_t handle, void *privdata, int reason, int arg)
if (cman_nodes[lpc].cn_nodeid == 0) {
/* Never allow node ID 0 to be considered a member #315711 */
/* Skip entirely, its a qdisk */
/* Skip entirely, it's a qdisk */
continue;
}
@@ -942,7 +942,7 @@ crm_is_corosync_peer_active(const crm_node_t * node)
} else if (is_cman_cluster() && (node->processes & crm_proc_cpg)) {
/* If we can still talk to our peer process on that node,
* then its also part of the corosync membership
* then it's also part of the corosync membership
*/
crm_trace("%s: processes=%.8x", node->uname, node->processes);
return TRUE;
View
@@ -42,7 +42,7 @@ dump_xml_for_digest(xmlNode * an_xml_node)
char *buffer = NULL;
int offset = 0, max = 0;
/* for compatability with the old result which is used for v1 digests */
/* for compatibility with the old result which is used for v1 digests */
crm_buffer_add_char(&buffer, &offset, &max, ' ');
crm_xml_dump(an_xml_node, 0, &buffer, &offset, &max, 0);
crm_buffer_add_char(&buffer, &offset, &max, '\n');
@@ -156,7 +156,7 @@ char *
calculate_on_disk_digest(xmlNode * input)
{
/* Always use the v1 format for on-disk digests
* a) its a compatability nightmare
* a) it's a compatibility nightmare
* b) we only use this once at startup, all other
* invocations are in a separate child process
*/
View
@@ -721,7 +721,7 @@ crm_log_preinit(const char *entity, int argc, char **argv)
qb_log_init(crm_system_name, qb_facility, LOG_ERR);
crm_log_level = LOG_CRIT;
/* Nuke any syslog activity until its asked for */
/* Nuke any syslog activity until it's asked for */
qb_log_ctl(QB_LOG_SYSLOG, QB_LOG_CONF_ENABLED, QB_FALSE);
/* Set format strings */
View
@@ -1152,7 +1152,7 @@ static gboolean mainloop_timer_cb(gpointer user_data)
CRM_ASSERT(t != NULL);
id = t->id;
t->id = 0; /* Ensure its unset during callbacks so that
t->id = 0; /* Ensure it's unset during callbacks so that
* mainloop_timer_running() works as expected
*/
View
@@ -616,11 +616,11 @@ __xml_acl_create(xmlNode * xml, xmlNode *target, enum xml_private_flags mode)
const char *xpath = crm_element_value(xml, XML_ACL_ATTR_XPATH);
if(tag == NULL) {
/* Compatability handling for pacemaker < 1.1.12 */
/* Compatibility handling for pacemaker < 1.1.12 */
tag = crm_element_value(xml, XML_ACL_ATTR_TAGv1);
}
if(ref == NULL) {
/* Compatability handling for pacemaker < 1.1.12 */
/* Compatibility handling for pacemaker < 1.1.12 */
ref = crm_element_value(xml, XML_ACL_ATTR_REFv1);
}
@@ -3874,7 +3874,7 @@ crm_xml_dump(xmlNode * data, int options, char **buffer, int *offset, int *max,
* It exists to help debug slowness in xmlNodeDump() and
* potentially if we ever want to go back to it.
*
* In theory its a good idea (reuse) but our custom version does
* In theory it's a good idea (reuse) but our custom version does
* better for the filtered case and avoids the final strdup() for
* everything
*/
View
@@ -737,7 +737,7 @@ read_output(int fd)
more = read(fd, buffer, READ_MAX - 1);
if (more > 0) {
buffer[more] = 0; /* Make sure its nul-terminated for logging
buffer[more] = 0; /* Make sure it's nul-terminated for logging
* 'more' is always less than our buffer size
*/
output = realloc_safe(output, len + more + 1);
View
@@ -3098,7 +3098,7 @@ unpack_rsc_op(resource_t * rsc, node_t * node, xmlNode * xml_op, xmlNode ** last
}
if (status == PCMK_LRM_OP_ERROR) {
/* Older versions set this if rc != 0 but its up to us to decide */
/* Older versions set this if rc != 0 but it's up to us to decide */
status = PCMK_LRM_OP_DONE;
}
View
@@ -247,7 +247,7 @@ systemd_unit_by_name(const gchar * arg_name, svc_action_t *op)
char *name = NULL;
/*
Equivalent to GetUnit if its already loaded
Equivalent to GetUnit if it's already loaded
<method name="LoadUnit">
<arg name="name" type="s" direction="in"/>
<arg name="unit" type="o" direction="out"/>
View
@@ -885,7 +885,7 @@ action_complete(svc_action_t * action)
*
* So we have to jump through a few hoops so that we don't
* report 'complete' to the rest of pacemaker until, you know,
* its actually done.
* it's actually done.
*/
goagain = true;
cmd->real_action = cmd->action;
@@ -1543,7 +1543,7 @@ cancel_op(const char *rsc_id, const char *action, int interval)
* 1. Check pending ops list, if it hasn't been handed off
* to the service library or stonith recurring list remove
* it there and that will stop it.
* 2. If it isn't in the pending ops list, then its either a
* 2. If it isn't in the pending ops list, then it's either a
* recurring op in the stonith recurring list, or the service
* library's recurring list. Stop it there
* 3. If not found in any lists, then this operation has either
View
@@ -1041,7 +1041,7 @@ main(int argc, char **argv)
}
#if 0
/* system() is not thread-safe, can't call from here
* Actually, its a pretty hacky way to try and achieve this anyway
* Actually, it's a pretty hacky way to try and achieve this anyway
*/
if (system("echo 1 > /proc/sys/kernel/core_uses_pid") != 0) {
crm_perror(LOG_ERR, "Could not enable /proc/sys/kernel/core_uses_pid");
View
@@ -28,15 +28,15 @@ SuccessExitStatus=100
ExecStart=@sbindir@/pacemakerd -f
# If pacemakerd doesn't stop, its probably waiting on a cluster
# If pacemakerd doesn't stop, it's probably waiting on a cluster
# resource. Sending -KILL will just get the node fenced
SendSIGKILL=no
# If we ever hit the StartLimitInterval/StartLimitBurst limit and the
# admin wants to stop the cluster while pacemakerd is not running, it
# might be a good idea to enable the ExecStopPost directive below.
#
# Although the node will likely end up being fenced as a result so its
# Although the node will likely end up being fenced as a result so it's
# not on by default
#
# ExecStopPost=/usr/bin/killall -TERM crmd attrd fenced cib pengine lrmd
View
@@ -2762,7 +2762,7 @@ stage8(pe_working_set_t * data_set)
&& crm_str_eq(action->task, RSC_STOP, TRUE)
) {
/* Eventually we should just ignore the 'fence' case
* But for now its the best way to detect (in CTS) when
* But for now it's the best way to detect (in CTS) when
* CIB resource updates are being lost
*/
if (is_set(data_set->flags, pe_flag_have_quorum)
View
@@ -47,13 +47,13 @@ get_action_flags(action_t * action, node_t * node)
/* Go to great lengths to ensure the correct value for pe_action_runnable...
*
* If we are a clone, then for _ordering_ constraints, its only relevant
* If we are a clone, then for _ordering_ constraints, it's only relevant
* if we are runnable _anywhere_.
*
* This only applies to _runnable_ though, and only for ordering constraints.
* If this function is ever used during colocation, then we'll need additional logic
*
* Not very satisfying, but its logical and appears to work well.
* Not very satisfying, but it's logical and appears to work well.
*/
if (is_not_set(clone_flags, pe_action_runnable)
&& is_set(flags, pe_action_runnable)) {
View
@@ -428,7 +428,7 @@ filter_anonymous_instance(resource_t * rsc, node_t * node)
resource_t *child = rIter->data;
/*
* We know its not running, but any score will still count if
* We know it's not running, but any score will still count if
* the instance has been probed on $node
*
* Again use ->find_rsc() because we might be a cloned group
@@ -1029,7 +1029,7 @@ master_rsc_colocation_rh(resource_t * rsc_lh, resource_t * rsc_rh, rsc_colocatio
}
}
/* Only do this if its not a master-master colocation
/* Only do this if it's not a master-master colocation
* Doing this unconditionally would prevent the slaves from being started
*/
if (constraint->role_lh != RSC_ROLE_MASTER || constraint->role_rh != RSC_ROLE_MASTER) {
View
@@ -694,7 +694,7 @@ RecurringOp(resource_t * rsc, action_t * start, node_t * node,
log_level = LOG_INFO;
result = "Cancelling";
/* its running : cancel it */
/* it's running : cancel it */
mon = custom_action(rsc, local_key, RSC_CANCEL, node, FALSE, TRUE, data_set);
@@ -2879,7 +2879,7 @@ native_start_constraints(resource_t * rsc, action_t * stonith_op, pe_working_set
* the node is shot before doing anything
* to with the resource
*
* its analogous to waiting for all the probes
* it's analogous to waiting for all the probes
* for rscX to complete before starting rscX
*
* the most likely explaination is that the
View
@@ -276,7 +276,7 @@ main(int argc, char **argv)
if (rc == -ENXIO) {
/* Nothing to delete...
* which means its not there...
* which means it's not there...
* which is what the admin wanted
*/
rc = pcmk_ok;
Oops, something went wrong.

0 comments on commit 9e10977

Please sign in to comment.