phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamestay...@apache.org
Subject git commit: PHOENIX-1370 Allow query timeout to differ from RPC timeout
Date Tue, 21 Oct 2014 18:32:26 GMT
Repository: phoenix
Updated Branches:
  refs/heads/3.0 b479d2804 -> 4e9fd62eb


PHOENIX-1370 Allow query timeout to differ from RPC timeout

Conflicts:
	phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4e9fd62e
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4e9fd62e
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4e9fd62e

Branch: refs/heads/3.0
Commit: 4e9fd62eb68c80d2909d0a8f18452322e8c7b354
Parents: b479d28
Author: James Taylor <jtaylor@salesforce.com>
Authored: Tue Oct 21 11:30:39 2014 -0700
Committer: James Taylor <jtaylor@salesforce.com>
Committed: Tue Oct 21 11:37:57 2014 -0700

----------------------------------------------------------------------
 .../java/org/apache/phoenix/mapreduce/CsvBulkLoadTool.java    | 1 +
 .../java/org/apache/phoenix/query/QueryServicesOptions.java   | 7 -------
 2 files changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/4e9fd62e/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkLoadTool.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkLoadTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkLoadTool.java
index 127cd2c..0584599 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkLoadTool.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkLoadTool.java
@@ -431,6 +431,7 @@ public class CsvBulkLoadTool extends Configured implements Tool {
 	            boolean success = job.waitForCompletion(true);
 	            if (!success) {
 	                LOG.error("Import job failed, check JobTracker for details");
+	                htable.close();
 	                return false;
 	            }
 	

http://git-wip-us.apache.org/repos/asf/phoenix/blob/4e9fd62e/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
index a208ac5..ad2b48a 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
@@ -59,7 +59,6 @@ import static org.apache.phoenix.query.QueryServices.USE_INDEXES_ATTRIB;
 import java.util.Map.Entry;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.regionserver.wal.WALEditCodec;
 import org.apache.phoenix.schema.SaltingUtil;
 import org.apache.phoenix.util.DateUtil;
@@ -148,12 +147,6 @@ public class QueryServicesOptions {
     }
     
     public ReadOnlyProps getProps(ReadOnlyProps defaultProps) {
-        // Ensure that HBase RPC time out value is at least as large as our thread time out
for query. 
-        int threadTimeOutMS = config.getInt(THREAD_TIMEOUT_MS_ATTRIB, DEFAULT_THREAD_TIMEOUT_MS);
-        int hbaseRPCTimeOut = config.getInt(HConstants.HBASE_RPC_TIMEOUT_KEY, HConstants.DEFAULT_HBASE_RPC_TIMEOUT);
-        if (threadTimeOutMS > hbaseRPCTimeOut) {
-            config.setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, threadTimeOutMS);
-        }
         return new ReadOnlyProps(defaultProps, config.iterator());
     }
     


Mime
View raw message