You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by je...@apache.org on 2014/07/10 02:39:42 UTC
git commit: PHOENIX-1072: Fast fail sqlline.py when pass wrong quorum
string or hbase cluster hasnt' started yet
Repository: phoenix
Updated Branches:
refs/heads/master 9bb0b01f6 -> 013e96c02
PHOENIX-1072: Fast fail sqlline.py when pass wrong quorum string or hbase cluster hasnt' started yet
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/013e96c0
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/013e96c0
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/013e96c0
Branch: refs/heads/master
Commit: 013e96c02b50f767e8e1e17d37c4cceef018d3eb
Parents: 9bb0b01
Author: Jeffrey Zhong <je...@apache.org>
Authored: Wed Jul 9 17:43:54 2014 -0700
Committer: Jeffrey Zhong <je...@apache.org>
Committed: Wed Jul 9 17:43:54 2014 -0700
----------------------------------------------------------------------
bin/log4j.properties | 4 +++-
.../org/apache/phoenix/query/ConnectionQueryServicesImpl.java | 7 +++++++
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/013e96c0/bin/log4j.properties
----------------------------------------------------------------------
diff --git a/bin/log4j.properties b/bin/log4j.properties
index 30119bc..47d45e8 100644
--- a/bin/log4j.properties
+++ b/bin/log4j.properties
@@ -65,5 +65,7 @@ log4j.appender.console.layout=org.apache.log4j.PatternLayout
log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n
# Custom Logging levels
-log4j.logger.org.apache.zookeeper=WARN
+log4j.logger.org.apache.zookeeper=ERROR
+log4j.logger.org.apache.hadoop.hbase.zookeeper.RecoverableZooKeeper=ERROR
+log4j.logger.org.apache.hadoop.hbase.zookeeper.ZKUtil=ERROR
log4j.logger.org.apache.hadoop.hbase.HBaseConfiguration=ERROR
http://git-wip-us.apache.org/repos/asf/phoenix/blob/013e96c0/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 5eb5314..04e65e7 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -1457,6 +1457,8 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement
SQLException sqlE = null;
PhoenixConnection metaConnection = null;
+ int origClientRetries = ConnectionQueryServicesImpl.this.config.getInt(
+ HConstants.HBASE_CLIENT_RETRIES_NUMBER, HConstants.DEFAULT_HBASE_CLIENT_RETRIES_NUMBER);
try {
openConnection();
Properties scnProps = PropertiesUtil.deepCopy(props);
@@ -1464,6 +1466,9 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement
PhoenixRuntime.CURRENT_SCN_ATTRIB,
Long.toString(MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP));
scnProps.remove(PhoenixRuntime.TENANT_ID_ATTRIB);
+ // during initialization fast fail when connection has issues
+ ConnectionQueryServicesImpl.this.config.setInt(
+ HConstants.HBASE_CLIENT_RETRIES_NUMBER, Math.min(2,origClientRetries));
metaConnection = new PhoenixConnection(
ConnectionQueryServicesImpl.this, url, scnProps, newEmptyMetaData());
try {
@@ -1482,6 +1487,8 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement
} catch (SQLException e) {
sqlE = e;
} finally {
+ ConnectionQueryServicesImpl.this.config.setInt(
+ HConstants.HBASE_CLIENT_RETRIES_NUMBER, origClientRetries);
try {
if (metaConnection != null) metaConnection.close();
} catch (SQLException e) {