You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by "abdullah alamoudi (Code Review)" <do...@asterixdb.incubator.apache.org> on 2016/01/11 14:29:01 UTC
Change in hyracks[master]: Fix Error in Aborting Task in Super Activity
abdullah alamoudi has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/582
Change subject: Fix Error in Aborting Task in Super Activity
......................................................................
Fix Error in Aborting Task in Super Activity
When aborting a task, its thread gets interrupted. This creates
a problem when interrupting
Change-Id: I603d3c101e0a4de4816eb5a6a7fd4320df317ce4
---
M hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/runtime/SuperActivityOperatorNodePushable.java
M hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java
2 files changed, 11 insertions(+), 3 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/hyracks refs/changes/82/582/1
diff --git a/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/runtime/SuperActivityOperatorNodePushable.java b/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/runtime/SuperActivityOperatorNodePushable.java
index 4e842bb..544c788 100644
--- a/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/runtime/SuperActivityOperatorNodePushable.java
+++ b/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/runtime/SuperActivityOperatorNodePushable.java
@@ -207,13 +207,21 @@
}));
}
+ HyracksDataException hde = null;
// Waits until all parallel actions to finish.
for (Future<Void> initializationTask : initializationTasks) {
try {
initializationTask.get();
- } catch (Exception e) {
- throw new HyracksDataException(e);
+ } catch (Throwable th) {
+ hde = new HyracksDataException(th);
+ break;
}
}
+ if (hde != null) {
+ for (Future<Void> initializationTask : initializationTasks) {
+ initializationTask.cancel(true);
+ }
+ throw hde;
+ }
}
}
diff --git a/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java b/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java
index 12df264..61baf82 100644
--- a/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java
+++ b/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java
@@ -255,8 +255,8 @@
addPendingThread(ct);
try {
ct.setName(displayName + ":" + taskAttemptId + ":" + 0);
- operator.initialize();
try {
+ operator.initialize();
if (collectors.length > 0) {
final Semaphore sem = new Semaphore(collectors.length - 1);
for (int i = 1; i < collectors.length; ++i) {
--
To view, visit https://asterix-gerrit.ics.uci.edu/582
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I603d3c101e0a4de4816eb5a6a7fd4320df317ce4
Gerrit-PatchSet: 1
Gerrit-Project: hyracks
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi <ba...@gmail.com>
Change in hyracks[master]: Fix Error in Aborting Task in Super Activity
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Fix Error in Aborting Task in Super Activity
......................................................................
Patch Set 2:
Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/719/
--
To view, visit https://asterix-gerrit.ics.uci.edu/582
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I603d3c101e0a4de4816eb5a6a7fd4320df317ce4
Gerrit-PatchSet: 2
Gerrit-Project: hyracks
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi <ba...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in hyracks[master]: Fix Error in Aborting Task in Super Activity
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Fix Error in Aborting Task in Super Activity
......................................................................
Patch Set 2: Verified+1
Build Successful
https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/719/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/582
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I603d3c101e0a4de4816eb5a6a7fd4320df317ce4
Gerrit-PatchSet: 2
Gerrit-Project: hyracks
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi <ba...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in hyracks[master]: Fix Error in Aborting Task in Super Activity
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Fix Error in Aborting Task in Super Activity
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/718/
--
To view, visit https://asterix-gerrit.ics.uci.edu/582
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I603d3c101e0a4de4816eb5a6a7fd4320df317ce4
Gerrit-PatchSet: 1
Gerrit-Project: hyracks
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi <ba...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in hyracks[master]: Fix Error in Aborting Task in Super Activity
Posted by "abdullah alamoudi (Code Review)" <do...@asterixdb.incubator.apache.org>.
abdullah alamoudi has uploaded a new patch set (#2).
Change subject: Fix Error in Aborting Task in Super Activity
......................................................................
Fix Error in Aborting Task in Super Activity
When aborting a task, its thread gets interrupted. This creates
a problem when interrupting
Change-Id: I603d3c101e0a4de4816eb5a6a7fd4320df317ce4
---
M hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/runtime/SuperActivityOperatorNodePushable.java
M hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java
2 files changed, 20 insertions(+), 18 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/hyracks refs/changes/82/582/2
--
To view, visit https://asterix-gerrit.ics.uci.edu/582
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I603d3c101e0a4de4816eb5a6a7fd4320df317ce4
Gerrit-PatchSet: 2
Gerrit-Project: hyracks
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi <ba...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Change in hyracks[master]: Fix Error in Aborting Task in Super Activity
Posted by "abdullah alamoudi (Code Review)" <do...@asterixdb.incubator.apache.org>.
abdullah alamoudi has submitted this change and it was merged.
Change subject: Fix Error in Aborting Task in Super Activity
......................................................................
Fix Error in Aborting Task in Super Activity
When aborting a task, its thread gets interrupted. This creates
a problem when interrupting
Change-Id: I603d3c101e0a4de4816eb5a6a7fd4320df317ce4
Reviewed-on: https://asterix-gerrit.ics.uci.edu/582
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Murtadha Hubail <hu...@gmail.com>
---
M hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/runtime/SuperActivityOperatorNodePushable.java
M hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java
2 files changed, 20 insertions(+), 18 deletions(-)
Approvals:
Murtadha Hubail: Looks good to me, approved
Jenkins: Verified
diff --git a/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/runtime/SuperActivityOperatorNodePushable.java b/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/runtime/SuperActivityOperatorNodePushable.java
index 4e842bb..827e478 100644
--- a/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/runtime/SuperActivityOperatorNodePushable.java
+++ b/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/runtime/SuperActivityOperatorNodePushable.java
@@ -196,24 +196,26 @@
private void runInParallel(OperatorNodePushableAction opAction) throws HyracksDataException {
List<Future<Void>> initializationTasks = new ArrayList<Future<Void>>();
- // Run one action for all OperatorNodePushables in parallel through a thread pool.
- for (final IOperatorNodePushable op : operatorNodePushablesBFSOrder) {
- initializationTasks.add(ctx.getExecutorService().submit(new Callable<Void>() {
- @Override
- public Void call() throws Exception {
- opAction.runAction(op);
- return null;
- }
- }));
- }
-
- // Waits until all parallel actions to finish.
- for (Future<Void> initializationTask : initializationTasks) {
- try {
- initializationTask.get();
- } catch (Exception e) {
- throw new HyracksDataException(e);
+ try {
+ // Run one action for all OperatorNodePushables in parallel through a thread pool.
+ for (final IOperatorNodePushable op : operatorNodePushablesBFSOrder) {
+ initializationTasks.add(ctx.getExecutorService().submit(new Callable<Void>() {
+ @Override
+ public Void call() throws Exception {
+ opAction.runAction(op);
+ return null;
+ }
+ }));
}
+ // Waits until all parallel actions to finish.
+ for (Future<Void> initializationTask : initializationTasks) {
+ initializationTask.get();
+ }
+ } catch (Throwable th) {
+ for (Future<Void> initializationTask : initializationTasks) {
+ initializationTask.cancel(true);
+ }
+ throw new HyracksDataException(th);
}
}
}
diff --git a/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java b/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java
index 12df264..61baf82 100644
--- a/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java
+++ b/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java
@@ -255,8 +255,8 @@
addPendingThread(ct);
try {
ct.setName(displayName + ":" + taskAttemptId + ":" + 0);
- operator.initialize();
try {
+ operator.initialize();
if (collectors.length > 0) {
final Semaphore sem = new Semaphore(collectors.length - 1);
for (int i = 1; i < collectors.length; ++i) {
--
To view, visit https://asterix-gerrit.ics.uci.edu/582
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I603d3c101e0a4de4816eb5a6a7fd4320df317ce4
Gerrit-PatchSet: 3
Gerrit-Project: hyracks
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi <ba...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Murtadha Hubail <hu...@gmail.com>
Gerrit-Reviewer: abdullah alamoudi <ba...@gmail.com>
Change in hyracks[master]: Fix Error in Aborting Task in Super Activity
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Fix Error in Aborting Task in Super Activity
......................................................................
Patch Set 1: Verified-1
Build Failed
https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/718/ : ABORTED
--
To view, visit https://asterix-gerrit.ics.uci.edu/582
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I603d3c101e0a4de4816eb5a6a7fd4320df317ce4
Gerrit-PatchSet: 1
Gerrit-Project: hyracks
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi <ba...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in hyracks[master]: Fix Error in Aborting Task in Super Activity
Posted by "Murtadha Hubail (Code Review)" <do...@asterixdb.incubator.apache.org>.
Murtadha Hubail has posted comments on this change.
Change subject: Fix Error in Aborting Task in Super Activity
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/582
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I603d3c101e0a4de4816eb5a6a7fd4320df317ce4
Gerrit-PatchSet: 2
Gerrit-Project: hyracks
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi <ba...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Murtadha Hubail <hu...@gmail.com>
Gerrit-HasComments: No