You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2018/11/16 20:12:19 UTC
[flink] 02/06: [hotfix] [s3] Minor fixes/code simplifications in S3
recoverable writer
This is an automated email from the ASF dual-hosted git repository.
sewen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 89548bafb092c0b9b92bb6e9c3616e2644c765e8
Author: Stephan Ewen <se...@apache.org>
AuthorDate: Thu Nov 15 17:05:16 2018 +0100
[hotfix] [s3] Minor fixes/code simplifications in S3 recoverable writer
---
.../fs/s3/common/utils/BackPressuringExecutor.java | 5 +---
.../flink/fs/s3/common/writer/S3ConfigOptions.java | 30 ----------------------
2 files changed, 1 insertion(+), 34 deletions(-)
diff --git a/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/utils/BackPressuringExecutor.java b/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/utils/BackPressuringExecutor.java
index d0dd7c8..e78e83d 100644
--- a/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/utils/BackPressuringExecutor.java
+++ b/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/utils/BackPressuringExecutor.java
@@ -23,7 +23,6 @@ import org.apache.flink.util.ExceptionUtils;
import org.apache.flink.util.FlinkRuntimeException;
import java.util.concurrent.Executor;
-import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.Semaphore;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -66,11 +65,9 @@ public final class BackPressuringExecutor implements Executor {
final SemaphoreReleasingRunnable runnable = new SemaphoreReleasingRunnable(command, permits);
try {
delegate.execute(runnable);
- } catch (RejectedExecutionException e) {
+ } catch (Throwable e) {
runnable.release();
ExceptionUtils.rethrow(e, e.getMessage());
- } catch (Throwable t) {
- ExceptionUtils.rethrow(t, t.getMessage());
}
}
diff --git a/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/writer/S3ConfigOptions.java b/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/writer/S3ConfigOptions.java
deleted file mode 100644
index 4218805..0000000
--- a/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/writer/S3ConfigOptions.java
+++ /dev/null
@@ -1,30 +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.fs.s3.common.writer;
-
-/**
- * Configuration keys for the S3 file system based using Hadoop's s3a.
- */
-public final class S3ConfigOptions {
-
- // ------------------------------------------------------------------------
-
- /** Not meant to be instantiated. */
- private S3ConfigOptions() {}
-}