This is an automated email from the ASF dual-hosted git repository.
hanishakoneru 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 b21a613 HDDS-6473. Empty data in response for V0 GetSmallFile request
(#3230)
b21a613 is described below
commit b21a613146c62b85b42f24222dab0a4ea9b617cb
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Thu Mar 24 18:22:36 2022 +0100
HDDS-6473. Empty data in response for V0 GetSmallFile request (#3230)
---
.../hadoop/hdds/scm/protocolPB/ContainerCommandResponseBuilders.java | 2 +-
.../org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/ContainerCommandResponseBuilders.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/ContainerCommandResponseBuilders.java
index 3ff2c2e..de7d083 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/ContainerCommandResponseBuilders.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/ContainerCommandResponseBuilders.java
@@ -232,7 +232,7 @@ public final class ContainerCommandResponseBuilders {
// V0 has all response data in a single ByteBuffer
ByteString combinedData = ByteString.EMPTY;
for (ByteString buffer : dataBuffers) {
- combinedData.concat(buffer);
+ combinedData = combinedData.concat(buffer);
}
readChunk = ReadChunkResponseProto.newBuilder()
.setChunkData(info)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
index 9ddcf13..b6fa410 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
@@ -33,7 +33,6 @@ import
org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachin
import org.apache.hadoop.ozone.container.common.statemachine.StateContext;
import org.junit.Assert;
import org.junit.Rule;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.migrationsupport.rules.EnableRuleMigrationSupport;
@@ -238,7 +237,6 @@ public class TestOzoneContainer {
}
}
- @Disabled("HDDS-6473")
@Test
public void testBothGetandPutSmallFile() throws Exception {
MiniOzoneCluster cluster = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
