Merge branch '#31' into development

srotya · Aug 12, 2017 · f73cba4 · f73cba4
2 parents 39c18ba + 0c79eb1
commit f73cba4
Show file tree

Hide file tree

Showing 139 changed files with 2,079 additions and 29,831 deletions.
diff --git a/ambari/pom.xml b/ambari/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.srotya.sidewinder</groupId>
     <artifactId>sidewinder-parent</artifactId>
-    <version>0.0.22-SNAPSHOT</version>
+    <version>0.0.23-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>ambari-stack</artifactId>

diff --git a/archiver/hdfs-archiver/pom.xml b/archiver/hdfs-archiver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.srotya.sidewinder</groupId>
     <artifactId>sidewinder-archiver</artifactId>
-    <version>0.0.22-SNAPSHOT</version>
+    <version>0.0.23-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>hdfs-archiver</artifactId>

diff --git a/...ver/hdfs-archiver/src/test/java/com/srotya/sidewinder/archiver/hdfs/TestHDFSArchiver.java b/...ver/hdfs-archiver/src/test/java/com/srotya/sidewinder/archiver/hdfs/TestHDFSArchiver.java
@@ -30,8 +30,8 @@
 import com.srotya.sidewinder.core.storage.ArchiveException;
 import com.srotya.sidewinder.core.storage.Archiver;
 import com.srotya.sidewinder.core.storage.DataPoint;
-import com.srotya.sidewinder.core.storage.Reader;
 import com.srotya.sidewinder.core.storage.TimeSeriesBucket;
+import com.srotya.sidewinder.core.storage.compression.Reader;
 import com.srotya.sidewinder.core.storage.compression.byzantine.ByzantineWriter;
 import com.srotya.sidewinder.core.storage.mem.archival.TimeSeriesArchivalObject;
 
@@ -60,7 +60,8 @@ public void testHDFSArchive() throws IOException, ArchiveException {
 		conf.put(HDFSArchiver.HDFS_ARCHIVE_DIRECTORY, "target/test-hdfs-" + System.currentTimeMillis());
 		archiver.init(conf);
 		long ts = System.currentTimeMillis();
-		TimeSeriesBucket bucket = new TimeSeriesBucket("seriesId", ByzantineWriter.class.getName(), ts, false, new HashMap<>());
+		//TODO fix unit tests for HDFS Archiver
+		TimeSeriesBucket bucket = null;
 		for (int i = 0; i < 1000; i++) {
 			bucket.addDataPoint(ts + i * 1000, i);
 		}

diff --git a/archiver/pom.xml b/archiver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.srotya.sidewinder</groupId>
     <artifactId>sidewinder-parent</artifactId>
-    <version>0.0.22-SNAPSHOT</version>
+    <version>0.0.23-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>sidewinder-archiver</artifactId>

diff --git a/archiver/s3-archiver/pom.xml b/archiver/s3-archiver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.srotya.sidewinder</groupId>
     <artifactId>sidewinder-archiver</artifactId>
-    <version>0.0.22-SNAPSHOT</version>
+    <version>0.0.23-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>s3-archiver</artifactId>

diff --git a/build/build-info.txt b/build/build-info.txt
@@ -1,2 +1,2 @@
-Release Build number:179
-Release Commit number:f329877ebf0294938199c626a7b091f9c7f73e64
+Release Build number:213
+Release Commit number:814a14ce6a79ff53345dccf4fe6de01b3616bb80
diff --git a/cluster/pom.xml b/cluster/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.srotya.sidewinder</groupId>
     <artifactId>sidewinder-parent</artifactId>
-    <version>0.0.22-SNAPSHOT</version>
+    <version>0.0.23-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>sidewinder-cluster</artifactId>

diff --git a/cluster/src/main/java/com/srotya/sidewinder/cluster/ClusterResourceMonitor.java b/cluster/src/main/java/com/srotya/sidewinder/cluster/ClusterResourceMonitor.java
@@ -19,6 +19,8 @@
 import java.util.Arrays;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import com.srotya.sidewinder.cluster.connectors.ClusterConnector;
 import com.srotya.sidewinder.core.storage.DataPoint;
@@ -30,7 +32,7 @@
 public class ClusterResourceMonitor {
 
 	private static final String DB = "_internal";
-//	private static Logger logger = Logger.getLogger(ClusterResourceMonitor.class.getName());
+	private static Logger logger = Logger.getLogger(ClusterResourceMonitor.class.getName());
 	private static final ClusterResourceMonitor INSTANCE = new ClusterResourceMonitor();
 	private StorageEngine storageEngine;
 	private ClusterConnector connector;
@@ -67,8 +69,7 @@ private void clusterMonitor() {
 			dp.setTags(Arrays.asList("controller"));
 			storageEngine.writeDataPoint(dp);
 		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
+			logger.log(Level.SEVERE, "Failed to monitor cluster", e);
 		}
 	}
 

diff --git a/cluster/src/main/java/com/srotya/sidewinder/cluster/routing/RoutingEngine.java b/cluster/src/main/java/com/srotya/sidewinder/cluster/routing/RoutingEngine.java
@@ -27,8 +27,8 @@
 import com.srotya.sidewinder.core.rpc.RawTimeSeriesBucket;
 import com.srotya.sidewinder.core.rpc.RawTimeSeriesBucket.Builder;
 import com.srotya.sidewinder.core.storage.StorageEngine;
+import com.srotya.sidewinder.core.storage.TimeSeries;
 import com.srotya.sidewinder.core.storage.TimeSeriesBucket;
-import com.srotya.sidewinder.core.storage.mem.TimeSeries;
 
 /**
  * Routing Engine provides the abstraction to stitch together the

diff --git a/core/pom.xml b/core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.srotya.sidewinder</groupId>
     <artifactId>sidewinder-parent</artifactId>
-    <version>0.0.22-SNAPSHOT</version>
+    <version>0.0.23-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>sidewinder-core</artifactId>
@@ -139,6 +139,11 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.lz4</groupId>
+      <artifactId>lz4-java</artifactId>
+      <version>1.4.0</version>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>

diff --git a/core/src/arc/AbstractStorageEngine.java b/core/src/arc/AbstractStorageEngine.java
diff --git a/core/src/arc/App.java b/core/src/arc/App.java
diff --git a/core/src/arc/DiskWriterBenchmark.java b/core/src/arc/DiskWriterBenchmark.java