Skip to content

Commit be2e6b1

Browse files
committed
Log: various: fix spelling errors in log messages and comments
1 parent a714a93 commit be2e6b1

File tree

13 files changed

+30
-28
lines changed

13 files changed

+30
-28
lines changed

BasicSanity.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function run_as_root() {
3131
$CMD
3232

3333
elif [ -z $TRAVIS ]; then
34-
# sudo doesn't work in builtbot, su doesn't work in travis
34+
# sudo doesn't work in buildbot, su doesn't work in travis
3535
echo "Enter the root password..."
3636
su root -c "$CMD"
3737

cib/messages.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ sync_our_cib(xmlNode * request, gboolean all)
544544

545545
/* remove the "all == FALSE" condition
546546
*
547-
* sync_from was failing, the local client wasnt being notified
547+
* sync_from was failing, the local client wasn't being notified
548548
* because it didn't know it was a reply
549549
* setting this does not prevent the other nodes from applying it
550550
* if all == TRUE

fencing/commands.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ dynamic_list_search_cb(GPid pid, int rc, const char *output, gpointer user_data)
988988

989989
/*!
990990
* \internal
991-
* \brief Returns true if any key in first is not is second or second has a different value for key
991+
* \brief Returns true if any key in first is not in second or second has a different value for key
992992
*/
993993
static int
994994
device_params_diff(GHashTable *first, GHashTable *second) {

include/crm/pengine/status.h

+5-3
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,11 @@ enum pe_action_flags {
232232
pe_action_clear = 0x00400,
233233
pe_action_dangle = 0x00800,
234234

235-
pe_action_requires_any = 0x01000, /* This action requires one or mre of its dependencies to be runnable
236-
* We use this to clear the runnable flag before checking dependencies
237-
*/
235+
/* This action requires one or more of its dependencies to be runnable.
236+
* We use this to clear the runnable flag before checking dependencies.
237+
*/
238+
pe_action_requires_any = 0x01000,
239+
238240
pe_action_reschedule = 0x02000,
239241
pe_action_tracking = 0x04000,
240242
};

lib/ais/plugin.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ pcmk_startup(struct corosync_api_v1 *init_with)
663663
if (use_mcp == FALSE) {
664664
pthread_create(&pcmk_wait_thread, NULL, pcmk_wait_dispatch, NULL);
665665
for (start_seq = 1; start_seq < max; start_seq++) {
666-
/* dont start anything with start_seq < 1 */
666+
/* don't start anything with start_seq < 1 */
667667
for (lpc = 0; lpc < max; lpc++) {
668668
if (start_seq == pcmk_children[lpc].start_seq) {
669669
spawn_child(&(pcmk_children[lpc]));
@@ -1108,7 +1108,7 @@ pcmk_shutdown(void)
11081108
wait_active = FALSE; /* stop the wait loop */
11091109

11101110
for (; phase > 0; phase--) {
1111-
/* dont stop anything with start_seq < 1 */
1111+
/* don't stop anything with start_seq < 1 */
11121112

11131113
for (lpc = max - 1; lpc >= 0; lpc--) {
11141114
if (phase != pcmk_children[lpc].start_seq) {

lib/cluster/cpg.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ send_cluster_text(int class, const char *data,
637637
free(target);
638638

639639
#if SUPPORT_PLUGIN
640-
/* The plugin is the only time we dont use CPG messaging */
640+
/* The plugin is the only time we don't use CPG messaging */
641641
if(get_cluster_type() == pcmk_cluster_classic_ais) {
642642
return send_plugin_text(class, iov);
643643
}

lib/cluster/heartbeat.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ convert_ha_field(xmlNode * parent, void *msg_v, int lpc)
117117

118118
if (rc == BZ_OUTBUFF_FULL) {
119119
size = size * 2;
120-
/* dont try to allocate more memory than we have */
120+
/* don't try to allocate more memory than we have */
121121
if (size > 0) {
122122
goto retry;
123123
}
@@ -489,7 +489,7 @@ ha_msg_dispatch(ll_cluster_t * cluster_conn, gpointer user_data)
489489
if (cluster_conn->llc_ops->msgready(cluster_conn) == 0) {
490490
crm_trace("no message ready yet");
491491
}
492-
/* invoke the callbacks but dont block.
492+
/* invoke the callbacks but don't block.
493493
* cluster_conn->llc_ops->rcvmsg(cluster_conn, 0); */
494494
msg = cluster_conn->llc_ops->readmsg(cluster_conn, 0);
495495
if (msg) {

lib/pengine/unpack.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -1494,7 +1494,7 @@ determine_online_status(xmlNode * node_state, node_t * this_node, pe_working_set
14941494
}
14951495

14961496
if (online && this_node->details->shutdown) {
1497-
/* dont run resources here */
1497+
/* don't run resources here */
14981498
this_node->fixed = TRUE;
14991499
this_node->weight = -INFINITY;
15001500
}
@@ -2381,14 +2381,14 @@ find_lrm_op(const char *resource, const char *op, const char *node, const char *
23812381
}
23822382

23832383
static void
2384-
unpack_rsc_migration(resource_t *rsc, node_t *node, xmlNode *xml_op, pe_working_set_t * data_set)
2384+
unpack_rsc_migration(resource_t *rsc, node_t *node, xmlNode *xml_op, pe_working_set_t * data_set)
23852385
{
2386-
2386+
23872387
/*
23882388
* The normal sequence is (now): migrate_to(Src) -> migrate_from(Tgt) -> stop(Src)
23892389
*
2390-
* So if a migrate_to is followed by a stop, then we dont need to care what
2391-
* happended on the target node
2390+
* So if a migrate_to is followed by a stop, then we don't need to care what
2391+
* happened on the target node
23922392
*
23932393
* Without the stop, we need to look for a successful migrate_from.
23942394
* This would also imply we're no longer running on the source
@@ -3096,13 +3096,13 @@ unpack_rsc_op(resource_t * rsc, node_t * node, xmlNode * xml_op, xmlNode ** last
30963096
if (is_not_set(rsc->flags, pe_rsc_unique)) {
30973097
parent = uber_parent(rsc);
30983098
}
3099-
3099+
31003100
pe_rsc_trace(rsc, "Unpacking task %s/%s (call_id=%d, status=%d, rc=%d) on %s (role=%s)",
31013101
task_key, task, task_id, status, rc, node->details->uname, role2text(rsc->role));
31023102

31033103
if (node->details->unclean) {
31043104
pe_rsc_trace(rsc, "Node %s (where %s is running) is unclean."
3105-
" Further action depends on the value of the stop's on-fail attribue",
3105+
" Further action depends on the value of the stop's on-fail attribute",
31063106
node->details->uname, rsc->id);
31073107
}
31083108

lib/pengine/utils.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ custom_action(resource_t * rsc, char *key, const char *task,
516516
#if 0
517517
/*
518518
* No point checking this
519-
* - if we dont have quorum we can't stonith anyway
519+
* - if we don't have quorum we can't stonith anyway
520520
*/
521521
} else if (action->needs == rsc_req_stonith) {
522522
crm_trace("Action %s requires only stonith", action->uuid);
@@ -1418,7 +1418,7 @@ sort_op_by_callid(gconstpointer a, gconstpointer b)
14181418
*
14191419
* if the UUID from the TE doesn't match then one better
14201420
* be a pending operation.
1421-
* pending operations dont survive between elections and joins
1421+
* pending operations don't survive between elections and joins
14221422
* because we query the LRM directly
14231423
*/
14241424

@@ -2098,7 +2098,7 @@ trigger_unfencing(
20982098
return;
20992099

21002100
} else if (rsc != NULL && is_not_set(rsc->flags, pe_rsc_fence_device)) {
2101-
/* Wasnt a stonith device */
2101+
/* Wasn't a stonith device */
21022102
return;
21032103

21042104
} else if(node

mcp/pacemaker.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ pcmk_shutdown_worker(gpointer user_data)
384384
}
385385

386386
for (; phase > 0; phase--) {
387-
/* dont stop anything with start_seq < 1 */
387+
/* Don't stop anything with start_seq < 1 */
388388

389389
for (lpc = max - 1; lpc >= 0; lpc--) {
390390
pcmk_child_t *child = &(pcmk_children[lpc]);
@@ -782,7 +782,7 @@ init_children_processes(void)
782782

783783
/* start any children that have not been detected */
784784
for (start_seq = 1; start_seq < max; start_seq++) {
785-
/* dont start anything with start_seq < 1 */
785+
/* don't start anything with start_seq < 1 */
786786
for (lpc = 0; lpc < max; lpc++) {
787787
if (pcmk_children[lpc].pid) {
788788
/* we are already tracking it */

pengine/graph.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -363,13 +363,13 @@ graph_update_action(action_t * first, action_t * then, node_t * node, enum pe_ac
363363
&& (flags & pe_action_optional) == 0) {
364364
processed = TRUE;
365365
crm_trace("%s implies %s printed", first->uuid, then->uuid);
366-
update_action_flags(then, pe_action_print_always, __FUNCTION__); /* dont care about changed */
366+
update_action_flags(then, pe_action_print_always, __FUNCTION__); /* don't care about changed */
367367
}
368368

369369
if ((type & pe_order_implies_first_printed) && (flags & pe_action_optional) == 0) {
370370
processed = TRUE;
371371
crm_trace("%s implies %s printed", then->uuid, first->uuid);
372-
update_action_flags(first, pe_action_print_always, __FUNCTION__); /* dont care about changed */
372+
update_action_flags(first, pe_action_print_always, __FUNCTION__); /* don't care about changed */
373373
}
374374

375375
if ((type & pe_order_implies_then

pengine/native.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -2879,7 +2879,7 @@ native_start_constraints(resource_t * rsc, action_t * stonith_op, pe_working_set
28792879

28802880
} else if (safe_str_eq(action->task, RSC_START)
28812881
&& NULL == pe_hash_table_lookup(rsc->known_on, target->details->id)) {
2882-
/* if known == NULL, then we dont know if
2882+
/* if known == NULL, then we don't know if
28832883
* the resource is active on the node
28842884
* we're about to shoot
28852885
*
@@ -2891,7 +2891,7 @@ native_start_constraints(resource_t * rsc, action_t * stonith_op, pe_working_set
28912891
* it's analogous to waiting for all the probes
28922892
* for rscX to complete before starting rscX
28932893
*
2894-
* the most likely explaination is that the
2894+
* the most likely explanation is that the
28952895
* DC died and took its status with it
28962896
*/
28972897

pengine/regression.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ do_test clone-require-all-7 "clone A and B both start at the same time. all inst
138138
do_test clone-require-all-no-interleave-1 "C starts everywhere after A and B"
139139
do_test clone-require-all-no-interleave-2 "C starts on nodes 1, 2, and 4 with only one active instance of B"
140140
do_test clone-require-all-no-interleave-3 "C remains active when instance of B is stopped on one node and started on another."
141-
do_test one-or-more-unrunnnable-instances "Avoid dependencies on instances that wont ever be started"
141+
do_test one-or-more-unrunnnable-instances "Avoid dependencies on instances that won't ever be started"
142142

143143
echo ""
144144
do_test order1 "Order start 1 "

0 commit comments

Comments
 (0)