yashmayya commented on code in PR #17623: URL: https://github.com/apache/pinot/pull/17623#discussion_r2785040650
########## pinot-server/src/main/java/org/apache/pinot/server/starter/helix/DefaultStateTransitionThreadPoolManager.java: ########## @@ -0,0 +1,86 @@ +/** + * 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.server.starter.helix; + +import com.google.common.util.concurrent.ThreadFactoryBuilder; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import javax.annotation.Nullable; +import org.apache.helix.messaging.handling.MessageTask; +import org.apache.helix.model.Message; +import org.apache.helix.participant.statemachine.StateModelFactory; +import org.apache.pinot.core.data.manager.SegmentOperationsTaskType; +import org.apache.pinot.core.data.manager.SegmentOperationsTaskWrapper; + + +/** + * Default state transition thread pool manager backed by a fixed-size pool. + */ +public class DefaultStateTransitionThreadPoolManager implements StateTransitionThreadPoolManager { + private static final int DEFAULT_POOL_SIZE = 40; + + private final ExecutorService _executorService; + + public DefaultStateTransitionThreadPoolManager() { + _executorService = new ContextWrappingExecutor(DEFAULT_POOL_SIZE, DEFAULT_POOL_SIZE, 0L, TimeUnit.MILLISECONDS, Review Comment: Do we really need to keep 40 threads alive all the time regardless of the actual workload? Let's reduce the core pool size and increase the keep alive time? ########## pinot-server/src/main/java/org/apache/pinot/server/starter/helix/DefaultStateTransitionThreadPoolManager.java: ########## @@ -0,0 +1,86 @@ +/** + * 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.server.starter.helix; + +import com.google.common.util.concurrent.ThreadFactoryBuilder; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import javax.annotation.Nullable; +import org.apache.helix.messaging.handling.MessageTask; +import org.apache.helix.model.Message; +import org.apache.helix.participant.statemachine.StateModelFactory; +import org.apache.pinot.core.data.manager.SegmentOperationsTaskType; +import org.apache.pinot.core.data.manager.SegmentOperationsTaskWrapper; + + +/** + * Default state transition thread pool manager backed by a fixed-size pool. + */ +public class DefaultStateTransitionThreadPoolManager implements StateTransitionThreadPoolManager { + private static final int DEFAULT_POOL_SIZE = 40; + + private final ExecutorService _executorService; + + public DefaultStateTransitionThreadPoolManager() { + _executorService = new ContextWrappingExecutor(DEFAULT_POOL_SIZE, DEFAULT_POOL_SIZE, 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue<>(), new ThreadFactoryBuilder().setNameFormat("state-transition-%d").build()); Review Comment: For the default state transition thread pool manager, let's try to use the same thread names as Helix - is this the same exact pattern? ########## pinot-core/src/main/java/org/apache/pinot/core/data/manager/SegmentOperationsTaskWrapper.java: ########## @@ -0,0 +1,55 @@ +/** + * 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.core.data.manager; + +import java.util.concurrent.Callable; +import javax.annotation.Nullable; + +/** + * Wraps tasks to bind a segment operations task context. + */ +public final class SegmentOperationsTaskWrapper { Review Comment: This doesn't really need to be a separate class IMO - can you bundle it into the task context class itself? ########## pinot-core/src/main/java/org/apache/pinot/core/data/manager/SegmentOperationsTaskType.java: ########## @@ -0,0 +1,61 @@ +/** + * 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.core.data.manager; + +/** + * Labels the task type for segment operations throttler binding. + */ +public class SegmentOperationsTaskType { Review Comment: Is this a class instead of an enum for extensibility reasons? I'd suggest documenting that here. ########## pinot-core/src/main/java/org/apache/pinot/core/data/manager/SegmentOperationsExecutorService.java: ########## @@ -0,0 +1,131 @@ +/** + * 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.core.data.manager; + +import java.util.Collection; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.stream.Collectors; +import javax.annotation.Nullable; + + +/** + * An ExecutorService wrapper that automatically wraps all submitted tasks with segment operations context. + */ +public class SegmentOperationsExecutorService implements ExecutorService { Review Comment: Can't we re-use `DecoratorExecutorService` from `pinot-spi` that already implements this pattern? ########## pinot-core/src/main/java/org/apache/pinot/core/data/manager/SegmentOperationsTaskType.java: ########## @@ -0,0 +1,61 @@ +/** + * 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.core.data.manager; + +/** + * Labels the task type for segment operations throttler binding. + */ +public class SegmentOperationsTaskType { + public static final SegmentOperationsTaskType CONSUMER_THREAD = + new SegmentOperationsTaskType("CONSUMER_THREAD"); + public static final SegmentOperationsTaskType STATE_TRANSITION = + new SegmentOperationsTaskType("STATE_TRANSITION"); + public static final SegmentOperationsTaskType REFRESH_RELOAD_THREAD = + new SegmentOperationsTaskType("REFRESH_RELOAD_THREAD"); + public static final SegmentOperationsTaskType PRELOAD_THREAD = + new SegmentOperationsTaskType("PRELOAD_THREAD"); Review Comment: Either all should have `_THREAD` as the suffix or none should for consistency - my preference would be to remove the suffix from all of them. ########## pinot-server/src/main/java/org/apache/pinot/server/starter/helix/BaseServerStarter.java: ########## @@ -300,7 +300,7 @@ public void init(PinotConfiguration serverConf) * Override to provide custom transition thread pool manager */ protected void initTransitionThreadPoolManager() { - _transitionThreadPoolManager = null; + _transitionThreadPoolManager = new DefaultStateTransitionThreadPoolManager(); Review Comment: This is a potential behavioral change that should be called out more explicitly - are we sure that the behavior is the same as the existing Helix managed thread pool for state transitions? Also, aren't we losing the ability to configure the number of threads used by the default state transition thread pool? ########## pinot-core/src/main/java/org/apache/pinot/core/data/manager/BaseTableDataManager.java: ########## @@ -179,8 +179,12 @@ public void init(InstanceDataManagerConfig instanceDataManagerConfig, HelixManag _propertyStore = helixManager.getHelixPropertyStore(); _segmentLocks = segmentLocks; _segmentReloadSemaphore = segmentReloadSemaphore; - _segmentReloadRefreshExecutor = segmentReloadRefreshExecutor; - _segmentPreloadExecutor = segmentPreloadExecutor; + _segmentReloadRefreshExecutor = new SegmentOperationsExecutorService(segmentReloadRefreshExecutor, Review Comment: Not directly related to this PR, but do you know why reload and refresh are bundled together? ########## pinot-core/src/main/java/org/apache/pinot/core/data/manager/SegmentOperationsExecutorService.java: ########## @@ -0,0 +1,131 @@ +/** + * 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.core.data.manager; + +import java.util.Collection; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.stream.Collectors; +import javax.annotation.Nullable; + + +/** + * An ExecutorService wrapper that automatically wraps all submitted tasks with segment operations context. + */ +public class SegmentOperationsExecutorService implements ExecutorService { + private final ExecutorService _delegate; + private final SegmentOperationsTaskType _taskType; + private final String _tableNameWithType; + + public SegmentOperationsExecutorService(ExecutorService delegate, SegmentOperationsTaskType taskType, + @Nullable String tableNameWithType) { Review Comment: Why is this nullable? ########## pinot-server/src/main/java/org/apache/pinot/server/starter/helix/DefaultStateTransitionThreadPoolManager.java: ########## @@ -0,0 +1,86 @@ +/** + * 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.server.starter.helix; + +import com.google.common.util.concurrent.ThreadFactoryBuilder; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import javax.annotation.Nullable; +import org.apache.helix.messaging.handling.MessageTask; +import org.apache.helix.model.Message; +import org.apache.helix.participant.statemachine.StateModelFactory; +import org.apache.pinot.core.data.manager.SegmentOperationsTaskType; +import org.apache.pinot.core.data.manager.SegmentOperationsTaskWrapper; + + +/** + * Default state transition thread pool manager backed by a fixed-size pool. + */ +public class DefaultStateTransitionThreadPoolManager implements StateTransitionThreadPoolManager { + private static final int DEFAULT_POOL_SIZE = 40; + + private final ExecutorService _executorService; + + public DefaultStateTransitionThreadPoolManager() { + _executorService = new ContextWrappingExecutor(DEFAULT_POOL_SIZE, DEFAULT_POOL_SIZE, 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue<>(), new ThreadFactoryBuilder().setNameFormat("state-transition-%d").build()); + } + + @Override + @Nullable + public StateModelFactory.CustomizedExecutorService getExecutorService(Message.MessageInfo messageInfo) { + return null; + } + + @Override + @Nullable + public ExecutorService getExecutorService(String resourceName, String fromState, String toState) { + return null; + } + + @Override + @Nullable + public ExecutorService getExecutorService(String resourceName) { + return _executorService; + } + + @Override + public void shutdown() { + _executorService.shutdown(); + } + + private static class ContextWrappingExecutor extends ThreadPoolExecutor { + ContextWrappingExecutor(int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, + LinkedBlockingQueue<Runnable> workQueue, java.util.concurrent.ThreadFactory threadFactory) { + super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory); + } + + @Override + public <T> Future<T> submit(Callable<T> task) { Review Comment: Other submit / execute methods not being overridden to wrap context seems quite fragile? -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
