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 2016/07/20 00:18:14 UTC
[1/2] incubator-trafodion git commit: [TRAFODION-2113] Fix for coring
idtmsrv process
Repository: incubator-trafodion
Updated Branches:
refs/heads/master b7dd48c1f -> 5b9c2b493
[TRAFODION-2113] Fix for coring idtmsrv process
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6985578f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6985578f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6985578f
Branch: refs/heads/master
Commit: 6985578f4f27f7f050e42293b2985cef661cb318
Parents: 08be5c1
Author: Sean Broeder <sb...@edev06.esgyn.local>
Authored: Mon Jul 18 20:08:40 2016 +0000
Committer: Sean Broeder <sb...@edev06.esgyn.local>
Committed: Mon Jul 18 20:08:40 2016 +0000
----------------------------------------------------------------------
.../hadoop/hbase/regionserver/transactional/IdTm.java | 2 +-
core/sqf/src/tm/idtmsrv.cpp | 13 ++++++++++++-
.../src/main/java/org/trafodion/sql/HTableClient.java | 3 ++-
3 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6985578f/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/IdTm.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/IdTm.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/IdTm.java
index da47099..590e9b5 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/IdTm.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/IdTm.java
@@ -116,7 +116,7 @@ public class IdTm implements IdTmCb {
* @exception IdTmException exception
*/
public void id(int timeout, IdTmId id) throws IdTmException {
- if (LOG.isDebugEnabled()) LOG.debug("id begin");
+ if (LOG.isDebugEnabled()) LOG.debug("id begin with timeout " + timeout);
try {
int err = native_id(timeout, id);
if (LOG.isDebugEnabled()) LOG.debug("id returned: " + id.val + ", error: " + err);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6985578f/core/sqf/src/tm/idtmsrv.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/tm/idtmsrv.cpp b/core/sqf/src/tm/idtmsrv.cpp
index a974b5d..d7e6295 100644
--- a/core/sqf/src/tm/idtmsrv.cpp
+++ b/core/sqf/src/tm/idtmsrv.cpp
@@ -434,7 +434,18 @@ void do_req(BMS_SRE *pp_sre) {
lv_ferr = BMSG_READDATA_(pp_sre->sre_msgId, // msgid
(char *) &lv_req, // reqdata
(int) sizeof(lv_req)); // bytecount
- assert(lv_ferr == XZFIL_ERR_OK);
+ if (lv_ferr != XZFIL_ERR_OK){
+ printf("srv: received lv_ferr %d in do_req \n", lv_ferr);
+ if((lv_ferr = XMSG_ISCANCELED_(pp_sre->sre_msgId))){
+ printf("srv: XMSG_ISCANCELED_ returned %d in do_req. Most likely the client timeout was exceeded \n", lv_ferr);
+ return;
+ }
+ else{
+ printf("srv: XMSG_ISCANCELED_ returned %d in do_req after FEEOF on BMSG_READDATA_. ABORTING \n", lv_ferr);
+ abort();
+ }
+ }
+
if (gv_verbose) {
switch (lv_req.iv_req_type) {
case GID_REQ_PING:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6985578f/core/sql/src/main/java/org/trafodion/sql/HTableClient.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/HTableClient.java b/core/sql/src/main/java/org/trafodion/sql/HTableClient.java
index 52de8ba..ec33084 100644
--- a/core/sql/src/main/java/org/trafodion/sql/HTableClient.java
+++ b/core/sql/src/main/java/org/trafodion/sql/HTableClient.java
@@ -345,7 +345,8 @@ public class HTableClient {
}
table = new RMInterface(tblName);
- if (logger.isDebugEnabled()) logger.debug("Exit HTableClient::init, table object: " + table);
+ if (logger.isDebugEnabled()) logger.debug("Exit HTableClient::init, useTRex: " + this.useTRex + ", useTRexScanner: "
+ + this.useTRexScanner + ", table object: " + table);
return true;
}
[2/2] incubator-trafodion git commit: Merge [TRAFODION-2113] PR 602
Fix for idtmsrv process core
Posted by db...@apache.org.
Merge [TRAFODION-2113] PR 602 Fix for idtmsrv process core
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/5b9c2b49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/5b9c2b49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/5b9c2b49
Branch: refs/heads/master
Commit: 5b9c2b493ac60a60bc9535cbaadc3cff5f8de5e9
Parents: b7dd48c 6985578
Author: Dave Birdsall <db...@apache.org>
Authored: Wed Jul 20 00:17:24 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed Jul 20 00:17:24 2016 +0000
----------------------------------------------------------------------
.../hadoop/hbase/regionserver/transactional/IdTm.java | 2 +-
core/sqf/src/tm/idtmsrv.cpp | 13 ++++++++++++-
.../src/main/java/org/trafodion/sql/HTableClient.java | 3 ++-
3 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------