This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new e1f9f21 HDDS-6157. More consistent synchronization in InputStreams
(#2965)
e1f9f21 is described below
commit e1f9f2133dfbdd8e8bb0aab7f51ca5fb2a43d97c
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Wed Jan 12 10:02:11 2022 +0100
HDDS-6157. More consistent synchronization in InputStreams (#2965)
---
.../java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java | 2 +-
.../java/org/apache/hadoop/ozone/client/io/KeyInputStream.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java
b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java
index 7475db2..e4500bc 100644
---
a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java
+++
b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java
@@ -512,7 +512,7 @@ public class BlockInputStream extends InputStream
}
@Override
- public void unbuffer() {
+ public synchronized void unbuffer() {
storePosition();
releaseClient();
diff --git
a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/KeyInputStream.java
b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/KeyInputStream.java
index e84e39a..f440cf9 100644
---
a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/KeyInputStream.java
+++
b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/KeyInputStream.java
@@ -351,14 +351,14 @@ public class KeyInputStream extends InputStream
}
@Override
- public int available() throws IOException {
+ public synchronized int available() throws IOException {
checkOpen();
long remaining = length - getPos();
return remaining <= Integer.MAX_VALUE ? (int) remaining :
Integer.MAX_VALUE;
}
@Override
- public void close() throws IOException {
+ public synchronized void close() throws IOException {
closed = true;
for (BlockInputStream blockStream : blockStreams) {
blockStream.close();
@@ -388,7 +388,7 @@ public class KeyInputStream extends InputStream
}
@Override
- public long skip(long n) throws IOException {
+ public synchronized long skip(long n) throws IOException {
if (n <= 0) {
return 0;
}
@@ -399,7 +399,7 @@ public class KeyInputStream extends InputStream
}
@Override
- public void unbuffer() {
+ public synchronized void unbuffer() {
for (BlockInputStream is : blockStreams) {
is.unbuffer();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
