You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2017/10/26 18:33:52 UTC
[1/3] incubator-trafodion git commit: fix TRAFODION-2773
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 9e5f36cd3 -> 9dd862c14
fix TRAFODION-2773
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9f93e7d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9f93e7d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9f93e7d5
Branch: refs/heads/master
Commit: 9f93e7d55357c543c035328ca21e9b70959184b6
Parents: 574452e
Author: SuJinpei <87...@qq.com>
Authored: Thu Oct 19 15:54:38 2017 +0800
Committer: SuJinpei <87...@qq.com>
Committed: Thu Oct 19 15:54:38 2017 +0800
----------------------------------------------------------------------
core/conn/odb/src/odb.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9f93e7d5/core/conn/odb/src/odb.c
----------------------------------------------------------------------
diff --git a/core/conn/odb/src/odb.c b/core/conn/odb/src/odb.c
index bf72f1b..da88eec 100755
--- a/core/conn/odb/src/odb.c
+++ b/core/conn/odb/src/odb.c
@@ -4156,18 +4156,17 @@ static void sigcatch(int sig)
exit ( EX_SIGNAL );
#else
if ( tn == 1 ) { /* single threaded */
- tclean( 0 );
gclean();
- exit( EX_SIGNAL );
} else {
for ( i = 0 ; i < tn ; i++ ) {
- if ( !pthread_kill(thid[i], 0) ) { /* If this thread is alive... */
+ if ( pthread_kill(thid[i], 0) ) { /* If this thread is alive... */
if ( pthread_cancel(thid[i]) ) /* ... cancel it */
fprintf(stderr, "odb [sigcatch(%d)] - Error canceling thread %d: [%d] %s\n",
__LINE__, i, errno, strerror(errno) );
}
}
}
+ exit(EX_SIGNAL);
#endif
}
[3/3] incubator-trafodion git commit: Merge [TRAFODION-2773] PR 1272
Fix odb hang when timeout is set
Posted by db...@apache.org.
Merge [TRAFODION-2773] PR 1272 Fix odb hang when timeout is set
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9dd862c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9dd862c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9dd862c1
Branch: refs/heads/master
Commit: 9dd862c1416def634ea9c071ff0dfa2dd046683a
Parents: 9e5f36c 7b29503
Author: Dave Birdsall <db...@apache.org>
Authored: Thu Oct 26 18:33:13 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Thu Oct 26 18:33:13 2017 +0000
----------------------------------------------------------------------
core/conn/odb/src/odb.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9dd862c1/core/conn/odb/src/odb.c
----------------------------------------------------------------------
[2/3] incubator-trafodion git commit: original code is valid
Posted by db...@apache.org.
original code is valid
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/7b295039
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/7b295039
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/7b295039
Branch: refs/heads/master
Commit: 7b2950393bd81138c85f006a0bc82b20d0de6e95
Parents: 9f93e7d
Author: SuJinpei <87...@qq.com>
Authored: Tue Oct 24 09:18:59 2017 +0800
Committer: SuJinpei <87...@qq.com>
Committed: Tue Oct 24 09:18:59 2017 +0800
----------------------------------------------------------------------
core/conn/odb/src/odb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7b295039/core/conn/odb/src/odb.c
----------------------------------------------------------------------
diff --git a/core/conn/odb/src/odb.c b/core/conn/odb/src/odb.c
index da88eec..e983be2 100755
--- a/core/conn/odb/src/odb.c
+++ b/core/conn/odb/src/odb.c
@@ -4159,7 +4159,7 @@ static void sigcatch(int sig)
gclean();
} else {
for ( i = 0 ; i < tn ; i++ ) {
- if ( pthread_kill(thid[i], 0) ) { /* If this thread is alive... */
+ if ( !pthread_kill(thid[i], 0) ) { /* If this thread is alive... */
if ( pthread_cancel(thid[i]) ) /* ... cancel it */
fprintf(stderr, "odb [sigcatch(%d)] - Error canceling thread %d: [%d] %s\n",
__LINE__, i, errno, strerror(errno) );