Repository: hadoop Updated Branches: refs/heads/HDFS-7240 1512c4878 -> eb0a766fd
HDFS-12851. Ozone: Upgrade to latest ratis build. Contributed by Mukul Kumar Singh Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/eb0a766f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/eb0a766f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/eb0a766f Branch: refs/heads/HDFS-7240 Commit: eb0a766fdeaa32457546eaaaf9ab18d99bf94f97 Parents: 1512c48 Author: Tsz-Wo Nicholas Sze <szets...@hortonworks.com> Authored: Mon Nov 27 13:36:16 2017 -0800 Committer: Tsz-Wo Nicholas Sze <szets...@hortonworks.com> Committed: Mon Nov 27 13:36:16 2017 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/scm/ScmConfigKeys.java | 11 ++++-- .../apache/hadoop/scm/XceiverClientRatis.java | 3 ++ .../main/java/org/apache/ratis/RatisHelper.java | 6 ++-- .../ozone/container/common/impl/Dispatcher.java | 2 +- .../server/ratis/XceiverServerRatis.java | 36 +++++++++++++++++--- .../src/main/resources/ozone-default.xml | 18 +++++++--- hadoop-project/pom.xml | 2 +- 7 files changed, 59 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb0a766f/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/scm/ScmConfigKeys.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/scm/ScmConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/scm/ScmConfigKeys.java index 0961aba..4eb074b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/scm/ScmConfigKeys.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/scm/ScmConfigKeys.java @@ -48,9 +48,14 @@ public final class ScmConfigKeys { // TODO : this is copied from OzoneConsts, may need to move to a better place public static final String OZONE_SCM_CHUNK_SIZE_KEY = "ozone.scm.chunk.size"; - // 1 MB by default - public static final int OZONE_SCM_CHUNK_SIZE_DEFAULT = 1 * 1024 * 1024; - public static final int OZONE_SCM_CHUNK_MAX_SIZE = 1 * 1024 * 1024; + // 16 MB by default + public static final int OZONE_SCM_CHUNK_SIZE_DEFAULT = 16 * 1024 * 1024; + public static final int OZONE_SCM_CHUNK_MAX_SIZE = 32 * 1024 * 1024; + + public static final String OZONE_SCM_RATIS_SEGMENT_SIZE_KEY = + "ozone.scm.ratis.segment.size"; + public static final int OZONE_SCM_RATIS_SEGMENT_SIZE_DEFAULT = + 128 * 1024 * 1024; public static final String OZONE_SCM_CLIENT_PORT_KEY = "ozone.scm.client.port"; http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb0a766f/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/scm/XceiverClientRatis.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/scm/XceiverClientRatis.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/scm/XceiverClientRatis.java index fd82845..5e171b1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/scm/XceiverClientRatis.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/scm/XceiverClientRatis.java @@ -144,6 +144,9 @@ public final class XceiverClientRatis extends XceiverClientSpi { @Override public void connect() throws Exception { + LOG.debug("Connecting to pipeline:{} leader:{}", + getPipeline().getPipelineName(), + RatisHelper.toRaftPeerId(pipeline.getLeader())); if (!client.compareAndSet(null, RatisHelper.newRaftClient(rpcType, getPipeline()))) { throw new IllegalStateException("Client is already connected."); http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb0a766f/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/ratis/RatisHelper.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/ratis/RatisHelper.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/ratis/RatisHelper.java index f7830a7..3fabe48 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/ratis/RatisHelper.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/ratis/RatisHelper.java @@ -20,7 +20,6 @@ package org.apache.ratis; import org.apache.hadoop.hdfs.protocol.DatanodeID; import org.apache.hadoop.scm.container.common.helpers.Pipeline; -import org.apache.ratis.client.ClientFactory; import org.apache.ratis.client.RaftClient; import org.apache.ratis.conf.RaftProperties; import org.apache.ratis.protocol.RaftGroup; @@ -74,7 +73,7 @@ public interface RatisHelper { * It should be changed to a unique id for each group. */ RaftGroupId DUMMY_GROUP_ID = - RaftGroupId.valueOf(ByteString.copyFromUtf8("AOZONERATISGROUP")); + RaftGroupId.valueOf(ByteString.copyFromUtf8("AOzoneRatisGroup")); RaftGroup EMPTY_GROUP = new RaftGroup(DUMMY_GROUP_ID, Collections.emptyList()); @@ -113,10 +112,9 @@ public interface RatisHelper { RpcType rpcType, RaftPeerId leader, RaftGroup group) { LOG.trace("newRaftClient: {}, leader={}, group={}", rpcType, leader, group); final RaftProperties properties = new RaftProperties(); - final ClientFactory factory = ClientFactory.cast(rpcType.newFactory(null)); + RaftConfigKeys.Rpc.setType(properties, rpcType); return RaftClient.newBuilder() - .setClientRpc(factory.newRaftClientRpc()) .setRaftGroup(group) .setLeaderId(leader) .setProperties(properties) http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb0a766f/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/Dispatcher.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/Dispatcher.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/Dispatcher.java index 205bfb0..900c408 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/Dispatcher.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/Dispatcher.java @@ -102,7 +102,7 @@ public class Dispatcher implements ContainerDispatcher { (cmdType == Type.ListContainer) || (cmdType == Type.UpdateContainer) || (cmdType == Type.CloseContainer)) { - return containerProcessHandler(msg); + resp = containerProcessHandler(msg); } if ((cmdType == Type.PutKey) || http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb0a766f/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java index 860090c..179c2a2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java @@ -28,6 +28,7 @@ import org.apache.hadoop.ozone.container.common.transport.server .XceiverServerSpi; import org.apache.hadoop.ozone.protocol.proto.OzoneProtos; +import org.apache.hadoop.scm.ScmConfigKeys; import org.apache.ratis.RaftConfigKeys; import org.apache.ratis.conf.RaftProperties; import org.apache.ratis.grpc.GrpcConfigKeys; @@ -37,6 +38,7 @@ import org.apache.ratis.rpc.RpcType; import org.apache.ratis.rpc.SupportedRpcType; import org.apache.ratis.server.RaftServer; import org.apache.ratis.server.RaftServerConfigKeys; +import org.apache.ratis.util.SizeInBytes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,23 +59,43 @@ public final class XceiverServerRatis implements XceiverServerSpi { private final RaftServer server; private XceiverServerRatis(DatanodeID id, int port, String storageDir, - ContainerDispatcher dispatcher, RpcType rpcType) throws IOException { + ContainerDispatcher dispatcher, RpcType rpcType, int maxChunkSize, + int raftSegmentSize) throws IOException { Objects.requireNonNull(id, "id == null"); this.port = port; + RaftProperties serverProperties = newRaftProperties(rpcType, port, + storageDir, maxChunkSize, raftSegmentSize); this.server = RaftServer.newBuilder() .setServerId(RatisHelper.toRaftPeerId(id)) .setGroup(RatisHelper.emptyRaftGroup()) - .setProperties(newRaftProperties(rpcType, port, storageDir)) + .setProperties(serverProperties) .setStateMachine(new ContainerStateMachine(dispatcher)) .build(); } - static RaftProperties newRaftProperties( - RpcType rpc, int port, String storageDir) { + private static RaftProperties newRaftProperties( + RpcType rpc, int port, String storageDir, int scmChunkSize, + int raftSegmentSize) { final RaftProperties properties = new RaftProperties(); + RaftServerConfigKeys.Log.Appender.setBatchEnabled(properties, true); + RaftServerConfigKeys.Log.Appender.setBufferCapacity(properties, + SizeInBytes.valueOf(raftSegmentSize)); + RaftServerConfigKeys.Log.setWriteBufferSize(properties, + SizeInBytes.valueOf(scmChunkSize)); + RaftServerConfigKeys.Log.setPreallocatedSize(properties, + SizeInBytes.valueOf(raftSegmentSize)); + RaftServerConfigKeys.Log.setSegmentSizeMax(properties, + SizeInBytes.valueOf(raftSegmentSize)); RaftServerConfigKeys.setStorageDir(properties, new File(storageDir)); RaftConfigKeys.Rpc.setType(properties, rpc); + + //TODO: change these configs to setter after RATIS-154 + properties.setInt("raft.server.log.segment.cache.num.max", 2); + properties.setInt("raft.grpc.message.size.max", + scmChunkSize + raftSegmentSize); + properties.setInt("raft.server.rpc.timeout.min", 500); + properties.setInt("raft.server.rpc.timeout.max", 600); if (rpc == SupportedRpcType.GRPC) { GrpcConfigKeys.Server.setPort(properties, port); } else { @@ -108,6 +130,10 @@ public final class XceiverServerRatis implements XceiverServerSpi { OzoneConfigKeys.DFS_CONTAINER_RATIS_RPC_TYPE_KEY, OzoneConfigKeys.DFS_CONTAINER_RATIS_RPC_TYPE_DEFAULT); final RpcType rpc = SupportedRpcType.valueOfIgnoreCase(rpcType); + final int raftSegmentSize = + ozoneConf.getInt(ScmConfigKeys.OZONE_SCM_RATIS_SEGMENT_SIZE_KEY, + ScmConfigKeys.OZONE_SCM_RATIS_SEGMENT_SIZE_DEFAULT); + final int maxChunkSize = ScmConfigKeys.OZONE_SCM_CHUNK_MAX_SIZE; // Get an available port on current node and // use that as the container port @@ -133,7 +159,7 @@ public final class XceiverServerRatis implements XceiverServerSpi { } datanodeID.setRatisPort(localPort); return new XceiverServerRatis(datanodeID, localPort, storageDir, - dispatcher, rpc); + dispatcher, rpc, maxChunkSize, raftSegmentSize); } @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb0a766f/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml index ecad056..309193f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml @@ -675,15 +675,23 @@ </property> <property> <name>ozone.scm.chunk.size</name> - <value>1048576</value> + <value>16777216</value> <tag>OZONE, SCM, CONTAINER, PERFORMANCE</tag> <description> The chunk size for reading/writing chunk operations in bytes. - The chunk size defaults to 1MB. If the value configured is more than the - maximum size (1MB), it will be reset to the maximum size. This maps to the - network packet sizes and file write operations in the client to datanode - protocol. + The chunk size defaults to 8MB. If the value configured is more than the + maximum size (16MB), it will be reset to the maximum size. This maps to + the network packet sizes and file write operations in the client to + datanode protocol. + </description> + </property> + <property> + <name>ozone.scm.ratis.segment.size</name> + <value>134217728</value> + <tag>OZONE, SCM, CONTAINER, PERFORMANCE</tag> + <description> + The size of the raft segment used by Apache Ratis on datanodes. </description> </property> <property> http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb0a766f/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 0eb605e..74ce27a 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -100,7 +100,7 @@ <ldap-api.version>1.0.0-M33</ldap-api.version> <!-- Apache Ratis version --> - <ratis.version>0.1.1-alpha-7a5c3ea-SNAPSHOT</ratis.version> + <ratis.version>0.1.1-alpha-e914e7a-SNAPSHOT</ratis.version> <jcache.version>1.0-alpha-1</jcache.version> <ehcache.version>3.3.1</ehcache.version> <hikari.version>2.4.12</hikari.version> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
