Skip to content

Commit

Permalink
New storage engine implementation #31 (#66)
Browse files Browse the repository at this point in the history
Cleaning up archival moving sql package

time series buckets

Fixing bugs with refactor

and diskstorage engine

Validating and fixing unit tests

windows)

adding unit tests for persistent measurement

Adding concurrency fixes #31

Fixing recovery bug

Fixing broken recovery system due to missing offsets, fixing unit tests
for recovery, adding parallel recovery for measurements

Improving test converage

Fixing minor code issues

fixing potential concurrency issue
  • Loading branch information
ambud committed Aug 20, 2017
1 parent dc4d448 commit e98d764
Show file tree
Hide file tree
Showing 134 changed files with 2,730 additions and 30,241 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
121 changes: 0 additions & 121 deletions core/src/arc/AbstractStorageEngine.java

This file was deleted.

89 changes: 0 additions & 89 deletions core/src/arc/App.java

This file was deleted.

51 changes: 0 additions & 51 deletions core/src/arc/DiskWriterBenchmark.java

This file was deleted.

52 changes: 0 additions & 52 deletions core/src/arc/SidewinderSchema.java

This file was deleted.

0 comments on commit e98d764

Please sign in to comment.