No OneTemporary
Actions

Size

34 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/lib/services/dbus.c b/lib/services/dbus.c
	index 69ea6accdf..a3286f2c78 100644
	--- a/lib/services/dbus.c
	+++ b/lib/services/dbus.c
	@@ -1,261 +1,392 @@
	#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"
	+
	+
	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);
	pcmk_dbus_error_check(&err, "Could not connect to System DBus", __FUNCTION__, __LINE__);

	return connection;
	}

	void pcmk_dbus_disconnect(DBusConnection *connection)
	{
	}

	bool pcmk_dbus_append_arg(DBusMessage msg, int dtype, const void value)
	{
	DBusMessageIter args;

	dbus_message_iter_init_append(msg, &args);
	if (!dbus_message_iter_append_basic(&args, dtype, value)) {
	crm_err("dbus_message_iter_append_basic(%c) failed", dtype);
	return FALSE;
	}

	return TRUE;
	}

	-DBusMessage pcmk_dbus_send_recv(DBusMessage msg, DBusConnection connection, char *e)
	+bool
	+pcmk_dbus_find_error(const char method, DBusPendingCall pending, DBusMessage reply, DBusError ret)
	{
	DBusError error;
	- const char *method = NULL;
	- DBusMessage *reply = NULL;
	- DBusPendingCall* pending = NULL;

	dbus_error_init(&error);

	- CRM_ASSERT(dbus_message_get_type (msg) == DBUS_MESSAGE_TYPE_METHOD_CALL);
	- method = dbus_message_get_member (msg);
	+ if(pending == NULL) {
	+ error.name = "org.clusterlabs.pacemaker.NoRequest";
	+ error.message = "No request sent";

	- // send message and get a handle for a reply
	- if (!dbus_connection_send_with_reply (connection, msg, &pending, -1)) { // -1 is default timeout
	- crm_err("Send with reply failed");
	- return NULL;
	- }
	- if (NULL == pending) {
	- crm_err("No pending call found");
	- return NULL;
	- }
	-
	- dbus_connection_flush(connection);
	-
	- /* block until we receive a reply */
	- dbus_pending_call_block(pending);
	-
	- /* get the reply message */
	- reply = dbus_pending_call_steal_reply(pending);
	- if(reply == NULL) {
	+ } 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_err("%s error '%s': %s", method, error.name, error.message);
	+ 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(error.name) {
	- if(e) {
	- *e = strdup(error.name);
	+ 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)) { // -1 is default timeout
	+ if(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);
	+ }
	+
	+ if(pcmk_dbus_find_error(method, pending, reply, error)) {
	+ crm_trace("Was error: '%s' '%s'", error->name, error->message);
	if(reply) {
	dbus_message_unref(reply);
	reply = NULL;
	}
	- } else if(e) {
	- *e = NULL;
	+ }
	+ crm_trace("Was error: '%s' '%s'", error->name, error->message);
	+
	+ if(pending) {
	+ /* free the pending message handle */
	+ dbus_pending_call_unref(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(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)) { // -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;
	+
	+ }
	+ CRM_ASSERT(dbus_pending_call_set_notify(pending, done, user_data, NULL));
	+ return TRUE;
	+}
	+
	bool pcmk_dbus_type_check(DBusMessage msg, DBusMessageIter field, int expected, const char *function, int line)
	{
	int 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 instead of %c in '%s'",
	expected, dtype, dbus_message_iter_get_signature(&args));
	return FALSE;
	}

	return TRUE;
	}

	-#define BUS_PROPERTY_IFACE "org.freedesktop.DBus.Properties"
	-
	char *
	pcmk_dbus_get_property(
	DBusConnection connection, const char target, const char obj, const gchar iface, const char *name)
	{
	DBusMessage *msg;
	DBusMessageIter args;
	DBusMessageIter dict;
	DBusMessage *reply = NULL;
	/* DBusBasicValue value; */
	const char *method = "GetAll";
	char *output = NULL;
	- char *error = NULL;
	+ DBusError error;

	/* desc = systemd_unit_property(path, BUS_NAME ".Unit", "Description"); */

	+ dbus_error_init(&error);
	crm_info("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;
	}

	pcmk_dbus_append_arg(msg, DBUS_TYPE_STRING, &iface);

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

	- if(reply == NULL) {
	+ if(error.name) {
	crm_err("Call to %s for %s failed: No reply", method, iface);
	return NULL;

	} else if (!dbus_message_iter_init(reply, &args)) {
	crm_err("Cannot get properties for %s from %s", obj, iface);
	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, &dict);
	while (dbus_message_iter_get_arg_type (&dict) != DBUS_TYPE_INVALID) {
	DBusMessageIter sv;
	DBusMessageIter v;
	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, &value);

	crm_trace("Got: %s", value.str);
	if(strcmp(value.str, 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("Result: %s", value.str);
	output = strdup(value.str);
	}
	break;
	default:
	pcmk_dbus_type_check(reply, &sv, DBUS_TYPE_STRING, __FUNCTION__, __LINE__);
	}
	dbus_message_iter_next (&sv);
	}

	dbus_message_iter_next (&dict);
	}


	crm_trace("Property %s[%s] is '%s'", obj, name, output);
	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,
	+};

	-int dbus_watch_get_unix_fd ( DBusWatch * watch );
	+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);

	-/* http://dbus.freedesktop.org/doc/api/html/group__DBusConnection.html#gaebf031eb444b4f847606aa27daa3d8e6 */
	-
	-DBUS_EXPORT dbus_bool_t dbus_connection_set_watch_functions(
	- DBusConnection * connection,
	- DBusAddWatchFunction add_function,
	- DBusRemoveWatchFunction remove_function,
	- DBusWatchToggledFunction toggled_function,
	- void * data,
	- DBusFreeFunction free_data_function
	- );
	+ crm_trace("Added %p with fd=%d", watch, fd);
	+ dbus_watch_set_data(watch, client, NULL);
	+ return TRUE;
	+}
	+
	+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, NULL, 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 27ac7373b0..c8d2234b7c 100644
	--- a/lib/services/pcmk-dbus.h
	+++ b/lib/services/pcmk-dbus.h
	@@ -1,7 +1,13 @@
	DBusConnection *pcmk_dbus_connect(void);
	+void pcmk_dbus_connection_setup_with_select(DBusConnection *c);
	void pcmk_dbus_disconnect(DBusConnection *connection);

	-DBusMessage pcmk_dbus_send_recv(DBusMessage msg, DBusConnection connection, char *error);
	+bool 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_append_arg(DBusMessage msg, int dtype, const void value);
	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);
	+
	+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 9aa5b03d6c..a06d5474fa 100644
	--- a/lib/services/systemd.c
	+++ b/lib/services/systemd.c
	@@ -1,531 +1,546 @@
	/*
	* 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
	*/

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

	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();
	+ pcmk_dbus_connection_setup_with_select(systemd_proxy);
	}
	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 bool
	systemd_daemon_reload(void)
	{
	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);
	dbus_message_unref(msg);
	if(reply) {
	dbus_message_unref(reply);
	}
	return TRUE;
	}

	static gboolean
	systemd_unit_by_name(const gchar * arg_name, gchar ** out_unit)
	{
	DBusMessage *msg;
	DBusMessageIter args;
	DBusMessage *reply = NULL;
	const char *method = "GetUnit";
	char *name = NULL;
	- char *error = NULL;
	+ DBusError error;

	/*
	<method name="GetUnit">
	<arg name="name" type="s" direction="in"/>
	<arg name="unit" type="o" direction="out"/>
	</method>

	<method name="LoadUnit">
	<arg name="name" type="s" direction="in"/>
	<arg name="unit" type="o" direction="out"/>
	</method>
	*/

	name = systemd_service_name(arg_name);

	while(*out_unit == NULL) {
	msg = systemd_new_method(BUS_NAME".Manager", method);
	CRM_ASSERT(msg != NULL);

	pcmk_dbus_append_arg(msg, DBUS_TYPE_STRING, &name);

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

	- if(error) {
	- crm_info("Call to %s failed: %s", method, error);
	- free(error);
	- error = NULL;
	+ if(error.name) {
	+ crm_info("Call to %s failed: %s", method, error.name);

	} else if (dbus_message_iter_init(reply, &args)) {

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

	dbus_message_iter_get_basic(&args, &value);
	*out_unit = strdup(value.str);
	dbus_message_unref(reply);
	free(name);
	return TRUE;
	}
	}

	if(strcmp(method, "LoadUnit") != 0) {
	method = "LoadUnit";
	crm_debug("Cannot find %s, reloading the systemd manager configuration", name);
	systemd_daemon_reload();
	if(reply) {
	dbus_message_unref(reply);
	}

	} else {
	free(name);
	return FALSE;
	}
	}
	return FALSE;
	}

	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";
	- char *error = NULL;
	+ 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) {
	- crm_err("Call to %s failed: %s", method, error);
	- free(error);
	+ 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;

	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 *path = NULL;
	gboolean pass = FALSE;

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

	if(systemd_unit_by_name(name, &path) && path) {
	crm_trace("Got %s", path);
	pass = TRUE;
	}

	free(path);
	return pass;
	}

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

	CRM_ASSERT(systemd_init());
	if (systemd_unit_by_name(name, &path)) {
	desc = pcmk_dbus_get_property(systemd_proxy, BUS_NAME, path, BUS_NAME ".Unit", "Description");
	} 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);
	return meta;
	}

	-#if 0
	+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_unit_exec_done(GObject * source_object, GAsyncResult * res, gpointer user_data)
	+systemd_async_dispatch(DBusPendingCall pending, void user_data)
	{
	- GError *error = NULL;
	- GVariant *_ret = NULL;
	+ DBusError error;
	+ DBusMessage *reply = NULL;
	svc_action_t *op = user_data;
	- GDBusProxy *proxy = G_DBUS_PROXY(source_object);

	- /* Obtain rc and stderr/out */
	- _ret = g_dbus_proxy_call_finish(proxy, res, &error);
	+ dbus_error_init(&error);
	+ if(pending) {
	+ reply = dbus_pending_call_steal_reply(pending);
	+ }
	+ if(pcmk_dbus_find_error(op->action, pending, reply, &error)) {

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

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

	- } else {
	- op->rc = PCMK_OCF_NOT_INSTALLED;
	- op->status = PCMK_LRM_OP_NOT_INSTALLED;
	- }
	+ if(!dbus_message_iter_init(reply, &args)) {
	+ crm_err("Call to %s failed: no arguments", op->action);

	- } else {
	- crm_err("Could not issue %s for %s: %s", op->action, op->rsc, error->message);
	- }
	- g_error_free(error);
	-
	- } else if(g_variant_is_of_type (_ret, G_VARIANT_TYPE("(o)"))) {
	- char *path = NULL;
	+ } else if(!pcmk_dbus_type_check(reply, &args, DBUS_TYPE_OBJECT_PATH, __FUNCTION__, __LINE__)) {
	+ crm_warn("Call to %s passed but return type was unexpected", op->action);
	+ op->rc = PCMK_OCF_OK;

	- g_variant_get(_ret, "(o)", &path);
	- crm_info("Call to %s passed: type '%s' %s", op->action, g_variant_get_type_string(_ret),
	- path);
	- op->rc = PCMK_OCF_OK;
	+ } else {
	+ const char *path = NULL;

	- } else {
	- crm_err("Call to %s passed but return type was '%s' not '(o)'", op->action, g_variant_get_type_string(_ret));
	- op->rc = PCMK_OCF_OK;
	+ 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 (_ret) {
	- g_variant_unref(_ret);
	+
	+ if(pending) {
	+ dbus_pending_call_unref(pending);
	+ }
	+ if(reply) {
	+ dbus_message_unref(reply);
	}
	}
	-#endif

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

	gboolean
	systemd_unit_exec(svc_action_t * op, gboolean synchronous)
	{
	- char *error = NULL;
	+ DBusError error;
	char *unit = NULL;
	const char *replace_s = "replace";
	gboolean pass = FALSE;
	const char *method = op->action;
	char *name = systemd_service_name(op->agent);
	DBusMessage *msg = NULL;
	DBusMessage *reply = NULL;
	DBusMessageIter args;
	-
	+
	+ dbus_error_init(&error);
	op->rc = PCMK_OCF_UNKNOWN_ERROR;
	CRM_ASSERT(systemd_init());

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

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

	pass = systemd_unit_by_name(op->agent, &unit);
	if (pass == FALSE) {
	crm_debug("Could not obtain unit named '%s'", op->agent);
	#if 0
	if (error && strstr(error->message, "systemd1.NoSuchUnit")) {
	op->rc = PCMK_OCF_NOT_INSTALLED;
	op->status = PCMK_LRM_OP_NOT_INSTALLED;
	}
	#endif
	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");

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

	free(state);
	goto cleanup;

	} 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/50-pacemaker.conf", override_dir);

	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: %s (%d)", override_file, pcmk_strerror(errno), errno);
	}

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

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

	-#if 0
	- if (synchronous == FALSE) {
	- g_dbus_proxy_call(systemd_proxy, method, g_variant_new("(ss)", name, "replace"),
	- G_DBUS_CALL_FLAGS_NONE, op->timeout, NULL, systemd_unit_exec_done, op);
	- free(unit);
	- free(name);
	- return TRUE;
	- }
	-#endif
	-
	msg = systemd_new_method(BUS_NAME".Manager", method);
	CRM_ASSERT(msg != NULL);

	/* (ss) */
	pcmk_dbus_append_arg(msg, DBUS_TYPE_STRING, &name);
	pcmk_dbus_append_arg(msg, DBUS_TYPE_STRING, &replace_s);

	+ if (synchronous == FALSE) {
	+ free(unit);
	+ free(name);
	+ return pcmk_dbus_send(msg, systemd_proxy, systemd_async_dispatch, op);
	+ }
	+
	reply = pcmk_dbus_send_recv(msg, systemd_proxy, &error);
	- dbus_message_unref(msg);

	- if(error) {
	+ if(error.name) {
	/* ignore "already started" or "not running" errors */
	- if (safe_str_eq(op->action, "stop")
	- && (strstr(error, "org.freedesktop.systemd1.InvalidName")
	- \|\| strstr(error, "org.freedesktop.systemd1.NoSuchUnit"))) {
	- crm_trace("Masking Stop failure for %s: unknown services are stopped", op->rsc);
	- op->rc = PCMK_OCF_OK;
	- } else {
	- crm_err("Could not issue %s for %s: %s (%s)", method, op->rsc, error, unit);
	+ if(!systemd_mask_error(op, error.name)) {
	+ crm_err("Could not issue %s for %s: %s (%s)", method, op->rsc, error.name, unit);
	}
	goto cleanup;

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

	- /* (o) */
	- if(!pcmk_dbus_type_check(reply, &args, DBUS_TYPE_OBJECT_PATH, __FUNCTION__, __LINE__)) {
	- crm_err("Call to %s failed: Message has invalid arguments", method);
	+ } else if(!pcmk_dbus_type_check(reply, &args, 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 {
	- DBusBasicValue value;
	+ const char *path = NULL;

	- dbus_message_iter_get_basic(&args, &value);
	- crm_info("Call to %s passed: %s", op->action, value.str);
	+ 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(error);
	free(unit);
	free(name);

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

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

File Metadata

Mime Type: text/x-diff
Expires: Wed, Jun 25, 5:59 AM (21 h, 52 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1952372
Default Alt Text: (34 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions