You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by xt...@apache.org on 2021/02/19 01:10:18 UTC
[flink] 01/04: [hotfix][runtime] Remove unused
LegacyActiveResourceManagerFactory
This is an automated email from the ASF dual-hosted git repository.
xtsong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit ec5388a831d1f4348ce0ae538fb016b3f624bf35
Author: Xintong Song <to...@gmail.com>
AuthorDate: Thu Feb 18 11:15:37 2021 +0800
[hotfix][runtime] Remove unused LegacyActiveResourceManagerFactory
---
.../active/LegacyActiveResourceManagerFactory.java | 87 ----------------------
1 file changed, 87 deletions(-)
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/active/LegacyActiveResourceManagerFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/active/LegacyActiveResourceManagerFactory.java
deleted file mode 100644
index a2080b8..0000000
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/active/LegacyActiveResourceManagerFactory.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * 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.flink.runtime.resourcemanager.active;
-
-import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.TaskManagerOptions;
-import org.apache.flink.runtime.clusterframework.TaskExecutorProcessUtils;
-import org.apache.flink.runtime.clusterframework.types.ResourceID;
-import org.apache.flink.runtime.clusterframework.types.ResourceIDRetrievable;
-import org.apache.flink.runtime.entrypoint.ClusterInformation;
-import org.apache.flink.runtime.heartbeat.HeartbeatServices;
-import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
-import org.apache.flink.runtime.metrics.MetricRegistry;
-import org.apache.flink.runtime.resourcemanager.ResourceManager;
-import org.apache.flink.runtime.resourcemanager.ResourceManagerFactory;
-import org.apache.flink.runtime.rpc.FatalErrorHandler;
-import org.apache.flink.runtime.rpc.RpcService;
-
-import javax.annotation.Nullable;
-
-import java.util.concurrent.Executor;
-
-/**
- * Resource manager factory which creates active {@link ResourceManager} implementations.
- *
- * <p>The default implementation will call {@link #createActiveResourceManagerConfiguration} to
- * create a new configuration which is configured with active resource manager relevant
- * configuration options.
- *
- * @param <T> type of the {@link ResourceIDRetrievable}
- */
-public abstract class LegacyActiveResourceManagerFactory<T extends ResourceIDRetrievable>
- extends ResourceManagerFactory<T> {
-
- @Override
- public ResourceManager<T> createResourceManager(
- Configuration configuration,
- ResourceID resourceId,
- RpcService rpcService,
- HighAvailabilityServices highAvailabilityServices,
- HeartbeatServices heartbeatServices,
- FatalErrorHandler fatalErrorHandler,
- ClusterInformation clusterInformation,
- @Nullable String webInterfaceUrl,
- MetricRegistry metricRegistry,
- String hostname,
- Executor ioExecutor)
- throws Exception {
- return super.createResourceManager(
- createActiveResourceManagerConfiguration(configuration),
- resourceId,
- rpcService,
- highAvailabilityServices,
- heartbeatServices,
- fatalErrorHandler,
- clusterInformation,
- webInterfaceUrl,
- metricRegistry,
- hostname,
- ioExecutor);
- }
-
- private Configuration createActiveResourceManagerConfiguration(
- Configuration originalConfiguration) {
- final Configuration copiedConfig = new Configuration(originalConfiguration);
- // In active mode, it's depend on the ResourceManager to set the ResourceID of TaskManagers.
- copiedConfig.removeConfig(TaskManagerOptions.TASK_MANAGER_RESOURCE_ID);
- return TaskExecutorProcessUtils.getConfigurationMapLegacyTaskManagerHeapSizeToConfigOption(
- copiedConfig, TaskManagerOptions.TOTAL_PROCESS_MEMORY);
- }
-}