Merge pull request #496 from emeroad/#320_backport_change_htablePool_api

#320 cleanup hbase option, log4j.xml

quickstart/collector/src/main/resources/hbase.properties

@@ -1,4 +1,23 @@
 # example
 hbase.client.host=localhost
 hbase.client.port=2181
-hbase.htable.threads.max=4
+
+# hbase timeout option==================================================================================
+# hbase default:true
+hbase.ipc.client.tcpnodelay=true
+# hbase default:60000
+hbase.rpc.timeout=10000
+# hbase default:Integer.MAX_VALUE
+hbase.client.operation.timeout=10000
+
+# hbase socket read timeout. default: 200000
+hbase.ipc.client.socket.timeout.read=20000
+# socket write timeout. hbase default: 600000
+hbase.ipc.client.socket.timeout.write=60000
+
+# ==================================================================================
+# hbase client thread pool option
+hbase.client.thread.max=128
+hbase.client.threadPool.queueSize=5120
+# prestartAllCoreThreads
+hbase.client.threadPool.prestart=false

quickstart/collector/src/main/resources/log4j.xml

@@ -20,29 +20,6 @@
     </appender>
 
 
-    <appender name="nelo" class="com.nhncorp.nelo2.log4j.NeloAppender">
-        <param name="Threshold" value="WARN"/>
-        <param name="projectName" value="PINPOINT"/>
-        <param name="collectorUrl" value="nelo2-col.nhncorp.com"/>
-        <param name="port" value="10006"/>
-        <param name="encoding" value="utf-8"/>
-        <param name="timeout" value="1200"/>
-        <param name="enable" value="true"/>
-        <param name="logType" value="local"/>
-        <param name="logSource" value="collector"/>
-        <param name="errorCodeTYpe" value="default"/>
-        <param name="debug" value="false"/>
-    </appender>
-
-    <appender name="nelo-async" class="com.nhncorp.nelo2.log4j.Nelo2AsyncAppender">
-        <param name="Threshold" value="WARN"/>
-        <param name="blocking" value="false"/>
-        <param name="locationInfo" value="false"/>
-        <param name="bufferSize" value="1024"/>
-        <appender-ref ref="nelo"/>
-    </appender>
-
-
     <logger name="com.navercorp.pinpoint" additivity="false">
         <level value="DEBUG"/>
         <appender-ref ref="console"/>
@@ -75,6 +52,5 @@
     <root>
         <level value="INFO"/>
         <appender-ref ref="console"/>
-        <!--<appender-ref ref="nelo-async"/>-->
     </root>
 </log4j:configuration>

quickstart/collector/src/main/resources/pinpoint-collector.properties

@@ -1,5 +1,3 @@
-hbase.hTablePoolSize=1024
-
 # tcp listen ip
 collector.tcpListenIp=0.0.0.0
 collector.tcpListenPort=29994

quickstart/web/src/main/resources/hbase.properties

@@ -1,4 +1,23 @@
 # example
 hbase.client.host=localhost
 hbase.client.port=2181
-hbase.htable.threads.max=4
+
+# hbase timeout option==================================================================================
+# hbase default:true
+hbase.ipc.client.tcpnodelay=true
+# hbase default:60000
+hbase.rpc.timeout=10000
+# hbase default:Integer.MAX_VALUE
+hbase.client.operation.timeout=10000
+
+# hbase socket read timeout. default: 200000
+hbase.ipc.client.socket.timeout.read=20000
+# socket write timeout. hbase default: 600000
+hbase.ipc.client.socket.timeout.write=60000
+
+# ==================================================================================
+# hbase client thread pool option
+hbase.client.thread.max=128
+hbase.client.threadPool.queueSize=5120
+# prestartAllCoreThreads
+hbase.client.threadPool.prestart=false

quickstart/web/src/main/resources/log4j.xml

@@ -85,5 +85,6 @@
 
     <root>
         <level value="DEBUG"/>
+        <appender-ref ref="console"/>
     </root>
 </log4j:configuration>