!4 修改tsan问题

Merge pull request !4 from steven/master
This commit is contained in:
openeuler-ci-bot 2020-03-30 16:59:22 +08:00 committed by Gitee
commit 584f202b94
2 changed files with 29 additions and 1 deletions

View File

@ -0,0 +1,24 @@
From cb761412e299ef907f22cd7c4146d50c8a792003 Mon Sep 17 00:00:00 2001
From: Guiyao <guiyao@huawei.com>
Date: Mar 26 2020 17:54:17 +0000
Subject: Unlock cond_mutex before pthread exit in gp_worker_main()
Signed-off-by: GuiYao <guiyao@huawei.com>
[rharwood@redhat.com: whitespace, tweak commit message]
Reviewed-by: Robbie Harwood <rharwood@redhat.com>
---
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);
}
}

View File

@ -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 <steven_ygui@163.com> - 0.8.0-12
- Unlock cond_mutex before pthread exit in gp_worker_main()
* Sun Jan 12 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.8.0-11
- revise the bogus date in changelog and instll the 24-nfs-server.conf file