[trafodion] branch master updated: [TRAFODION-3260] SSMP may wait 3 seconds before handling requests The commit 95c2712b131adc2ba06b4e620ad67f93c2658497 introduced a regression with ESPs acting as master to run SQL queries. These SQL queries were stuck at close.

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

selva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafodion.git


The following commit(s) were added to refs/heads/master by this push:
     new a696be5  [TRAFODION-3260] SSMP may wait 3 seconds before handling requests The commit 95c2712b131adc2ba06b4e620ad67f93c2658497 introduced a regression with ESPs acting as master to run SQL queries. These SQL queries were stuck at close.
     new 8230c10  Merge pull request #1805 from selvaganesang/trafodion-3260
a696be5 is described below

commit a696be5753934326f7de11a249ee9a273900efa4
Author: selvaganesang <se...@apache.org>
AuthorDate: Tue Feb 26 17:45:00 2019 +0000

    [TRAFODION-3260] SSMP may wait 3 seconds before handling requests
    The commit 95c2712b131adc2ba06b4e620ad67f93c2658497 introduced
    a regression with ESPs acting as master to run SQL queries. These SQL
    queries were stuck at close.
---
 core/sql/common/Ipc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/sql/common/Ipc.cpp b/core/sql/common/Ipc.cpp
index cfb737b..61f7908 100644
--- a/core/sql/common/Ipc.cpp
+++ b/core/sql/common/Ipc.cpp
@@ -1161,7 +1161,7 @@ WaitReturnStatus IpcAllConnections::waitOnAll(
 
   if (timeout != IpcImmediately && timeout != IpcInfiniteTimeout) {
      short mask;
-     if (ipcEnv_->getControlConnection() != NULL) {
+     if (ipcEnv_->getControlConnection() != NULL && (! GetCliGlobals()->isEspProcess())) {
         mask = XWAIT(LREQ | LDONE, timeout);
         if (mask & LREQ) 
            retcode = ipcEnv_->getControlConnection()->castToGuaReceiveControlConnection()->wait(IpcImmediately);