You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by sz...@apache.org on 2021/01/08 03:34:40 UTC
[ozone] branch master updated: HDDS-4649. Upgrade ratis to
1.1.0-35f17fa-SNAPSHOT to address incompatible changes (#1763)
This is an automated email from the ASF dual-hosted git repository.
szetszwo 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 1bbbf73 HDDS-4649. Upgrade ratis to 1.1.0-35f17fa-SNAPSHOT to address incompatible changes (#1763)
1bbbf73 is described below
commit 1bbbf73fae1269375abbb5ae9a3085912e0635ae
Author: runzhiwang <51...@users.noreply.github.com>
AuthorDate: Fri Jan 8 11:34:12 2021 +0800
HDDS-4649. Upgrade ratis to 1.1.0-35f17fa-SNAPSHOT to address incompatible changes (#1763)
---
.../transport/server/ratis/XceiverServerRatis.java | 14 +++++--
.../server/http/RatisNameRewriteSampleBuilder.java | 2 +-
.../server/http/TestRatisDropwizardExports.java | 9 ++++-
.../ozone/om/TestOzoneManagerHAMetadataOnly.java | 47 ++++++++++++++--------
.../apache/hadoop/ozone/om/KeyDeletingService.java | 15 ++++---
.../ozone/om/ratis/OzoneManagerRatisServer.java | 16 +++++---
pom.xml | 2 +-
7 files changed, 71 insertions(+), 34 deletions(-)
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java
index 66c211e..faa69a8 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java
@@ -605,10 +605,16 @@ public final class XceiverServerRatis implements XceiverServerSpi {
private RaftClientRequest createRaftClientRequest(
ContainerCommandRequestProto request, HddsProtos.PipelineID pipelineID,
RaftClientRequest.Type type) {
- return new RaftClientRequest(clientId, server.getId(),
- RaftGroupId.valueOf(PipelineID.getFromProtobuf(pipelineID).getId()),
- nextCallId(), ContainerCommandRequestMessage.toMessage(request, null),
- type, null);
+ return RaftClientRequest.newBuilder()
+ .setClientId(clientId)
+ .setServerId(server.getId())
+ .setGroupId(
+ RaftGroupId.valueOf(
+ PipelineID.getFromProtobuf(pipelineID).getId()))
+ .setCallId(nextCallId())
+ .setMessage(ContainerCommandRequestMessage.toMessage(request, null))
+ .setType(type)
+ .build();
}
private GroupInfoRequest createGroupInfoRequest(
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/RatisNameRewriteSampleBuilder.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/RatisNameRewriteSampleBuilder.java
index cbee652..e3fb737 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/RatisNameRewriteSampleBuilder.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/RatisNameRewriteSampleBuilder.java
@@ -26,7 +26,7 @@ import java.util.regex.Pattern;
import io.prometheus.client.Collector.MetricFamilySamples.Sample;
import io.prometheus.client.dropwizard.samplebuilder.DefaultSampleBuilder;
import org.apache.logging.log4j.util.Strings;
-import static org.apache.ratis.server.metrics.RaftLogMetrics.RATIS_APPLICATION_NAME_METRICS;
+import static org.apache.ratis.metrics.RatisMetrics.RATIS_APPLICATION_NAME_METRICS;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/server/http/TestRatisDropwizardExports.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/server/http/TestRatisDropwizardExports.java
index 25f1cef..906ff55 100644
--- a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/server/http/TestRatisDropwizardExports.java
+++ b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/server/http/TestRatisDropwizardExports.java
@@ -24,7 +24,10 @@ import java.util.concurrent.TimeUnit;
import com.codahale.metrics.MetricRegistry;
import io.prometheus.client.CollectorRegistry;
import io.prometheus.client.exporter.common.TextFormat;
-import org.apache.ratis.server.metrics.RaftLogMetrics;
+import org.apache.ratis.protocol.RaftGroupId;
+import org.apache.ratis.protocol.RaftGroupMemberId;
+import org.apache.ratis.protocol.RaftPeerId;
+import org.apache.ratis.server.metrics.SegmentedRaftLogMetrics;
import org.junit.Assert;
import org.junit.Test;
@@ -36,7 +39,9 @@ public class TestRatisDropwizardExports {
@Test
public void export() throws IOException {
//create Ratis metrics
- RaftLogMetrics instance = new RaftLogMetrics("instance");
+ SegmentedRaftLogMetrics instance = new SegmentedRaftLogMetrics(
+ RaftGroupMemberId.valueOf(
+ RaftPeerId.valueOf("peerId"), RaftGroupId.randomId()));
instance.getRaftLogSyncTimer().update(10, TimeUnit.MILLISECONDS);
MetricRegistry dropWizardMetricRegistry =
instance.getRegistry().getDropWizardMetricRegistry();
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAMetadataOnly.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAMetadataOnly.java
index bfdcefe..84a1b17 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAMetadataOnly.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAMetadataOnly.java
@@ -65,7 +65,7 @@ import java.util.UUID;
import static org.apache.hadoop.ozone.MiniOzoneHAClusterImpl.NODE_FAILURE_TIMEOUT;
import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_CLIENT_WAIT_BETWEEN_RETRIES_MILLIS_DEFAULT;
-import static org.apache.ratis.server.metrics.RaftLogMetrics.RATIS_APPLICATION_NAME_METRICS;
+import static org.apache.ratis.metrics.RatisMetrics.RATIS_APPLICATION_NAME_METRICS;
import static org.junit.Assert.fail;
/**
@@ -395,11 +395,16 @@ public class TestOzoneManagerHAMetadataOnly extends TestOzoneManagerHA {
.setCmdType(OzoneManagerProtocolProtos.Type.CreateVolume).build();
RaftClientReply raftClientReply =
- raftServer.submitClientRequest(new RaftClientRequest(clientId,
- raftServer.getId(), ozoneManagerRatisServer.getRaftGroup()
- .getGroupId(), callId,
- Message.valueOf(OMRatisHelper.convertRequestToByteString(omRequest)),
- RaftClientRequest.writeRequestType(), null));
+ raftServer.submitClientRequest(RaftClientRequest.newBuilder()
+ .setClientId(clientId)
+ .setServerId(raftServer.getId())
+ .setGroupId(ozoneManagerRatisServer.getRaftGroup().getGroupId())
+ .setCallId(callId)
+ .setMessage(
+ Message.valueOf(
+ OMRatisHelper.convertRequestToByteString(omRequest)))
+ .setType(RaftClientRequest.writeRequestType())
+ .build());
Assert.assertTrue(raftClientReply.isSuccess());
@@ -409,11 +414,16 @@ public class TestOzoneManagerHAMetadataOnly extends TestOzoneManagerHA {
logCapturer.clearOutput();
raftClientReply =
- raftServer.submitClientRequest(new RaftClientRequest(clientId,
- raftServer.getId(), ozoneManagerRatisServer.getRaftGroup()
- .getGroupId(), callId, Message.valueOf(
- OMRatisHelper.convertRequestToByteString(omRequest)),
- RaftClientRequest.writeRequestType(), null));
+ raftServer.submitClientRequest(RaftClientRequest.newBuilder()
+ .setClientId(clientId)
+ .setServerId(raftServer.getId())
+ .setGroupId(ozoneManagerRatisServer.getRaftGroup().getGroupId())
+ .setCallId(callId)
+ .setMessage(
+ Message.valueOf(
+ OMRatisHelper.convertRequestToByteString(omRequest)))
+ .setType(RaftClientRequest.writeRequestType())
+ .build());
Assert.assertTrue(raftClientReply.isSuccess());
@@ -428,11 +438,16 @@ public class TestOzoneManagerHAMetadataOnly extends TestOzoneManagerHA {
Thread.sleep(getRetryCacheDuration().toMillis() + 5000);
raftClientReply =
- raftServer.submitClientRequest(new RaftClientRequest(clientId,
- raftServer.getId(), ozoneManagerRatisServer.getRaftGroup()
- .getGroupId(), callId, Message.valueOf(
- OMRatisHelper.convertRequestToByteString(omRequest)),
- RaftClientRequest.writeRequestType(), null));
+ raftServer.submitClientRequest(RaftClientRequest.newBuilder()
+ .setClientId(clientId)
+ .setServerId(raftServer.getId())
+ .setGroupId(ozoneManagerRatisServer.getRaftGroup().getGroupId())
+ .setCallId(callId)
+ .setMessage(
+ Message.valueOf(
+ OMRatisHelper.convertRequestToByteString(omRequest)))
+ .setType(RaftClientRequest.writeRequestType())
+ .build());
Assert.assertTrue(raftClientReply.isSuccess());
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyDeletingService.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyDeletingService.java
index 418d7a8..7c9dabd 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyDeletingService.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyDeletingService.java
@@ -282,11 +282,16 @@ public class KeyDeletingService extends BackgroundService {
private RaftClientRequest createRaftClientRequestForPurge(
OMRequest omRequest) {
- return new RaftClientRequest(clientId,
- ozoneManager.getOmRatisServer().getRaftPeerId(),
- ozoneManager.getOmRatisServer().getRaftGroupId(), runCount.get(),
- Message.valueOf(OMRatisHelper.convertRequestToByteString(omRequest)),
- RaftClientRequest.writeRequestType(), null);
+ return RaftClientRequest.newBuilder()
+ .setClientId(clientId)
+ .setServerId(ozoneManager.getOmRatisServer().getRaftPeerId())
+ .setGroupId(ozoneManager.getOmRatisServer().getRaftGroupId())
+ .setCallId(runCount.get())
+ .setMessage(
+ Message.valueOf(
+ OMRatisHelper.convertRequestToByteString(omRequest)))
+ .setType(RaftClientRequest.writeRequestType())
+ .build();
}
/**
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java
index 128ddc7..78a19cb 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java
@@ -148,11 +148,17 @@ public final class OzoneManagerRatisServer {
private RaftClientRequest createWriteRaftClientRequest(OMRequest omRequest) {
Preconditions.checkArgument(Server.getClientId() != DUMMY_CLIENT_ID);
Preconditions.checkArgument(Server.getCallId() != INVALID_CALL_ID);
- return new RaftClientRequest(
- ClientId.valueOf(UUID.nameUUIDFromBytes(Server.getClientId())),
- server.getId(), raftGroupId, Server.getCallId(),
- Message.valueOf(OMRatisHelper.convertRequestToByteString(omRequest)),
- RaftClientRequest.writeRequestType(), null);
+ return RaftClientRequest.newBuilder()
+ .setClientId(
+ ClientId.valueOf(UUID.nameUUIDFromBytes(Server.getClientId())))
+ .setServerId(server.getId())
+ .setGroupId(raftGroupId)
+ .setCallId(Server.getCallId())
+ .setMessage(
+ Message.valueOf(
+ OMRatisHelper.convertRequestToByteString(omRequest)))
+ .setType(RaftClientRequest.writeRequestType())
+ .build();
}
/**
diff --git a/pom.xml b/pom.xml
index 1f21625..9800005 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<declared.ozone.version>${ozone.version}</declared.ozone.version>
<!-- Apache Ratis version -->
- <ratis.version>1.1.0-c5eafb9-SNAPSHOT</ratis.version>
+ <ratis.version>1.1.0-35f17fa-SNAPSHOT</ratis.version>
<!-- Apache Ratis thirdparty version -->
<ratis.thirdparty.version>0.6.0-SNAPSHOT</ratis.thirdparty.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org