amrishlal commented on a change in pull request #7174:
URL: https://github.com/apache/pinot/pull/7174#discussion_r688796021
##########
File path:
pinot-core/src/main/java/org/apache/pinot/core/periodictask/BasePeriodicTask.java
##########
@@ -111,22 +126,49 @@ protected void setUpTask() {
*/
@Override
public final void run() {
- _running = true;
-
- if (_started) {
- long startTime = System.currentTimeMillis();
- LOGGER.info("Start running task: {}", _taskName);
- try {
- runTask();
- } catch (Exception e) {
- LOGGER.error("Caught exception while running task: {}", _taskName, e);
+ try {
+ // Don't allow a task to run more than once at a time.
+ _runLock.lock();
+ _running = true;
+
+ String periodicTaskRequestId =
+ _activePeriodicTaskProperties != null ?
_activePeriodicTaskProperties.getProperty("requestid") : null;
Review comment:
Fixed.
##########
File path:
pinot-controller/src/main/java/org/apache/pinot/controller/ControllerMessageHandlerFactory.java
##########
@@ -0,0 +1,105 @@
+/**
+ * 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.pinot.controller;
+
+import java.util.Properties;
+import org.apache.helix.NotificationContext;
+import org.apache.helix.messaging.handling.HelixTaskResult;
+import org.apache.helix.messaging.handling.MessageHandler;
+import org.apache.helix.messaging.handling.MessageHandlerFactory;
+import org.apache.helix.model.Message;
+import org.apache.pinot.common.messages.RunPeriodicTaskMessage;
+import org.apache.pinot.core.periodictask.PeriodicTaskScheduler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/** Factory class for creating message handlers for incoming helix messages. */
+public class ControllerMessageHandlerFactory implements MessageHandlerFactory {
+ private static final Logger LOGGER =
LoggerFactory.getLogger(ControllerMessageHandlerFactory.class);
+ private static final String USER_DEFINED_MSG_STRING =
Message.MessageType.USER_DEFINE_MSG.toString();
+
+ private final PeriodicTaskScheduler _periodicTaskScheduler;
+
+ public ControllerMessageHandlerFactory(PeriodicTaskScheduler
periodicTaskScheduler) {
+ _periodicTaskScheduler = periodicTaskScheduler;
+ }
+
+ @Override
+ public MessageHandler createHandler(Message message, NotificationContext
notificationContext) {
+ String messageType = message.getMsgSubType();
+ if
(messageType.equals(RunPeriodicTaskMessage.RUN_PERIODIC_TASK_MSG_SUB_TYPE)) {
+ return new RunPeriodicTaskMessageHandler(new
RunPeriodicTaskMessage(message), notificationContext,
+ _periodicTaskScheduler);
+ }
+
+ LOGGER.warn("Unknown message type {} received by controller. ",
messageType);
+ return null;
+ }
+
+ @Override
+ public String getMessageType() {
+ return USER_DEFINED_MSG_STRING;
+ }
+
+ @Override
+ public void reset() {
+ }
+
+ /** Message handler for {@link RunPeriodicTaskMessage} message. */
+ private static class RunPeriodicTaskMessageHandler extends MessageHandler {
+ private final String _periodicTaskReqeustId;
+ private final String _periodicTaskName;
+ private final String _tableNameWithType;
+ private final PeriodicTaskScheduler _periodicTaskScheduler;
+
+ RunPeriodicTaskMessageHandler(RunPeriodicTaskMessage message,
NotificationContext context,
+ PeriodicTaskScheduler periodicTaskScheduler) {
+ super(message, context);
+ _periodicTaskReqeustId = message.getPeriodicTaskRequestId();
+ _periodicTaskName = message.getPeriodicTaskName();
+ _tableNameWithType = message.getTableNameWithType();
+ _periodicTaskScheduler = periodicTaskScheduler;
+ }
+
+ @Override
+ public HelixTaskResult handleMessage()
+ throws InterruptedException {
+ LOGGER.info("[TaskRequestId: {}] Handling RunPeriodicTaskMessage by
executing task {}", _periodicTaskReqeustId,
+ _periodicTaskName);
+ _periodicTaskScheduler
+ .scheduleNow(_periodicTaskName,
createTaskProperties(_periodicTaskReqeustId, _tableNameWithType));
+ HelixTaskResult helixTaskResult = new HelixTaskResult();
+ helixTaskResult.setSuccess(true);
+ return helixTaskResult;
+ }
+
+ @Override
+ public void onError(Exception e, ErrorCode errorCode, ErrorType errorType)
{
+ LOGGER.error("[TaskRequestId: {}] Message handling error.",
_periodicTaskReqeustId, e);
+ }
+
+ private static Properties createTaskProperties(String
periodicTaskReqeustId, String tableNameWithType) {
+ Properties periodicTaskParameters = new Properties();
+ periodicTaskParameters.setProperty("requestid", periodicTaskReqeustId);
Review comment:
Done.
##########
File path:
pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotControllerPeriodicTaskRestletResource.java
##########
@@ -0,0 +1,107 @@
+/**
+ * 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.pinot.controller.api.resources;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import java.util.List;
+import java.util.UUID;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import org.apache.helix.ClusterMessagingService;
+import org.apache.helix.Criteria;
+import org.apache.helix.InstanceType;
+import org.apache.pinot.common.messages.RunPeriodicTaskMessage;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
+import org.apache.pinot.core.periodictask.PeriodicTaskScheduler;
+import org.apache.pinot.spi.utils.CommonConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+@Api(tags = Constants.PERIODIC_TASK_TAG)
+@Path("/periodictask")
+public class PinotControllerPeriodicTaskRestletResource {
+
+ private static final Logger LOGGER =
LoggerFactory.getLogger(PinotControllerPeriodicTaskRestletResource.class);
+
+ @Inject
+ PinotHelixResourceManager _pinotHelixResourceManager;
+
+ @Inject
+ PeriodicTaskScheduler _periodicTaskScheduler;
+
+ @GET
+ @Produces(MediaType.APPLICATION_JSON)
+ @Path("/run")
+ @ApiOperation(value = "Run a periodic task against specified table. If no
table name is specified, task will run against all tables.")
+ public String runPeriodicTask(
+ @ApiParam(value = "Periodic task name", required = true)
@QueryParam("taskname") String periodicTaskName,
+ @ApiParam(value = "Table name", required = false)
@QueryParam("tablename") String tableName,
+ @ApiParam(value = "Table type suffix", required = false, example =
"OFFLINE | REALTIME", defaultValue = "OFFLINE") @QueryParam("tabletype") String
tableType) {
+ if (!_periodicTaskScheduler.hasTask(periodicTaskName)) {
+ throw new WebApplicationException("Periodic task '" + periodicTaskName +
"' not found.",
+ Response.Status.NOT_FOUND);
+ }
+
+ if (!_pinotHelixResourceManager.getAllRawTables().contains(tableName)) {
Review comment:
Fixed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
