commit | 035231e82ce1ce37bcfe6683b772e5b5faff1260 | [log] [tgz] |
---|---|---|
author | Jordan Halterman <jordan@onlab.us> | Tue Jul 18 08:39:07 2017 -0700 |
committer | Ray Milkey <ray@opennetworking.org> | Thu Jul 20 19:04:15 2017 +0000 |
tree | 68e44e9da4741aa6fd9f4152cb321aaffba8b4d3 | |
parent | 3548bb24db0fe0f87f4b88caa67c25ac47910bd9 [diff] |
Upgrade to Atomix 2.0.0-raft-beta1 Change-Id: I9f3345eb0107ee0079fec8980542678ee9d6f01f
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StorageNamespaces.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StorageNamespaces.java index 2db6aff..e0e3ad7 100644 --- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StorageNamespaces.java +++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StorageNamespaces.java
@@ -158,7 +158,6 @@ .register(MemberId.class) .register(SessionId.class) .register(RaftMember.Type.class) - .register(RaftMember.Status.class) .register(Instant.class) .register(Configuration.class) .register(AtomixAtomicCounterMapOperations.class) @@ -198,7 +197,6 @@ .register(DefaultRaftMember.class) .register(MemberId.class) .register(RaftMember.Type.class) - .register(RaftMember.Status.class) .register(Instant.class) .register(Configuration.class) .register(AtomixAtomicCounterMapOperations.class)
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionServer.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionServer.java index c1ea37c..c161c21 100644 --- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionServer.java +++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionServer.java
@@ -40,6 +40,7 @@ private final Logger log = getLogger(getClass()); private static final int MAX_ENTRIES_PER_LOG_SEGMENT = 32768; + private static final int MAX_SEGMENT_SIZE = 1024 * 1024 * 64; private final MemberId localMemberId; private final StoragePartition partition; private final Supplier<RaftServerProtocol> protocol; @@ -102,6 +103,7 @@ .withSerializer(new AtomixSerializerAdapter(Serializer.using(StorageNamespaces.RAFT_STORAGE))) .withDirectory(dataFolder) .withMaxEntriesPerSegment(MAX_ENTRIES_PER_LOG_SEGMENT) + .withMaxSegmentSize(MAX_SEGMENT_SIZE) .build()); StoragePartition.RAFT_SERVICES.forEach(builder::addService); return builder.build();