Return-Path: X-Original-To: apmail-tajo-commits-archive@minotaur.apache.org Delivered-To: apmail-tajo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 43A2F17528 for ; Wed, 11 Mar 2015 01:21:58 +0000 (UTC) Received: (qmail 20046 invoked by uid 500); 11 Mar 2015 01:21:58 -0000 Delivered-To: apmail-tajo-commits-archive@tajo.apache.org Received: (qmail 19930 invoked by uid 500); 11 Mar 2015 01:21:58 -0000 Mailing-List: contact commits-help@tajo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tajo.apache.org Delivered-To: mailing list commits@tajo.apache.org Received: (qmail 19879 invoked by uid 99); 11 Mar 2015 01:21:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Mar 2015 01:21:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CEFB5E10A2; Wed, 11 Mar 2015 01:21:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jihoonson@apache.org To: commits@tajo.apache.org Date: Wed, 11 Mar 2015 01:21:58 -0000 Message-Id: <16a5e6f753bb443d8fe6876fe57a8821@git.apache.org> In-Reply-To: <9326c0bfaa094a1387143e894ec2ad37@git.apache.org> References: <9326c0bfaa094a1387143e894ec2ad37@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/12] tajo git commit: TAJO-1369: Some stack trace information is missed in error/fail logging. (Contributed by navis, Committed by hyunsik) TAJO-1369: Some stack trace information is missed in error/fail logging. (Contributed by navis, Committed by hyunsik) Closes #396 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/f1aeb734 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/f1aeb734 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/f1aeb734 Branch: refs/heads/index_support Commit: f1aeb734a42dfe0ab756069e5380bb253e09b45c Parents: 6e519bc Author: Hyunsik Choi Authored: Fri Mar 6 00:32:23 2015 -0800 Committer: Hyunsik Choi Committed: Fri Mar 6 00:36:13 2015 -0800 ---------------------------------------------------------------------- CHANGES | 3 +++ .../tajo/catalog/AbstractCatalogClient.java | 4 ++-- .../org/apache/tajo/catalog/CatalogServer.java | 6 +++--- .../tajo/catalog/store/AbstractDBStore.java | 18 +++++++++--------- .../tajo/engine/codegen/ExecutorPreCompiler.java | 2 +- .../tajo/engine/function/FunctionLoader.java | 2 +- .../tajo/engine/planner/global/GlobalPlanner.java | 2 +- .../tajo/master/QueryCoordinatorService.java | 2 +- .../org/apache/tajo/master/QueryInProgress.java | 2 +- .../java/org/apache/tajo/master/QueryManager.java | 2 +- .../java/org/apache/tajo/master/TajoMaster.java | 4 ++-- .../tajo/master/rm/TajoWorkerResourceManager.java | 4 ++-- .../org/apache/tajo/querymaster/QueryMaster.java | 4 ++-- .../java/org/apache/tajo/querymaster/Task.java | 2 +- .../org/apache/tajo/session/SessionManager.java | 2 +- .../apache/tajo/util/history/HistoryWriter.java | 2 +- .../apache/tajo/webapp/QueryExecutorServlet.java | 4 ++-- .../org/apache/tajo/worker/DeletionService.java | 4 ++-- .../apache/tajo/worker/ExecutionBlockContext.java | 2 +- .../tajo/worker/ExecutionBlockSharedResource.java | 2 +- .../main/java/org/apache/tajo/worker/Fetcher.java | 6 +++--- .../apache/tajo/worker/TajoResourceAllocator.java | 2 +- .../main/java/org/apache/tajo/worker/Task.java | 2 +- .../java/org/apache/tajo/worker/TaskRunner.java | 2 +- .../tajo/worker/WorkerHeartbeatService.java | 2 +- .../tajo/worker/rule/WorkerRuleProvider.java | 2 +- .../java/org/apache/tajo/jdbc/JdbcConnection.java | 4 ++-- .../java/org/apache/tajo/plan/LogicalPlanner.java | 2 +- .../tajo/plan/exprrewrite/EvalTreeOptimizer.java | 2 +- .../tajo/pullserver/PullServerAuxService.java | 4 ++-- .../apache/tajo/pullserver/PullServerUtil.java | 2 +- .../tajo/pullserver/TajoPullServerService.java | 4 ++-- .../java/org/apache/tajo/rpc/NettyServerBase.java | 2 +- .../org/apache/tajo/rpc/RpcConnectionPool.java | 2 +- 34 files changed, 57 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/f1aeb734/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 974e4d7..003ae1a 100644 --- a/CHANGES +++ b/CHANGES @@ -11,6 +11,9 @@ Release 0.11.0 - unreleased TAJO-527: Upgrade to Netty 4. (jihun) + TAJO-1369: Some stack trace information is missed in error/fail logging. + (Contributed by navis, Committed by hyunsik) + BUG FIXES TAJO-1362: Resolve findbug warnings on Tajo Core Module. (jihun) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1aeb734/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/AbstractCatalogClient.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/AbstractCatalogClient.java b/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/AbstractCatalogClient.java index 718f7d6..d8350a3 100644 --- a/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/AbstractCatalogClient.java +++ b/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/AbstractCatalogClient.java @@ -459,7 +459,7 @@ public abstract class AbstractCatalogClient implements CatalogService { try { list.add(new FunctionDesc(response.getFunctionDesc(i))); } catch (ClassNotFoundException e) { - LOG.error(e); + LOG.error(e, e); return null; } } @@ -753,7 +753,7 @@ public abstract class AbstractCatalogClient implements CatalogService { try { return new FunctionDesc(descProto); } catch (ClassNotFoundException e) { - LOG.error(e); + LOG.error(e, e); throw new NoSuchFunctionException(signature, paramTypes); } } http://git-wip-us.apache.org/repos/asf/tajo/blob/f1aeb734/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java index 30b1767..c34b4d2 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java +++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java @@ -895,7 +895,7 @@ public class CatalogServer extends AbstractService { try { return store.existIndexByName(databaseName, indexName) ? ProtoUtil.TRUE : ProtoUtil.FALSE; } catch (Exception e) { - LOG.error(e); + LOG.error(e, e); return BoolProto.newBuilder().setValue(false).build(); } finally { rlock.unlock(); @@ -916,7 +916,7 @@ public class CatalogServer extends AbstractService { return store.existIndexByColumn(databaseName, tableName, columnName) ? ProtoUtil.TRUE : ProtoUtil.FALSE; } catch (Exception e) { - LOG.error(e); + LOG.error(e, e); return BoolProto.newBuilder().setValue(false).build(); } finally { rlock.unlock(); @@ -981,7 +981,7 @@ public class CatalogServer extends AbstractService { } store.dropIndex(databaseName, indexName); } catch (Exception e) { - LOG.error(e); + LOG.error(e, e); } finally { wlock.unlock(); } http://git-wip-us.apache.org/repos/asf/tajo/blob/f1aeb734/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java index 04694b0..5c78f82 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java +++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java @@ -154,7 +154,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo try { dropBaseTable(); } catch (Throwable t) { - LOG.error(t); + LOG.error(t, t); } throw ce; } @@ -299,7 +299,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo try { conn.rollback(); } catch (SQLException e) { - LOG.error(e); + LOG.error(e, e); } } throw new CatalogException(se); @@ -363,7 +363,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo try { conn.rollback(); } catch (SQLException e) { - LOG.error(e); + LOG.error(e, e); } } throw new CatalogException(String.format("Failed to drop tablespace \"%s\"", tableSpaceName), se); @@ -523,7 +523,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo try { conn.rollback(); } catch (SQLException e) { - LOG.error(e); + LOG.error(e, e); } } throw new CatalogException(se); @@ -584,7 +584,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo try { conn.rollback(); } catch (SQLException e) { - LOG.error(e); + LOG.error(e, e); } } throw new CatalogException(String.format("Failed to drop database \"%s\"", databaseName), se); @@ -878,7 +878,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo try { conn.rollback(); } catch (SQLException e) { - LOG.error(e); + LOG.error(e, e); } } throw new CatalogException(se); @@ -946,7 +946,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo try { conn.rollback(); } catch (SQLException e) { - LOG.error(e); + LOG.error(e, e); } } throw new CatalogException(se); @@ -1292,7 +1292,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo try { conn.rollback(); } catch (SQLException e) { - LOG.error(e); + LOG.error(e, e); } } finally { CatalogUtil.closeQuietly(conn); @@ -1708,7 +1708,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo try { conn.rollback(); } catch (SQLException e) { - LOG.error(e); + LOG.error(e, e); } } throw new CatalogException(se); http://git-wip-us.apache.org/repos/asf/tajo/blob/f1aeb734/tajo-core/src/main/java/org/apache/tajo/engine/codegen/ExecutorPreCompiler.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/codegen/ExecutorPreCompiler.java b/tajo-core/src/main/java/org/apache/tajo/engine/codegen/ExecutorPreCompiler.java index 79513dc..e472ee1 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/codegen/ExecutorPreCompiler.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/codegen/ExecutorPreCompiler.java @@ -85,7 +85,7 @@ public class ExecutorPreCompiler extends BasicLogicalPlanVisitor { Fragment fragment = FragmentConvertor.convert(systemConf, eachFragment); fragmentList.add(fragment.toString()); } catch (Exception e) { - LOG.error(e.getMessage()); + LOG.error(e.getMessage(), e); fragmentList.add("ERROR: " + eachFragment.getStoreType() + "," + eachFragment.getId() + ": " + e.getMessage()); } } http://git-wip-us.apache.org/repos/asf/tajo/blob/f1aeb734/tajo-core/src/main/java/org/apache/tajo/session/SessionManager.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/session/SessionManager.java b/tajo-core/src/main/java/org/apache/tajo/session/SessionManager.java index 571144b..5d66b2b 100644 --- a/tajo-core/src/main/java/org/apache/tajo/session/SessionManager.java +++ b/tajo-core/src/main/java/org/apache/tajo/session/SessionManager.java @@ -131,7 +131,7 @@ public class SessionManager extends CompositeService implements EventHandler