Hello community, here is the log from the commit of package libdlm for openSUSE:Factory checked in at 2013-07-08 07:24:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdlm (Old) and /work/SRC/openSUSE:Factory/.libdlm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdlm" Changes: -------- --- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes 2013-01-30 11:16:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2013-07-08 07:24:10.000000000 +0200 @@ -1,0 +2,17 @@ +Mon May 27 08:14:43 UTC 2013 - tser...@suse.com + +- Replace NAME= with SYMLINK+= in udev rules (bnc#779718) + + use-symlink-in-udev-rules.patch + +------------------------------------------------------------------- +Thu Mar 28 09:50:01 UTC 2013 - dmzh...@suse.com + +- reduce dlm_controld priority to RR(1). (bnc#804707) + +------------------------------------------------------------------- +Fri Feb 22 18:16:54 UTC 2013 - l...@suse.com + +- Make sure we poll the right fd for AIS notifications to avoid spinning + (bnc#803746) + +------------------------------------------------------------------- New: ---- bnc804707-reduce-RR-priority.patch use-symlink-in-udev-rules.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdlm.spec ++++++ --- /var/tmp/diff_new_pack.0ivw3S/_old 2013-07-08 07:24:11.000000000 +0200 +++ /var/tmp/diff_new_pack.0ivw3S/_new 2013-07-08 07:24:11.000000000 +0200 @@ -40,6 +40,8 @@ Patch1: libdlm-gcc47.patch Patch2: bnc777137-fix-plock-dev_write-no-op.patch Patch3: bnc798263-fix-opensuse123-compile-error.patch +Patch4: bnc804707-reduce-RR-priority.patch +Patch5: use-symlink-in-udev-rules.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: pacemaker BuildRequires: glib2-devel @@ -78,10 +80,12 @@ %prep ########################################################### %setup -n libdlm -%patch0 +%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 ########################################################### %build ++++++ bnc804707-reduce-RR-priority.patch ++++++ Index: libdlm/group/dlm_controld/main.c =================================================================== --- libdlm.orig/group/dlm_controld/main.c +++ libdlm/group/dlm_controld/main.c @@ -1230,7 +1230,7 @@ static void set_scheduler(void) struct sched_param sched_param; int rv; - rv = sched_get_priority_max(SCHED_RR); + rv = sched_get_priority_min(SCHED_RR); if (rv != -1) { sched_param.sched_priority = rv; rv = sched_setscheduler(0, SCHED_RR, &sched_param); ++++++ libdlm-pacemaker.patch ++++++ --- /var/tmp/diff_new_pack.0ivw3S/_old 2013-07-08 07:24:11.000000000 +0200 +++ /var/tmp/diff_new_pack.0ivw3S/_new 2013-07-08 07:24:11.000000000 +0200 @@ -1,17 +1,85 @@ -Index: group/dlm_controld/pacemaker.c +Index: libdlm/configure.ac =================================================================== ---- group/dlm_controld/pacemaker.c.orig -+++ group/dlm_controld/pacemaker.c -@@ -16,7 +16,7 @@ +--- libdlm.orig/configure.ac ++++ libdlm/configure.ac +@@ -132,7 +132,7 @@ if test "x${enable_pacemaker}" = xyes; t + PKG_CHECK_MODULES([glib],[glib-2.0]) + check_lib_no_libs cib cib_new + check_lib_no_libs crmcluster crm_set_status_callback +- check_lib_no_libs crmcommon init_server_ipc_comms ++# check_lib_no_libs crmcommon init_server_ipc_comms + fi + + if test "x${enable_cman}" = xyes; then +Index: libdlm/group/dlm_controld/pacemaker.c +=================================================================== +--- libdlm.orig/group/dlm_controld/pacemaker.c ++++ libdlm/group/dlm_controld/pacemaker.c +@@ -10,13 +10,12 @@ + #include <pacemaker/crm_config.h> + + #include <pacemaker/crm/crm.h> +-#include <pacemaker/crm/ais.h> ++#include <pacemaker/crm/cluster.h> ++#include <pacemaker/crm/cluster/plugin.h> + #include <pacemaker/crm/attrd.h> + /* heartbeat support is irrelevant here */ #undef SUPPORT_HEARTBEAT #define SUPPORT_HEARTBEAT 0 - #include <pacemaker/crm/common/cluster.h> +-#include <pacemaker/crm/common/cluster.h> -#include <pacemaker/crm/common/stack.h> -+#include <pacemaker/crm/cluster/stack.h> #include <pacemaker/crm/common/ipc.h> #include <pacemaker/crm/msg_xml.h> #include <pacemaker/crm/cib.h> -@@ -117,7 +117,7 @@ void dlm_process_node(gpointer key, gpoi +@@ -52,20 +51,27 @@ int setup_cluster_cfg(void) { return 0; + void process_cluster_cfg(int ci) {} + void close_cluster_cfg(void) {} + +-extern int ais_fd_async; +- ++static crm_cluster_t crm_cluster; + char *local_node_uname = NULL; + void dlm_process_node(gpointer key, gpointer value, gpointer user_data); + ++/* Mean ugly dirty hack */ ++extern int ais_fd_async; ++ + int setup_cluster(void) + { +- ais_fd_async = -1; +- crm_log_init("cluster-dlm", LOG_INFO, FALSE, TRUE, 0, NULL); ++ crm_log_init("cluster-dlm", LOG_INFO, FALSE, TRUE, 0, NULL, FALSE); + +- if(init_ais_connection(NULL, NULL, NULL, &local_node_uname, &our_nodeid) == FALSE) { ++ if(crm_cluster_connect(&crm_cluster) == FALSE ) { + log_error("Connection to our AIS plugin (CRM) failed"); + return -1; + } ++ if (!ais_fd_async) { ++ log_error("Connection to our AIS plugin (CRM) did not return a valid fd"); ++ return -1; ++ } ++ local_node_uname = crm_cluster.uname; ++ our_nodeid = crm_cluster.nodeid; + + /* Sign up for membership updates */ + send_ais_text(crm_class_notify, "true", TRUE, NULL, crm_msg_ais); +@@ -89,12 +95,12 @@ void update_cluster(void) + + void process_cluster(int ci) + { +- ais_dispatch(ais_fd_async, NULL); ++ ais_dispatch(NULL); + update_cluster(); + } + + void close_cluster(void) { +- terminate_ais_connection(); ++ crm_cluster_disconnect(&crm_cluster); + } + + #include <arpa/inet.h> +@@ -117,7 +123,7 @@ void dlm_process_node(gpointer key, gpoi snprintf(path, PATH_MAX, "%s/%d", COMMS_DIR, node->id); rc = stat(path, &tmp); @@ -20,7 +88,7 @@ if(rc == 0 && is_active) { /* nothing to do? -@@ -205,7 +205,7 @@ void dlm_process_node(gpointer key, gpoi +@@ -205,7 +211,7 @@ void dlm_process_node(gpointer key, gpoi } log_debug("%s %sctive node %u: born-on=%llu, last-seen=%llu, this-event=%llu, last-event=%llu", @@ -29,7 +97,7 @@ node->id, node->born, node->last_seen, crm_peer_seq, (unsigned long long)*last); } -@@ -213,7 +213,7 @@ void dlm_process_node(gpointer key, gpoi +@@ -213,7 +219,7 @@ void dlm_process_node(gpointer key, gpoi int is_cluster_member(uint32_t nodeid) { crm_node_t *node = crm_get_peer(nodeid, NULL); @@ -38,3 +106,16 @@ } char *nodeid2name(int nodeid) { +@@ -278,9 +284,9 @@ static cib_t *cib_connect(void) + } + + cib = cib_new(); +- rc = cib->cmds->signon_raw(cib, crm_system_name, cib_command, &cib_fd, NULL); +- if(rc != cib_ok) { +- log_error("Signon to cib failed: %s", cib_error2string(rc)); ++ rc = cib->cmds->signon_raw(cib, crm_system_name, cib_command, &cib_fd); ++ if(rc != 0) { ++ log_error("Signon to cib failed: %s", pcmk_strerror(rc)); + cib = NULL; /* TODO: memory leak in unlikely error path */ + + } else { ++++++ use-symlink-in-udev-rules.patch ++++++ Index: libdlm/dlm/libdlm/51-dlm.rules =================================================================== --- libdlm.orig/dlm/libdlm/51-dlm.rules +++ libdlm/dlm/libdlm/51-dlm.rules @@ -1,5 +1,5 @@ -KERNEL=="dlm-control", NAME="misc/dlm-control", MODE="0666" -KERNEL=="dlm-monitor", NAME="misc/dlm-monitor", MODE="0666" -KERNEL=="dlm_default", NAME="misc/dlm_default", MODE="0666" -KERNEL=="dlm_*", NAME="misc/%k", MODE="0660" +KERNEL=="dlm-control", SYMLINK+="misc/dlm-control", MODE="0666" +KERNEL=="dlm-monitor", SYMLINK+="misc/dlm-monitor", MODE="0666" +KERNEL=="dlm_default", SYMLINK+="misc/dlm_default", MODE="0666" +KERNEL=="dlm_*", SYMLINK+="misc/%k", MODE="0660" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org