You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by xk...@apache.org on 2018/05/04 19:27:42 UTC
[14/50] [abbrv] hadoop git commit: HADOOP-15239
S3ABlockOutputStream.flush() be no-op when stream closed. Contributed by
Gabor Bota.
HADOOP-15239 S3ABlockOutputStream.flush() be no-op when stream closed. Contributed by Gabor Bota.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/919865a3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/919865a3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/919865a3
Branch: refs/heads/HDFS-12943
Commit: 919865a34bd5c3c99603993a0410846a97975869
Parents: fc074a3
Author: Aaron Fabbri <fa...@apache.org>
Authored: Mon Apr 30 16:02:57 2018 -0700
Committer: Aaron Fabbri <fa...@apache.org>
Committed: Mon Apr 30 16:02:57 2018 -0700
----------------------------------------------------------------------
.../hadoop/fs/s3a/S3ABlockOutputStream.java | 7 ++-
.../hadoop/fs/s3a/TestS3ABlockOutputStream.java | 66 ++++++++++++++++++++
2 files changed, 72 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/919865a3/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java
index 96de8e4..bdffed4 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java
@@ -238,7 +238,12 @@ class S3ABlockOutputStream extends OutputStream implements
*/
@Override
public synchronized void flush() throws IOException {
- checkOpen();
+ try {
+ checkOpen();
+ } catch (IOException e) {
+ LOG.warn("Stream closed: " + e.getMessage());
+ return;
+ }
S3ADataBlocks.DataBlock dataBlock = getActiveBlock();
if (dataBlock != null) {
dataBlock.flush();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/919865a3/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3ABlockOutputStream.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3ABlockOutputStream.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3ABlockOutputStream.java
new file mode 100644
index 0000000..ff176f5
--- /dev/null
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3ABlockOutputStream.java
@@ -0,0 +1,66 @@
+/*
+ * 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.hadoop.fs.s3a;
+
+import org.apache.hadoop.fs.s3a.commit.PutTracker;
+import org.apache.hadoop.util.Progressable;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.concurrent.ExecutorService;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+
+/**
+ * Unit tests for {@link S3ABlockOutputStream}.
+ */
+public class TestS3ABlockOutputStream extends AbstractS3AMockTest {
+
+ private S3ABlockOutputStream stream;
+
+ @Before
+ public void setUp() throws Exception {
+ ExecutorService executorService = mock(ExecutorService.class);
+ Progressable progressable = mock(Progressable.class);
+ S3ADataBlocks.BlockFactory blockFactory =
+ mock(S3ADataBlocks.BlockFactory.class);
+ long blockSize = Constants.DEFAULT_MULTIPART_SIZE;
+ S3AInstrumentation.OutputStreamStatistics statistics = null;
+ WriteOperationHelper oHelper = mock(WriteOperationHelper.class);
+ PutTracker putTracker = mock(PutTracker.class);
+ stream = spy(new S3ABlockOutputStream(fs, "", executorService,
+ progressable, blockSize, blockFactory, statistics, oHelper,
+ putTracker));
+ }
+
+ @Test
+ public void testFlushNoOpWhenStreamClosed() throws Exception {
+ doThrow(new IOException()).when(stream).checkOpen();
+
+ try {
+ stream.flush();
+ } catch (Exception e){
+ fail("Should not have any exception.");
+ }
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org