[Debian-ha-commits] [pacemaker] 19/69: Low: all: spelling corrections
Christoph Berg
myon at debian.org
Tue Jan 26 09:14:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
myon pushed a commit to branch debian/master
in repository pacemaker.
commit 5f8a298e24e19a9140fae7a2ed2a2c64aea72f28
Author: Ken Gaillot <kgaillot at redhat.com>
Date: Wed Dec 23 10:54:19 2015 -0600
Low: all: spelling corrections
---
cib/io.c | 2 +-
cib/messages.c | 2 +-
crmd/control.c | 4 ++--
crmd/election.c | 2 +-
crmd/fsa_defines.h | 19 +++++++++----------
crmd/messages.c | 10 +++++-----
crmd/te_actions.c | 2 +-
doc/Pacemaker_Remote/en-US/Ch-Intro.txt | 2 +-
fencing/main.c | 2 +-
lib/cib/cib_utils.c | 2 +-
lib/cluster/election.c | 4 ++--
lib/cluster/heartbeat.c | 4 ++--
lib/common/digest.c | 2 +-
lib/common/mainloop.c | 2 +-
lib/common/utils.c | 2 +-
lib/common/xml.c | 10 +++++-----
lib/pengine/native.c | 2 +-
lib/pengine/unpack.c | 6 ++++--
lib/pengine/utils.c | 8 ++++----
pengine/allocate.c | 7 ++++---
pengine/clone.c | 2 +-
pengine/master.c | 2 +-
tools/crmadmin.c | 2 +-
tools/test.iso8601.c | 2 +-
24 files changed, 52 insertions(+), 50 deletions(-)
diff --git a/cib/io.c b/cib/io.c
index 4e2b24a..068275f 100644
--- a/cib/io.c
+++ b/cib/io.c
@@ -275,7 +275,7 @@ readCibXmlFile(const char *dir, const char *file, gboolean discard_status)
value = crm_element_value(root, name);
if (value == NULL) {
crm_warn("No value for %s was specified in the configuration.", name);
- crm_warn("The reccomended course of action is to shutdown,"
+ crm_warn("The recommended course of action is to shutdown,"
" run crm_verify and fix any errors it reports.");
crm_warn("We will default to zero and continue but may get"
" confused about which configuration to use if"
diff --git a/cib/messages.c b/cib/messages.c
index ff197cd..ff149f7 100644
--- a/cib/messages.c
+++ b/cib/messages.c
@@ -545,7 +545,7 @@ sync_our_cib(xmlNode * request, gboolean all)
/* remove the "all == FALSE" condition
*
* sync_from was failing, the local client wasnt being notified
- * because it didnt know it was a reply
+ * because it didn't know it was a reply
* setting this does not prevent the other nodes from applying it
* if all == TRUE
*/
diff --git a/crmd/control.c b/crmd/control.c
index a3dd5dd..56a5f41 100644
--- a/crmd/control.c
+++ b/crmd/control.c
@@ -196,7 +196,7 @@ do_shutdown(long long action,
}
if (stonith_api) {
- /* Prevent it from comming up again */
+ /* Prevent it from coming up again */
clear_bit(fsa_input_register, R_ST_REQUIRED);
crm_info("Disconnecting STONITH...");
@@ -1140,7 +1140,7 @@ crm_shutdown(int nsig)
shutdown_escalation_timer->period_ms = msec;
}
- /* cant rely on this... */
+ /* can't rely on this... */
crm_notice("Requesting shutdown, upper limit is %dms",
shutdown_escalation_timer->period_ms);
crm_timer_start(shutdown_escalation_timer);
diff --git a/crmd/election.c b/crmd/election.c
index dee4750..cfa68ab 100644
--- a/crmd/election.c
+++ b/crmd/election.c
@@ -241,7 +241,7 @@ do_dc_release(long long action,
crm_info("DC role released");
#if 0
if (are there errors) {
- /* we cant stay up if not healthy */
+ /* we can't stay up if not healthy */
/* or perhaps I_ERROR and go to S_RECOVER? */
result = I_SHUTDOWN;
}
diff --git a/crmd/fsa_defines.h b/crmd/fsa_defines.h
index 43567e7..4ff35d6 100644
--- a/crmd/fsa_defines.h
+++ b/crmd/fsa_defines.h
@@ -38,8 +38,7 @@ enum crmd_fsa_state {
* the CIB
*/
S_NOT_DC, /* we are in crmd/slave mode */
- S_POLICY_ENGINE, /* Determin the next stable state of the cluster
- */
+ S_POLICY_ENGINE, /* Determine next stable state of the cluster */
S_RECOVERY, /* Something bad happened, check everything is ok
* before continuing and attempt to recover if
* required
@@ -108,7 +107,7 @@ Description:
Once the election is complete, if we are the DC, we enter the
S_INTEGRATION state which is a DC-in-waiting style state. We are
- the DC, but we shouldnt do anything yet because we may not have an
+ the DC, but we shouldn't do anything yet because we may not have an
up-to-date picture of the cluster. There may of course be times
when this fails, so we should go back to the S_RECOVERY stage and
check everything is ok. We may also end up here if a new node came
@@ -213,7 +212,7 @@ enum crmd_fsa_input {
*/
I_WAIT_FOR_EVENT, /* we may be waiting for an async task to "happen"
- * and until it does, we cant do anything else
+ * and until it does, we can't do anything else
*/
I_DC_HEARTBEAT, /* The DC is telling us that it is alive and well */
@@ -240,9 +239,9 @@ enum crmd_fsa_input {
* Some of the actions below will always occur together for now, but I can
* forsee that this may not always be the case. So I've spilt them up so
* that if they ever do need to be called independantly in the future, it
- * wont be a problem.
+ * won't be a problem.
*
- * For example, separating A_LRM_CONNECT from A_STARTUP might be useful
+ * For example, separating A_LRM_CONNECT from A_STARTUP might be useful
* if we ever try to recover from a faulty or disconnected LRM.
*
*======================================*/
@@ -339,12 +338,12 @@ enum crmd_fsa_input {
# define A_CIB_STOP 0x0000040000000000ULL
/* -- Transition Engine actions -- */
- /* Attempt to reach the newly calculated cluster state. This is
+ /* Attempt to reach the newly calculated cluster state. This is
* only called once per transition (except if it is asked to
* stop the transition or start a new one).
- * Once given a cluster state to reach, the TE will determin
+ * Once given a cluster state to reach, the TE will determine
* tasks that can be performed in parallel, execute them, wait
- * for replies and then determin the next set until the new
+ * for replies and then determine the next set until the new
* state is reached or no further tasks can be taken.
*/
# define A_TE_INVOKE 0x0000100000000000ULL
@@ -456,7 +455,7 @@ enum crmd_fsa_input {
awaiting completion? */
# define R_RESP_PEND 0x08000000ULL
/* Do we have clients waiting on a
- response? if so perhaps we shouldnt
+ response? if so perhaps we shouldn't
stop yet */
# define R_IN_TRANSITION 0x10000000ULL
diff --git a/crmd/messages.c b/crmd/messages.c
index a6e8376..5114519 100644
--- a/crmd/messages.c
+++ b/crmd/messages.c
@@ -176,7 +176,7 @@ register_fsa_input_adv(enum crmd_fsa_cause cause, enum crmd_fsa_input input,
/* fsa_dump_queue(LOG_DEBUG_2); */
if (old_len == g_list_length(fsa_message_queue)) {
- crm_err("Couldnt add message to the queue");
+ crm_err("Couldn't add message to the queue");
}
if (fsa_source && input != I_WAIT_FOR_EVENT) {
@@ -697,8 +697,8 @@ handle_request(xmlNode * stored_msg, enum crmd_fsa_cause cause)
return I_STOP;
} else if (dc_match) {
- crm_err("We didnt ask to be shut down, yet our"
- " TE is telling us too." " Better get out now!");
+ crm_err("We didn't ask to be shut down, yet our"
+ " TE is telling us to. Better get out now!");
return I_TERMINATE;
} else if (fsa_state != S_STOPPING) {
@@ -779,7 +779,7 @@ handle_request(xmlNode * stored_msg, enum crmd_fsa_cause cause)
if (dc_match || fsa_our_dc == NULL) {
if (is_set(fsa_input_register, R_SHUTDOWN) == FALSE) {
- crm_err("We didn't ask to be shut down, yet our" " DC is telling us too.");
+ crm_err("We didn't ask to be shut down, yet our DC is telling us to.");
set_bit(fsa_input_register, R_STAYDOWN);
return I_STOP;
}
@@ -881,7 +881,7 @@ enum crmd_fsa_input
handle_shutdown_request(xmlNode * stored_msg)
{
/* handle here to avoid potential version issues
- * where the shutdown message/proceedure may have
+ * where the shutdown message/procedure may have
* been changed in later versions.
*
* This way the DC is always in control of the shutdown
diff --git a/crmd/te_actions.c b/crmd/te_actions.c
index b3e6078..039083d 100644
--- a/crmd/te_actions.c
+++ b/crmd/te_actions.c
@@ -725,7 +725,7 @@ notify_crmd(crm_graph_t * graph)
event = I_STOP;
} else {
- crm_err("We didn't ask to be shut down, yet our" " PE is telling us too.");
+ crm_err("We didn't ask to be shut down, yet our PE is telling us to.");
event = I_TERMINATE;
}
}
diff --git a/doc/Pacemaker_Remote/en-US/Ch-Intro.txt b/doc/Pacemaker_Remote/en-US/Ch-Intro.txt
index 1693490..9edf054 100644
--- a/doc/Pacemaker_Remote/en-US/Ch-Intro.txt
+++ b/doc/Pacemaker_Remote/en-US/Ch-Intro.txt
@@ -66,7 +66,7 @@ in Pacemaker clusters:
cluster having any awareness of the services running inside the virtual
machine. The virtual machine is 'opaque' to the cluster.
* A virtual machine can be a cluster resource, and run pacemaker_remote
- to make it a a guest node, allowing the cluster to manage services
+ to make it a guest node, allowing the cluster to manage services
inside it. The virtual machine is 'transparent' to the cluster.
======
diff --git a/fencing/main.c b/fencing/main.c
index 0dc4492..c3edae9 100644
--- a/fencing/main.c
+++ b/fencing/main.c
@@ -1071,7 +1071,7 @@ update_cib_cache_cb(const char *event, xmlNode * msg)
crm_trace("Re-requesting the full cib");
rc = cib_api->cmds->query(cib_api, NULL, &local_cib, cib_scope_local | cib_sync_call);
if(rc != pcmk_ok) {
- crm_err("Couldnt retrieve the CIB: %s (%d)", pcmk_strerror(rc), rc);
+ crm_err("Couldn't retrieve the CIB: %s (%d)", pcmk_strerror(rc), rc);
return;
}
CRM_ASSERT(local_cib != NULL);
diff --git a/lib/cib/cib_utils.c b/lib/cib/cib_utils.c
index 4dc65aa..2817e5a 100644
--- a/lib/cib/cib_utils.c
+++ b/lib/cib/cib_utils.c
@@ -123,7 +123,7 @@ get_cib_copy(cib_t * cib)
return NULL;
} else if (rc != pcmk_ok) {
- crm_err("Couldnt retrieve the CIB");
+ crm_err("Couldn't retrieve the CIB");
free_xml(xml_cib);
return NULL;
diff --git a/lib/cluster/election.c b/lib/cluster/election.c
index f164dd6..c2c5f51 100644
--- a/lib/cluster/election.c
+++ b/lib/cluster/election.c
@@ -333,7 +333,7 @@ election_count_vote(election_t *e, xmlNode *vote, bool can_win)
static time_t expires = 0;
static time_t last_election_loss = 0;
- /* if the membership copy is NULL we REALLY shouldnt be voting
+ /* if the membership copy is NULL we REALLY shouldn't be voting
* the question is how we managed to get here.
*/
@@ -456,7 +456,7 @@ election_count_vote(election_t *e, xmlNode *vote, bool can_win)
} else {
reason = "Host name";
CRM_ASSERT(strcasecmp(e->uname, from) < 0);
-/* cant happen...
+/* can't happen...
* } else if(strcasecmp(e->uname, from) == 0) {
*
*/
diff --git a/lib/cluster/heartbeat.c b/lib/cluster/heartbeat.c
index e55eeec..47702b1 100644
--- a/lib/cluster/heartbeat.c
+++ b/lib/cluster/heartbeat.c
@@ -109,7 +109,7 @@ convert_ha_field(xmlNode * parent, void *msg_v, int lpc)
uncompressed = realloc_safe(uncompressed, size);
memset(uncompressed, 0, size);
used = size - 1; /* always leave room for a trailing '\0'
- * BZ2_bzBuffToBuffDecompress wont say anything if
+ * BZ2_bzBuffToBuffDecompress won't say anything if
* the uncompressed data is exactly 'size' bytes
*/
@@ -408,7 +408,7 @@ send_ha_message(ll_cluster_t * hb_conn, xmlNode * xml, const char *node, gboolea
HA_Message *msg = convert_xml_message(xml);
if (msg == NULL) {
- crm_err("cant send NULL message");
+ crm_err("can't send NULL message");
all_is_good = FALSE;
} else if (hb_conn == NULL) {
diff --git a/lib/common/digest.c b/lib/common/digest.c
index f5a7cc4..64dc1fa 100644
--- a/lib/common/digest.c
+++ b/lib/common/digest.c
@@ -108,7 +108,7 @@ calculate_xml_digest_v2(xmlNode * source, gboolean do_filter)
if (do_filter && BEST_EFFORT_STATUS) {
/* Exclude the status calculation from the digest
*
- * This doesn't mean it wont be sync'd, we just wont be paranoid
+ * This doesn't mean it won't be sync'd, we just won't be paranoid
* about it being an _exact_ copy
*
* We don't need it to be exact, since we throw it away and regenerate
diff --git a/lib/common/mainloop.c b/lib/common/mainloop.c
index be24271..51d129d 100644
--- a/lib/common/mainloop.c
+++ b/lib/common/mainloop.c
@@ -68,7 +68,7 @@ crm_trigger_prepare(GSource * source, gint * timeout)
* This means mainloop's poll() will block until an event for one
* of these sources occurs - any /other/ type of source, such as
* this one or g_idle_*, that doesn't use g_source_add_poll() is
- * S-O-L and wont be processed until there is something fd-based
+ * S-O-L and won't be processed until there is something fd-based
* happens.
*
* Luckily the timeout we can set here affects all sources and
diff --git a/lib/common/utils.c b/lib/common/utils.c
index e08dbaf..264e171 100644
--- a/lib/common/utils.c
+++ b/lib/common/utils.c
@@ -1957,7 +1957,7 @@ create_operation_update(xmlNode * parent, lrmd_event_data_t * op, const char * c
task = op->op_type;
/* remap the task name under various scenarios
- * this makes life easier for the PE when its trying determin the current state
+ * this makes life easier for the PE when trying determine the current state
*/
if (crm_str_eq(task, "reload", TRUE)) {
if (op->op_status == PCMK_LRM_OP_DONE) {
diff --git a/lib/common/xml.c b/lib/common/xml.c
index 048a129..bebfcef 100644
--- a/lib/common/xml.c
+++ b/lib/common/xml.c
@@ -3094,7 +3094,7 @@ decompress_file(const char *filename)
buffer[length] = '\0';
if (rc != BZ_STREAM_END) {
- crm_err("Couldnt read compressed xml from file");
+ crm_err("Couldn't read compressed xml from file");
free(buffer);
buffer = NULL;
}
@@ -4271,7 +4271,7 @@ __xml_diff_object(xmlNode * old, xmlNode * new)
char *value = crm_element_value_copy(new, name);
crm_trace("Created %s@%s=%s", new->name, name, value);
- /* Remove plus create wont work as it will modify the relative attribute ordering */
+ /* Remove plus create won't work as it will modify the relative attribute ordering */
if(__xml_acl_check(new, name, xpf_acl_write)) {
crm_attr_dirty(prop);
} else {
@@ -4725,12 +4725,12 @@ add_xml_comment(xmlNode * parent, xmlNode * target, xmlNode * update)
if (target == NULL) {
target = find_xml_comment(parent, update);
- }
-
+ }
+
if (target == NULL) {
add_node_copy(parent, update);
- /* We wont reach here currently */
+ /* We won't reach here currently */
} else if (safe_str_neq((const char *)target->content, (const char *)update->content)) {
xmlFree(target->content);
target->content = xmlStrdup(update->content);
diff --git a/lib/pengine/native.c b/lib/pengine/native.c
index 58f9c2e..5a206c4 100644
--- a/lib/pengine/native.c
+++ b/lib/pengine/native.c
@@ -58,7 +58,7 @@ native_add_running(resource_t * rsc, node_t * node, pe_working_set_t * data_set)
if (is_not_set(rsc->flags, pe_rsc_managed)) {
resource_t *p = rsc->parent;
- pe_rsc_info(rsc, "resource %s isnt managed", rsc->id);
+ pe_rsc_info(rsc, "resource %s isn't managed", rsc->id);
resource_location(rsc, node, INFINITY, "not_managed_default", data_set);
while(p && node->details->online) {
diff --git a/lib/pengine/unpack.c b/lib/pengine/unpack.c
index c149f49..6a125b0 100644
--- a/lib/pengine/unpack.c
+++ b/lib/pengine/unpack.c
@@ -1318,7 +1318,9 @@ determine_online_status_fencing(pe_working_set_t * data_set, xmlNode * node_stat
if (this_node->details->shutdown) {
crm_debug("%s is shutting down", this_node->details->uname);
- online = crm_is_true(is_peer); /* Slightly different criteria since we cant shut down a dead peer */
+
+ /* Slightly different criteria since we can't shut down a dead peer */
+ online = crm_is_true(is_peer);
} else if (in_cluster == NULL) {
pe_fence_node(data_set, this_node, "because the peer has not been seen by the cluster");
@@ -2691,7 +2693,7 @@ determine_op_status(
}
/* we could clean this up significantly except for old LRMs and CRMs that
- * didnt include target_rc and liked to remap status
+ * didn't include target_rc and liked to remap status
*/
switch (rc) {
case PCMK_OCF_OK:
diff --git a/lib/pengine/utils.c b/lib/pengine/utils.c
index 49292fc..a891d83 100644
--- a/lib/pengine/utils.c
+++ b/lib/pengine/utils.c
@@ -517,7 +517,7 @@ custom_action(resource_t * rsc, char *key, const char *task,
#if 0
/*
* No point checking this
- * - if we dont have quorum we cant stonith anyway
+ * - if we dont have quorum we can't stonith anyway
*/
} else if (action->needs == rsc_req_stonith) {
crm_trace("Action %s requires only stonith", action->uuid);
@@ -1403,8 +1403,8 @@ sort_op_by_callid(gconstpointer a, gconstpointer b)
if(!decode_transition_magic(b_magic, &b_uuid, &b_id, &dummy, &dummy, &dummy, &dummy)) {
sort_return(0, "bad magic b");
}
- /* try and determin the relative age of the operation...
- * some pending operations (ie. a start) may have been supuerceeded
+ /* try to determine the relative age of the operation...
+ * some pending operations (ie. a start) may have been superseded
* by a subsequent stop
*
* [a|b]_id == -1 means its a shutdown operation and _always_ comes last
@@ -1640,7 +1640,7 @@ get_failcount_full(node_t * node, resource_t * rsc, time_t *last_failure,
free(key);
/* This block is still relevant once we omit anonymous instance numbers
- * because stopped clones wont have clone_name set
+ * because stopped clones won't have clone_name set
*/
} else if (is_not_set(rsc->flags, pe_rsc_unique)) {
search.rsc = uber_parent(rsc);
diff --git a/pengine/allocate.c b/pengine/allocate.c
index 572ba74..6462a0e 100644
--- a/pengine/allocate.c
+++ b/pengine/allocate.c
@@ -540,7 +540,8 @@ check_actions(pe_working_set_t * data_set)
/* Still need to check actions for a maintenance node to cancel existing monitor operations */
} else if (can_run_resources(node) == FALSE && node->details->maintenance == FALSE) {
- crm_trace("Skipping param check for %s: cant run resources", node->details->uname);
+ crm_trace("Skipping param check for %s: can't run resources",
+ node->details->uname);
continue;
}
@@ -1346,7 +1347,7 @@ stage6(pe_working_set_t * data_set)
char *key = stop_key(container);
GListPtr stop_list = find_actions(container->actions, key, NULL);
- crm_info("Impliying node %s is down when container %s is stopped (%p)",
+ crm_info("Implying node %s is down when container %s is stopped (%p)",
node->details->uname, container->id, stop_list);
if(stop_list) {
stonith_constraints(node, stop_list->data, data_set);
@@ -1457,7 +1458,7 @@ stage6(pe_working_set_t * data_set)
}
/*
- * Determin the sets of independent actions and the correct order for the
+ * Determine the sets of independent actions and the correct order for the
* actions in each set.
*
* Mark dependencies of un-runnable actions un-runnable
diff --git a/pengine/clone.c b/pengine/clone.c
index ebf53ed..75127e8 100644
--- a/pengine/clone.c
+++ b/pengine/clone.c
@@ -90,7 +90,7 @@ sort_clone_instance(gconstpointer a, gconstpointer b, gpointer data_set)
/* allocation order:
* - active instances
* - instances running on nodes with the least copies
- * - active instances on nodes that cant support them or are to be fenced
+ * - active instances on nodes that can't support them or are to be fenced
* - failed instances
* - inactive instances
*/
diff --git a/pengine/master.c b/pengine/master.c
index 83b9d1c..4837a53 100644
--- a/pengine/master.c
+++ b/pengine/master.c
@@ -207,7 +207,7 @@ can_be_master(resource_t * rsc)
return NULL;
} else if (can_run_resources(node) == FALSE) {
- crm_trace("Node cant run any resources: %s", node->details->uname);
+ crm_trace("Node can't run any resources: %s", node->details->uname);
return NULL;
}
diff --git a/tools/crmadmin.c b/tools/crmadmin.c
index 0e8c91d..293c099 100644
--- a/tools/crmadmin.c
+++ b/tools/crmadmin.c
@@ -319,7 +319,7 @@ do_work(void)
crm_exit(rc);
} else if (DO_RESET) {
- /* tell dest_node to initiate the shutdown proceedure
+ /* tell dest_node to initiate the shutdown procedure
*
* if dest_node is NULL, the request will be sent to the
* local node
diff --git a/tools/test.iso8601.c b/tools/test.iso8601.c
index 6d70ce4..6f54602 100644
--- a/tools/test.iso8601.c
+++ b/tools/test.iso8601.c
@@ -145,7 +145,7 @@ main(int argc, char **argv)
date_time = crm_time_new(NULL);
if (date_time == NULL) {
- fprintf(stderr, "Internal error: couldnt determin 'now' !\n");
+ fprintf(stderr, "Internal error: couldn't determine 'now'!\n");
crm_help('?', 1);
}
crm_time_log(LOG_TRACE, "Current date/time", date_time,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pacemaker.git
More information about the Debian-HA-Commits
mailing list