Repository: phoenix Updated Branches: refs/heads/4.0 46b445bef -> 0b5b14654
Revert "PHOENIX-1072: Fast fail sqlline.py when pass wrong quorum string or hbase cluster hasnt' started yet" This reverts commit 013e96c02b50f767e8e1e17d37c4cceef018d3eb. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/0b5b1465 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/0b5b1465 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/0b5b1465 Branch: refs/heads/4.0 Commit: 0b5b14654cec20a987f514ccadb0ec05449a4793 Parents: 46b445b Author: Jeffrey Zhong <jeffr...@apache.org> Authored: Wed Jul 9 19:19:36 2014 -0700 Committer: Jeffrey Zhong <jeffr...@apache.org> Committed: Wed Jul 9 19:19:36 2014 -0700 ---------------------------------------------------------------------- bin/log4j.properties | 4 +--- .../org/apache/phoenix/query/ConnectionQueryServicesImpl.java | 7 ------- 2 files changed, 1 insertion(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b5b1465/bin/log4j.properties ---------------------------------------------------------------------- diff --git a/bin/log4j.properties b/bin/log4j.properties index 47d45e8..30119bc 100644 --- a/bin/log4j.properties +++ b/bin/log4j.properties @@ -65,7 +65,5 @@ 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=ERROR -log4j.logger.org.apache.hadoop.hbase.zookeeper.RecoverableZooKeeper=ERROR -log4j.logger.org.apache.hadoop.hbase.zookeeper.ZKUtil=ERROR +log4j.logger.org.apache.zookeeper=WARN log4j.logger.org.apache.hadoop.hbase.HBaseConfiguration=ERROR http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b5b1465/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 be0ac7a..a83a0c9 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,8 +1457,6 @@ 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); @@ -1466,9 +1464,6 @@ 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 { @@ -1487,8 +1482,6 @@ 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) {