From 9168d69086da1d7126763d7e59989f31fe07f1ff Mon Sep 17 00:00:00 2001 From: steven Date: Fri, 27 Mar 2020 20:04:34 +0800 Subject: [PATCH 1/2] Unlock cond_mutex before pthread exit in gp_worker_main() --- ...efore-pthread-exit-in-gp_worker_main.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Unlock-cond_mutex-before-pthread-exit-in-gp_worker_main.patch diff --git a/Unlock-cond_mutex-before-pthread-exit-in-gp_worker_main.patch b/Unlock-cond_mutex-before-pthread-exit-in-gp_worker_main.patch new file mode 100644 index 0000000..c3558b4 --- /dev/null +++ b/Unlock-cond_mutex-before-pthread-exit-in-gp_worker_main.patch @@ -0,0 +1,24 @@ +From cb761412e299ef907f22cd7c4146d50c8a792003 Mon Sep 17 00:00:00 2001 +From: Guiyao +Date: Mar 26 2020 17:54:17 +0000 +Subject: Unlock cond_mutex before pthread exit in gp_worker_main() + + +Signed-off-by: GuiYao +[rharwood@redhat.com: whitespace, tweak commit message] +Reviewed-by: Robbie Harwood + +--- + +diff --git a/src/gp_workers.c b/src/gp_workers.c +index 18f38f6..ae42cef 100644 +--- a/src/gp_workers.c ++++ b/src/gp_workers.c +@@ -369,6 +369,7 @@ static void *gp_worker_main(void *pvt) + /* wait for next query */ + pthread_cond_wait(&t->cond_wakeup, &t->cond_mutex); + if (t->pool->shutdown) { ++ pthread_mutex_unlock(&t->cond_mutex); + pthread_exit(NULL); + } + } -- Gitee From 18e0c504d3a191c8a103804bd7366b11b0a9d908 Mon Sep 17 00:00:00 2001 From: steven Date: Fri, 27 Mar 2020 20:06:56 +0800 Subject: [PATCH 2/2] update gssproxy.spec. --- gssproxy.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gssproxy.spec b/gssproxy.spec index f9dc33e..cb49d59 100644 --- a/gssproxy.spec +++ b/gssproxy.spec @@ -4,7 +4,7 @@ Name: gssproxy Version: 0.8.0 -Release: 11 +Release: 12 Summary: GSSAPI Proxy License: MIT URL: https://pagure.io/gssproxy @@ -14,6 +14,7 @@ Patch0: Always-use-the-encype-we-selected.patch Patch1: Clarify-debug-and-debug_level-in-man-pages.patch Patch2: Always-choose-highest-requested-debug-level.patch Patch3: Don-t-leak-sock_ctx-if-verto_add_io-fails.patch +Patch4: Unlock-cond_mutex-before-pthread-exit-in-gp_worker_main.patch Requires: krb5 keyutils libverto-module-base libini_config Requires(post): systemd @@ -89,6 +90,9 @@ mkdir -p %{buildroot}%{gpstatedir}/rcache %{_mandir}/man8/gssproxy-mech.8* %changelog +* Fri Mar 27 2020 steven - 0.8.0-12 +- Unlock cond_mutex before pthread exit in gp_worker_main() + * Sun Jan 12 2020 openEuler Buildteam - 0.8.0-11 - revise the bogus date in changelog and instll the 24-nfs-server.conf file -- Gitee