HDDS-380. Remove synchronization from ChunkGroupOutputStream and ChunkOutputStream. Contributed by Shashikant Banerjee.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0bd42171 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0bd42171 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0bd42171 Branch: refs/heads/HDFS-12090 Commit: 0bd4217194ae50ec30e386b200fcfa54c069f042 Parents: 3fa4639 Author: Nanda kumar <na...@apache.org> Authored: Wed Aug 29 13:31:19 2018 +0530 Committer: Nanda kumar <na...@apache.org> Committed: Wed Aug 29 13:31:19 2018 +0530 ---------------------------------------------------------------------- .../hadoop/hdds/scm/storage/ChunkOutputStream.java | 16 ++++++++-------- .../ozone/client/io/ChunkGroupOutputStream.java | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0bd42171/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/ChunkOutputStream.java ---------------------------------------------------------------------- diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/ChunkOutputStream.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/ChunkOutputStream.java index f2df3fa..8d311d0 100644 --- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/ChunkOutputStream.java +++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/ChunkOutputStream.java @@ -99,7 +99,7 @@ public class ChunkOutputStream extends OutputStream { } @Override - public synchronized void write(int b) throws IOException { + public void write(int b) throws IOException { checkOpen(); int rollbackPosition = buffer.position(); int rollbackLimit = buffer.limit(); @@ -110,7 +110,7 @@ public class ChunkOutputStream extends OutputStream { } @Override - public synchronized void write(byte[] b, int off, int len) + public void write(byte[] b, int off, int len) throws IOException { if (b == null) { throw new NullPointerException(); @@ -137,7 +137,7 @@ public class ChunkOutputStream extends OutputStream { } @Override - public synchronized void flush() throws IOException { + public void flush() throws IOException { checkOpen(); if (buffer.position() > 0) { int rollbackPosition = buffer.position(); @@ -147,7 +147,7 @@ public class ChunkOutputStream extends OutputStream { } @Override - public synchronized void close() throws IOException { + public void close() throws IOException { if (xceiverClientManager != null && xceiverClient != null && buffer != null) { if (buffer.position() > 0) { @@ -164,7 +164,7 @@ public class ChunkOutputStream extends OutputStream { } } - public synchronized void cleanup() { + public void cleanup() { xceiverClientManager.releaseClient(xceiverClient); xceiverClientManager = null; xceiverClient = null; @@ -176,7 +176,7 @@ public class ChunkOutputStream extends OutputStream { * * @throws IOException if stream is closed */ - private synchronized void checkOpen() throws IOException { + private void checkOpen() throws IOException { if (xceiverClient == null) { throw new IOException("ChunkOutputStream has been closed."); } @@ -191,7 +191,7 @@ public class ChunkOutputStream extends OutputStream { * @param rollbackLimit limit to restore in buffer if write fails * @throws IOException if there is an I/O error while performing the call */ - private synchronized void flushBufferToChunk(int rollbackPosition, + private void flushBufferToChunk(int rollbackPosition, int rollbackLimit) throws IOException { boolean success = false; try { @@ -213,7 +213,7 @@ public class ChunkOutputStream extends OutputStream { * * @throws IOException if there is an I/O error while performing the call */ - private synchronized void writeChunkToContainer() throws IOException { + private void writeChunkToContainer() throws IOException { buffer.flip(); ByteString data = ByteString.copyFrom(buffer); ChunkInfo chunk = ChunkInfo http://git-wip-us.apache.org/repos/asf/hadoop/blob/0bd42171/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/ChunkGroupOutputStream.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/ChunkGroupOutputStream.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/ChunkGroupOutputStream.java index 988af07..00624d5 100644 --- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/ChunkGroupOutputStream.java +++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/ChunkGroupOutputStream.java @@ -105,7 +105,7 @@ public class ChunkGroupOutputStream extends OutputStream { * @param length */ @VisibleForTesting - public synchronized void addStream(OutputStream outputStream, long length) { + public void addStream(OutputStream outputStream, long length) { streamEntries.add(new ChunkOutputStreamEntry(outputStream, length)); } @@ -227,7 +227,7 @@ public class ChunkGroupOutputStream extends OutputStream { @Override - public synchronized void write(int b) throws IOException { + public void write(int b) throws IOException { byte[] buf = new byte[1]; buf[0] = (byte) b; write(buf, 0, 1); @@ -246,7 +246,7 @@ public class ChunkGroupOutputStream extends OutputStream { * @throws IOException */ @Override - public synchronized void write(byte[] b, int off, int len) + public void write(byte[] b, int off, int len) throws IOException { checkNotClosed(); handleWrite(b, off, len); @@ -404,7 +404,7 @@ public class ChunkGroupOutputStream extends OutputStream { } @Override - public synchronized void flush() throws IOException { + public void flush() throws IOException { checkNotClosed(); handleFlushOrClose(false); } @@ -450,7 +450,7 @@ public class ChunkGroupOutputStream extends OutputStream { * @throws IOException */ @Override - public synchronized void close() throws IOException { + public void close() throws IOException { if (closed) { return; } @@ -585,7 +585,7 @@ public class ChunkGroupOutputStream extends OutputStream { return length - currentPosition; } - private synchronized void checkStream() { + private void checkStream() { if (this.outputStream == null) { this.outputStream = new ChunkOutputStream(blockID, key, xceiverClientManager, xceiverClient, --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org