trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [1/2] incubator-trafodion git commit: [TRAFODION-2696] control query cancel qid fails with error 8031 sometimes
Date Fri, 28 Jul 2017 21:17:21 GMT
Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 3ae998f75 -> 3168b44fa


[TRAFODION-2696] control query cancel qid fails with error 8031 sometimes

With this change, ssmp will not be stopped when the query
is stuck at the time of close for more than 5 minutes. The ssmp is forced
to dump core only.

Fix for executor/TEST106 failure caused by PR 1188


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/392465ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/392465ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/392465ac

Branch: refs/heads/master
Commit: 392465ac77f7dd298316694f0ab7d10705d484f9
Parents: 3ae998f
Author: selvaganesang <selva.govindarajan@esgyn.com>
Authored: Fri Jul 28 16:56:57 2017 +0000
Committer: selvaganesang <selva.govindarajan@esgyn.com>
Committed: Fri Jul 28 16:56:57 2017 +0000

----------------------------------------------------------------------
 core/sql/executor/ex_root.cpp         |  2 +-
 core/sql/regress/executor/EXPECTED106 | 59 ------------------------------
 core/sql/regress/executor/TEST106     | 27 --------------
 core/sql/runtimestats/ssmpipc.cpp     |  2 +-
 4 files changed, 2 insertions(+), 88 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/392465ac/core/sql/executor/ex_root.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_root.cpp b/core/sql/executor/ex_root.cpp
index 5bc62c7..bd6ce58 100644
--- a/core/sql/executor/ex_root.cpp
+++ b/core/sql/executor/ex_root.cpp
@@ -3051,7 +3051,7 @@ void ex_root_tcb::dumpCb()
   statsGlobals->releaseStatsSemaphore(cliGlobals->getSemId(),
                       cliGlobals->myPin(),savedPriority, savedStopMode);
   if (doDump)
-    cbServer_->getServerId().getPhandle().dumpAndStop(true, true);
+    cbServer_->getServerId().getPhandle().dumpAndStop(true, false);
 }
 
 // -----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/392465ac/core/sql/regress/executor/EXPECTED106
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/EXPECTED106 b/core/sql/regress/executor/EXPECTED106
index 31028f0..efe1966 100644
--- a/core/sql/regress/executor/EXPECTED106
+++ b/core/sql/regress/executor/EXPECTED106
@@ -2003,65 +2003,6 @@ CONTROL_RUNNING_QUERY =====================  SEQ_NO 1        NO CHILDREN
 
 --- SQL operation failed with errors.
 >>
->>set envvar HP_FAKE_ERROR_2024;
-
---- SQL operation complete.
->>
->>control query cancel qid
-+>MXID11000026954212168745269419968000000000217DEFAULT_MXCI_USER00_22_S1;
-
-*** ERROR[8028] Server declined cancel request. The process $ZSM000 was not found.
-
---- SQL operation failed with errors.
->>
->>set envvar HP_FAKE_ERROR_8142;
-
---- SQL operation complete.
->>
->>control query cancel qid
-+>MXID11000026954212168745269419968000000000217DEFAULT_MXCI_USER00_22_S1;
-
-*** ERROR[8142] An error was artificially injected, to test error handling. Testpoint ../executor/ExCancel.cpp,
Value cbServer_ is NULL.
-
---- SQL operation failed with errors.
->>
->>reset envvar HP_FAKE_ERROR_2024;
-
---- SQL operation complete.
->>
->>reset envvar HP_FAKE_ERROR_8142;
-
---- SQL operation complete.
->>
->>control query cancel qid
-+>MXID11000026954212168745269419968000000000217DEFAULT_MXCI_USER00_22_S1;
-
-*** ERROR[8026] Server declined cancel request. The query ID  of the targeted query was not
found.
-
---- SQL operation failed with errors.
->>
->>set envvar HP_FAKE_ERROR_8028;
-
---- SQL operation complete.
->>
->>control query cancel qid
-+>MXID11000026954212168745269419968000000000217DEFAULT_MXCI_USER00_22_S1;
-
-*** ERROR[8028] Server declined cancel request. The process $ZSM000 was not found.
-
---- SQL operation failed with errors.
->>
->>reset envvar HP_FAKE_ERROR_8028;
-
---- SQL operation complete.
->>
->>control query cancel qid
-+>MXID11000026954212168745269419968000000000217DEFAULT_MXCI_USER00_22_S1;
-
-*** ERROR[8026] Server declined cancel request. The query ID  of the targeted query was not
found.
-
---- SQL operation failed with errors.
->>
 >>set envvar HP_FAKE_ERROR_201;
 
 --- SQL operation complete.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/392465ac/core/sql/regress/executor/TEST106
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/TEST106 b/core/sql/regress/executor/TEST106
index 0270193..dca40fd 100755
--- a/core/sql/regress/executor/TEST106
+++ b/core/sql/regress/executor/TEST106
@@ -1212,33 +1212,6 @@ log LOG106;
 ?section invalid_qid
 control query cancel qid foo;
 
-set envvar HP_FAKE_ERROR_2024;
-
-control query cancel qid
-MXID11000026954212168745269419968000000000217DEFAULT_MXCI_USER00_22_S1;
-
-set envvar HP_FAKE_ERROR_8142;
-
-control query cancel qid
-MXID11000026954212168745269419968000000000217DEFAULT_MXCI_USER00_22_S1;
-
-reset envvar HP_FAKE_ERROR_2024;
-
-reset envvar HP_FAKE_ERROR_8142;
-
-control query cancel qid
-MXID11000026954212168745269419968000000000217DEFAULT_MXCI_USER00_22_S1;
-
-set envvar HP_FAKE_ERROR_8028;
-
-control query cancel qid
-MXID11000026954212168745269419968000000000217DEFAULT_MXCI_USER00_22_S1;
-
-reset envvar HP_FAKE_ERROR_8028;
-
-control query cancel qid
-MXID11000026954212168745269419968000000000217DEFAULT_MXCI_USER00_22_S1;
-
 set envvar HP_FAKE_ERROR_201;
 
 control query cancel qid

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/392465ac/core/sql/runtimestats/ssmpipc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/runtimestats/ssmpipc.cpp b/core/sql/runtimestats/ssmpipc.cpp
index 1f9faf8..63fde9b 100755
--- a/core/sql/runtimestats/ssmpipc.cpp
+++ b/core/sql/runtimestats/ssmpipc.cpp
@@ -99,7 +99,7 @@ IpcServer *ExSsmpManager::getSsmpServer(char *nodeName, short cpuNum,
         GuaConnectionToServer *cbGCTS = ssmpServer->getControlConnection()->castToGuaConnectionToServer();
 
         // We need to keep 2 entries free - To send QueryFinishedMessage and to get the response
for query started message
-       if (cbGCTS->numReceiveCallbacksPending()+2 == cbGCTS->getNowaitDepth())
+       if (cbGCTS->numReceiveCallbacksPending()+2 >= cbGCTS->getNowaitDepth())
        {
           *diagsArea << DgSqlCode(-2026)
             << DgString0(tmpProcessName)


Mime
View raw message