This is an automated email from the ASF dual-hosted git repository. srichter pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 5aee179cb6677aad1e1b6f1808873167c4a05789 Author: Stefan Richter <s.rich...@data-artisans.com> AuthorDate: Fri Mar 15 15:02:51 2019 +0100 [hotfix] Remove unused exception from FileSystem#initialize --- .../src/main/java/org/apache/flink/client/cli/CliFrontend.java | 10 ++-------- .../src/main/java/org/apache/flink/core/fs/FileSystem.java | 2 +- .../apache/flink/mesos/entrypoint/MesosTaskExecutorRunner.java | 7 +------ .../apache/flink/runtime/webmonitor/history/HistoryServer.java | 6 +----- .../org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java | 10 ++-------- .../apache/flink/runtime/taskexecutor/TaskManagerRunner.java | 8 +------- .../apache/flink/table/client/gateway/local/LocalExecutor.java | 7 +------ .../org/apache/flink/yarn/AbstractYarnClusterDescriptor.java | 7 +------ 8 files changed, 10 insertions(+), 47 deletions(-) diff --git a/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontend.java b/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontend.java index 6b20e78..c7cbe9b 100644 --- a/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontend.java +++ b/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontend.java @@ -67,7 +67,6 @@ import org.slf4j.LoggerFactory; import java.io.File; import java.io.FileNotFoundException; -import java.io.IOException; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.UndeclaredThrowableException; @@ -124,16 +123,11 @@ public class CliFrontend { public CliFrontend( Configuration configuration, - List<CustomCommandLine<?>> customCommandLines) throws Exception { + List<CustomCommandLine<?>> customCommandLines) { this.configuration = Preconditions.checkNotNull(configuration); this.customCommandLines = Preconditions.checkNotNull(customCommandLines); - try { - FileSystem.initialize(this.configuration); - } catch (IOException e) { - throw new Exception("Error while setting the default " + - "filesystem scheme from configuration.", e); - } + FileSystem.initialize(this.configuration); this.customCommandLineOptions = new Options(); diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java index d451109..e7a3765 100644 --- a/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java +++ b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java @@ -251,7 +251,7 @@ public abstract class FileSystem { * * @param config the configuration from where to fetch the parameter. */ - public static void initialize(Configuration config) throws IOException, IllegalConfigurationException { + public static void initialize(Configuration config) throws IllegalConfigurationException { LOCK.lock(); try { // make sure file systems are re-instantiated after re-configuration diff --git a/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosTaskExecutorRunner.java b/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosTaskExecutorRunner.java index cc1289f..98d2157 100644 --- a/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosTaskExecutorRunner.java +++ b/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosTaskExecutorRunner.java @@ -40,7 +40,6 @@ import org.apache.commons.cli.PosixParser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; import java.lang.reflect.UndeclaredThrowableException; import java.util.Map; @@ -86,11 +85,7 @@ public class MesosTaskExecutorRunner { final Map<String, String> envs = System.getenv(); // configure the filesystems - try { - FileSystem.initialize(configuration); - } catch (IOException e) { - throw new IOException("Error while configuring the filesystems.", e); - } + FileSystem.initialize(configuration); // tell akka to die in case of an error configuration.setBoolean(AkkaOptions.JVM_EXIT_ON_FATAL_ERROR, true); diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServer.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServer.java index a93fe93..8d5183b 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServer.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServer.java @@ -109,11 +109,7 @@ public class HistoryServer { LOG.info("Loading configuration from {}", configDir); final Configuration flinkConfig = GlobalConfiguration.loadConfiguration(configDir); - try { - FileSystem.initialize(flinkConfig); - } catch (IOException e) { - throw new Exception("Error while setting the default filesystem scheme from configuration.", e); - } + FileSystem.initialize(flinkConfig); // run the history server SecurityUtils.install(new SecurityConfiguration(flinkConfig)); diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java index ec707d8..e9dd23e 100755 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java @@ -181,15 +181,9 @@ public abstract class ClusterEntrypoint implements AutoCloseableAsync, FatalErro } } - private void configureFileSystems(Configuration configuration) throws Exception { + private void configureFileSystems(Configuration configuration) { LOG.info("Install default filesystem."); - - try { - FileSystem.initialize(configuration); - } catch (IOException e) { - throw new IOException("Error while setting the default " + - "filesystem scheme from configuration.", e); - } + FileSystem.initialize(configuration); } protected SecurityContext installSecurityContext(Configuration configuration) throws Exception { diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java index 0ef5a06..0fa5492 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java @@ -61,7 +61,6 @@ import org.apache.flink.util.ExecutorUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; import java.lang.reflect.UndeclaredThrowableException; import java.net.InetAddress; import java.util.ArrayList; @@ -278,12 +277,7 @@ public class TaskManagerRunner implements FatalErrorHandler, AutoCloseableAsync final Configuration configuration = loadConfiguration(args); - try { - FileSystem.initialize(configuration); - } catch (IOException e) { - throw new IOException("Error while setting the default " + - "filesystem scheme from configuration.", e); - } + FileSystem.initialize(configuration); SecurityUtils.install(new SecurityConfiguration(configuration)); diff --git a/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/LocalExecutor.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/LocalExecutor.java index e9ee000..ee3b2e5 100644 --- a/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/LocalExecutor.java +++ b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/LocalExecutor.java @@ -110,12 +110,7 @@ public class LocalExecutor implements Executor { this.flinkConfig = GlobalConfiguration.loadConfiguration(flinkConfigDir); // initialize default file system - try { - FileSystem.initialize(this.flinkConfig); - } catch (IOException e) { - throw new SqlClientException( - "Error while setting the default filesystem scheme from configuration.", e); - } + FileSystem.initialize(this.flinkConfig); // load command lines for deployment this.commandLines = CliFrontend.loadCustomCommandLines(flinkConfig, flinkConfigDir); diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java b/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java index 783a459..69cb0d9 100644 --- a/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java +++ b/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java @@ -661,12 +661,7 @@ public abstract class AbstractYarnClusterDescriptor implements ClusterDescriptor // ------------------ Initialize the file systems ------------------------- - try { - org.apache.flink.core.fs.FileSystem.initialize(configuration); - } catch (IOException e) { - throw new IOException("Error while setting the default " + - "filesystem scheme from configuration.", e); - } + org.apache.flink.core.fs.FileSystem.initialize(configuration); // initialize file system // Copy the application master jar to the filesystem