Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,10 @@ private void onMessage(UUID nodeId, final QueryStartRequest msg) {
U.error(log, "Error occurred during send error message: " + X.getFullStackTrace(e));
}
finally {
qryReg.query(msg.queryId()).onError(ex);
Query<?> qry = qryReg.query(msg.queryId());

if (qry != null)
qry.onError(ex);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,12 @@ public void testNotOriginatorNodeStop() throws Exception {
// Sometimes remote node during stopping can send error to originator node and this error processed before
// node left event, in this case exception stack will looks like:
// IgniteSQLException -> RemoteException -> exception on remote node during node stop.
// Also, remote node can be stopped during processing of QueryStartRequest, in this case QueryCloseRequest
// with an error will be sent to originator node, this causes query cancelation with an IgniteSQLException.
if (!X.hasCause(ex, "node left", ClusterTopologyCheckedException.class) &&
!X.hasCause(ex, RemoteException.class)) {
!X.hasCause(ex, RemoteException.class) &&
!X.hasCause(ex, "The query was cancelled while executing", IgniteSQLException.class)
) {
log.error("Unexpected exception", ex);

fail("Unexpected exception: " + ex);
Expand Down
Loading