Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDDS-1320. Update ozone to latest ratis snapshot build (0.4.0-1fc5ace-SNAPSHOT). Contributed by Mukul Kumar Singh.

This commit is contained in:
Arpit Agarwal 2019-03-21 14:24:02 -07:00
parent 2828f8c339
commit 90afc9ab03
No known key found for this signature in database
GPG Key ID: E4B09E903FDF9E98
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java
View File

@ -495,7 +495,8 @@ public final class XceiverServerRatis extends XceiverServer {
RaftClientRequest.Type type) { RaftClientRequest.Type type) {
return new RaftClientRequest(clientId, server.getId(), return new RaftClientRequest(clientId, server.getId(),
RaftGroupId.valueOf(PipelineID.getFromProtobuf(pipelineID).getId()), RaftGroupId.valueOf(PipelineID.getFromProtobuf(pipelineID).getId()),
nextCallId(), 0, Message.valueOf(request.toByteString()), type); nextCallId(), Message.valueOf(request.toByteString()), type,
null);
} }
private void handlePipelineFailure(RaftGroupId groupId, private void handlePipelineFailure(RaftGroupId groupId,

2
hadoop-hdds/pom.xml
View File

@ -46,7 +46,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<hdds.version>0.5.0-SNAPSHOT</hdds.version> <hdds.version>0.5.0-SNAPSHOT</hdds.version>
<!-- Apache Ratis version --> <!-- Apache Ratis version -->
<ratis.version>0.4.0-5680cf5-SNAPSHOT</ratis.version> <ratis.version>0.4.0-1fc5ace-SNAPSHOT</ratis.version>
<bouncycastle.version>1.60</bouncycastle.version> <bouncycastle.version>1.60</bouncycastle.version>

8
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerStateMachine.java
View File

@ -134,11 +134,11 @@ public class TestOzoneManagerStateMachine {
RaftClientRequest raftClientRequest = RaftClientRequest raftClientRequest =
new RaftClientRequest(ClientId.randomId(), new RaftClientRequest(ClientId.randomId(),
RaftPeerId.valueOf("random"), raftGroupId, 1, 1, RaftPeerId.valueOf("random"), raftGroupId, 1,
Message.valueOf( Message.valueOf(
OMRatisHelper.convertRequestToByteString(omRequest)), OMRatisHelper.convertRequestToByteString(omRequest)),
RaftClientRequest.Type.valueOf( RaftClientRequest.Type.valueOf(
RaftProtos.WriteRequestTypeProto.getDefaultInstance())); RaftProtos.WriteRequestTypeProto.getDefaultInstance()), null);
TransactionContext transactionContext = TransactionContext transactionContext =
ozoneManagerStateMachine.startTransaction(raftClientRequest); ozoneManagerStateMachine.startTransaction(raftClientRequest);
@ -232,11 +232,11 @@ public class TestOzoneManagerStateMachine {
RaftClientRequest raftClientRequest = RaftClientRequest raftClientRequest =
new RaftClientRequest(ClientId.randomId(), new RaftClientRequest(ClientId.randomId(),
RaftPeerId.valueOf("random"), raftGroupId, 1, 1, RaftPeerId.valueOf("random"), raftGroupId, 1,
Message.valueOf( Message.valueOf(
OMRatisHelper.convertRequestToByteString(omRequest)), OMRatisHelper.convertRequestToByteString(omRequest)),
RaftClientRequest.Type.valueOf( RaftClientRequest.Type.valueOf(
RaftProtos.WriteRequestTypeProto.getDefaultInstance())); RaftProtos.WriteRequestTypeProto.getDefaultInstance()), null);
TransactionContext transactionContext = TransactionContext transactionContext =
ozoneManagerStateMachine.startTransaction(raftClientRequest); ozoneManagerStateMachine.startTransaction(raftClientRequest);

2
hadoop-ozone/pom.xml
View File

@ -29,7 +29,7 @@
<hadoop.version>3.2.0</hadoop.version> <hadoop.version>3.2.0</hadoop.version>
<hdds.version>0.5.0-SNAPSHOT</hdds.version> <hdds.version>0.5.0-SNAPSHOT</hdds.version>
<ozone.version>0.5.0-SNAPSHOT</ozone.version> <ozone.version>0.5.0-SNAPSHOT</ozone.version>
<ratis.version>0.4.0-5680cf5-SNAPSHOT</ratis.version> <ratis.version>0.4.0-1fc5ace-SNAPSHOT</ratis.version>
<bouncycastle.version>1.60</bouncycastle.version> <bouncycastle.version>1.60</bouncycastle.version>
<ozone.release>Crater Lake</ozone.release> <ozone.release>Crater Lake</ozone.release>
<declared.ozone.version>${ozone.version}</declared.ozone.version> <declared.ozone.version>${ozone.version}</declared.ozone.version>