- reduce ocfs2_controld priority to RR(1). (bnc#804707)
+ bnc804707-reduce-RR-priority.patch - Fix the race between udev making misc device node and ocfs2 opening that device (bnc#805764) + bug-805764-ocfs2-controld.patch - ocfs2_controld: ocfs2_controld-pacemaker.diff -- changes to be compatible with pacemaker >= 1.1.8 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=55
This commit is contained in:
Tim Serong
Git OBS Bridge
parent
a486893bfd
commit
9dc35c2df8
13
bnc804707-reduce-RR-priority.patch
Normal file
13
bnc804707-reduce-RR-priority.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
Index: ocfs2-tools/ocfs2_controld/main.c
|
||||||
|
===================================================================
|
||||||
|
--- ocfs2-tools.orig/ocfs2_controld/main.c
|
||||||
|
+++ ocfs2-tools/ocfs2_controld/main.c
|
||||||
|
@@ -1233,7 +1233,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);
|
||||||
84
bug-805764-ocfs2-controld.patch
Normal file
84
bug-805764-ocfs2-controld.patch
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
Index: ocfs2-tools/ocfs2_controld/main.c
|
||||||
|
===================================================================
|
||||||
|
--- ocfs2-tools.orig/ocfs2_controld/main.c
|
||||||
|
+++ ocfs2-tools/ocfs2_controld/main.c
|
||||||
|
@@ -948,6 +948,68 @@ static void cpg_joined(int first)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+static int find_minors(void)
|
||||||
|
+{
|
||||||
|
+ FILE *fl;
|
||||||
|
+ char name[256];
|
||||||
|
+ uint32_t number;
|
||||||
|
+ int c;
|
||||||
|
+ int control_minor = 0;
|
||||||
|
+
|
||||||
|
+ if (!(fl = fopen("/proc/misc", "r"))) {
|
||||||
|
+ log_error("failed to open /proc/misc: %s", strerror(errno));
|
||||||
|
+ goto out;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ while (!feof(fl)) {
|
||||||
|
+ if (fscanf(fl, "%d %255s\n", &number, &name[0]) == 2) {
|
||||||
|
+ if (!strcmp(name, "ocfs2_control"))
|
||||||
|
+ control_minor = number;
|
||||||
|
+ } else do {
|
||||||
|
+ c = fgetc(fl);
|
||||||
|
+ } while (c != EOF && c != '\n');
|
||||||
|
+
|
||||||
|
+ if (control_minor)
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ fclose(fl);
|
||||||
|
+
|
||||||
|
+ if (!control_minor)
|
||||||
|
+ log_error("Is ocfs2 missing from kernel? No misc devices found");
|
||||||
|
+out:
|
||||||
|
+ return control_minor;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int find_udev_device(const char *path, uint32_t minor)
|
||||||
|
+{
|
||||||
|
+ struct stat st;
|
||||||
|
+ int i;
|
||||||
|
+
|
||||||
|
+ for (i = 0; i < 10; i++) {
|
||||||
|
+ if (stat(path, &st) == 0 && minor(st.st_rdev) == minor)
|
||||||
|
+ return 0;
|
||||||
|
+ sleep(1);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ log_error("cannot find device %s with minor %d", path, minor);
|
||||||
|
+ return -1;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int setup_misc_device(void)
|
||||||
|
+{
|
||||||
|
+ int rv = -1;
|
||||||
|
+ int control_minor = find_minors();
|
||||||
|
+
|
||||||
|
+ if (control_minor) {
|
||||||
|
+ rv = find_udev_device("/dev/misc/ocfs2_control", control_minor);
|
||||||
|
+ if (rv < 0)
|
||||||
|
+ return rv;
|
||||||
|
+ log_debug("found /dev/misc/ocfs2_control %u", control_minor);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return rv;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static int loop(void)
|
||||||
|
{
|
||||||
|
int rv, i, poll_timeout = -1;
|
||||||
|
@@ -968,6 +1030,10 @@ static int loop(void)
|
||||||
|
if (rv < 0)
|
||||||
|
goto out;
|
||||||
|
|
||||||
|
+ rv = setup_misc_device();
|
||||||
|
+ if (rv < 0)
|
||||||
|
+ goto out;
|
||||||
|
+
|
||||||
|
rv = setup_cpg(cpg_joined);
|
||||||
|
if (rv < 0)
|
||||||
|
goto out;
|
||||||
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 22 03:04:22 UTC 2013 - tserong@suse.com
|
||||||
|
|
||||||
|
- reduce ocfs2_controld priority to RR(1). (bnc#804707)
|
||||||
|
+ bnc804707-reduce-RR-priority.patch
|
||||||
|
- Fix the race between udev making misc device node and ocfs2
|
||||||
|
opening that device (bnc#805764)
|
||||||
|
+ bug-805764-ocfs2-controld.patch
|
||||||
|
- ocfs2_controld: ocfs2_controld-pacemaker.diff -- changes to be
|
||||||
|
compatible with pacemaker >= 1.1.8
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat Apr 13 11:57:30 UTC 2013 - schwab@suse.de
|
Sat Apr 13 11:57:30 UTC 2013 - schwab@suse.de
|
||||||
|
|
||||||
|
|||||||
@ -42,6 +42,8 @@ Patch207: fix-indexed-dirs.patch
|
|||||||
Patch208: 0001-fswreck-Create-a-loop-in-group-chains.patch
|
Patch208: 0001-fswreck-Create-a-loop-in-group-chains.patch
|
||||||
Patch209: 0002-Break-a-chain-loop-in-group-desc.patch
|
Patch209: 0002-Break-a-chain-loop-in-group-desc.patch
|
||||||
Patch210: restore-g_list_append.patch
|
Patch210: restore-g_list_append.patch
|
||||||
|
Patch212: bug-805764-ocfs2-controld.patch
|
||||||
|
Patch213: bnc804707-reduce-RR-priority.patch
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: e2fsprogs-devel
|
BuildRequires: e2fsprogs-devel
|
||||||
BuildRequires: libaio-devel
|
BuildRequires: libaio-devel
|
||||||
@ -137,6 +139,8 @@ managing the file system.
|
|||||||
%patch208 -p1
|
%patch208 -p1
|
||||||
%patch209 -p1
|
%patch209 -p1
|
||||||
%patch210 -p1
|
%patch210 -p1
|
||||||
|
%patch212 -p1
|
||||||
|
%patch213 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export PROJECT="ocfs2-tools"
|
export PROJECT="ocfs2-tools"
|
||||||
|
|||||||
@ -1,13 +1,60 @@
|
|||||||
Index: ocfs2-tools/ocfs2_controld/pacemaker.c
|
Index: ocfs2-tools/ocfs2_controld/pacemaker.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- ocfs2-tools.orig/ocfs2_controld/pacemaker.c 2012-08-24 10:17:33.000000000 -0500
|
--- ocfs2-tools.orig/ocfs2_controld/pacemaker.c 2012-08-24 10:02:19.000000000 -0500
|
||||||
+++ ocfs2-tools/ocfs2_controld/pacemaker.c 2012-08-24 10:19:13.000000000 -0500
|
+++ ocfs2-tools/ocfs2_controld/pacemaker.c 2012-11-26 16:16:38.000000000 -0600
|
||||||
@@ -30,7 +30,7 @@
|
@@ -28,9 +28,8 @@
|
||||||
|
#define SUPPORT_HEARTBEAT 0
|
||||||
|
|
||||||
#include <pacemaker/crm/crm.h>
|
#include <pacemaker/crm/crm.h>
|
||||||
#include <pacemaker/crm/ais.h>
|
-#include <pacemaker/crm/ais.h>
|
||||||
#include <pacemaker/crm/common/cluster.h>
|
-#include <pacemaker/crm/common/cluster.h>
|
||||||
-#include <pacemaker/crm/common/stack.h>
|
-#include <pacemaker/crm/common/stack.h>
|
||||||
+#include <pacemaker/crm/cluster/stack.h>
|
+#include <pacemaker/crm/cluster.h>
|
||||||
|
+#include <pacemaker/crm/cluster/plugin.h>
|
||||||
#include <pacemaker/crm/common/ipc.h>
|
#include <pacemaker/crm/common/ipc.h>
|
||||||
#include <pacemaker/crm/msg_xml.h>
|
#include <pacemaker/crm/msg_xml.h>
|
||||||
|
|
||||||
|
@@ -47,6 +46,7 @@ static char * clustername = "pacemaker"
|
||||||
|
extern struct list_head mounts;
|
||||||
|
const char *stackname = "pcmk";
|
||||||
|
|
||||||
|
+static crm_cluster_t crm_cluster;
|
||||||
|
extern int ais_fd_async;
|
||||||
|
char *local_node_uname = NULL;
|
||||||
|
|
||||||
|
@@ -138,28 +138,29 @@ static void dead_pcmk(int ci)
|
||||||
|
connection_dead(ci);
|
||||||
|
}
|
||||||
|
|
||||||
|
-extern void terminate_ais_connection(void);
|
||||||
|
-
|
||||||
|
void exit_stack(void)
|
||||||
|
{
|
||||||
|
log_debug("closing pacemaker connection");
|
||||||
|
- terminate_ais_connection();
|
||||||
|
+ crm_cluster_disconnect(&crm_cluster);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void process_pcmk(int ci)
|
||||||
|
{
|
||||||
|
- ais_dispatch(ais_fd_async, NULL);
|
||||||
|
+ ais_dispatch(NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
int setup_stack(void)
|
||||||
|
{
|
||||||
|
- crm_log_init("ocfs2_controld", LOG_INFO, FALSE, TRUE, 0, NULL);
|
||||||
|
+ crm_log_init("ocfs2_controld", 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;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ 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);
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user