9b7f65cbfb
- some upstream fixes for corosync(bsc#1048259)
Added:
bsc#1047860-add-version.patch
0007-Make-corosync-work-when-FIPS-mode-is-enabled.patch
0008-main.c-add-option-to-set-priority.patch
0009-totem-Propagate-totem-initialization-failure.patch
Removed:
bnc#867767-add-version.patch
0007-improve-corosync-keygen.patch(since this patch is not for corosync v2.x)
Modified:
corosync.spec, add judgement whether /etc/sysconfig/corosycn* exist before remove these files
OBS-URL: https://build.opensuse.org/request/show/509614
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=94
69 lines
1.7 KiB
Diff
69 lines
1.7 KiB
Diff
--- corosync-2.4.2.orig/exec/main.c 2017-07-11 17:23:41.903330368 +0800
|
|
+++ corosync-2.4.2/exec/main.c 2017-07-11 17:31:08.687343622 +0800
|
|
@@ -1424,9 +1424,13 @@
|
|
* Join multicast group and setup delivery
|
|
* and configuration change functions
|
|
*/
|
|
- totempg_initialize (
|
|
+ if(totempg_initialize (
|
|
corosync_poll_handle,
|
|
- &totem_config);
|
|
+ &totem_config) != 0) {
|
|
+
|
|
+ log_printf (LOGSYS_LEVEL_ERROR, "Can't initialize TOTEM layer");
|
|
+ corosync_exit_error (COROSYNC_DONE_FATAL_ERR);
|
|
+ }
|
|
|
|
totempg_service_ready_register (
|
|
main_service_ready);
|
|
--- corosync-2.4.2.orig/exec/totempg.c 2016-11-08 00:39:12.000000000 +0800
|
|
+++ corosync-2.4.2/exec/totempg.c 2017-07-11 17:27:47.615337658 +0800
|
|
@@ -814,6 +814,10 @@
|
|
totempg_confchg_fn,
|
|
totempg_waiting_trans_ack_cb);
|
|
|
|
+ if (res == -1) {
|
|
+ goto error_exit;
|
|
+ }
|
|
+
|
|
totemmrp_callback_token_create (
|
|
&callback_token_received_handle,
|
|
TOTEM_CALLBACK_TOKEN_RECEIVED,
|
|
@@ -827,6 +831,7 @@
|
|
|
|
list_init (&totempg_groups_list);
|
|
|
|
+error_exit:
|
|
return (res);
|
|
}
|
|
|
|
--- corosync-2.4.2.orig/exec/totemsrp.c 2016-11-08 00:39:12.000000000 +0800
|
|
+++ corosync-2.4.2/exec/totemsrp.c 2017-07-11 17:30:30.887342501 +0800
|
|
@@ -851,6 +851,7 @@
|
|
int waiting_trans_ack))
|
|
{
|
|
struct totemsrp_instance *instance;
|
|
+ int res;
|
|
|
|
instance = malloc (sizeof (struct totemsrp_instance));
|
|
if (instance == NULL) {
|
|
@@ -993,7 +994,7 @@
|
|
}
|
|
}
|
|
|
|
- totemrrp_initialize (
|
|
+ res = totemrrp_initialize (
|
|
poll_handle,
|
|
&instance->totemrrp_context,
|
|
totem_config,
|
|
@@ -1004,6 +1005,9 @@
|
|
main_token_seqid_get,
|
|
main_msgs_missing,
|
|
target_set_completed);
|
|
+ if (res == -1) {
|
|
+ goto error_exit;
|
|
+ }
|
|
|
|
/*
|
|
* Must have net_mtu adjusted by totemrrp_initialize first
|