You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mh...@apache.org on 2017/10/26 19:46:02 UTC
asterixdb git commit: [NO ISSUE][API] Add NC Query Cancellation API
Repository: asterixdb
Updated Branches:
refs/heads/master 2cba46880 -> 63b92981e
[NO ISSUE][API] Add NC Query Cancellation API
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Introduce NCQueryCancellationServlet that uses NC<->CC
messaging to cancel queries.
Change-Id: I75d326b6987ed87ccc4b58c171bd45cab33a4009
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2103
Reviewed-by: Michael Blow <mb...@apache.org>
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Contrib: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/63b92981
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/63b92981
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/63b92981
Branch: refs/heads/master
Commit: 63b92981e0e65bb8d63d83480fe8df6c681c2551
Parents: 2cba468
Author: Murtadha Hubail <mh...@apache.org>
Authored: Wed Oct 25 19:45:19 2017 +0300
Committer: Murtadha Hubail <mh...@apache.org>
Committed: Thu Oct 26 12:45:32 2017 -0700
----------------------------------------------------------------------
.../http/server/NCQueryCancellationServlet.java | 76 ++++++++++++++++++++
.../http/server/QueryCancellationServlet.java | 2 +-
2 files changed, 77 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/63b92981/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryCancellationServlet.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryCancellationServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryCancellationServlet.java
new file mode 100644
index 0000000..637c492
--- /dev/null
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryCancellationServlet.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.asterix.api.http.server;
+
+import static org.apache.asterix.app.message.ExecuteStatementRequestMessage.DEFAULT_NC_TIMEOUT_MILLIS;
+
+import java.io.IOException;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.asterix.app.message.CancelQueryRequest;
+import org.apache.asterix.common.messaging.api.INCMessageBroker;
+import org.apache.asterix.common.messaging.api.MessageFuture;
+import org.apache.hyracks.api.application.INCServiceContext;
+import org.apache.hyracks.http.api.IServletRequest;
+import org.apache.hyracks.http.api.IServletResponse;
+
+import io.netty.handler.codec.http.HttpResponseStatus;
+
+/**
+ * The servlet provides a REST API on an NC for cancelling an on-going query.
+ */
+public class NCQueryCancellationServlet extends QueryCancellationServlet {
+ private static final Logger LOGGER = Logger.getLogger(NCQueryCancellationServlet.class.getName());
+ private final INCServiceContext serviceCtx;
+ private final INCMessageBroker messageBroker;
+
+ public NCQueryCancellationServlet(ConcurrentMap<String, Object> ctx, String... paths) {
+ super(ctx, paths);
+ this.serviceCtx = (INCServiceContext) ctx.get(ServletConstants.SERVICE_CONTEXT_ATTR);
+ messageBroker = (INCMessageBroker) serviceCtx.getMessageBroker();
+ }
+
+ @Override
+ protected void delete(IServletRequest request, IServletResponse response) throws IOException {
+ // gets the parameter client_context_id from the request.
+ String clientContextId = request.getParameter(CLIENT_CONTEXT_ID);
+ if (clientContextId == null) {
+ response.setStatus(HttpResponseStatus.BAD_REQUEST);
+ return;
+ }
+ final MessageFuture cancelQueryFuture = messageBroker.registerMessageFuture();
+ try {
+ CancelQueryRequest cancelQueryMessage =
+ new CancelQueryRequest(serviceCtx.getNodeId(), cancelQueryFuture.getFutureId(), clientContextId);
+ messageBroker.sendMessageToCC(cancelQueryMessage);
+ cancelQueryFuture.get(DEFAULT_NC_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+ response.setStatus(HttpResponseStatus.OK);
+ } catch (Exception e) {
+ if (LOGGER.isLoggable(Level.SEVERE)) {
+ LOGGER.log(Level.SEVERE, "Unexpected exception while canceling query", e);
+ }
+ response.setStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR);
+ } finally {
+ messageBroker.deregisterMessageFuture(cancelQueryFuture.getFutureId());
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/63b92981/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryCancellationServlet.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryCancellationServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryCancellationServlet.java
index 3f07151..96ff71c 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryCancellationServlet.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryCancellationServlet.java
@@ -37,7 +37,7 @@ import io.netty.handler.codec.http.HttpResponseStatus;
*/
public class QueryCancellationServlet extends AbstractServlet {
private static final Logger LOGGER = Logger.getLogger(QueryCancellationServlet.class.getName());
- private static final String CLIENT_CONTEXT_ID = "client_context_id";
+ protected static final String CLIENT_CONTEXT_ID = "client_context_id";
public QueryCancellationServlet(ConcurrentMap<String, Object> ctx, String... paths) {
super(ctx, paths);