Repository: phoenix Updated Branches: refs/heads/4.0 8dfda14ae -> 46b445bef
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/46b445be Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/46b445be Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/46b445be Branch: refs/heads/4.0 Commit: 46b445befb43e6257bb085c01a0a26e30ee68366 Parents: 8dfda14 Author: Jeffrey Zhong <jeffr...@apache.org> Authored: Wed Jul 9 17:43:54 2014 -0700 Committer: Jeffrey Zhong <jeffr...@apache.org> Committed: Wed Jul 9 17:49:05 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/46b445be/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/46b445be/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 a83a0c9..be0ac7a 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) {
