Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread abdullah alamoudi (Code Review)
abdullah alamoudi has submitted this change and it was merged.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


[ASTERIXDB-2064][ING] Timeout Stop Feed

- user model changes: no
- storage format changes: no
- interface changes: no

details:
- The abort feed message stops the reader and wait for the
  dataflow controller to signal end of life.
- If the reader returns true to stop but the dataflow controller
  never signal ends, it can get stuck.
- This change adds a timeout after which, the task thread is
  interrupted.

Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1964
Tested-by: Jenkins 
Contrib: Jenkins 
Reviewed-by: Michael Blow 
Integration-Tests: Jenkins 
---
M 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataFlowController.java
M 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java
M 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedStreamDataFlowController.java
M 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataset/adapter/FeedAdapter.java
M 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorNodePushable.java
M 
asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapter.java
M 
hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java
M 
hyracks-fullstack/hyracks/hyracks-api/src/main/resources/errormsg/en.properties
8 files changed, 35 insertions(+), 12 deletions(-)

Approvals:
  Jenkins: Verified; ; Verified
  Michael Blow: Looks good to me, approved

Objections:
  Jenkins: Violations found



diff --git 
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataFlowController.java
 
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataFlowController.java
index 7412338..f59b82e 100644
--- 
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataFlowController.java
+++ 
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataFlowController.java
@@ -40,7 +40,7 @@
 throw new RuntimeDataException(ErrorCode.OPERATION_NOT_SUPPORTED);
 }
 
-public default boolean stop() throws HyracksDataException {
+public default boolean stop(long timeout) throws HyracksDataException {
 throw new RuntimeDataException(ErrorCode.OPERATION_NOT_SUPPORTED);
 }
 }
diff --git 
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java
 
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java
index e24c26d..4ed1b08 100644
--- 
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java
+++ 
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java
@@ -213,16 +213,24 @@
 }
 }
 
-private void waitForSignal() throws InterruptedException {
+private void waitForSignal(long timeout) throws InterruptedException, 
HyracksDataException {
+if (timeout <= 0) {
+throw new IllegalArgumentException("timeout must be greater than 
0");
+}
 synchronized (closed) {
 while (!closed.get()) {
-closed.wait();
+long before = System.currentTimeMillis();
+closed.wait(timeout);
+timeout -= System.currentTimeMillis() - before;
+if (!closed.get() && timeout <= 0) {
+throw 
HyracksDataException.create(org.apache.hyracks.api.exceptions.ErrorCode.TIMEOUT);
+}
 }
 }
 }
 
 @Override
-public boolean stop() throws HyracksDataException {
+public boolean stop(long timeout) throws HyracksDataException {
 synchronized (this) {
 switch (state) {
 case CREATED:
@@ -238,7 +246,7 @@
 }
 if (recordReader.stop()) {
 try {
-waitForSignal();
+waitForSignal(timeout);
 } catch (InterruptedException e) {
 Thread.currentThread().interrupt();
 throw HyracksDataException.create(e);
diff --git 
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedStreamDataFlowController.java
 
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedStreamDataFlowController.java
index 1f1f545..025520e 100644
--- 

Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 3: Integration-Tests+1

Integration Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/3837/ 
: SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Michael Blow (Code Review)
Michael Blow has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 3: Code-Review+2

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 3: Contrib+1

BAD Compatibility Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/1694/ : SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 3:

BAD Compatibility Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/1694/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 3:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/3837/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 3:

Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/752/ 
(10/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 3:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/1092/ 
(7/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 3:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-rebalance-cancellation/578/
 (8/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 3:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/1495/ 
(3/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 3:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/757/ 
(9/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 3:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/4830/ (6/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 3:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/6311/ (11/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 3:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app/1676/ (4/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 2:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/3836/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/1494/ 
(11/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 2:

WARNING: THIS CHANGE CONTAINS CROSS-PRODUCT CHANGES IN:
* asterixdb
* hyracks-fullstack

PLEASE REVIEW CAREFULLY AND LOOK FOR API CHANGES!

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/1091/ 
(4/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/756/ 
(8/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread abdullah alamoudi (Code Review)
Hello Anon. E. Moose #1000171, Jenkins,

I'd like you to reexamine a change.  Please visit

https://asterix-gerrit.ics.uci.edu/1964

to look at the new patch set (#2).

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..

[ASTERIXDB-2064][ING] Timeout Stop Feed

- user model changes: no
- storage format changes: no
- interface changes: no

details:
- The abort feed message stops the reader and wait for the
  dataflow controller to signal end of life.
- If the reader returns true to stop but the dataflow controller
  never signal ends, it can get stuck.
- This change adds a timeout after which, the task thread is
  interrupted.

Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
---
M 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataFlowController.java
M 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java
M 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedStreamDataFlowController.java
M 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataset/adapter/FeedAdapter.java
M 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorNodePushable.java
M 
asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapter.java
M 
hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java
M 
hyracks-fullstack/hyracks/hyracks-api/src/main/resources/errormsg/en.properties
8 files changed, 35 insertions(+), 12 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/64/1964/2
-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 2:

Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/751/ (6/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/1371/ (1/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/1434/
 (5/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/4829/ (10/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-rebalance-cancellation/577/
 (9/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/6310/ (2/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app/1675/ (7/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/754/
 (3/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-24 Thread abdullah alamoudi (Code Review)
abdullah alamoudi has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 1:

(2 comments)

https://asterix-gerrit.ics.uci.edu/#/c/1964/1/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java
File 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java:

PS1, Line 221: long sofar = now - start;
 : long remaining = timeout - sofar;
> can't we replace start, now, sofar, and remaining with a single long repres
Done


https://asterix-gerrit.ics.uci.edu/#/c/1964/1/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorNodePushable.java
File 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorNodePushable.java:

PS1, Line 126: 1
> introduce constant?  should this be configurable (in the future)?
of course. creating an issue.


-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: Yes


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-23 Thread Anon. E. Moose (Code Review)
Anon. E. Moose #1000171 has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 1: Contrib-1

Analytics Compatibility Tests Failed Build 2495
: UNSTABLE

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-23 Thread Michael Blow (Code Review)
Michael Blow has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 1:

(2 comments)

https://asterix-gerrit.ics.uci.edu/#/c/1964/1/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java
File 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java:

PS1, Line 221: long sofar = now - start;
 : long remaining = timeout - sofar;
can't we replace start, now, sofar, and remaining with a single long 
representing the timeout time, and avoid all these updates?  e.g. end = 
System.currentTimeMillis() + timeout;, then compare that to 
System.currentTimeMillis() to determine when to break?


https://asterix-gerrit.ics.uci.edu/#/c/1964/1/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorNodePushable.java
File 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorNodePushable.java:

PS1, Line 126: 1
introduce constant?  should this be configurable (in the future)?


-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-HasComments: Yes


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-23 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 1: Integration-Tests+1

Integration Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/3827/ 
: SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-23 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 1: Contrib+1

BAD Compatibility Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/1688/ : SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-23 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 1:

BAD Compatibility Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/1688/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-23 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 1:

WARNING: THIS CHANGE CONTAINS CROSS-PRODUCT CHANGES IN:
* asterixdb
* hyracks-fullstack

PLEASE REVIEW CAREFULLY AND LOOK FOR API CHANGES!

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-23 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 1:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/3827/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-23 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 1:

Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/743/ (7/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-23 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/748/ 
(9/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-23 Thread abdullah alamoudi (Code Review)
abdullah alamoudi has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/1964

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..

[ASTERIXDB-2064][ING] Timeout Stop Feed

- user model changes: no
- storage format changes: no
- interface changes: no

details:
- The abort feed message stops the reader and wait for the
  dataflow controller to signal end of life.
- If the reader returns true to stop but the dataflow controller
  never signal ends, it can get stuck.
- This change adds a timeout after which, the task thread is
  interrupted.

Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
---
M 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataFlowController.java
M 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java
M 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedStreamDataFlowController.java
M 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataset/adapter/FeedAdapter.java
M 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorNodePushable.java
M 
asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapter.java
M 
hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java
M 
hyracks-fullstack/hyracks/hyracks-api/src/main/resources/errormsg/en.properties
8 files changed, 37 insertions(+), 12 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/64/1964/1

diff --git 
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataFlowController.java
 
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataFlowController.java
index 7412338..f59b82e 100644
--- 
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataFlowController.java
+++ 
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataFlowController.java
@@ -40,7 +40,7 @@
 throw new RuntimeDataException(ErrorCode.OPERATION_NOT_SUPPORTED);
 }
 
-public default boolean stop() throws HyracksDataException {
+public default boolean stop(long timeout) throws HyracksDataException {
 throw new RuntimeDataException(ErrorCode.OPERATION_NOT_SUPPORTED);
 }
 }
diff --git 
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java
 
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java
index e24c26d..921739f 100644
--- 
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java
+++ 
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java
@@ -213,16 +213,28 @@
 }
 }
 
-private void waitForSignal() throws InterruptedException {
+private void waitForSignal(long timeout) throws InterruptedException, 
HyracksDataException {
+long start = System.currentTimeMillis();
+long now = start;
 synchronized (closed) {
 while (!closed.get()) {
-closed.wait();
+long sofar = now - start;
+long remaining = timeout - sofar;
+if (remaining > 0) {
+closed.wait(remaining);
+now = System.currentTimeMillis();
+sofar = now - start;
+remaining = timeout - sofar;
+}
+if (!closed.get() && remaining <= 0) {
+throw 
HyracksDataException.create(org.apache.hyracks.api.exceptions.ErrorCode.TIMEOUT);
+}
 }
 }
 }
 
 @Override
-public boolean stop() throws HyracksDataException {
+public boolean stop(long timeout) throws HyracksDataException {
 synchronized (this) {
 switch (state) {
 case CREATED:
@@ -238,7 +250,7 @@
 }
 if (recordReader.stop()) {
 try {
-waitForSignal();
+waitForSignal(timeout);
 } catch (InterruptedException e) {
 Thread.currentThread().interrupt();
 throw HyracksDataException.create(e);
diff --git 
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedStreamDataFlowController.java
 
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedStreamDataFlowController.java
index 1f1f545..025520e 100644
--- 
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedStreamDataFlowController.java
+++ 

Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-23 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/1486/ 
(4/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-23 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/1083/ 
(8/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-23 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app/1666/ (2/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-23 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/1363/ (1/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-23 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/746/
 (5/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-23 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/1426/
 (11/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-23 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/4821/ (3/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-23 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-rebalance-cancellation/569/
 (10/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No


Change in asterixdb[master]: [ASTERIXDB-2064][ING] Timeout Stop Feed

2017-08-23 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: [ASTERIXDB-2064][ING] Timeout Stop Feed
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/6302/ (6/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1964
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If609a8343767ee7a80689a58af35a1b3fca2964b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No