.corosync-qdevice.metadata

@@ -1 +1 @@
-ecb95fe22cba66c75df6d7897de8d867fdb65ed3 SOURCES/corosync-qdevice-3.0.3.tar.gz
+8f72eb0d945136a243761c823e9c8ab7f1c14139 SOURCES/corosync-qdevice-3.0.2.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/corosync-qdevice-3.0.3.tar.gz
+SOURCES/corosync-qdevice-3.0.2.tar.gz

SOURCES/bz2180045-1-qdevice-Destroy-non-blocking-client-on-failure.patch

@@ -0,0 +1,41 @@
+From 4331c7d5650a8bf44c16512419f1954d0ef96df5 Mon Sep 17 00:00:00 2001
+From: Jan Friesse <jfriesse@redhat.com>
+Date: Mon, 20 Mar 2023 11:01:46 +0100
+Subject: [PATCH] qdevice: Destroy non blocking client on failure
+
+This fixes regression introduced in patch
+8217e33e86bca79dc307e112f0c0c4a278f9a568 which made qdevice assert when
+PR_GetError in nss_sock_non_blocking_client_try_next called by
+qdevice_model_net_pre_poll_loop returns error other than
+PR_IN_PROGRESS_ERROR. This is usually not happening - only way to get
+such error seems to be to ifdown ALL network interfaces other than
+loopback and returned error is then PR_NETWORK_UNREACHABLE_ERROR
+(-5980).
+
+Fix is rather simple (and present in pre
+8217e33e86bca79dc307e112f0c0c4a278f9a568) - just call
+nss_sock_non_blocking_client_destroy.
+
+Signed-off-by: Jan Friesse <jfriesse@redhat.com>
+---
+ qdevices/qdevice-model-net.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/qdevices/qdevice-model-net.c b/qdevices/qdevice-model-net.c
+index afcc649..f63e4bd 100644
+--- a/qdevices/qdevice-model-net.c
++++ b/qdevices/qdevice-model-net.c
+@@ -211,6 +211,10 @@ qdevice_model_net_pre_poll_loop(struct qdevice_instance *instance)
+ 	res = nss_sock_non_blocking_client_try_next(&net_instance->non_blocking_client);
+ 	if (res == -1) {
+ 		log_nss(LOG_ERR, "Can't connect to qnetd host");
++		/*
++		 * To prevent adding non_blocking_client into loop but still keep loop running
++		 */
++		nss_sock_non_blocking_client_destroy(&net_instance->non_blocking_client);
+ 	}
+ 
+ 	res = qdevice_net_socket_add_to_main_poll_loop(net_instance);
+-- 
+2.39.1
+

SPECS/corosync-qdevice.spec

@@ -10,12 +10,14 @@
 
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
-Version: 3.0.3
+Version: 3.0.2
-Release: 7%{?gitver}%{?dist}
+Release: 2%{?gitver}%{?dist}
-License: BSD-3-Clause
+License: BSD
 URL: https://github.com/corosync/corosync-qdevice
 Source0: https://github.com/corosync/corosync-qdevice/releases/download/v%{version}%{?gittarver}/%{name}-%{version}%{?gittarver}.tar.gz
 
+Patch0: bz2180045-1-qdevice-Destroy-non-blocking-client-on-failure.patch
+
 # Runtime bits
 Requires: corosync >= 2.4.0
 Requires: corosynclib >= 2.4.0
@@ -46,6 +48,8 @@ BuildRequires: make
 %prep
 %setup -q -n %{name}-%{version}%{?gittarver}
 
+%patch0 -p1 -b .bz2180045-1
+
 %build
 %if %{with runautogen}
 ./autogen.sh
@@ -207,39 +211,23 @@ fi
 %{_mandir}/man8/corosync-qnetd.8*
 
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.0.3-7
+* Thu Mar 23 2023 Jan Friesse <jfriesse@redhat.com> - 3.0.2-2
-- Bump release for October 2024 mass rebuild:
+- Resolves: rhbz#2180045
-  Resolves: RHEL-64018
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.0.3-6
-- Bump release for June 2024 mass rebuild
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-3
+- qdevice: Destroy non blocking client on failure (rhbz#2180045)
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+- merge upstream commit 4331c7d5650a8bf44c16512419f1954d0ef96df5 (rhbz#2180045)
-
-* Tue Jun 06 2023 Jan Friesse <jfriesse@redhat.com> - 3.0.3-2
-- migrated to SPDX license
-
-* Wed Mar 22 2023 Jan Friesse <jfriesse@redhat.com> - 3.0.3-1
-- New upstream release
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
 * Thu Nov 03 2022 Jan Friesse <jfriesse@redhat.com> - 3.0.2-1
+- Resolves: rhbz#2135863
+
 - New upstream release
 
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-4
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.0.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-3
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.0.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild