This is an automated email from the ASF dual-hosted git repository.
sodonnell pushed a commit to branch HDDS-3816-ec
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/HDDS-3816-ec by this push:
new b90f001 HDDS-6372. EC: Do not throw NotImplementedException in
flush() (#3133)
b90f001 is described below
commit b90f00192dac456b581f6997773074231ff01860
Author: Kaijie Chen <[email protected]>
AuthorDate: Thu Feb 24 21:13:59 2022 +0800
HDDS-6372. EC: Do not throw NotImplementedException in flush() (#3133)
---
.../hadoop/ozone/client/io/ECKeyOutputStream.java | 3 +--
.../apache/hadoop/ozone/client/TestOzoneECClient.java | 17 -----------------
.../hadoop/ozone/freon/OzoneClientKeyGenerator.java | 10 +++-------
3 files changed, 4 insertions(+), 26 deletions(-)
diff --git
a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/ECKeyOutputStream.java
b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/ECKeyOutputStream.java
index 266ee90..4be43e7 100644
---
a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/ECKeyOutputStream.java
+++
b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/ECKeyOutputStream.java
@@ -22,7 +22,6 @@ import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.List;
-import org.apache.commons.lang3.NotImplementedException;
import org.apache.hadoop.fs.FSExceptionMessages;
import org.apache.hadoop.hdds.client.ECReplicationConfig;
import org.apache.hadoop.hdds.scm.OzoneClientConfig;
@@ -462,7 +461,7 @@ public class ECKeyOutputStream extends KeyOutputStream {
@Override
public void flush() {
- throw new NotImplementedException("The flush API is not implemented yet.");
+ LOG.debug("ECKeyOutputStream does not support flush.");
}
private void closeCurrentStreamEntry()
diff --git
a/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/TestOzoneECClient.java
b/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/TestOzoneECClient.java
index 8a17d81..bd9ac20 100644
---
a/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/TestOzoneECClient.java
+++
b/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/TestOzoneECClient.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.ozone.client;
-import org.apache.commons.lang3.NotImplementedException;
import org.apache.hadoop.conf.StorageUnit;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.client.DefaultReplicationConfig;
@@ -909,22 +908,6 @@ public class TestOzoneECClient {
}
}
- @Test(expected = NotImplementedException.class)
- public void testFlushShouldThrowNotImplementedException() throws IOException
{
- store.createVolume(volumeName);
- OzoneVolume volume = store.getVolume(volumeName);
- volume.createBucket(bucketName);
- OzoneBucket bucket = volume.getBucket(bucketName);
-
- try (OzoneOutputStream out = bucket.createKey(keyName, 1024 * 3,
- new ECReplicationConfig(3, 2, ECReplicationConfig.EcCodec.RS,
- chunkSize), new HashMap<>())) {
- out.write(inputChunks[0]); // Just write some content.
- out.flush();
- }
- }
-
-
private OzoneBucket writeIntoECKey(byte[] data, String key,
DefaultReplicationConfig defaultReplicationConfig) throws IOException {
return writeIntoECKey(new byte[][] {data}, key, defaultReplicationConfig);
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/OzoneClientKeyGenerator.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/OzoneClientKeyGenerator.java
index a774fbb..be1a272 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/OzoneClientKeyGenerator.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/OzoneClientKeyGenerator.java
@@ -16,6 +16,7 @@
*/
package org.apache.hadoop.ozone.freon;
+import java.io.OutputStream;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.Callable;
@@ -28,8 +29,6 @@ import org.apache.hadoop.hdds.client.ReplicationType;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.client.OzoneBucket;
import org.apache.hadoop.ozone.client.OzoneClient;
-import org.apache.hadoop.ozone.client.io.ECKeyOutputStream;
-import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import com.codahale.metrics.Timer;
import picocli.CommandLine.Command;
@@ -141,13 +140,10 @@ public class OzoneClientKeyGenerator extends
BaseFreonGenerator
final String key = generateObjectName(counter);
timer.time(() -> {
- try (OzoneOutputStream stream = bucket.createKey(key, keySize,
+ try (OutputStream stream = bucket.createKey(key, keySize,
replicationConfig, metadata)) {
contentGenerator.write(stream);
- if (!(stream.getOutputStream() instanceof ECKeyOutputStream)) {
- // ECKeyOutputStream#flush() is not implemented yet.
- stream.flush();
- }
+ stream.flush();
}
return null;
});
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
