Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: simbacai/pacemaker
base: 9812e5b81f
...
head fork: ClusterLabs/pacemaker
compare: 5ad4f88b7a
  • 6 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
14 lib/common/xml.c
View
@@ -323,16 +323,10 @@ pcmkDeregisterNode(xmlNodePtr node)
{
xml_private_t *p = node->_private;
- switch(node->type) {
- case XML_ELEMENT_NODE:
- case XML_DOCUMENT_NODE:
- case XML_ATTRIBUTE_NODE:
- CRM_ASSERT(node->_private != NULL);
- CRM_ASSERT(p->check == (long) 0x81726354);
- free(node->_private);
- break;
- default:
- break;
+ if(p) {
+ CRM_ASSERT(node->_private != NULL);
+ CRM_ASSERT(p->check == (long) 0x81726354);
+ free(node->_private);
}
}
8 lib/fencing/st_client.c
View
@@ -2421,7 +2421,6 @@ stonith_api_time(uint32_t nodeid, const char *uname, bool in_progress)
char *name = NULL;
time_t when = 0;
- time_t progress = 0;
stonith_t *st = NULL;
stonith_history_t *history, *hp = NULL;
enum stonith_call_options opts = st_opt_sync_call;
@@ -2453,9 +2452,6 @@ stonith_api_time(uint32_t nodeid, const char *uname, bool in_progress)
entries++;
if (in_progress) {
progress++;
- if (hp->state != st_done && hp->state != st_failed) {
- progress = time(NULL);
- }
} else if (hp->state == st_done) {
completed++;
@@ -2472,10 +2468,6 @@ stonith_api_time(uint32_t nodeid, const char *uname, bool in_progress)
}
}
- if (progress) {
- when = progress;
- }
-
if (st) {
st->cmds->disconnect(st);
stonith_api_delete(st);
1  pengine/allocate.c
View
@@ -172,6 +172,7 @@ CancelXmlOp(resource_t * rsc, xmlNode * xml_op, node_t * active_node,
cancel = custom_action(rsc, strdup(key), RSC_CANCEL, active_node, FALSE, TRUE, data_set);
free(cancel->task);
+ free(cancel->cancel_task);
cancel->task = strdup(RSC_CANCEL);
cancel->cancel_task = strdup(task);
2  pengine/native.c
View
@@ -730,6 +730,7 @@ RecurringOp(resource_t * rsc, action_t * start, node_t * node,
mon = custom_action(rsc, local_key, RSC_CANCEL, node, FALSE, TRUE, data_set);
free(mon->task);
+ free(mon->cancel_task);
mon->task = strdup(RSC_CANCEL);
mon->cancel_task = strdup(name);
add_hash_param(mon->meta, XML_LRM_ATTR_INTERVAL, interval);
@@ -907,6 +908,7 @@ RecurringOp_Stopped(resource_t * rsc, action_t * start, node_t * node,
cancel_op = custom_action(rsc, local_key, RSC_CANCEL, node, FALSE, TRUE, data_set);
free(cancel_op->task);
+ free(cancel_op->cancel_task);
cancel_op->task = strdup(RSC_CANCEL);
cancel_op->cancel_task = strdup(name);
add_hash_param(cancel_op->meta, XML_LRM_ATTR_INTERVAL, interval);
2  tools/crm_resource.c
View
@@ -857,7 +857,7 @@ parse_cli_lifetime(const char *input)
if (duration == NULL) {
CMD_ERR("Invalid duration specified: %s\n", move_lifetime);
CMD_ERR("Please refer to"
- " http://en.wikipedia.org/wiki/ISO_8601#Duration"
+ " http://en.wikipedia.org/wiki/ISO_8601#Durations"
" for examples of valid durations\n");
return NULL;
}

No commit comments for this range

Something went wrong with that request. Please try again.