No OneTemporary
Actions

Size

56 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/lib/services/dbus.c b/lib/services/dbus.c
	index f44b59056f..637f749986 100644
	--- a/lib/services/dbus.c
	+++ b/lib/services/dbus.c
	@@ -1,542 +1,546 @@
	#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;
	}

	DBusPendingCall* 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 NULL;

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

	crm_trace("DBus %s call sent", method);
	if (dbus_pending_call_get_completed(pending)) {
	crm_info("DBus %s call completed too soon", method);
	if(done) {
	#if 0
	/* This sounds like a good idea, but allegedly it breaks things */
	done(pending, user_data);
	pending = NULL;
	#else
	CRM_ASSERT(dbus_pending_call_set_notify(pending, done, user_data, NULL));
	#endif
	}

	} else if(done) {
	CRM_ASSERT(dbus_pending_call_set_notify(pending, done, user_data, NULL));
	}
	return pending;
	}

	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);
	}

	if(data->name && data->callback) {
	crm_trace("No value for property %s[%s]", data->object, data->name);
	data->callback(data->name, NULL, data->userdata);
	}

	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(pending) {
	dbus_pending_call_unref(pending);
	}
	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)
	+ void (callback)(const char name, const char value, void userdata), void userdata, DBusPendingCall *pending)
	{
	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);
	+ DBusPendingCall* _pending;
	+ _pending = pcmk_dbus_send(msg, connection, pcmk_dbus_lookup_cb, query_data);
	+ if (pending != NULL) {
	+ *pending = _pending;
	+ }

	} 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);

	while (dbus_connection_get_dispatch_status(connection) == DBUS_DISPATCH_DATA_REMAINS) {
	dbus_connection_dispatch(connection);
	}
	}
	}

	/* Copied from dbus-watch.c */

	static const char*
	dbus_watch_flags_to_string (int flags)
	{
	const char *watch_type;

	if ((flags & DBUS_WATCH_READABLE) &&
	(flags & DBUS_WATCH_WRITABLE))
	watch_type = "readwrite";
	else if (flags & DBUS_WATCH_READABLE)
	watch_type = "read";
	else if (flags & DBUS_WATCH_WRITABLE)
	watch_type = "write";
	else
	watch_type = "not read or write";
	return watch_type;
	}

	static int
	pcmk_dbus_watch_dispatch(gpointer userdata)
	{
	bool oom = FALSE;
	DBusWatch *watch = userdata;
	int flags = dbus_watch_get_flags(watch);
	bool enabled = dbus_watch_get_enabled (watch);
	mainloop_io_t *client = dbus_watch_get_data(watch);

	crm_trace("Dispatching client %p: %s", client, dbus_watch_flags_to_string(flags));
	if (enabled && is_set(flags, DBUS_WATCH_READABLE)) {
	oom = !dbus_watch_handle(watch, flags);

	} else if (enabled && is_set(flags, DBUS_WATCH_READABLE)) {
	oom = !dbus_watch_handle(watch, flags);

	} else if(enabled) {
	oom = !dbus_watch_handle(watch, DBUS_WATCH_ERROR);
	}

	if(flags != dbus_watch_get_flags(watch)) {
	flags = dbus_watch_get_flags(watch);
	crm_trace("Dispatched client %p: %s (%d)", client, dbus_watch_flags_to_string(flags), flags);
	}

	if(oom) {
	crm_err("DBus encountered OOM while attempting to dispatch %p (%s)", client, dbus_watch_flags_to_string(flags));
	}
	return 0;
	}

	static void
	pcmk_dbus_watch_destroy(gpointer userdata)
	{
	mainloop_io_t *client = dbus_watch_get_data(userdata);
	crm_trace("Destroyed %p", client);
	}


	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 watch %p with fd=%d to client %p", watch, fd, client);
	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 client %p (%p)", client, data);
	mainloop_del_fd(client);
	}

	static gboolean
	pcmk_dbus_timeout_dispatch(gpointer data)
	{
	crm_info("Timeout %p expired", data);
	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);

	crm_trace("Adding timeout %p (%ld)", timeout, dbus_timeout_get_interval(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);

	crm_trace("Removing timeout %p (%p)", timeout, data);

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

	static void
	pcmk_dbus_timeout_toggle(DBusTimeout timeout, void data){
	bool enabled = dbus_timeout_get_enabled(timeout);

	crm_trace("Toggling timeout for %p to %s", timeout, enabled?"off":"on");

	if(enabled) {
	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/pcmk-dbus.h b/lib/services/pcmk-dbus.h
	index 468020eeab..63910f621e 100644
	--- a/lib/services/pcmk-dbus.h
	+++ b/lib/services/pcmk-dbus.h
	@@ -1,14 +1,15 @@
	DBusConnection *pcmk_dbus_connect(void);
	void pcmk_dbus_connection_setup_with_select(DBusConnection *c);
	void pcmk_dbus_disconnect(DBusConnection *connection);

	DBusPendingCall pcmk_dbus_send(DBusMessage msg, DBusConnection *connection,
	void(done)(DBusPendingCall pending, void user_data), void user_data);
	DBusMessage pcmk_dbus_send_recv(DBusMessage msg, DBusConnection connection, DBusError error);
	bool pcmk_dbus_type_check(DBusMessage msg, DBusMessageIter field, int expected, const char *function, int line);
	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);
	+ void (callback)(const char name, const char value, void userdata), void *userdata,
	+ DBusPendingCall **pending);

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

	diff --git a/lib/services/systemd.c b/lib/services/systemd.c
	index c0a1721b96..10c605aae2 100644
	--- a/lib/services/systemd.c
	+++ b/lib/services/systemd.c
	@@ -1,668 +1,681 @@
	/*
	* 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;
	unsigned int reload_count = GPOINTER_TO_UINT(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)
	{
	static unsigned int reload_count = 0;
	const char *method = "Reload";


	reload_count++;
	if(reload_count % 10 == 0) {
	DBusMessage *msg = systemd_new_method(BUS_NAME".Manager", method);

	CRM_ASSERT(msg != NULL);
	pcmk_dbus_send(msg, systemd_proxy, systemd_daemon_reload_complete, GUINT_TO_POINTER(reload_count));
	dbus_message_unref(msg);
	}
	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;
	svc_action_t * op = user_data;

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

	if(op) {
	crm_trace("Got result: %p for %p for %s, %s", reply, pending, op->rsc, op->action);
	} else {
	crm_trace("Got result: %p for %p", reply, pending);
	}
	systemd_loadunit_result(reply, user_data);

	if(pending) {
	dbus_pending_call_unref(pending);
	}
	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);
	dbus_message_unref(msg);
	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);
	+ desc = pcmk_dbus_get_property(systemd_proxy, BUS_NAME, path, BUS_NAME ".Unit", "Description", NULL, 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);
	}

	if(op) {
	crm_trace("Got result: %p for %p for %s, %s", reply, pending, op->rsc, op->action);
	op->opaque->pending = NULL;
	systemd_exec_result(reply, op);

	} else {
	crm_trace("Got result: %p for %p", reply, pending);
	}

	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_trace("Resource %s has %s='%s'", op->rsc, name, state);

	if(state == NULL) {
	op->rc = PCMK_OCF_NOT_RUNNING;

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

	if (op->synchronous == FALSE) {
	+ if (op->opaque->pending) {
	+ dbus_pending_call_unref(op->opaque->pending);
	+ }
	op->opaque->pending = NULL;
	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);
	+ DBusPendingCall *pending = NULL;
	+ char *state;
	+
	+ state = pcmk_dbus_get_property(systemd_proxy, BUS_NAME, unit,
	+ BUS_NAME ".Unit", "ActiveState",
	+ op->synchronous?NULL:systemd_unit_check,
	+ op, op->synchronous?NULL:&pending);
	if (op->synchronous) {
	systemd_unit_check("ActiveState", state, op);
	free(state);
	return op->rc == PCMK_OCF_OK;
	+ } else if (pending) {
	+ dbus_pending_call_ref(pending);
	+ op->opaque->pending = pending;
	+ return TRUE;
	}
	- return TRUE;
	+
	+ return FALSE;

	} 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) {
	DBusPendingCall* pending = pcmk_dbus_send(msg, systemd_proxy, systemd_async_dispatch, op);

	dbus_message_unref(msg);
	if(pending) {
	dbus_pending_call_ref(pending);
	op->opaque->pending = pending;
	return TRUE;
	}
	return FALSE;

	} else {
	DBusError error;

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

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

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

	return op->rc == PCMK_OCF_OK;
	}

	static gboolean
	systemd_timeout_callback(gpointer p)
	{
	svc_action_t * op = p;

	op->opaque->timerid = 0;
	crm_warn("%s operation on systemd unit %s named '%s' timed out", op->action, op->agent, op->rsc);
	operation_finalize(op);

	return FALSE;
	}

	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) {
	op->opaque->timerid = g_timeout_add(op->timeout + 5000, systemd_timeout_callback, op);
	return TRUE;
	}

	return op->rc == PCMK_OCF_OK;
	}
	diff --git a/lib/services/upstart.c b/lib/services/upstart.c
	index 01ff817a6b..9894430727 100644
	--- a/lib/services/upstart.c
	+++ b/lib/services/upstart.c
	@@ -1,569 +1,579 @@
	/*
	* 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
	*
	* File: upstart-dbus.c
	* Copyright (C) 2010 Senko Rasic <senko.rasic@dobarkod.hr>
	* Copyright (c) 2010 Ante Karamatic <ivoks@init.hr>
	*
	*
	* Each exported function is standalone, and creates a new connection to
	* the upstart daemon. This is because lrmd plugins fork off for exec,
	* and if we try and share the connection, the whole thing blocks
	* indefinitely.
	*/

	#include <crm_internal.h>

	#include <stdio.h>

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

	#include <services_private.h>
	#include <upstart.h>
	#include <dbus/dbus.h>
	#include <pcmk-dbus.h>

	#include <glib.h>
	#include <gio/gio.h>

	#define BUS_NAME "com.ubuntu.Upstart"
	#define BUS_PATH "/com/ubuntu/Upstart"

	#define UPSTART_06_API BUS_NAME"0_6"
	#define UPSTART_JOB_IFACE UPSTART_06_API".Job"
	#define BUS_PROPERTY_IFACE "org.freedesktop.DBus.Properties"

	/*
	http://upstart.ubuntu.com/wiki/DBusInterface
	*/
	static DBusConnection *upstart_proxy = NULL;

	static gboolean
	upstart_init(void)
	{
	static int need_init = 1;

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

	void
	upstart_cleanup(void)
	{
	if (upstart_proxy) {
	pcmk_dbus_disconnect(upstart_proxy);
	upstart_proxy = NULL;
	}
	}

	static gboolean
	upstart_job_by_name(const gchar * arg_name, gchar ** out_unit)
	{
	/*
	com.ubuntu.Upstart0_6.GetJobByName (in String name, out ObjectPath job)
	*/
	DBusError error;
	DBusMessage *msg;
	DBusMessage *reply = NULL;
	const char *method = "GetJobByName";

	if(upstart_init() == FALSE) {
	return FALSE;
	}
	msg = dbus_message_new_method_call(BUS_NAME, // target for the method call
	BUS_PATH, // object to call on
	UPSTART_06_API, // interface to call on
	method); // method name

	dbus_error_init(&error);
	CRM_LOG_ASSERT(dbus_message_append_args(msg, DBUS_TYPE_STRING, &arg_name, DBUS_TYPE_INVALID));
	reply = pcmk_dbus_send_recv(msg, upstart_proxy, &error);
	dbus_message_unref(msg);

	if(error.name) {
	/* ignore "already started" or "not running" errors */
	crm_err("Could not issue %s for %s: %s", method, arg_name, error.name);

	} else if(!pcmk_dbus_type_check(reply, NULL, DBUS_TYPE_OBJECT_PATH, __FUNCTION__, __LINE__)) {
	crm_err("Invalid return type for %s", method);

	} else {
	if(out_unit) {
	char *path = NULL;

	dbus_message_get_args (reply, NULL,
	DBUS_TYPE_OBJECT_PATH, &path,
	DBUS_TYPE_INVALID);

	*out_unit = strdup(path);
	}
	dbus_message_unref(reply);
	return TRUE;
	}

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

	static void
	fix(char input, const char search, char replace)
	{
	char *match = NULL;
	int shuffle = strlen(search) - 1;

	while (TRUE) {
	int len, lpc;

	match = strstr(input, search);
	if (match == NULL) {
	break;
	}
	crm_trace("Found: %s", match);
	match[0] = replace;
	len = strlen(match) - shuffle;
	for (lpc = 1; lpc <= len; lpc++) {
	match[lpc] = match[lpc + shuffle];
	}
	}
	}

	static char *
	fix_upstart_name(const char *input)
	{
	char *output = strdup(input);

	fix(output, "_2b", '+');
	fix(output, "_2c", ',');
	fix(output, "_2d", '-');
	fix(output, "_2e", '.');
	fix(output, "_40", '@');
	fix(output, "_5f", '_');
	return output;
	}

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

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

	/*
	com.ubuntu.Upstart0_6.GetAllJobs (out <Array of ObjectPath> jobs)
	*/

	dbus_error_init(&error);
	msg = dbus_message_new_method_call(BUS_NAME, // target for the method call
	BUS_PATH, // object to call on
	UPSTART_06_API, // interface to call on
	method); // method name
	CRM_ASSERT(msg != NULL);

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

	if(error.name) {
	crm_err("Call to %s failed: %s", method, error.name);
	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;
	const char *job = NULL;
	char *path = NULL;

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

	dbus_message_iter_get_basic(&unit, &value);

	if(value.str) {
	int llpc = 0;
	path = value.str;
	job = value.str;
	while (path[llpc] != 0) {
	if (path[llpc] == '/') {
	job = path + llpc + 1;
	}
	llpc++;
	}
	lpc++;
	crm_trace("%s -> %s\n", path, job);
	units = g_list_append(units, fix_upstart_name(job));
	}
	dbus_message_iter_next (&unit);
	}

	dbus_message_unref(reply);
	crm_trace("Found %d upstart jobs", lpc);
	return units;
	}

	gboolean
	upstart_job_exists(const char *name)
	{
	return upstart_job_by_name(name, NULL);
	}

	static char *
	get_first_instance(const gchar * job)
	{
	char *instance = NULL;
	const char *method = "GetAllInstances";
	DBusError error;
	DBusMessage *msg;
	DBusMessage *reply;
	DBusMessageIter args;
	DBusMessageIter unit;

	dbus_error_init(&error);
	msg = dbus_message_new_method_call(BUS_NAME, // target for the method call
	job, // object to call on
	UPSTART_JOB_IFACE, // interface to call on
	method); // method name
	CRM_ASSERT(msg != NULL);

	dbus_message_append_args(msg, DBUS_TYPE_INVALID);
	reply = pcmk_dbus_send_recv(msg, upstart_proxy, &error);
	dbus_message_unref(msg);

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

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

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

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

	dbus_message_iter_recurse(&args, &unit);
	if(pcmk_dbus_type_check(reply, &unit, DBUS_TYPE_OBJECT_PATH, __FUNCTION__, __LINE__)) {
	DBusBasicValue value;

	dbus_message_iter_get_basic(&unit, &value);

	if(value.str) {
	instance = strdup(value.str);
	crm_trace("Result: %s", instance);
	}
	}

	done:
	if(reply) {
	dbus_message_unref(reply);
	}
	return instance;
	}

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

	if (state && g_strcmp0(state, "running") == 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) {
	+ if (op->opaque->pending) {
	+ dbus_pending_call_unref(op->opaque->pending);
	+ }
	+ op->opaque->pending = NULL;
	operation_finalize(op);
	}
	}

	static char *
	upstart_job_metadata(const char *name)
	{
	return 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"
	" Upstart agent for controlling the system %s service\n"
	" </longdesc>\n"
	" <shortdesc lang=\"en\">%s upstart agent</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=\"upstart\">\n"
	" </special>\n" "</resource-agent>\n", name, name, name);
	}

	static bool
	upstart_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, UPSTART_06_API ".Error.UnknownInstance")) {
	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 if(safe_str_eq(op->action, "start")) {
	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;

	} else if (safe_str_eq(op->action, "start")
	&& strstr(error, UPSTART_06_API ".Error.AlreadyStarted")) {
	crm_trace("Mapping %s failure for %s: starting a started resource is allowed", op->action, op->rsc);
	op->rc = PCMK_OCF_OK;
	return TRUE;
	}

	return FALSE;
	}

	static void
	upstart_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);
	}
	if(pcmk_dbus_find_error(op->action, pending, reply, &error)) {

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

	} else if (!g_strcmp0(op->action, "stop")) {
	/* No return vaue */
	op->rc = PCMK_OCF_OK;

	} 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);

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

	gboolean
	upstart_job_exec(svc_action_t * op, gboolean synchronous)
	{
	char *job = NULL;
	int arg_wait = TRUE;
	const char *arg_env = "pacemaker=1";
	const char *action = op->action;

	DBusError error;
	DBusMessage *msg = NULL;
	DBusMessage *reply = NULL;
	DBusMessageIter iter, array_iter;

	op->rc = PCMK_OCF_UNKNOWN_ERROR;
	CRM_ASSERT(upstart_init());

	if (safe_str_eq(op->action, "meta-data")) {
	op->stdout_data = upstart_job_metadata(op->agent);
	op->rc = PCMK_OCF_OK;
	goto cleanup;
	}

	if(!upstart_job_by_name(op->agent, &job)) {
	crm_debug("Could not obtain job named '%s' to %s", op->agent, action);
	if (!g_strcmp0(action, "stop")) {
	op->rc = PCMK_OCF_OK;

	} else {
	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(action, "status")) {

	char *path = get_first_instance(job);

	op->rc = PCMK_OCF_NOT_RUNNING;
	if(path) {
	+ DBusPendingCall *pending = NULL;
	char *state = pcmk_dbus_get_property(
	upstart_proxy, BUS_NAME, path, UPSTART_06_API ".Instance", "state",
	- op->synchronous?NULL:upstart_job_check, op);
	+ op->synchronous?NULL:upstart_job_check, op,
	+ op->synchronous?NULL:&pending);

	free(job);
	free(path);

	if(op->synchronous) {
	upstart_job_check("state", state, op);
	free(state);
	return op->rc == PCMK_OCF_OK;
	+ } else if (pending) {
	+ dbus_pending_call_ref(pending);
	+ op->opaque->pending = pending;
	+ return TRUE;
	}
	- return TRUE;
	+ return FALSE;
	}
	goto cleanup;

	} else if (!g_strcmp0(action, "start")) {
	action = "Start";
	} else if (!g_strcmp0(action, "stop")) {
	action = "Stop";
	} else if (!g_strcmp0(action, "restart")) {
	action = "Restart";
	} else {
	op->rc = PCMK_OCF_UNIMPLEMENT_FEATURE;
	goto cleanup;
	}

	crm_debug("Calling %s for %s on %s", action, op->rsc, job);

	msg = dbus_message_new_method_call(BUS_NAME, // target for the method call
	job, // object to call on
	UPSTART_JOB_IFACE, // interface to call on
	action); // method name
	CRM_ASSERT(msg != NULL);

	dbus_message_iter_init_append (msg, &iter);

	CRM_LOG_ASSERT(dbus_message_iter_open_container (&iter,
	DBUS_TYPE_ARRAY,
	DBUS_TYPE_STRING_AS_STRING,
	&array_iter));

	CRM_LOG_ASSERT(dbus_message_iter_append_basic (&array_iter, DBUS_TYPE_STRING, &arg_env));
	CRM_LOG_ASSERT(dbus_message_iter_close_container (&iter, &array_iter));

	CRM_LOG_ASSERT(dbus_message_append_args(msg, DBUS_TYPE_BOOLEAN, &arg_wait, DBUS_TYPE_INVALID));

	if (op->synchronous == FALSE) {
	DBusPendingCall* pending = pcmk_dbus_send(msg, upstart_proxy, upstart_async_dispatch, op);
	free(job);

	if(pending) {
	dbus_pending_call_ref(pending);
	op->opaque->pending = pending;
	return TRUE;
	}
	return FALSE;
	}

	dbus_error_init(&error);
	reply = pcmk_dbus_send_recv(msg, upstart_proxy, &error);

	if(error.name) {
	if(!upstart_mask_error(op, error.name)) {
	crm_err("Could not issue %s for %s: %s (%s)", action, op->rsc, error.name, job);
	}

	} else if (!g_strcmp0(op->action, "stop")) {
	/* No return vaue */
	op->rc = PCMK_OCF_OK;

	} 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;
	}


	cleanup:
	free(job);
	if(msg) {
	dbus_message_unref(msg);
	}

	if(reply) {
	dbus_message_unref(reply);
	}

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

File Metadata

Mime Type: text/x-diff
Expires: Sat, Nov 23, 5:43 AM (10 h, 1 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1018269
Default Alt Text: (56 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions