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: beekhof/pacemaker
...
head fork: beekhof/pacemaker
  • 5 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
1  cib/callbacks.c
View
@@ -745,6 +745,7 @@ cib_process_request(xmlNode * request, gboolean force_synchronous, gboolean priv
the_cib ? crm_element_value(the_cib, XML_ATTR_NUMUPDATES) : "0");
if ((now + 1) < time(NULL)) {
+ crm_trace("%s operation took %ds to complete", op, time(NULL) - now);
crm_write_blackbox(0, NULL);
}
4 cts/cts
View
@@ -70,8 +70,8 @@ EOF
cp $local_root/$f $cts_root/
done
- cp $local_root/report_common.in $local_root/report_common
- sed -i.sed s:@localstatedir@:/var: $local_root/report_common
+ cp $local_root/tools/report.common.in $local_root/tools/report.common
+ sed -i.sed s:@localstatedir@:/var: $local_root/tools/report.common
cp $cts_root/crm_report.in $cts_root/crm_report
sed -i.sed s:@datadir@/@PACKAGE@:$local_root/tools: $cts_root/crm_report
5 extra/cluster-clean
View
@@ -38,7 +38,7 @@ if [ $kill != 0 ]; then
echo "Cleaning processes"
cluster-helper $target -- "killall -q -9 corosync aisexec heartbeat pacemakerd pacemaker-remoted ccm stonithd ha_logd lrmd crmd pengine attrd pingd mgmtd cib fenced dlm_controld gfs_controld" &> /dev/null
- cluster-helper $target -- 'kill -q -9 `pidof valgrind`' &> /dev/null
+ cluster-helper $target -- 'kill -9 `pidof valgrind`' &> /dev/null
# Bah. Force systemd to actually look at the process and realize its dead"
cluster-helper $target -- "service corosync stop" &> /dev/null
@@ -60,6 +60,7 @@ log_files="$log_files pacemaker.log"
state_files=""
state_files="$state_files 'cib.xml*'"
+state_files="$state_files 'valgrind-*'"
state_files="$state_files 'cib-*'"
state_files="$state_files 'core.*'"
state_files="$state_files hostcache"
@@ -76,7 +77,7 @@ done
cluster-helper $target -- "find /dev/shm -name 'qb-*' -exec rm -f \{\} \;"
cluster-helper $target -- "find /var/lib/pacemaker/blackbox -name '*.*' -exec rm -f \{\} \;"
-cluster-helper $target -- "find /tmp -name 'cts-*.valgrind' -exec rm -f \{\} \;"
+cluster-helper $target -- "find /tmp -name '*.valgrind' -exec rm -f \{\} \;"
cluster-helper $target -- service rsyslog restart 2>&1 > /dev/null
cluster-helper $target -- logger -i -p daemon.info __clean_logs__
13 fencing/commands.c
View
@@ -148,6 +148,7 @@ free_async_command(async_command_t * cmd)
free(cmd->client);
free(cmd->client_name);
free(cmd->origin);
+ free(cmd->mode);
free(cmd->op);
free(cmd);
}
@@ -1560,7 +1561,7 @@ stonith_fence_get_devices_cb(GList * devices, void *user_data)
}
/* no device found! */
- stonith_send_async_reply(cmd, NULL, -EHOSTUNREACH, 0);
+ stonith_send_async_reply(cmd, NULL, -ENODEV, 0);
free_async_command(cmd);
g_list_free_full(devices, free);
@@ -1570,7 +1571,6 @@ static int
stonith_fence(xmlNode * msg)
{
const char *device_id = NULL;
- int rc = -EHOSTUNREACH;
stonith_device_t *device = NULL;
async_command_t *cmd = create_async_command(msg);
xmlNode *dev = get_xpath_object("//@" F_STONITH_TARGET, msg, LOG_ERR);
@@ -1584,10 +1584,10 @@ stonith_fence(xmlNode * msg)
device = g_hash_table_lookup(device_list, device_id);
if (device == NULL) {
crm_err("Requested device '%s' is not available", device_id);
- } else {
- schedule_stonith_command(cmd, device);
- rc = -EINPROGRESS;
+ return -ENODEV;
}
+ schedule_stonith_command(cmd, device);
+
} else {
const char *host = crm_element_value(dev, F_STONITH_TARGET);
@@ -1601,10 +1601,9 @@ stonith_fence(xmlNode * msg)
}
get_capable_devices(host, cmd->action, cmd->default_timeout, cmd,
stonith_fence_get_devices_cb);
- rc = -EINPROGRESS;
}
- return rc;
+ return -EINPROGRESS;
}
xmlNode *
1  fencing/remote.c
View
@@ -76,6 +76,7 @@ free_remote_query(gpointer data)
crm_trace("Free'ing query result from %s", query->host);
free(query->host);
+ g_list_free_full(query->device_list, free);
g_hash_table_destroy(query->custom_action_timeouts);
g_hash_table_destroy(query->verified_devices);
free(query);
2  mcp/pacemaker.sysconfig
View
@@ -85,4 +85,4 @@
# PCMK_valgrind_enabled=cib,crmd
# PCMK_callgrind_enabled=yes
# PCMK_callgrind_enabled=cib,crmd
-# VALGRIND_OPTS="--leak-check=full --trace-children=no --num-callers=25 --log-file=/tmp/pacemaker-%p.valgrind"
+# VALGRIND_OPTS="--leak-check=full --trace-children=no --num-callers=25 --log-file=/var/lib/pacemaker/valgrind-%p"

No commit comments for this range

Something went wrong with that request. Please try again.