You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by mf...@apache.org on 2014/06/17 21:45:57 UTC
[14/15] git commit: STREAMS-83 | Updated elasticsearch provider with
running method
STREAMS-83 | Updated elasticsearch provider with running method
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/b90f7ce5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/b90f7ce5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/b90f7ce5
Branch: refs/heads/master
Commit: b90f7ce5022880b75ca47716f6f63237186ebc63
Parents: 8d874a9
Author: mfranklin <mf...@apache.org>
Authored: Thu Jun 12 12:50:24 2014 -0500
Committer: mfranklin <mf...@apache.org>
Committed: Thu Jun 12 12:50:24 2014 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/streams/s3/S3PersistReader.java | 6 ++++--
.../streams/elasticsearch/ElasticsearchPersistReader.java | 8 +++++++-
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b90f7ce5/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3PersistReader.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3PersistReader.java b/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3PersistReader.java
index a73f744..1123dbb 100644
--- a/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3PersistReader.java
+++ b/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3PersistReader.java
@@ -38,6 +38,7 @@ import java.util.Collection;
import java.util.Queue;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
import java.util.concurrent.LinkedBlockingQueue;
public class S3PersistReader implements StreamsPersistReader, DatumStatusCountable {
@@ -55,6 +56,7 @@ public class S3PersistReader implements StreamsPersistReader, DatumStatusCountab
protected DatumStatusCounter countersTotal = new DatumStatusCounter();
protected DatumStatusCounter countersCurrent = new DatumStatusCounter();
+ private Future<?> task;
public AmazonS3Client getAmazonS3Client() {
return this.amazonS3Client;
@@ -78,7 +80,7 @@ public class S3PersistReader implements StreamsPersistReader, DatumStatusCountab
@Override
public boolean isRunning() {
- return !executor.isShutdown() && !executor.isTerminated();
+ return !task.isDone() && !task.isCancelled();
}
public DatumStatusCounter getDatumStatusCounter() {
@@ -160,7 +162,7 @@ public class S3PersistReader implements StreamsPersistReader, DatumStatusCountab
public void startStream() {
LOGGER.debug("startStream");
- executor.submit(new S3PersistReaderTask(this));
+ task = executor.submit(new S3PersistReaderTask(this));
}
public StreamsResultSet readCurrent() {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b90f7ce5/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistReader.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistReader.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistReader.java
index 8c0af33..0f91e8a 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistReader.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistReader.java
@@ -56,6 +56,7 @@ public class ElasticsearchPersistReader implements StreamsPersistReader, Seriali
private int threadPoolSize = 10;
private ExecutorService executor;
private ReadWriteLock lock = new ReentrantReadWriteLock();
+ private Future<?> readerTask;
public ElasticsearchPersistReader() {
}
@@ -69,7 +70,7 @@ public class ElasticsearchPersistReader implements StreamsPersistReader, Seriali
public void startStream() {
LOGGER.debug("startStream");
executor = Executors.newSingleThreadExecutor();
- executor.submit(new ElasticsearchPersistReaderTask(this, elasticsearchQuery));
+ readerTask = executor.submit(new ElasticsearchPersistReaderTask(this, elasticsearchQuery));
}
@Override
@@ -118,6 +119,11 @@ public class ElasticsearchPersistReader implements StreamsPersistReader, Seriali
}
@Override
+ public boolean isRunning() {
+ return !readerTask.isDone() && !readerTask.isCancelled();
+ }
+
+ @Override
public void cleanUp() {
this.shutdownAndAwaitTermination(executor);
LOGGER.info("PersistReader done");