Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. Patch Set 1: BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/3614/ -- To view, visit https://asterix-gerrit.ics.uci.edu/2912 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. Patch Set 1: BAD Compatibility Tests Failed https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/3614/ : FAILURE -- To view, visit https://asterix-gerrit.ics.uci.edu/2912 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Michael Blow has submitted this change and it was merged. Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. [NO ISSUE][NET] Propagate Network Failure Error Codes - user model changes: no - storage format changes: no - interface changes: no Details: - Pass the network error code to the channel to determine whether the error should be sent to the receiver or not. Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 Reviewed-on: https://asterix-gerrit.ics.uci.edu/2912 Reviewed-by: Michael Blow Tested-by: Michael Blow --- M hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkOutputChannel.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/NetworkManager.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/ResultNetworkManager.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/PartitionManager.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/result/ResultPartitionReader.java 5 files changed, 12 insertions(+), 8 deletions(-) Approvals: Anon. E. Moose #1000171: Michael Blow: Looks good to me, approved; Verified diff --git a/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkOutputChannel.java b/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkOutputChannel.java index 8bee56e..334fb5c 100644 --- a/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkOutputChannel.java +++ b/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkOutputChannel.java @@ -104,8 +104,8 @@ ccb.getWriteInterface().getFullBufferAcceptor().close(); } -public void abort() { - ccb.getWriteInterface().getFullBufferAcceptor().error(AbstractChannelWriteInterface.REMOTE_ERROR_CODE); +public void abort(int ecode) { +ccb.getWriteInterface().getFullBufferAcceptor().error(ecode); synchronized (NetworkOutputChannel.this) { aborted = true; NetworkOutputChannel.this.notifyAll(); diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/NetworkManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/NetworkManager.java index 98693d0..8b02f9c 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/NetworkManager.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/NetworkManager.java @@ -139,7 +139,7 @@ @Override public void error(int ecode) { if (noc != null) { -noc.abort(); +noc.abort(ecode); } } } diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/ResultNetworkManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/ResultNetworkManager.java index 6927a58..ee821d6 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/ResultNetworkManager.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/ResultNetworkManager.java @@ -33,6 +33,7 @@ import org.apache.hyracks.api.result.ResultSetId; import org.apache.hyracks.comm.channels.IChannelConnectionFactory; import org.apache.hyracks.comm.channels.NetworkOutputChannel; +import org.apache.hyracks.net.protocols.muxdemux.AbstractChannelWriteInterface; import org.apache.hyracks.net.protocols.muxdemux.ChannelControlBlock; import org.apache.hyracks.net.protocols.muxdemux.IChannelOpenListener; import org.apache.hyracks.net.protocols.muxdemux.MultiplexedConnection; @@ -146,7 +147,7 @@ partitionManager.initializeResultPartitionReader(jobId, rsId, partition, noc); } catch (HyracksException e) { LOGGER.warn("Failed to initialize result partition reader", e); -noc.abort(); +noc.abort(AbstractChannelWriteInterface.REMOTE_ERROR_CODE); } } @@ -158,7 +159,7 @@ @Override public void error(int ecode) { if (noc != null) { -noc.abort(); +noc.abort(ecode); } } } diff --git
Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Michael Blow has posted comments on this change. Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. Patch Set 1: Verified+1 -- To view, visit https://asterix-gerrit.ics.uci.edu/2912 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Anon. E. Moose #1000171 has posted comments on this change. Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. Patch Set 1: Contrib+1 Analytics Compatibility Tests Successful https://goo.gl/RadNJn : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/2912 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. Patch Set 1: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/7194/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/2912 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Michael Blow has posted comments on this change. Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. Patch Set 1: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/2912 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/4728/ (13/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2912 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Anon. E. Moose #1000171 has posted comments on this change. Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. Patch Set 1: Analytics Compatibility Compilation Successful https://goo.gl/hVs5ca : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/2912 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/7194/ -- To view, visit https://asterix-gerrit.ics.uci.edu/2912 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/8305/ (4/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2912 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/4925/ (10/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2912 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/4369/ (1/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2912 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-format/4335/ (12/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2912 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/4759/ (3/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2912 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/9845/ (9/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2912 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/4281/ (8/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2912 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-ensure-ancestor/2381/ (5/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2912 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/4367/ (2/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2912 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/4588/ (6/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2912 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-java10/580/ (7/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2912 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage-jre10/654/ (11/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2912 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][NET] Propagate Network Failure Error Codes
Murtadha Hubail has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/2912 Change subject: [NO ISSUE][NET] Propagate Network Failure Error Codes .. [NO ISSUE][NET] Propagate Network Failure Error Codes - user model changes: no - storage format changes: no - interface changes: no Details: - Pass the network error code to the channel to determine whether the error should be sent to the receiver or not. Change-Id: I29cffa916df9fecc9942f449ba6c5ca7c84b43b3 --- M hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkOutputChannel.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/NetworkManager.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/ResultNetworkManager.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/PartitionManager.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/result/ResultPartitionReader.java 5 files changed, 12 insertions(+), 8 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/12/2912/1 diff --git a/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkOutputChannel.java b/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkOutputChannel.java index 8bee56e..334fb5c 100644 --- a/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkOutputChannel.java +++ b/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkOutputChannel.java @@ -104,8 +104,8 @@ ccb.getWriteInterface().getFullBufferAcceptor().close(); } -public void abort() { - ccb.getWriteInterface().getFullBufferAcceptor().error(AbstractChannelWriteInterface.REMOTE_ERROR_CODE); +public void abort(int ecode) { +ccb.getWriteInterface().getFullBufferAcceptor().error(ecode); synchronized (NetworkOutputChannel.this) { aborted = true; NetworkOutputChannel.this.notifyAll(); diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/NetworkManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/NetworkManager.java index 98693d0..8b02f9c 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/NetworkManager.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/NetworkManager.java @@ -139,7 +139,7 @@ @Override public void error(int ecode) { if (noc != null) { -noc.abort(); +noc.abort(ecode); } } } diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/ResultNetworkManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/ResultNetworkManager.java index 6927a58..ee821d6 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/ResultNetworkManager.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/ResultNetworkManager.java @@ -33,6 +33,7 @@ import org.apache.hyracks.api.result.ResultSetId; import org.apache.hyracks.comm.channels.IChannelConnectionFactory; import org.apache.hyracks.comm.channels.NetworkOutputChannel; +import org.apache.hyracks.net.protocols.muxdemux.AbstractChannelWriteInterface; import org.apache.hyracks.net.protocols.muxdemux.ChannelControlBlock; import org.apache.hyracks.net.protocols.muxdemux.IChannelOpenListener; import org.apache.hyracks.net.protocols.muxdemux.MultiplexedConnection; @@ -146,7 +147,7 @@ partitionManager.initializeResultPartitionReader(jobId, rsId, partition, noc); } catch (HyracksException e) { LOGGER.warn("Failed to initialize result partition reader", e); -noc.abort(); +noc.abort(AbstractChannelWriteInterface.REMOTE_ERROR_CODE); } } @@ -158,7 +159,7 @@ @Override public void error(int ecode) { if (noc != null) { -noc.abort(); +noc.abort(ecode); } } } diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/PartitionManager.java