|
|
60de42 |
From be2e6b14f019e1e7f109fb5e7e4391edc42062cb Mon Sep 17 00:00:00 2001
|
|
|
60de42 |
From: Ken Gaillot <kgaillot@redhat.com>
|
|
|
60de42 |
Date: Tue, 6 Dec 2016 12:04:10 -0600
|
|
|
60de42 |
Subject: [PATCH] Log: various: fix spelling errors in log messages and
|
|
|
60de42 |
comments
|
|
|
60de42 |
|
|
|
60de42 |
---
|
|
|
60de42 |
BasicSanity.sh | 2 +-
|
|
|
60de42 |
cib/messages.c | 2 +-
|
|
|
60de42 |
fencing/commands.c | 2 +-
|
|
|
60de42 |
include/crm/pengine/status.h | 8 +++++---
|
|
|
60de42 |
lib/ais/plugin.c | 4 ++--
|
|
|
60de42 |
lib/cluster/cpg.c | 2 +-
|
|
|
60de42 |
lib/cluster/heartbeat.c | 4 ++--
|
|
|
60de42 |
lib/pengine/unpack.c | 14 +++++++-------
|
|
|
60de42 |
lib/pengine/utils.c | 6 +++---
|
|
|
60de42 |
mcp/pacemaker.c | 4 ++--
|
|
|
60de42 |
pengine/graph.c | 4 ++--
|
|
|
60de42 |
pengine/native.c | 4 ++--
|
|
|
60de42 |
pengine/regression.sh | 2 +-
|
|
|
60de42 |
13 files changed, 30 insertions(+), 28 deletions(-)
|
|
|
60de42 |
|
|
|
60de42 |
diff --git a/BasicSanity.sh b/BasicSanity.sh
|
|
|
60de42 |
index d00f337..fb687ad 100755
|
|
|
60de42 |
--- a/BasicSanity.sh
|
|
|
60de42 |
+++ b/BasicSanity.sh
|
|
|
60de42 |
@@ -31,7 +31,7 @@ function run_as_root() {
|
|
|
60de42 |
$CMD
|
|
|
60de42 |
|
|
|
60de42 |
elif [ -z $TRAVIS ]; then
|
|
|
60de42 |
- # sudo doesn't work in builtbot, su doesn't work in travis
|
|
|
60de42 |
+ # sudo doesn't work in buildbot, su doesn't work in travis
|
|
|
60de42 |
echo "Enter the root password..."
|
|
|
60de42 |
su root -c "$CMD"
|
|
|
60de42 |
|
|
|
60de42 |
diff --git a/cib/messages.c b/cib/messages.c
|
|
|
60de42 |
index ff149f7..4e704dc 100644
|
|
|
60de42 |
--- a/cib/messages.c
|
|
|
60de42 |
+++ b/cib/messages.c
|
|
|
60de42 |
@@ -544,7 +544,7 @@ sync_our_cib(xmlNode * request, gboolean all)
|
|
|
60de42 |
|
|
|
60de42 |
/* remove the "all == FALSE" condition
|
|
|
60de42 |
*
|
|
|
60de42 |
- * sync_from was failing, the local client wasnt being notified
|
|
|
60de42 |
+ * sync_from was failing, the local client wasn't being notified
|
|
|
60de42 |
* because it didn't know it was a reply
|
|
|
60de42 |
* setting this does not prevent the other nodes from applying it
|
|
|
60de42 |
* if all == TRUE
|
|
|
60de42 |
diff --git a/fencing/commands.c b/fencing/commands.c
|
|
|
60de42 |
index d21e5a8..e7fce78 100644
|
|
|
60de42 |
--- a/fencing/commands.c
|
|
|
60de42 |
+++ b/fencing/commands.c
|
|
|
60de42 |
@@ -988,7 +988,7 @@ dynamic_list_search_cb(GPid pid, int rc, const char *output, gpointer user_data)
|
|
|
60de42 |
|
|
|
60de42 |
/*!
|
|
|
60de42 |
* \internal
|
|
|
60de42 |
- * \brief Returns true if any key in first is not is second or second has a different value for key
|
|
|
60de42 |
+ * \brief Returns true if any key in first is not in second or second has a different value for key
|
|
|
60de42 |
*/
|
|
|
60de42 |
static int
|
|
|
60de42 |
device_params_diff(GHashTable *first, GHashTable *second) {
|
|
|
60de42 |
diff --git a/include/crm/pengine/status.h b/include/crm/pengine/status.h
|
|
|
60de42 |
index 5e3b191..79e4572 100644
|
|
|
60de42 |
--- a/include/crm/pengine/status.h
|
|
|
60de42 |
+++ b/include/crm/pengine/status.h
|
|
|
60de42 |
@@ -232,9 +232,11 @@ enum pe_action_flags {
|
|
|
60de42 |
pe_action_clear = 0x00400,
|
|
|
60de42 |
pe_action_dangle = 0x00800,
|
|
|
60de42 |
|
|
|
60de42 |
- pe_action_requires_any = 0x01000, /* This action requires one or mre of its dependencies to be runnable
|
|
|
60de42 |
- * We use this to clear the runnable flag before checking dependencies
|
|
|
60de42 |
- */
|
|
|
60de42 |
+ /* This action requires one or more of its dependencies to be runnable.
|
|
|
60de42 |
+ * We use this to clear the runnable flag before checking dependencies.
|
|
|
60de42 |
+ */
|
|
|
60de42 |
+ pe_action_requires_any = 0x01000,
|
|
|
60de42 |
+
|
|
|
60de42 |
pe_action_reschedule = 0x02000,
|
|
|
60de42 |
pe_action_tracking = 0x04000,
|
|
|
60de42 |
};
|
|
|
60de42 |
diff --git a/lib/ais/plugin.c b/lib/ais/plugin.c
|
|
|
60de42 |
index 007fc24..b8a2b96 100644
|
|
|
60de42 |
--- a/lib/ais/plugin.c
|
|
|
60de42 |
+++ b/lib/ais/plugin.c
|
|
|
60de42 |
@@ -663,7 +663,7 @@ pcmk_startup(struct corosync_api_v1 *init_with)
|
|
|
60de42 |
if (use_mcp == FALSE) {
|
|
|
60de42 |
pthread_create(&pcmk_wait_thread, NULL, pcmk_wait_dispatch, NULL);
|
|
|
60de42 |
for (start_seq = 1; start_seq < max; start_seq++) {
|
|
|
60de42 |
- /* dont start anything with start_seq < 1 */
|
|
|
60de42 |
+ /* don't start anything with start_seq < 1 */
|
|
|
60de42 |
for (lpc = 0; lpc < max; lpc++) {
|
|
|
60de42 |
if (start_seq == pcmk_children[lpc].start_seq) {
|
|
|
60de42 |
spawn_child(&(pcmk_children[lpc]));
|
|
|
60de42 |
@@ -1108,7 +1108,7 @@ pcmk_shutdown(void)
|
|
|
60de42 |
wait_active = FALSE; /* stop the wait loop */
|
|
|
60de42 |
|
|
|
60de42 |
for (; phase > 0; phase--) {
|
|
|
60de42 |
- /* dont stop anything with start_seq < 1 */
|
|
|
60de42 |
+ /* don't stop anything with start_seq < 1 */
|
|
|
60de42 |
|
|
|
60de42 |
for (lpc = max - 1; lpc >= 0; lpc--) {
|
|
|
60de42 |
if (phase != pcmk_children[lpc].start_seq) {
|
|
|
60de42 |
diff --git a/lib/cluster/cpg.c b/lib/cluster/cpg.c
|
|
|
60de42 |
index 5efafc8..aef3583 100644
|
|
|
60de42 |
--- a/lib/cluster/cpg.c
|
|
|
60de42 |
+++ b/lib/cluster/cpg.c
|
|
|
60de42 |
@@ -637,7 +637,7 @@ send_cluster_text(int class, const char *data,
|
|
|
60de42 |
free(target);
|
|
|
60de42 |
|
|
|
60de42 |
#if SUPPORT_PLUGIN
|
|
|
60de42 |
- /* The plugin is the only time we dont use CPG messaging */
|
|
|
60de42 |
+ /* The plugin is the only time we don't use CPG messaging */
|
|
|
60de42 |
if(get_cluster_type() == pcmk_cluster_classic_ais) {
|
|
|
60de42 |
return send_plugin_text(class, iov);
|
|
|
60de42 |
}
|
|
|
60de42 |
diff --git a/lib/cluster/heartbeat.c b/lib/cluster/heartbeat.c
|
|
|
60de42 |
index a471402..8414602 100644
|
|
|
60de42 |
--- a/lib/cluster/heartbeat.c
|
|
|
60de42 |
+++ b/lib/cluster/heartbeat.c
|
|
|
60de42 |
@@ -117,7 +117,7 @@ convert_ha_field(xmlNode * parent, void *msg_v, int lpc)
|
|
|
60de42 |
|
|
|
60de42 |
if (rc == BZ_OUTBUFF_FULL) {
|
|
|
60de42 |
size = size * 2;
|
|
|
60de42 |
- /* dont try to allocate more memory than we have */
|
|
|
60de42 |
+ /* don't try to allocate more memory than we have */
|
|
|
60de42 |
if (size > 0) {
|
|
|
60de42 |
goto retry;
|
|
|
60de42 |
}
|
|
|
60de42 |
@@ -489,7 +489,7 @@ ha_msg_dispatch(ll_cluster_t * cluster_conn, gpointer user_data)
|
|
|
60de42 |
if (cluster_conn->llc_ops->msgready(cluster_conn) == 0) {
|
|
|
60de42 |
crm_trace("no message ready yet");
|
|
|
60de42 |
}
|
|
|
60de42 |
- /* invoke the callbacks but dont block.
|
|
|
60de42 |
+ /* invoke the callbacks but don't block.
|
|
|
60de42 |
* cluster_conn->llc_ops->rcvmsg(cluster_conn, 0); */
|
|
|
60de42 |
msg = cluster_conn->llc_ops->readmsg(cluster_conn, 0);
|
|
|
60de42 |
if (msg) {
|
|
|
60de42 |
diff --git a/lib/pengine/unpack.c b/lib/pengine/unpack.c
|
|
|
60de42 |
index a4d6845..a9fbcc0 100644
|
|
|
60de42 |
--- a/lib/pengine/unpack.c
|
|
|
60de42 |
+++ b/lib/pengine/unpack.c
|
|
|
60de42 |
@@ -1494,7 +1494,7 @@ determine_online_status(xmlNode * node_state, node_t * this_node, pe_working_set
|
|
|
60de42 |
}
|
|
|
60de42 |
|
|
|
60de42 |
if (online && this_node->details->shutdown) {
|
|
|
60de42 |
- /* dont run resources here */
|
|
|
60de42 |
+ /* don't run resources here */
|
|
|
60de42 |
this_node->fixed = TRUE;
|
|
|
60de42 |
this_node->weight = -INFINITY;
|
|
|
60de42 |
}
|
|
|
60de42 |
@@ -2381,14 +2381,14 @@ find_lrm_op(const char *resource, const char *op, const char *node, const char *
|
|
|
60de42 |
}
|
|
|
60de42 |
|
|
|
60de42 |
static void
|
|
|
60de42 |
-unpack_rsc_migration(resource_t *rsc, node_t *node, xmlNode *xml_op, pe_working_set_t * data_set)
|
|
|
60de42 |
+unpack_rsc_migration(resource_t *rsc, node_t *node, xmlNode *xml_op, pe_working_set_t * data_set)
|
|
|
60de42 |
{
|
|
|
60de42 |
-
|
|
|
60de42 |
+
|
|
|
60de42 |
/*
|
|
|
60de42 |
* The normal sequence is (now): migrate_to(Src) -> migrate_from(Tgt) -> stop(Src)
|
|
|
60de42 |
*
|
|
|
60de42 |
- * So if a migrate_to is followed by a stop, then we dont need to care what
|
|
|
60de42 |
- * happended on the target node
|
|
|
60de42 |
+ * So if a migrate_to is followed by a stop, then we don't need to care what
|
|
|
60de42 |
+ * happened on the target node
|
|
|
60de42 |
*
|
|
|
60de42 |
* Without the stop, we need to look for a successful migrate_from.
|
|
|
60de42 |
* This would also imply we're no longer running on the source
|
|
|
60de42 |
@@ -3096,13 +3096,13 @@ unpack_rsc_op(resource_t * rsc, node_t * node, xmlNode * xml_op, xmlNode ** last
|
|
|
60de42 |
if (is_not_set(rsc->flags, pe_rsc_unique)) {
|
|
|
60de42 |
parent = uber_parent(rsc);
|
|
|
60de42 |
}
|
|
|
60de42 |
-
|
|
|
60de42 |
+
|
|
|
60de42 |
pe_rsc_trace(rsc, "Unpacking task %s/%s (call_id=%d, status=%d, rc=%d) on %s (role=%s)",
|
|
|
60de42 |
task_key, task, task_id, status, rc, node->details->uname, role2text(rsc->role));
|
|
|
60de42 |
|
|
|
60de42 |
if (node->details->unclean) {
|
|
|
60de42 |
pe_rsc_trace(rsc, "Node %s (where %s is running) is unclean."
|
|
|
60de42 |
- " Further action depends on the value of the stop's on-fail attribue",
|
|
|
60de42 |
+ " Further action depends on the value of the stop's on-fail attribute",
|
|
|
60de42 |
node->details->uname, rsc->id);
|
|
|
60de42 |
}
|
|
|
60de42 |
|
|
|
60de42 |
diff --git a/lib/pengine/utils.c b/lib/pengine/utils.c
|
|
|
60de42 |
index 2e43623..cc97db1 100644
|
|
|
60de42 |
--- a/lib/pengine/utils.c
|
|
|
60de42 |
+++ b/lib/pengine/utils.c
|
|
|
60de42 |
@@ -516,7 +516,7 @@ custom_action(resource_t * rsc, char *key, const char *task,
|
|
|
60de42 |
#if 0
|
|
|
60de42 |
/*
|
|
|
60de42 |
* No point checking this
|
|
|
60de42 |
- * - if we dont have quorum we can't stonith anyway
|
|
|
60de42 |
+ * - if we don't have quorum we can't stonith anyway
|
|
|
60de42 |
*/
|
|
|
60de42 |
} else if (action->needs == rsc_req_stonith) {
|
|
|
60de42 |
crm_trace("Action %s requires only stonith", action->uuid);
|
|
|
60de42 |
@@ -1418,7 +1418,7 @@ sort_op_by_callid(gconstpointer a, gconstpointer b)
|
|
|
60de42 |
*
|
|
|
60de42 |
* if the UUID from the TE doesn't match then one better
|
|
|
60de42 |
* be a pending operation.
|
|
|
60de42 |
- * pending operations dont survive between elections and joins
|
|
|
60de42 |
+ * pending operations don't survive between elections and joins
|
|
|
60de42 |
* because we query the LRM directly
|
|
|
60de42 |
*/
|
|
|
60de42 |
|
|
|
60de42 |
@@ -2098,7 +2098,7 @@ trigger_unfencing(
|
|
|
60de42 |
return;
|
|
|
60de42 |
|
|
|
60de42 |
} else if (rsc != NULL && is_not_set(rsc->flags, pe_rsc_fence_device)) {
|
|
|
60de42 |
- /* Wasnt a stonith device */
|
|
|
60de42 |
+ /* Wasn't a stonith device */
|
|
|
60de42 |
return;
|
|
|
60de42 |
|
|
|
60de42 |
} else if(node
|
|
|
60de42 |
diff --git a/mcp/pacemaker.c b/mcp/pacemaker.c
|
|
|
60de42 |
index c5898c9..292e28c 100644
|
|
|
60de42 |
--- a/mcp/pacemaker.c
|
|
|
60de42 |
+++ b/mcp/pacemaker.c
|
|
|
60de42 |
@@ -384,7 +384,7 @@ pcmk_shutdown_worker(gpointer user_data)
|
|
|
60de42 |
}
|
|
|
60de42 |
|
|
|
60de42 |
for (; phase > 0; phase--) {
|
|
|
60de42 |
- /* dont stop anything with start_seq < 1 */
|
|
|
60de42 |
+ /* Don't stop anything with start_seq < 1 */
|
|
|
60de42 |
|
|
|
60de42 |
for (lpc = max - 1; lpc >= 0; lpc--) {
|
|
|
60de42 |
pcmk_child_t *child = &(pcmk_children[lpc]);
|
|
|
60de42 |
@@ -782,7 +782,7 @@ init_children_processes(void)
|
|
|
60de42 |
|
|
|
60de42 |
/* start any children that have not been detected */
|
|
|
60de42 |
for (start_seq = 1; start_seq < max; start_seq++) {
|
|
|
60de42 |
- /* dont start anything with start_seq < 1 */
|
|
|
60de42 |
+ /* don't start anything with start_seq < 1 */
|
|
|
60de42 |
for (lpc = 0; lpc < max; lpc++) {
|
|
|
60de42 |
if (pcmk_children[lpc].pid) {
|
|
|
60de42 |
/* we are already tracking it */
|
|
|
60de42 |
diff --git a/pengine/graph.c b/pengine/graph.c
|
|
|
60de42 |
index 645150b..ee7c7c8 100644
|
|
|
60de42 |
--- a/pengine/graph.c
|
|
|
60de42 |
+++ b/pengine/graph.c
|
|
|
60de42 |
@@ -363,13 +363,13 @@ graph_update_action(action_t * first, action_t * then, node_t * node, enum pe_ac
|
|
|
60de42 |
&& (flags & pe_action_optional) == 0) {
|
|
|
60de42 |
processed = TRUE;
|
|
|
60de42 |
crm_trace("%s implies %s printed", first->uuid, then->uuid);
|
|
|
60de42 |
- update_action_flags(then, pe_action_print_always, __FUNCTION__); /* dont care about changed */
|
|
|
60de42 |
+ update_action_flags(then, pe_action_print_always, __FUNCTION__); /* don't care about changed */
|
|
|
60de42 |
}
|
|
|
60de42 |
|
|
|
60de42 |
if ((type & pe_order_implies_first_printed) && (flags & pe_action_optional) == 0) {
|
|
|
60de42 |
processed = TRUE;
|
|
|
60de42 |
crm_trace("%s implies %s printed", then->uuid, first->uuid);
|
|
|
60de42 |
- update_action_flags(first, pe_action_print_always, __FUNCTION__); /* dont care about changed */
|
|
|
60de42 |
+ update_action_flags(first, pe_action_print_always, __FUNCTION__); /* don't care about changed */
|
|
|
60de42 |
}
|
|
|
60de42 |
|
|
|
60de42 |
if ((type & pe_order_implies_then
|
|
|
60de42 |
diff --git a/pengine/native.c b/pengine/native.c
|
|
|
60de42 |
index b24e3fd..56a1434 100644
|
|
|
60de42 |
--- a/pengine/native.c
|
|
|
60de42 |
+++ b/pengine/native.c
|
|
|
60de42 |
@@ -2879,7 +2879,7 @@ native_start_constraints(resource_t * rsc, action_t * stonith_op, pe_working_set
|
|
|
60de42 |
|
|
|
60de42 |
} else if (safe_str_eq(action->task, RSC_START)
|
|
|
60de42 |
&& NULL == pe_hash_table_lookup(rsc->known_on, target->details->id)) {
|
|
|
60de42 |
- /* if known == NULL, then we dont know if
|
|
|
60de42 |
+ /* if known == NULL, then we don't know if
|
|
|
60de42 |
* the resource is active on the node
|
|
|
60de42 |
* we're about to shoot
|
|
|
60de42 |
*
|
|
|
60de42 |
@@ -2891,7 +2891,7 @@ native_start_constraints(resource_t * rsc, action_t * stonith_op, pe_working_set
|
|
|
60de42 |
* it's analogous to waiting for all the probes
|
|
|
60de42 |
* for rscX to complete before starting rscX
|
|
|
60de42 |
*
|
|
|
60de42 |
- * the most likely explaination is that the
|
|
|
60de42 |
+ * the most likely explanation is that the
|
|
|
60de42 |
* DC died and took its status with it
|
|
|
60de42 |
*/
|
|
|
60de42 |
|
|
|
60de42 |
diff --git a/pengine/regression.sh b/pengine/regression.sh
|
|
|
60de42 |
index 4fea356..be1734b 100755
|
|
|
60de42 |
--- a/pengine/regression.sh
|
|
|
60de42 |
+++ b/pengine/regression.sh
|
|
|
60de42 |
@@ -138,7 +138,7 @@ do_test clone-require-all-7 "clone A and B both start at the same time. all inst
|
|
|
60de42 |
do_test clone-require-all-no-interleave-1 "C starts everywhere after A and B"
|
|
|
60de42 |
do_test clone-require-all-no-interleave-2 "C starts on nodes 1, 2, and 4 with only one active instance of B"
|
|
|
60de42 |
do_test clone-require-all-no-interleave-3 "C remains active when instance of B is stopped on one node and started on another."
|
|
|
60de42 |
-do_test one-or-more-unrunnnable-instances "Avoid dependencies on instances that wont ever be started"
|
|
|
60de42 |
+do_test one-or-more-unrunnnable-instances "Avoid dependencies on instances that won't ever be started"
|
|
|
60de42 |
|
|
|
60de42 |
echo ""
|
|
|
60de42 |
do_test order1 "Order start 1 "
|
|
|
60de42 |
--
|
|
|
60de42 |
1.8.3.1
|
|
|
60de42 |
|