[phoenix] branch master updated: PHOENIX-5199 Pherf overrides user provided properties like dataloader threadpool, monitor frequency etc with pherf.properties

[karanmehta93]

This is an automated email from the ASF dual-hosted git repository.

karanmehta93 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
     new c1e7744  PHOENIX-5199 Pherf overrides user provided properties like 
dataloader threadpool, monitor frequency etc with pherf.properties
c1e7744 is described below

commit c1e7744c4b2b4591c15a62421ab39c048fbc2090
Author: Monani Mihir <mmon...@salesforce.com>
AuthorDate: Fri Mar 15 16:48:12 2019 +0530

    PHOENIX-5199 Pherf overrides user provided properties like dataloader 
threadpool, monitor frequency etc with pherf.properties
---
 phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java       | 2 +-
 .../main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java 
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
index 43061e0..d92ffde 100644
--- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
+++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
@@ -156,7 +156,7 @@ public class Pherf {
                 writerThreadPoolSize =
                 command.getOptionValue("writerThreadSize",
                         
properties.getProperty("pherf.default.dataloader.threadpool"));
-        properties.setProperty("pherf. default.dataloader.threadpool", 
writerThreadPoolSize);
+        properties.setProperty("pherf.default.dataloader.threadpool", 
writerThreadPoolSize);
         label = command.getOptionValue("label", null);
         compareResults = command.getOptionValue("compare", null);
         compareType = command.hasOption("useAverageCompareType") ? 
CompareType.AVERAGE : CompareType.MINIMUM;
diff --git 
a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java
 
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java
index c482b3f..b340a2b 100644
--- 
a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java
+++ 
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java
@@ -84,8 +84,8 @@ public class WriteWorkload implements Workload {
 
     public WriteWorkload(PhoenixUtil phoenixUtil, XMLConfigParser parser, 
Scenario scenario, GeneratePhoenixStats generateStatistics)
             throws Exception {
-        this(phoenixUtil, 
PherfConstants.create().getProperties(PherfConstants.PHERF_PROPERTIES,
-                false),
+        this(phoenixUtil,
+                
PherfConstants.create().getProperties(PherfConstants.PHERF_PROPERTIES, true),
                 parser, scenario, generateStatistics);
     }