No OneTemporary
Actions

Size

43 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/include/crm/common/logging.h b/include/crm/common/logging.h
	index 5b8e47ff55..642fa92c08 100644
	--- a/include/crm/common/logging.h
	+++ b/include/crm/common/logging.h
	@@ -1,210 +1,210 @@
	/*
	* Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
	*
	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*
	* This software is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* General Public License for more details.
	*
	* You should have received a copy of the GNU General Public
	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	*/

	/**
	* \file
	* \brief Wrappers for and extensions to libqb logging
	* \ingroup core
	*/

	#ifndef CRM_LOGGING__H
	# define CRM_LOGGING__H
	# include <qb/qblog.h>
	# ifndef LOG_TRACE
	# define LOG_TRACE LOG_DEBUG+1
	# endif
	# define LOG_DEBUG_2 LOG_TRACE
	# define LOG_DEBUG_3 LOG_TRACE
	# define LOG_DEBUG_4 LOG_TRACE
	# define LOG_DEBUG_5 LOG_TRACE
	# define LOG_DEBUG_6 LOG_TRACE

	extern unsigned int crm_log_level;
	extern gboolean crm_config_error;
	extern gboolean crm_config_warning;
	extern unsigned int crm_trace_nonlog;

	enum xml_log_options
	{
	xml_log_option_filtered = 0x0001,
	xml_log_option_formatted = 0x0002,
	xml_log_option_diff_plus = 0x0010,
	xml_log_option_diff_minus = 0x0020,
	xml_log_option_diff_short = 0x0040,
	xml_log_option_diff_all = 0x0100,
	xml_log_option_dirty_add = 0x1000,
	xml_log_option_open = 0x2000,
	xml_log_option_children = 0x4000,
	xml_log_option_close = 0x8000,
	};

	void crm_enable_blackbox(int nsig);
	void crm_disable_blackbox(int nsig);
	void crm_write_blackbox(int nsig, struct qb_log_callsite *callsite);

	void crm_update_callsites(void);

	void crm_log_deinit(void);

	gboolean crm_log_cli_init(const char *entity);

	void crm_log_preinit(const char entity, int argc, char *argv);
	gboolean crm_log_init(const char *entity, uint8_t level, gboolean daemon,
	gboolean to_stderr, int argc, char **argv, gboolean quiet);

	void crm_log_args(int argc, char **argv);
	void crm_log_output_fn(const char file, const char function, int line, int level,
	const char prefix, const char output);
	# define crm_log_output(level, prefix, output) crm_log_output_fn(__FILE__, __FUNCTION__, __LINE__, level, prefix, output)

	gboolean crm_add_logfile(const char *filename);

	void crm_bump_log_level(int argc, char **argv);

	void crm_enable_stderr(int enable);

	gboolean crm_is_callsite_active(struct qb_log_callsite *cs, uint8_t level, uint32_t tags);

	void log_data_element(int log_level, const char file, const char function, int line,
	const char prefix, xmlNode data, int depth, gboolean formatted);

	/* returns the old value */
	unsigned int set_crm_log_level(unsigned int level);

	unsigned int get_crm_log_level(void);

	/*
	* Throughout the macros below, note the leading, pre-comma, space in the
	* various ' , ##args' occurences to aid portability across versions of 'gcc'.
	* http://gcc.gnu.org/onlinedocs/cpp/Variadic-Macros.html#Variadic-Macros
	*/
	#if defined(__clang__)
	# define CRM_TRACE_INIT_DATA(name)
	# else
	# define CRM_TRACE_INIT_DATA(name) QB_LOG_INIT_DATA(name)
	#endif

	# define do_crm_log(level, fmt, args...) qb_log_from_external_source( __func__, __FILE__, fmt, level, __LINE__, 0, ##args)

	/* level /MUST/ be a constant or compilation will fail */
	# define do_crm_log_unlikely(level, fmt, args...) do { \
	static struct qb_log_callsite *trace_cs = NULL; \
	if(trace_cs == NULL) { \
	trace_cs = qb_log_callsite_get(__func__, __FILE__, fmt, level, __LINE__, 0); \
	} \
	if (crm_is_callsite_active(trace_cs, level, 0)) { \
	qb_log_from_external_source( \
	__func__, __FILE__, fmt, level, __LINE__, 0, ##args); \
	} \
	} while(0)

	# define CRM_LOG_ASSERT(expr) do { \
	if(__unlikely((expr) == FALSE)) { \
	static struct qb_log_callsite *core_cs = NULL; \
	if(core_cs == NULL) { \
	core_cs = qb_log_callsite_get(__func__, __FILE__, "log-assert", LOG_TRACE, __LINE__, 0); \
	} \
	crm_abort(__FILE__, __FUNCTION__, __LINE__, #expr, \
	core_cs?core_cs->targets:FALSE, TRUE); \
	} \
	} while(0)

	/* 'failure_action' MUST NOT be 'continue' as it will apply to the
	* macro's do-while loop
	*/
	# define CRM_CHECK(expr, failure_action) do { \
	if(__unlikely((expr) == FALSE)) { \
	static struct qb_log_callsite *core_cs = NULL; \
	if(core_cs == NULL) { \
	core_cs = qb_log_callsite_get(__func__, __FILE__, "check-assert", LOG_TRACE, __LINE__, 0); \
	} \
	crm_abort(__FILE__, __FUNCTION__, __LINE__, #expr, \
	core_cs?core_cs->targets:FALSE, TRUE); \
	failure_action; \
	} \
	} while(0)

	# define do_crm_log_xml(level, text, xml) do { \
	static struct qb_log_callsite *xml_cs = NULL; \
	if(xml_cs == NULL) { \
	xml_cs = qb_log_callsite_get(__func__, __FILE__, "xml-blob", level, __LINE__, 0); \
	} \
	if (crm_is_callsite_active(xml_cs, level, 0)) { \
	log_data_element(level, __FILE__, __FUNCTION__, __LINE__, text, xml, 1, xml_log_option_formatted); \
	} \
	} while(0)

	# define do_crm_log_alias(level, file, function, line, fmt, args...) do { \
	if(level > 0) { \
	qb_log_from_external_source(function, file, fmt, level, line, 0, ##args); \
	} else { \
	printf(fmt "\n", ##args); \
	} \
	} while(0)

	-# define do_crm_log_always(level, fmt, args...) qb_log(level, "%s: " fmt, __FUNCTION__ , ##args)
	+# define do_crm_log_always(level, fmt, args...) qb_log(level, fmt , ##args)

	# define crm_perror(level, fmt, args...) do { \
	const char *err = strerror(errno); \
	if(level <= crm_log_level) { \
	fprintf(stderr, "%s: " fmt ": %s (%d)\n", __FUNCTION__, ##args, err, errno); \
	} \
	do_crm_log(level, fmt ": %s (%d)", ##args, err, errno); \
	} while(0)

	# define crm_log_tag(level, tag, fmt, args...) do { \
	static struct qb_log_callsite *trace_tag_cs = NULL; \
	int converted_tag = g_quark_try_string(tag); \
	if(trace_tag_cs == NULL) { \
	trace_tag_cs = qb_log_callsite_get(__func__, __FILE__, fmt, level, __LINE__, converted_tag); \
	} \
	if (crm_is_callsite_active(trace_tag_cs, level, converted_tag)) { \
	qb_log_from_external_source( __func__, __FILE__, fmt, level, __LINE__, converted_tag, ##args); \
	} \
	} while(0)

	# define crm_crit(fmt, args...) qb_logt(LOG_CRIT, 0, fmt , ##args)
	# define crm_err(fmt, args...) qb_logt(LOG_ERR, 0, fmt , ##args)
	# define crm_warn(fmt, args...) qb_logt(LOG_WARNING, 0, fmt , ##args)
	# define crm_notice(fmt, args...) qb_logt(LOG_NOTICE, 0, fmt , ##args)
	# define crm_info(fmt, args...) qb_logt(LOG_INFO, 0, fmt , ##args)

	# define crm_debug(fmt, args...) do_crm_log_unlikely(LOG_DEBUG, fmt , ##args)
	# define crm_trace(fmt, args...) do_crm_log_unlikely(LOG_TRACE, fmt , ##args)

	# define crm_log_xml_crit(xml, text) do_crm_log_xml(LOG_CRIT, text, xml)
	# define crm_log_xml_err(xml, text) do_crm_log_xml(LOG_ERR, text, xml)
	# define crm_log_xml_warn(xml, text) do_crm_log_xml(LOG_WARNING, text, xml)
	# define crm_log_xml_notice(xml, text) do_crm_log_xml(LOG_NOTICE, text, xml)
	# define crm_log_xml_info(xml, text) do_crm_log_xml(LOG_INFO, text, xml)
	# define crm_log_xml_debug(xml, text) do_crm_log_xml(LOG_DEBUG, text, xml)
	# define crm_log_xml_trace(xml, text) do_crm_log_xml(LOG_TRACE, text, xml)

	# define crm_log_xml_explicit(xml, text) do { \
	static struct qb_log_callsite *digest_cs = NULL; \
	digest_cs = qb_log_callsite_get( \
	__func__, __FILE__, text, LOG_TRACE, __LINE__, \
	crm_trace_nonlog); \
	if (digest_cs && digest_cs->targets) { \
	do_crm_log_xml(LOG_TRACE, text, xml); \
	} \
	} while(0)

	# define crm_str(x) (const char*)(x?x:"<null>")

	#endif
	diff --git a/lib/services/dbus.c b/lib/services/dbus.c
	index c0153b5f02..74c5a50796 100644
	--- a/lib/services/dbus.c
	+++ b/lib/services/dbus.c
	@@ -1,483 +1,486 @@
	#include <crm_internal.h>
	#include <crm/crm.h>
	#include <crm/services.h>
	#include <dbus/dbus.h>
	#include <pcmk-dbus.h>

	#define BUS_PROPERTY_IFACE "org.freedesktop.DBus.Properties"

	struct db_getall_data
	{
	char *name;
	char *target;
	char *object;
	void *userdata;
	void (callback)(const char name, const char value, void userdata);
	};

	static bool pcmk_dbus_error_check(DBusError err, const char prefix, const char *function, int line)
	{
	if (err && dbus_error_is_set(err)) {
	do_crm_log_alias(LOG_ERR, __FILE__, function, line, "%s: DBus error '%s'", prefix, err->message);
	dbus_error_free(err);
	return TRUE;
	}
	return FALSE;
	}

	DBusConnection *pcmk_dbus_connect(void)
	{
	DBusError err;
	DBusConnection *connection;

	dbus_error_init(&err);
	connection = dbus_bus_get(DBUS_BUS_SYSTEM, &err);
	if(pcmk_dbus_error_check(&err, "Could not connect to System DBus", __FUNCTION__, __LINE__)) {
	return NULL;
	}

	if(connection) {
	pcmk_dbus_connection_setup_with_select(connection);
	}
	return connection;
	}

	void pcmk_dbus_disconnect(DBusConnection *connection)
	{
	}

	bool
	pcmk_dbus_find_error(const char method, DBusPendingCall pending, DBusMessage reply, DBusError ret)
	{
	DBusError error;

	dbus_error_init(&error);

	if(pending == NULL) {
	error.name = "org.clusterlabs.pacemaker.NoRequest";
	error.message = "No request sent";

	} else if(reply == NULL) {
	error.name = "org.clusterlabs.pacemaker.NoReply";
	error.message = "No reply";

	} else {
	DBusMessageIter args;
	int dtype = dbus_message_get_type(reply);

	switch(dtype) {
	case DBUS_MESSAGE_TYPE_METHOD_RETURN:
	dbus_message_iter_init(reply, &args);
	crm_trace("Call to %s returned '%s'", method, dbus_message_iter_get_signature(&args));
	break;
	case DBUS_MESSAGE_TYPE_INVALID:
	error.message = "Invalid reply";
	error.name = "org.clusterlabs.pacemaker.InvalidReply";
	crm_err("Error processing %s response: %s", method, error.message);
	break;
	case DBUS_MESSAGE_TYPE_METHOD_CALL:
	error.message = "Invalid reply (method call)";
	error.name = "org.clusterlabs.pacemaker.InvalidReply.Method";
	crm_err("Error processing %s response: %s", method, error.message);
	break;
	case DBUS_MESSAGE_TYPE_SIGNAL:
	error.message = "Invalid reply (signal)";
	error.name = "org.clusterlabs.pacemaker.InvalidReply.Signal";
	crm_err("Error processing %s response: %s", method, error.message);
	break;

	case DBUS_MESSAGE_TYPE_ERROR:
	dbus_set_error_from_message (&error, reply);
	crm_info("%s error '%s': %s", method, error.name, error.message);
	break;
	default:
	error.message = "Unknown reply type";
	error.name = "org.clusterlabs.pacemaker.InvalidReply.Type";
	crm_err("Error processing %s response: %s (%d)", method, error.message, dtype);
	}
	}

	if(ret && (error.name \|\| error.message)) {
	*ret = error;
	return TRUE;
	}

	return FALSE;
	}

	DBusMessage pcmk_dbus_send_recv(DBusMessage msg, DBusConnection connection, DBusError error)
	{
	const char *method = NULL;
	DBusMessage *reply = NULL;
	DBusPendingCall* pending = NULL;

	CRM_ASSERT(dbus_message_get_type (msg) == DBUS_MESSAGE_TYPE_METHOD_CALL);
	method = dbus_message_get_member (msg);

	// send message and get a handle for a reply
	if (!dbus_connection_send_with_reply (connection, msg, &pending, -1/* aka. DBUS_TIMEOUT_USE_DEFAULT */)) {
	if(error) {
	dbus_error_init(error);
	error->message = "Call to dbus_connection_send_with_reply() failed";
	error->name = "org.clusterlabs.pacemaker.SendFailed";
	}
	crm_err("Error sending %s request", method);
	return NULL;
	}

	dbus_connection_flush(connection);

	if(pending) {
	/* block until we receive a reply */
	dbus_pending_call_block(pending);

	/* get the reply message */
	reply = dbus_pending_call_steal_reply(pending);
	}

	pcmk_dbus_find_error(method, pending, reply, error);

	if(pending) {
	/* free the pending message handle */
	dbus_pending_call_unref(pending);
	}

	return reply;
	}

	bool pcmk_dbus_send(DBusMessage msg, DBusConnection connection,
	void(done)(DBusPendingCall pending, void user_data), void user_data)
	{
	DBusError error;
	const char *method = NULL;
	DBusPendingCall* pending = NULL;

	dbus_error_init(&error);

	CRM_ASSERT(done);
	CRM_ASSERT(dbus_message_get_type (msg) == DBUS_MESSAGE_TYPE_METHOD_CALL);
	method = dbus_message_get_member (msg);

	// send message and get a handle for a reply
	if (!dbus_connection_send_with_reply (connection, msg, &pending, -1/* aka. DBUS_TIMEOUT_USE_DEFAULT */)) { // -1 is default timeout
	crm_err("Send with reply failed for %s", method);
	return FALSE;

	} else if (pending == NULL) {
	crm_err("No pending call found for %s", method);
	return FALSE;

	}

	- if (dbus_pending_call_get_completed(pending)) {
	+ if (done && dbus_pending_call_get_completed(pending)) {
	crm_info("DBus %s call completed too soon");
	#if 1
	/* This sounds like a good idea, but allegedly it breaks things */
	done(pending, user_data);
	#else
	CRM_ASSERT(dbus_pending_call_set_notify(pending, done, user_data, NULL));
	#endif

	- } else {
	+ } else if(done) {
	CRM_ASSERT(dbus_pending_call_set_notify(pending, done, user_data, NULL));
	+
	+ } else {
	+ crm_info("DBus %s call completed too soon");
	}
	return TRUE;
	}

	bool pcmk_dbus_type_check(DBusMessage msg, DBusMessageIter field, int expected, const char *function, int line)
	{
	int dtype = 0;
	DBusMessageIter lfield;

	if(field == NULL) {
	if(dbus_message_iter_init(msg, &lfield)) {
	field = &lfield;
	}
	}

	if(field == NULL) {
	do_crm_log_alias(LOG_ERR, __FILE__, function, line,
	"Empty parameter list in reply expecting '%c'", expected);
	return FALSE;
	}

	dtype = dbus_message_iter_get_arg_type(field);

	if(dtype != expected) {
	DBusMessageIter args;

	dbus_message_iter_init(msg, &args);
	do_crm_log_alias(LOG_ERR, __FILE__, function, line,
	"Unexepcted DBus type, expected %c in '%s' instead of %c",
	expected, dbus_message_iter_get_signature(&args), dtype);
	return FALSE;
	}

	return TRUE;
	}

	static char *
	pcmk_dbus_lookup_result(DBusMessage reply, struct db_getall_data data)
	{
	DBusError error;
	char *output = NULL;
	DBusMessageIter dict;
	DBusMessageIter args;

	if(pcmk_dbus_find_error("GetAll", (void*)&error, reply, &error)) {
	crm_err("Cannot get properties from %s for %s", data->target, data->object);
	goto cleanup;
	}

	dbus_message_iter_init(reply, &args);
	if(!pcmk_dbus_type_check(reply, &args, DBUS_TYPE_ARRAY, __FUNCTION__, __LINE__)) {
	crm_err("Invalid reply from %s for %s", data->target, data->object);
	goto cleanup;
	}

	dbus_message_iter_recurse(&args, &dict);
	while (dbus_message_iter_get_arg_type (&dict) != DBUS_TYPE_INVALID) {
	DBusMessageIter sv;
	DBusMessageIter v;
	DBusBasicValue name;
	DBusBasicValue value;

	if(!pcmk_dbus_type_check(reply, &dict, DBUS_TYPE_DICT_ENTRY, __FUNCTION__, __LINE__)) {
	dbus_message_iter_next (&dict);
	continue;
	}

	dbus_message_iter_recurse(&dict, &sv);
	while (dbus_message_iter_get_arg_type (&sv) != DBUS_TYPE_INVALID) {
	int dtype = dbus_message_iter_get_arg_type(&sv);

	switch(dtype) {
	case DBUS_TYPE_STRING:
	dbus_message_iter_get_basic(&sv, &name);

	if(data->name && strcmp(name.str, data->name) != 0) {
	dbus_message_iter_next (&sv); /* Skip the value */
	}
	break;
	case DBUS_TYPE_VARIANT:
	dbus_message_iter_recurse(&sv, &v);
	if(pcmk_dbus_type_check(reply, &v, DBUS_TYPE_STRING, __FUNCTION__, __LINE__)) {
	dbus_message_iter_get_basic(&v, &value);

	crm_trace("Property %s[%s] is '%s'", data->object, name.str, value.str);
	if(data->callback) {
	data->callback(name.str, value.str, data->userdata);

	} else {
	output = strdup(value.str);
	}

	if(data->name) {
	goto cleanup;
	}
	}
	break;
	default:
	pcmk_dbus_type_check(reply, &sv, DBUS_TYPE_STRING, __FUNCTION__, __LINE__);
	}
	dbus_message_iter_next (&sv);
	}

	dbus_message_iter_next (&dict);
	}

	cleanup:
	free(data->target);
	free(data->object);
	free(data->name);
	free(data);

	return output;
	}

	static void
	pcmk_dbus_lookup_cb(DBusPendingCall pending, void user_data)
	{
	DBusMessage *reply = NULL;

	if(pending) {
	reply = dbus_pending_call_steal_reply(pending);
	}

	pcmk_dbus_lookup_result(reply, user_data);

	if(reply) {
	dbus_message_unref(reply);
	}
	}

	char *
	pcmk_dbus_get_property(
	DBusConnection connection, const char target, const char obj, const gchar iface, const char *name,
	void (callback)(const char name, const char value, void userdata), void *userdata)
	{
	DBusMessage *msg;
	const char *method = "GetAll";
	char *output = NULL;

	struct db_getall_data *query_data = NULL;

	/* char state = pcmk_dbus_get_property(systemd_proxy, BUS_NAME, unit, BUS_NAME ".Unit", "ActiveState"); /

	crm_debug("Calling: %s on %s", method, target);
	msg = dbus_message_new_method_call(target, // target for the method call
	obj, // object to call on
	BUS_PROPERTY_IFACE, // interface to call on
	method); // method name

	if (NULL == msg) {
	crm_err("Call to %s failed: No message", method);
	return NULL;
	}

	CRM_LOG_ASSERT(dbus_message_append_args(msg, DBUS_TYPE_STRING, &iface, DBUS_TYPE_INVALID));

	query_data = malloc(sizeof(struct db_getall_data));
	if(query_data == NULL) {
	crm_err("Call to %s failed: malloc failed", method);
	return NULL;
	}

	query_data->target = strdup(target);
	query_data->object = strdup(obj);
	query_data->callback = callback;
	query_data->userdata = userdata;
	query_data->name = NULL;

	if(name) {
	query_data->name = strdup(name);
	}

	if(query_data->callback) {
	pcmk_dbus_send(msg, connection, pcmk_dbus_lookup_cb, query_data);

	} else {
	DBusMessage *reply = pcmk_dbus_send_recv(msg, connection, NULL);

	output = pcmk_dbus_lookup_result(reply, query_data);

	if(reply) {
	dbus_message_unref(reply);
	}
	}

	dbus_message_unref(msg);

	return output;
	}

	static void pcmk_dbus_connection_dispatch(DBusConnection connection, DBusDispatchStatus new_status, void data){
	crm_trace("status %d for %p", new_status, data);
	if (new_status == DBUS_DISPATCH_DATA_REMAINS){
	dbus_connection_dispatch(connection);
	}
	}

	static int
	pcmk_dbus_watch_dispatch(gpointer userdata)
	{
	DBusWatch *watch = userdata;
	int flags = dbus_watch_get_flags(watch);

	crm_trace("Dispatching %p with flags %d", watch, flags);
	if(flags & DBUS_WATCH_READABLE) {
	dbus_watch_handle(watch, DBUS_WATCH_READABLE);
	} else {
	dbus_watch_handle(watch, DBUS_WATCH_ERROR);
	}
	return 0;
	}

	static void
	pcmk_dbus_watch_destroy(gpointer userdata)
	{
	crm_trace("Destroyed %p", userdata);
	}


	struct mainloop_fd_callbacks pcmk_dbus_cb = {
	.dispatch = pcmk_dbus_watch_dispatch,
	.destroy = pcmk_dbus_watch_destroy,
	};

	static dbus_bool_t
	pcmk_dbus_watch_add(DBusWatch watch, void data){
	int fd = dbus_watch_get_unix_fd(watch);

	mainloop_io_t *client = mainloop_add_fd(
	"dbus", G_PRIORITY_DEFAULT, fd, watch, &pcmk_dbus_cb);

	crm_trace("Added %p with fd=%d", watch, fd);
	dbus_watch_set_data(watch, client, NULL);
	return TRUE;
	}

	static void
	pcmk_dbus_watch_toggle(DBusWatch watch, void data)
	{
	mainloop_io_t *client = dbus_watch_get_data(watch);
	crm_notice("DBus client %p is now %s", client, dbus_watch_get_enabled(watch)?"enabled":"disabled");
	}


	static void
	pcmk_dbus_watch_remove(DBusWatch watch, void data){
	mainloop_io_t *client = dbus_watch_get_data(watch);

	crm_trace("Removed %p", watch);
	mainloop_del_fd(client);
	}

	static gboolean
	pcmk_dbus_timeout_dispatch(gpointer data)
	{
	crm_trace("Timeout for %p");
	dbus_timeout_handle(data);
	return FALSE;
	}

	static dbus_bool_t
	pcmk_dbus_timeout_add(DBusTimeout timeout, void data){
	guint id = g_timeout_add(dbus_timeout_get_interval(timeout), pcmk_dbus_timeout_dispatch, timeout);

	if(id) {
	dbus_timeout_set_data(timeout, GUINT_TO_POINTER(id), NULL);
	}
	return TRUE;
	}

	static void
	pcmk_dbus_timeout_remove(DBusTimeout timeout, void data){
	void *vid = dbus_timeout_get_data(timeout);
	guint id = GPOINTER_TO_UINT(vid);

	if(id) {
	g_source_remove(id);
	dbus_timeout_set_data(timeout, 0, NULL);
	}
	}

	static void
	pcmk_dbus_timeout_toggle(DBusTimeout timeout, void data){
	if(dbus_timeout_get_enabled(timeout)) {
	pcmk_dbus_timeout_add(timeout, data);
	} else {
	pcmk_dbus_timeout_remove(timeout, data);
	}
	}

	/* Inspired by http://www.kolej.mff.cuni.cz/~vesej3am/devel/dbus-select.c */

	void pcmk_dbus_connection_setup_with_select(DBusConnection *c){
	dbus_connection_set_timeout_functions(
	c, pcmk_dbus_timeout_add, pcmk_dbus_timeout_remove, pcmk_dbus_timeout_toggle, NULL, NULL);
	dbus_connection_set_watch_functions(c, pcmk_dbus_watch_add, pcmk_dbus_watch_remove, pcmk_dbus_watch_toggle, NULL, NULL);
	dbus_connection_set_dispatch_status_function(c, pcmk_dbus_connection_dispatch, NULL, NULL);

	pcmk_dbus_connection_dispatch(c, dbus_connection_get_dispatch_status(c), NULL);
	}
	diff --git a/lib/services/systemd.c b/lib/services/systemd.c
	index 9a7b0789d4..bc5878130d 100644
	--- a/lib/services/systemd.c
	+++ b/lib/services/systemd.c
	@@ -1,603 +1,626 @@
	/*
	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public
	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.
	*
	* This software is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* General Public License for more details.
	*
	* You should have received a copy of the GNU General Public
	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	*
	* Copyright (C) 2012 Andrew Beekhof <andrew@beekhof.net>
	*/

	#include <crm_internal.h>
	#include <crm/crm.h>
	#include <crm/services.h>
	#include <crm/common/mainloop.h>

	#include <gio/gio.h>
	#include <services_private.h>
	#include <systemd.h>
	#include <dbus/dbus.h>
	#include <pcmk-dbus.h>

	#define BUS_NAME "org.freedesktop.systemd1"
	#define BUS_PATH "/org/freedesktop/systemd1"

	#define BUS_PROPERTY_IFACE "org.freedesktop.DBus.Properties"

	/*
	/usr/share/dbus-1/interfaces/org.freedesktop.systemd1.Manager.xml
	*/
	gboolean
	systemd_unit_exec_with_unit(svc_action_t * op, const char *unit);


	struct unit_info {
	const char *id;
	const char *description;
	const char *load_state;
	const char *active_state;
	const char *sub_state;
	const char *following;
	const char *unit_path;
	uint32_t job_id;
	const char *job_type;
	const char *job_path;
	};

	struct pcmk_dbus_data
	{
	char *name;
	char *unit;
	DBusError error;
	svc_action_t *op;
	void (callback)(DBusMessage reply, svc_action_t *op);
	};

	static DBusMessage systemd_new_method(const char iface, const char *method)
	{
	crm_trace("Calling: %s on %s", method, iface);
	return dbus_message_new_method_call(BUS_NAME, // target for the method call
	BUS_PATH, // object to call on
	iface, // interface to call on
	method); // method name
	}


	static DBusConnection* systemd_proxy = NULL;
	static gboolean
	systemd_init(void)
	{
	static int need_init = 1;
	/* http://dbus.freedesktop.org/doc/api/html/group__DBusConnection.html */

	if (need_init) {
	need_init = 0;
	systemd_proxy = pcmk_dbus_connect();
	}
	if (systemd_proxy == NULL) {
	return FALSE;
	}
	return TRUE;
	}

	void
	systemd_cleanup(void)
	{
	if (systemd_proxy) {
	pcmk_dbus_disconnect(systemd_proxy);
	systemd_proxy = NULL;
	}
	}

	static char *
	systemd_service_name(const char *name)
	{
	if (name == NULL) {
	return NULL;

	} else if (strstr(name, ".service")) {
	return strdup(name);
	}

	return g_strdup_printf("%s.service", name);
	}

	+static void
	+systemd_daemon_reload_complete(DBusPendingCall pending, void user_data)
	+{
	+ DBusError error;
	+ DBusMessage *reply = NULL;
	+ int *reload_count = user_data;
	+
	+ dbus_error_init(&error);
	+ if(pending) {
	+ reply = dbus_pending_call_steal_reply(pending);
	+ }
	+
	+ if(pcmk_dbus_find_error("Reload", pending, reply, &error)) {
	+ crm_err("Could not issue systemd reload %d: %s", *reload_count, error.message);
	+
	+ } else {
	+ crm_trace("Reload %d complete", *reload_count);
	+ }
	+
	+ if(pending) {
	+ dbus_pending_call_unref(pending);
	+ }
	+ if(reply) {
	+ dbus_message_unref(reply);
	+ }
	+}
	+
	static bool
	systemd_daemon_reload(void)
	{
	- /* TODO: Make this asynchronous */
	+ static int reload_count = 0;
	const char *method = "Reload";
	- DBusMessage *reply = NULL;
	DBusMessage *msg = systemd_new_method(BUS_NAME".Manager", method);

	CRM_ASSERT(msg != NULL);
	- reply = pcmk_dbus_send_recv(msg, systemd_proxy, NULL);
	+ pcmk_dbus_send(msg, systemd_proxy, systemd_daemon_reload_complete, &reload_count);
	dbus_message_unref(msg);
	- if(reply) {
	- dbus_message_unref(reply);
	- }
	return TRUE;
	}

	static const char *
	systemd_loadunit_result(DBusMessage reply, svc_action_t op)
	{
	const char *path = NULL;

	if(pcmk_dbus_find_error("LoadUnit", (void*)&path, reply, NULL)) {
	if(op) {
	crm_warn("No unit found for %s", op->rsc);
	}

	} else if(pcmk_dbus_type_check(reply, NULL, DBUS_TYPE_OBJECT_PATH, __FUNCTION__, __LINE__)) {
	dbus_message_get_args (reply, NULL,
	DBUS_TYPE_OBJECT_PATH, &path,
	DBUS_TYPE_INVALID);
	}

	if(op) {
	systemd_unit_exec_with_unit(op, path);
	}

	return path;
	}


	static void
	systemd_loadunit_cb(DBusPendingCall pending, void user_data)
	{
	DBusMessage *reply = NULL;

	if(pending) {
	reply = dbus_pending_call_steal_reply(pending);
	}

	systemd_loadunit_result(reply, user_data);

	if(reply) {
	dbus_message_unref(reply);
	}
	}

	static char *
	systemd_unit_by_name(const gchar * arg_name, svc_action_t *op)
	{
	DBusMessage *msg;
	DBusMessage *reply = NULL;
	char *name = NULL;

	/*
	Equivalent to GetUnit if its already loaded
	<method name="LoadUnit">
	<arg name="name" type="s" direction="in"/>
	<arg name="unit" type="o" direction="out"/>
	</method>
	*/

	if (systemd_init() == FALSE) {
	return FALSE;
	}

	msg = systemd_new_method(BUS_NAME".Manager", "LoadUnit");
	CRM_ASSERT(msg != NULL);

	name = systemd_service_name(arg_name);
	CRM_LOG_ASSERT(dbus_message_append_args(msg, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID));
	free(name);

	if(op == NULL \|\| op->synchronous) {
	const char *unit = NULL;
	char *munit = NULL;
	DBusError error;

	dbus_error_init(&error);
	reply = pcmk_dbus_send_recv(msg, systemd_proxy, &error);
	dbus_message_unref(msg);

	unit = systemd_loadunit_result(reply, op);
	if(unit) {
	munit = strdup(unit);
	}
	if(reply) {
	dbus_message_unref(reply);
	}
	return munit;
	}

	pcmk_dbus_send(msg, systemd_proxy, systemd_loadunit_cb, op);
	return NULL;
	}

	GList *
	systemd_unit_listall(void)
	{
	int lpc = 0;
	GList *units = NULL;
	DBusMessageIter args;
	DBusMessageIter unit;
	DBusMessageIter elem;
	DBusMessage *msg = NULL;
	DBusMessage *reply = NULL;
	const char *method = "ListUnits";
	DBusError error;

	if (systemd_init() == FALSE) {
	return NULL;
	}

	/*
	" <method name=\"ListUnits\">\n" \
	" <arg name=\"units\" type=\"a(ssssssouso)\" direction=\"out\"/>\n" \
	" </method>\n" \
	*/

	dbus_error_init(&error);
	msg = systemd_new_method(BUS_NAME".Manager", method);
	CRM_ASSERT(msg != NULL);

	reply = pcmk_dbus_send_recv(msg, systemd_proxy, &error);
	dbus_message_unref(msg);

	if(error.name) {
	crm_err("Call to %s failed: %s", method, error.name);
	return NULL;

	} else if (reply == NULL) {
	crm_err("Call to %s failed: Message has no reply", method);
	return NULL;

	} else if (!dbus_message_iter_init(reply, &args)) {
	crm_err("Call to %s failed: Message has no arguments", method);
	dbus_message_unref(reply);
	return NULL;
	}

	if(!pcmk_dbus_type_check(reply, &args, DBUS_TYPE_ARRAY, __FUNCTION__, __LINE__)) {
	crm_err("Call to %s failed: Message has invalid arguments", method);
	dbus_message_unref(reply);
	return NULL;
	}

	dbus_message_iter_recurse(&args, &unit);
	while (dbus_message_iter_get_arg_type (&unit) != DBUS_TYPE_INVALID) {
	DBusBasicValue value;

	if(!pcmk_dbus_type_check(reply, &unit, DBUS_TYPE_STRUCT, __FUNCTION__, __LINE__)) {
	continue;
	}

	dbus_message_iter_recurse(&unit, &elem);
	if(!pcmk_dbus_type_check(reply, &elem, DBUS_TYPE_STRING, __FUNCTION__, __LINE__)) {
	continue;
	}

	dbus_message_iter_get_basic(&elem, &value);
	crm_trace("Got: %s", value.str);
	if(value.str) {
	char *match = strstr(value.str, ".service");

	if (match) {
	lpc++;
	match[0] = 0;

	units = g_list_append(units, strdup(value.str));
	}
	}
	dbus_message_iter_next (&unit);
	}

	dbus_message_unref(reply);

	crm_trace("Found %d systemd services", lpc);
	return units;
	}

	gboolean
	systemd_unit_exists(const char *name)
	{
	char *unit = NULL;

	/* Note: Makes a blocking dbus calls
	* Used by resources_find_service_class() when resource class=service
	*/
	unit = systemd_unit_by_name(name, NULL);
	if(unit) {
	free(unit);
	return TRUE;
	}
	return FALSE;
	}

	static char *
	systemd_unit_metadata(const char *name)
	{
	char *meta = NULL;
	char *desc = NULL;
	char *path = systemd_unit_by_name(name, NULL);

	if (path) {
	/* TODO: Worth a making blocking call for? Probably not. Possibly if cached. */
	desc = pcmk_dbus_get_property(systemd_proxy, BUS_NAME, path, BUS_NAME ".Unit", "Description", NULL, NULL);
	} else {
	desc = g_strdup_printf("Systemd unit file for %s", name);
	}

	meta = g_strdup_printf("<?xml version=\"1.0\"?>\n"
	"<!DOCTYPE resource-agent SYSTEM \"ra-api-1.dtd\">\n"
	"<resource-agent name=\"%s\" version=\"0.1\">\n"
	" <version>1.0</version>\n"
	" <longdesc lang=\"en\">\n"
	" %s\n"
	" </longdesc>\n"
	" <shortdesc lang=\"en\">systemd unit file for %s</shortdesc>\n"
	" <parameters>\n"
	" </parameters>\n"
	" <actions>\n"
	" <action name=\"start\" timeout=\"15\" />\n"
	" <action name=\"stop\" timeout=\"15\" />\n"
	" <action name=\"status\" timeout=\"15\" />\n"
	" <action name=\"restart\" timeout=\"15\" />\n"
	" <action name=\"monitor\" timeout=\"15\" interval=\"15\" start-delay=\"15\" />\n"
	" <action name=\"meta-data\" timeout=\"5\" />\n"
	" </actions>\n"
	" <special tag=\"systemd\">\n"
	" </special>\n" "</resource-agent>\n", name, desc, name);
	free(desc);
	free(path);
	return meta;
	}

	static bool
	systemd_mask_error(svc_action_t op, const char error)
	{
	crm_trace("Could not issue %s for %s: %s", op->action, op->rsc, error);
	if(strstr(error, "org.freedesktop.systemd1.InvalidName")
	\|\| strstr(error, "org.freedesktop.systemd1.LoadFailed")
	\|\| strstr(error, "org.freedesktop.systemd1.NoSuchUnit")) {

	if (safe_str_eq(op->action, "stop")) {
	crm_trace("Masking %s failure for %s: unknown services are stopped", op->action, op->rsc);
	op->rc = PCMK_OCF_OK;

	} else {
	crm_trace("Mapping %s failure for %s: unknown services are not installed", op->action, op->rsc);
	op->rc = PCMK_OCF_NOT_INSTALLED;
	op->status = PCMK_LRM_OP_NOT_INSTALLED;
	}
	return TRUE;
	}

	return FALSE;
	}

	static void
	systemd_exec_result(DBusMessage reply, svc_action_t op)
	{
	DBusError error;

	if(pcmk_dbus_find_error(op->action, (void*)&error, reply, &error)) {

	/* ignore "already started" or "not running" errors */
	if (!systemd_mask_error(op, error.name)) {
	crm_err("Could not issue %s for %s: %s (%s)", op->action, op->rsc, error.message);
	}

	} else {
	if(!pcmk_dbus_type_check(reply, NULL, DBUS_TYPE_OBJECT_PATH, __FUNCTION__, __LINE__)) {
	crm_warn("Call to %s passed but return type was unexpected", op->action);
	op->rc = PCMK_OCF_OK;

	} else {
	const char *path = NULL;

	dbus_message_get_args (reply, NULL,
	DBUS_TYPE_OBJECT_PATH, &path,
	DBUS_TYPE_INVALID);
	crm_info("Call to %s passed: %s", op->action, path);
	op->rc = PCMK_OCF_OK;
	}
	}

	operation_finalize(op);
	}

	static void
	systemd_async_dispatch(DBusPendingCall pending, void user_data)
	{
	DBusError error;
	DBusMessage *reply = NULL;
	svc_action_t *op = user_data;

	dbus_error_init(&error);
	if(pending) {
	reply = dbus_pending_call_steal_reply(pending);
	}

	systemd_exec_result(reply, op);

	if(pending) {
	dbus_pending_call_unref(pending);
	}
	if(reply) {
	dbus_message_unref(reply);
	}
	}

	#define SYSTEMD_OVERRIDE_ROOT "/run/systemd/system/"

	static void
	systemd_unit_check(const char name, const char state, void *userdata)
	{
	svc_action_t * op = userdata;

	CRM_ASSERT(state != NULL);

	if (g_strcmp0(state, "active") == 0) {
	op->rc = PCMK_OCF_OK;
	} else if (g_strcmp0(state, "activating") == 0) {
	op->rc = PCMK_OCF_PENDING;
	} else {
	op->rc = PCMK_OCF_NOT_RUNNING;
	}

	if (op->synchronous == FALSE) {
	operation_finalize(op);
	}
	}

	gboolean
	systemd_unit_exec_with_unit(svc_action_t * op, const char *unit)
	{
	const char *method = op->action;
	DBusMessage *msg = NULL;
	DBusMessage *reply = NULL;

	CRM_ASSERT(unit);

	if (unit == NULL) {
	crm_debug("Could not obtain unit named '%s'", op->agent);
	op->rc = PCMK_OCF_NOT_INSTALLED;
	op->status = PCMK_LRM_OP_NOT_INSTALLED;
	goto cleanup;
	}

	if (safe_str_eq(op->action, "monitor") \|\| safe_str_eq(method, "status")) {
	char *state = pcmk_dbus_get_property(systemd_proxy, BUS_NAME, unit, BUS_NAME ".Unit", "ActiveState",
	op->synchronous?NULL:systemd_unit_check, op);
	if (op->synchronous) {
	systemd_unit_check("ActiveState", state, op);
	free(state);
	return op->rc == PCMK_OCF_OK;
	}
	return TRUE;

	} else if (g_strcmp0(method, "start") == 0) {
	FILE *file_strm = NULL;
	char *override_dir = g_strdup_printf("%s/%s", SYSTEMD_OVERRIDE_ROOT, unit);
	char *override_file = g_strdup_printf("%s/%s/50-pacemaker.conf", SYSTEMD_OVERRIDE_ROOT, unit);

	method = "StartUnit";
	crm_build_path(override_dir, 0755);

	file_strm = fopen(override_file, "w");
	if (file_strm != NULL) {
	int rc = fprintf(file_strm, "[Service]\nRestart=no");
	if (rc < 0) {
	crm_perror(LOG_ERR, "Cannot write to systemd override file %s", override_file);
	}

	} else {
	crm_err("Cannot open systemd override file %s for writing", override_file);
	}

	if (file_strm != NULL) {
	fflush(file_strm);
	fclose(file_strm);
	}
	systemd_daemon_reload();
	free(override_file);
	free(override_dir);

	} else if (g_strcmp0(method, "stop") == 0) {
	char *override_file = g_strdup_printf("%s/%s/50-pacemaker.conf", SYSTEMD_OVERRIDE_ROOT, unit);

	method = "StopUnit";
	unlink(override_file);
	free(override_file);
	systemd_daemon_reload();

	} else if (g_strcmp0(method, "restart") == 0) {
	method = "RestartUnit";

	} else {
	op->rc = PCMK_OCF_UNIMPLEMENT_FEATURE;
	goto cleanup;
	}

	crm_debug("Calling %s for %s: %s", method, op->rsc, unit);

	msg = systemd_new_method(BUS_NAME".Manager", method);
	CRM_ASSERT(msg != NULL);

	/* (ss) */
	{
	const char *replace_s = "replace";
	char *name = systemd_service_name(op->agent);

	CRM_LOG_ASSERT(dbus_message_append_args(msg, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID));
	CRM_LOG_ASSERT(dbus_message_append_args(msg, DBUS_TYPE_STRING, &replace_s, DBUS_TYPE_INVALID));

	free(name);
	}

	if (op->synchronous == FALSE) {
	return pcmk_dbus_send(msg, systemd_proxy, systemd_async_dispatch, op);

	} else {
	DBusError error;

	reply = pcmk_dbus_send_recv(msg, systemd_proxy, &error);
	systemd_exec_result(reply, op);

	if(reply) {
	dbus_message_unref(reply);
	}
	if(msg) {
	dbus_message_unref(msg);
	}

	return FALSE;
	}

	if(msg) {
	dbus_message_unref(msg);
	}

	cleanup:
	if (op->synchronous == FALSE) {
	operation_finalize(op);
	return TRUE;
	}

	return op->rc == PCMK_OCF_OK;
	}

	gboolean
	systemd_unit_exec(svc_action_t * op)
	{
	char *unit = NULL;

	CRM_ASSERT(op);
	CRM_ASSERT(systemd_init());
	op->rc = PCMK_OCF_UNKNOWN_ERROR;
	crm_debug("Performing %ssynchronous %s op on systemd unit %s named '%s'",
	op->synchronous ? "" : "a", op->action, op->agent, op->rsc);

	if (safe_str_eq(op->action, "meta-data")) {
	/* TODO: See if we can teach the lrmd not to make these calls synchronously */
	op->stdout_data = systemd_unit_metadata(op->agent);
	op->rc = PCMK_OCF_OK;

	if (op->synchronous == FALSE) {
	operation_finalize(op);
	}
	return TRUE;
	}

	unit = systemd_unit_by_name(op->agent, op);
	free(unit);

	if (op->synchronous == FALSE) {
	return TRUE;
	}

	return op->rc == PCMK_OCF_OK;
	}

File Metadata

Mime Type: text/x-diff
Expires: Tue, Jul 8, 6:42 PM (2 h, 8 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 2002764
Default Alt Text: (43 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions