stevenzwu commented on code in PR #9998: URL: https://github.com/apache/iceberg/pull/9998#discussion_r1538061348
########## core/src/test/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java: ########## @@ -0,0 +1,67 @@ +/* + * 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 java.io.IOException; +import java.io.OutputStream; +import java.util.concurrent.CancellationException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; + +/** mock class for testing hadoop s3a writer */ +public class S3ABlockOutputStream extends OutputStream { + public ExecutorService mockCloseService; + public Future<?> mockUploadOnClose; + + public S3ABlockOutputStream() { + mockCloseService = Executors.newSingleThreadExecutor(); + } + + @Override + public void write(int b) throws IOException { + throw new IOException("mocked class, do not use"); + } + + @Override + public void close() throws IOException { + try { + mockUploadOnClose = + mockCloseService.submit( Review Comment: wondering if we need to sleep in a separate thread. just sleep directly? ########## core/src/test/java/org/apache/iceberg/hadoop/TestHadoopStreams.java: ########## @@ -0,0 +1,60 @@ +/* + * 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.iceberg.hadoop; + +import java.io.IOException; +import java.util.concurrent.Executors; +import org.apache.hadoop.fs.FSDataOutputStream; +import org.apache.hadoop.fs.s3a.S3ABlockOutputStream; +import org.apache.iceberg.io.PositionOutputStream; +import org.assertj.core.api.Assertions; +import org.junit.Assert; +import org.junit.jupiter.api.Test; + +class TestHadoopStreams { + + @Test + void closeShouldThrowIOExceptionWhenInterrupted() throws Exception { + + long startTime = System.currentTimeMillis(); + S3ABlockOutputStream s3ABlockOutputStream = new S3ABlockOutputStream(); + FSDataOutputStream fsDataOutputStream = new FSDataOutputStream(s3ABlockOutputStream, null); + PositionOutputStream wrap = HadoopStreams.wrap(fsDataOutputStream); + + // interrupt mock upload on close after a delay + Executors.newSingleThreadExecutor() + .execute( + () -> { + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + s3ABlockOutputStream.interruptClose(); + }); + + Assertions.assertThatThrownBy(wrap::close) + .isInstanceOf(IOException.class) + .hasMessage("S3ABlockOutputStream failed to upload object after stream was closed"); + + long endTime = System.currentTimeMillis(); + long closeDuration = endTime - startTime; + Assert.assertTrue(closeDuration < 30 * 1000 && closeDuration > 1000); Review Comment: I know I suggested this earlier. seems like the error msg check might be enough to verify the interrupt behavior. I am ok to remove the time check, which might cause flakiness. ########## core/src/test/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java: ########## @@ -0,0 +1,67 @@ +/* + * 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 java.io.IOException; +import java.io.OutputStream; +import java.util.concurrent.CancellationException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; + +/** mock class for testing hadoop s3a writer */ +public class S3ABlockOutputStream extends OutputStream { + public ExecutorService mockCloseService; + public Future<?> mockUploadOnClose; + + public S3ABlockOutputStream() { + mockCloseService = Executors.newSingleThreadExecutor(); + } + + @Override + public void write(int b) throws IOException { + throw new IOException("mocked class, do not use"); + } + + @Override + public void close() throws IOException { + try { + mockUploadOnClose = + mockCloseService.submit( + () -> { + try { + Thread.sleep(30 * 1000); Review Comment: nit: can we increase it the sleep timeout to 2 mins. CI machines tend to be very overloaded. wondering if 30s may give higher false alarm. -- 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: issues-unsubscr...@iceberg.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For additional commands, e-mail: issues-h...@iceberg.apache.org
