[cloudstack] branch master updated: server: use latest InfluxDB (2.15), add support to Batch Mode (#3289)

[rohit]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new d6437d5  server: use latest InfluxDB (2.15), add support to Batch Mode 
(#3289)
d6437d5 is described below

commit d6437d5acafc331ef784dc3c6f947206515684ae
Author: Gabriel Beims Bräscher <gabr...@pcextreme.nl>
AuthorDate: Mon Apr 29 15:05:37 2019 -0300

    server: use latest InfluxDB (2.15), add support to Batch Mode (#3289)
    
    The InfluxDB Java client supports Batch Mode at versions 2.9+ [1]. Thus, 
this PR updated to the latest InfluxDB (2.15), adding support to Batch Mode
    
    [1] https://github.com/influxdata/influxdb-java
---
 pom.xml                                                   | 6 ++++++
 server/pom.xml                                            | 1 -
 server/src/main/java/com/cloud/server/StatsCollector.java | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0e30e69..d7a7b53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,6 +130,7 @@
         <cs.guava.version>23.6-jre</cs.guava.version>
         <cs.httpclient.version>4.5.4</cs.httpclient.version>
         <cs.httpcore.version>4.4.8</cs.httpcore.version>
+        <cs.influxdb-java.version>2.15</cs.influxdb-java.version>
         <cs.jackson.version>2.9.2</cs.jackson.version>
         <cs.jasypt.version>1.9.2</cs.jasypt.version>
         <cs.java-ipv6.version>0.16</cs.java-ipv6.version>
@@ -525,6 +526,11 @@
                 <version>${cs.groovy.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.influxdb</groupId>
+                <artifactId>influxdb-java</artifactId>
+                <version>${cs.influxdb-java.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-jmx</artifactId>
                 <version>${cs.jetty.version}</version>
diff --git a/server/pom.xml b/server/pom.xml
index 4c69f7d..c0ee119 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -160,7 +160,6 @@
         <dependency>
             <groupId>org.influxdb</groupId>
             <artifactId>influxdb-java</artifactId>
-            <version>2.8</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/server/src/main/java/com/cloud/server/StatsCollector.java 
b/server/src/main/java/com/cloud/server/StatsCollector.java
index 80b745e..7ae7905 100644
--- a/server/src/main/java/com/cloud/server/StatsCollector.java
+++ b/server/src/main/java/com/cloud/server/StatsCollector.java
@@ -51,6 +51,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
+import org.influxdb.BatchOptions;
 import org.influxdb.InfluxDB;
 import org.influxdb.InfluxDBFactory;
 import org.influxdb.dto.BatchPoints;
@@ -1502,6 +1503,7 @@ public class StatsCollector extends ManagerBase 
implements ComponentMethodInterc
      */
     protected void writeBatches(InfluxDB influxDbConnection, String dbName, 
List<Point> points) {
         BatchPoints batchPoints = BatchPoints.database(dbName).build();
+        influxDbConnection.enableBatch(BatchOptions.DEFAULTS);
 
         for (Point point : points) {
             batchPoints.point(point);