Robert Varga [Fri, 31 Jan 2025 20:15:57 +0000 (21:15 +0100)]
Make 'local' a presence container
It does not change on-wire representation and it is more expressive.
Also spell out case statements to have them bear different names.
Change-Id: Ibade66fb29080f0601ca701ef3e93dbbdff45d30
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Fri, 31 Jan 2025 20:03:55 +0000 (21:03 +0100)]
Fix member-voting-state
The list here is meant to carry each member name once and for each
positively identify whether or not it is voting. The list has to be
non-empty, as already enforced by the implementation.
Change-Id: Idc5e9dd37812e9b4af4a71bee9e8178c9ad7bbc2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Fri, 31 Jan 2025 19:45:23 +0000 (20:45 +0100)]
Separate out shard-name as a separate typedef
This allows us to rely it as a source of type safety, foregoing a few
checks.
Change-Id: Id27b7ffe0d6c09dd94547006f5f334f7c8a7599b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 7 Jan 2025 12:19:37 +0000 (13:19 +0100)]
Modernize LocalSnapshotStore
Use java.nio.file.Path and related NIO utilities to provide the same
functionality with more modern tools.
Change-Id: I4a2999e267f38189f7aa55bb40ac534142425d16
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 7 Jan 2025 12:18:46 +0000 (13:18 +0100)]
Modernize InputOutputStreamFactory
Use java.nio.file.Path internally, while keeping the external interface
unchanged.
Change-Id: Ib10c6094a8d3f746e64502c8023b4a5c1d05cf30
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 7 Jan 2025 12:17:52 +0000 (13:17 +0100)]
Modernize FileAkkaConfigurationReader
Use java.nio.file.Path instead of java.io.File and simplify code a bit.
Change-Id: I107cf5044975c2ee3b6dd473b68ecd17c6510994
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 7 Jan 2025 11:54:54 +0000 (12:54 +0100)]
Modernize atomix-storage path management
Use java.nio.file.Path in most places, so we have a more modern
interface.
Change-Id: I6c42a9f88102063961af7615a12372f6372cfa89
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 7 Jan 2025 11:39:40 +0000 (12:39 +0100)]
Modernize DataStoreAppConfigMetadata path management
Use java.nio.file.Path for better instantiation, eliminating the need to
split path into its components.
Change-Id: Ia3aaf1276ac310862790be89ab741675cac84be4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 30 Jan 2025 11:36:03 +0000 (12:36 +0100)]
Clean up payloadVersion lifecycle
This is something that cannot ever change, make sure we have that
covered.
Change-Id: I1ce6a888ce39af7722f0c33640387ca158a19f41
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 30 Jan 2025 03:50:18 +0000 (04:50 +0100)]
Split out WaitCallback
There is a lot going on for an anonymous class. Refactor into a
method-private class, which makes things a tad easier on the eyes.
Change-Id: I06f433fa830f53a7fa4002ae9ff6c9fcb8c661c2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 30 Jan 2025 08:39:40 +0000 (09:39 +0100)]
Clean up minor nits in tests
Mostly assertTrue()/assertFalse() to use explicit binding to boolean
instead of going through objects.
Change-Id: Ib6a4c21ac75ec4ccadc83678f6330faea6ebd2bf
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 30 Jan 2025 03:41:06 +0000 (04:41 +0100)]
Simplify sendMessageToManagerForConfiguredShards()
We are always sending messages to all datastores, so this refactors
the basic primitive and its users to be much more friendly.
Change-Id: Ia8bd477808d40f74c2faa791b84ada650cf27d27
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 30 Jan 2025 02:08:02 +0000 (03:08 +0100)]
Improve toChangeShardMembersVotingStatus()
Use a stream with a collector to create the HashMap we need.
Change-Id: I6bc2bc88e5b92e1363c04b1478b72d662180a583
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 30 Jan 2025 01:59:55 +0000 (02:59 +0100)]
Improve processReplies()
Use BindingMap.toMap() to simply index resuts via a streaming pipeline.
Makes things a lot easier on the eyes.
Change-Id: I8f108a097aa4f6a55e874776125eec89a5b67fa3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 30 Jan 2025 01:48:47 +0000 (02:48 +0100)]
Inline getAllShardLeadersClients()
This method has a single caller, which can realize it much more neatly
when inlined.
Change-Id: Ifc5f1daaa5679a4acf5c643970ad36cd97af6809
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 30 Jan 2025 01:41:39 +0000 (02:41 +0100)]
Inline sendMessageToShardManagers()
This method has a single caller, which is much better served with
using sendMessageToShardManager().
Change-Id: I82524ade1d0e93707e5fb9211f67264ffab7944d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 30 Jan 2025 01:34:16 +0000 (02:34 +0100)]
Modernize callback dispatch
Use proper generics and local variable type inference to streamline
bridging to ListenableFuture.
Change-Id: If4158288463611cb0ee15120436ce2ed524de6f6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 30 Jan 2025 08:08:33 +0000 (09:08 +0100)]
Remove TransactionRateLimiter
This component is completely unused. Remove it along with all its
surrounding wiring -- including marking its configuration as obsolete.
Change-Id: Ica980f21109ca80d19660a6327e00e10073c9610
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 30 Jan 2025 07:02:58 +0000 (08:02 +0100)]
Specialize UnsignedLongSet.EntryImpl
Separate out the interface and implementations, so that we now have two
record covering the case of a singleton range or a range encompassing
multiple values.
Change-Id: I08e86f2f4e58c50734ec34433b946ceaa3f55b17
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 30 Jan 2025 06:17:01 +0000 (07:17 +0100)]
Promote UnsignedLong{Bitmap,Set}
Tracking unsigned long things is useful in RAFT context, not just where
sal-distributed-datastore is concerned.
Promote these utilities to cluster.raft.spi for wider exposure.
Change-Id: Iab9f9a326ee60101230b7a3130cc48134182c48f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 30 Jan 2025 01:19:45 +0000 (02:19 +0100)]
Use BindingMap.toMap()
We are collecting EntryObjects, we have a specialized utility to make
that easy.
Change-Id: I4920e20d42e4636ec151abd72fb36d7db37679dc
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 30 Jan 2025 01:16:55 +0000 (02:16 +0100)]
Unify ActorUtils lookup
Use a simple utility method with a switch expression to return the
correct ActorUtils and use it where needed.
Change-Id: I7fefe74fb2d7706d5fb82bd091e214beba7ce3e9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 29 Jan 2025 23:52:08 +0000 (00:52 +0100)]
Do not use commons-lang3 for serialization
The method we are using here is a plain wrapper around
ObjectOutputStream masking IOException. Just the two lines ourselves,
replacing use of FileOutputStream with java.nio.file.Files instead.
Change-Id: I07ed7b6303c1d1d7ffabc730eb89598c255e935f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 29 Jan 2025 22:58:31 +0000 (23:58 +0100)]
Improve duration formatting
DurationFormatUtils.formatDurationHMS() is not doing quite what we want
if we go for peers inactive for longer than 24 hours.
Replace this commons-lang3 dependency with a Duration+String.format()
solution, which caps the result at a millisecond-before-24-hours on
overflow. Also issue a warning if that happens.
Change-Id: Ic79062890dcb777a6d0cfd7f4bc49be98ff48f29
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 29 Jan 2025 22:29:24 +0000 (23:29 +0100)]
Ditch use of ObjectUtils.identityToString()
Use Objects.toIdentityString() instead, reducing reliance on
commons-lang3.
Change-Id: Ib6c6698ca1b33bf9aaef85c74c2df45a6a584897
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 29 Jan 2025 21:10:55 +0000 (22:10 +0100)]
Clean up RaftActorBehaviour.canGrantVote()
We are using state variable and if/else blocks to change its initial
value. Rather than doing that, let's just return the appopriate result
as soon as we know it.
While we are here, store values we access multiple times in local
variables for brevity and simplicity.
Change-Id: I2c8eb29d617bf41d0451ae42d31b30e8f959774e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 29 Jan 2025 20:57:05 +0000 (21:57 +0100)]
Improve RaftActorBehavior.shouldUpdateTerm()
Use local variable type inference and Optional.isEmpty() to simplify
things.
Change-Id: I1ec28dd24f4eb9c36ddd0c20bf1140ef2509b15f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 29 Jan 2025 18:06:33 +0000 (19:06 +0100)]
Add RaftActor.memberId()
Rename the protected getId() method to memberId() and make it public.
Deprecated persistenceId() for removal, as it will be gone when we ditch
persistence.
JIRA: CONTROLLER-2073
Change-Id: Id02ae441855556160ad4746eeb0a8774fa87c4aa
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 29 Jan 2025 18:01:58 +0000 (19:01 +0100)]
Deprecate RaftActor.persistenceId()
persistenceId() is something we inherit from AbstractPersistentActor,
which we are getting rid of.
Make RaftActor.getId() public as memberId() and use it instead of
persistenceId().
JIRA: CONTROLLER-2073
Change-Id: If8a76654e9d8102a41548883a90d680db833f9f8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 29 Jan 2025 17:28:10 +0000 (18:28 +0100)]
Clean up RaftActor name handling
We have three concepts here:
- persistenceId, which is left to be defined by subclasses
- id, which gets passed to the constructor
- Shard.name, which is effectively the same thing
Eliminate the need to call overridable methods in constructor by
codifying the constructor id as persistenceId(), which is now a final
method in RaftActor.
Also prevent RaftActor.getId() from being overridden: this is the id
passed to constructor, even when we ditch persistence. We also eliminate
Shard.name, as it was always the same thing as getId().
Change-Id: I007964f8c17c5693bd96a030c4b75821d491254b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 29 Jan 2025 16:42:25 +0000 (17:42 +0100)]
Reduce RaftActor method visibility
We have a few protected methods which really should be
package-protected. Hide them from outside world.
JIRA: CONTROLLER-2073
Change-Id: I53cc6de8271d2425e15a9631170555214d67c828
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 29 Jan 2025 14:32:10 +0000 (15:32 +0100)]
Store ReplicatedLog reference
We are logging a number of things from the the replicated log, make sure
to keep the instance local.
Change-Id: I66961cb66046927c4805ff9f6cd931b11d7cc509
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 29 Jan 2025 14:19:37 +0000 (15:19 +0100)]
Centralize lz4-java version
Do not hide the version in sal-clustering-commons, keep it in
bnd-parent.
Change-Id: I0f1f1240cb616bd547c2fdc852d277798ea6fff3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 28 Jan 2025 20:43:28 +0000 (21:43 +0100)]
Add Automatic-Module-Name to sal-clustering-commons
Make it easier on downstreams to consume this artifact by explicitly
downgrading m-j-d version.
While we are here, also reformat and re-parent to bundle-plugin instead
of mdsal-plugin, as we do not have any codegen here.
Change-Id: Id40df7c6e1259b8d0c6142667464982763c85b9f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 28 Jan 2025 15:22:21 +0000 (16:22 +0100)]
Clean up AbstractReplicatedLog
The string we get is tied to RaftActorContext.getId(), let's call it
logId, just as we do in LocalAccess.
Force subclasses to provide initial data, so that it is clear the
magic values we are using are for test/mock classes -- which now specify
them explicitly.
Use List.of() instead of Collections.emptyList() as a final touch.
JIRA: CONTROLLER-2073
Change-Id: I784d02ecc55b668e2d991db6d6ff4e109e033d52
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 28 Jan 2025 20:08:23 +0000 (21:08 +0100)]
Use bnd-parent in raft-journal
raft-journal is a simple JPMS API component at this point. Use
bnd-parent to package it. Also fix javadocs while we are at it.
Change-Id: Ib821ea720f80edcd87dbdb528366b4599dbd9d3e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 28 Jan 2025 19:53:10 +0000 (20:53 +0100)]
Add bnd-parent and use it in blueprint
bnd-parent is essentially the same thing as bundle-parent, except driven
by bnd-maven-plugin.
This allows us to use annotations to control the manifest layout,
significantly improving maintainability.
Change-Id: I47dad895b7c3db907b6272827f57f84e933cb836
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 28 Jan 2025 15:00:58 +0000 (16:00 +0100)]
Rename AbstractReplicatedLogImpl
AbstractReplicatedLog better captures the intent, let's use that without
implying anything about ReplicatedLogImpl itself.
JIRA: CONTROLLER-2073
Change-Id: I14abc64495a92476258eb07c3f6915a77afbbf00
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 28 Jan 2025 19:18:28 +0000 (20:18 +0100)]
Use bundle-parent in blueprint
Just inherit the things from bundle-parent, reducing maintenance
overhead.
Change-Id: I4ee826f6aa50363f36db2352fa88b9c93b3bec18
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 28 Jan 2025 19:12:12 +0000 (20:12 +0100)]
Bump upstreams
Adopt:
- yangtools-14.0.7
- mdsal-14.0.8
Change-Id: Ie64ae6015793088bede41d3d8c7e931befb2c964
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 28 Jan 2025 14:03:14 +0000 (15:03 +0100)]
Acquire persistence provider once
We have a few places where we call getPersistenceProvider() twice. Make
things clearer by acquiring it only once.
JIRA: CONTROLLER-2073
Change-Id: Ic4bc681140076396b5d3384b1a7386aa00ee3e8a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 28 Jan 2025 13:59:19 +0000 (14:59 +0100)]
Inline isPersistentPayload()
The only caller already accesses entry data, so let's inline this method
and also clean up onRecoveredJournalLogEntry() a bit.
JIRA: CONTROLLER-2073
Change-Id: I5be0d85631692612bdaa284dcd132232c2ca744a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 28 Jan 2025 13:42:35 +0000 (14:42 +0100)]
Clean up RaftActorDelegatingPersistentDataProviderTest
We use unchecked casts and raw types. Modernize the setup a bit,
eliminating the need for suppressions.
JIRA: CONTROLLER-2073
Change-Id: Idb0c31e66de3721b9bf9ecf46b8c9484748a287f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Mon, 27 Jan 2025 19:11:07 +0000 (20:11 +0100)]
Add cluster.raft.LocalAccess
Current layout of state management needs some better encapsulation, i.e.
something RaftActor sees from local storage perspective. One aspect
is TermInfoStore, as tied logId.
Introduce LocalAccess to maintain a combination of a TermInfoStore and a
logId.
Tests are migrated so that the test suites not involved with persistence
use the newly-improved TestTermInfoStore, or FailingTermInfoStore if
they want to assert that persistence was not called.
Common path with RaftActor is exposed via the
DataPersistenceProvider-based constructor, allowing those involving
persistence call out into that path to improve consistency.
JIRA: CONTROLLER-2133
Change-Id: I5960036b599f76b284d53d60bbdf8a58c706f290
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 7 Jan 2025 18:32:57 +0000 (19:32 +0100)]
Split ImmutableUnsignedLongSet.readFrom()
We have two methods of reading entries. Split them into separate
methods, making things a tad easier to follow.
Ditch use of ArrayList, as using Entry[] results in a better path
to ImmutableSortedSet.construct().
Change-Id: I0c91fc0b07d5b9e10f4ba03454ebff5237b20da3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 7 Jan 2025 17:19:15 +0000 (18:19 +0100)]
Do not use Collections2
Building an ImmutableRangeSet through copyOf() offers to advantages over
using an explicit Builder -- it literally is the same thing.
Ditch Collections2.transform() in favor of a simple loop of
Builder.add() calls, resulting in more performant code.
Change-Id: I700b4d6d3082fed6413d8762085d6971285bdb66
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 7 Jan 2025 17:06:11 +0000 (18:06 +0100)]
Refactor UnsignedLongSet.Entry
Hide this class and make it a record, as that is what it is.
Change-Id: I7ccaa219590b2bf2c7ea880c8e2e185165272a5f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 7 Jan 2025 15:59:38 +0000 (16:59 +0100)]
Use switch expressions in UnsignedLongBitmap
Both copyOf() and readFrom() dispatch based on size, always returning an
instance. Use a switch expression to express that, improving code layout
a bit.
Change-Id: I25247537e7a55bf0e3710fe8d70e2a1dd8a4d6f2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 7 Jan 2025 16:12:18 +0000 (17:12 +0100)]
Clean up UnsignedLongSet.Entry.equals()
Use an instanceof pattern to squash the implementation into a single
expression.
Change-Id: I2b1562a4e7e30559f3e439150b21ad267c4f188a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 7 Jan 2025 16:27:38 +0000 (17:27 +0100)]
Improve UnsignedLongSet.toString()
Use arrow form, documenting the explicit no-op on empty.
Change-Id: I486c55a1764666fd7738c3fac67d276f0f47e3ed
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 7 Jan 2025 16:12:58 +0000 (17:12 +0100)]
Improve UnsignedLongSet.equals()
Use instanceof pattern to eliminate an explicit cast.
Change-Id: I5f928238056fc85511e96a5a8010531e598d2bef
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 7 Jan 2025 16:05:51 +0000 (17:05 +0100)]
Defer empty UnsignedLongBitmap instantiation
Move the EMPTY singleton in Regular, so that we instantiate it only when
needed.
Change-Id: Ib70d3c3c5dd5aea4f82efc485998248a8ff54ec1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 7 Jan 2025 16:14:49 +0000 (17:14 +0100)]
Seal UnsignedLongSet
We have only two internal implementations, make sure this is enforced in
class hierarchy.
Change-Id: I01338e132929784ac2671af0cc7439364136e685
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 7 Jan 2025 16:03:08 +0000 (17:03 +0100)]
Seal UnsignedLongBitmap
We only allow our two internal implementations, make that explicit by
sealing the class hierarchy.
Change-Id: I44d7ea88b38b48688bf18362ff44bdaccbe8c612
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 7 Jan 2025 13:47:59 +0000 (14:47 +0100)]
Use HashMap.newHashMap() in UnsignedLongBitmap
We have a replacement for Maps.newHashMapWithExpectedSize(), use it.
Change-Id: I75ffa21fe23732c176e50ec968258ae9fda761a8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 7 Jan 2025 13:46:42 +0000 (14:46 +0100)]
Simplify UnsignedLongBitmap.mutableCopy()
We only check for empty size, so use an if to peel this case.
Change-Id: I70b497a12098d2fffe601593ec2cf0852ef261c0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 7 Jan 2025 13:44:29 +0000 (14:44 +0100)]
Optimize UnsignedLongBitmap.equals()
Use instanceof pattern to simplify the two implementations down to a
single expression.
Change-Id: I1eda90f4e98bedbc482b469be9c221a7c50080a3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 7 Jan 2025 11:37:23 +0000 (12:37 +0100)]
Use Path.resolve() in mdsal-it-base
Improve path management by spelling out components.
Change-Id: Ibde6c604dc5157749171973c187402bacdc297a0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sat, 30 Nov 2024 11:56:06 +0000 (12:56 +0100)]
Bump upstream
Adopt:
- odlparent-14.0.5
- yangtools-14.0.6
- mdsal-14.0.6
Change-Id: I4c6906e4179ac1ce208d3ad3a2eb58a8ae57bc39
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit
e091fab4335eb872985722b23b1eb53261a5c0d5)
Robert Varga [Fri, 22 Nov 2024 12:40:28 +0000 (13:40 +0100)]
Move ApplyLeaderSnapshot
This record is really an SnapshotManager-internal message, reduce make
sure it is defined within it.
JIRA: CONTROLLER-2135
Change-Id: I82a3ac2b51e9b36943147ffe4f54b6010aff85ff
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 21 Nov 2024 10:07:07 +0000 (11:07 +0100)]
Use Awaitility in ShardTest
Let's not brew our own code to wait for an assertion, just use
Awaitility.await() instead.
Change-Id: Ic62ea5325cde86f6ea3a41dd5da7a8d53d188280
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 12 Nov 2024 19:38:02 +0000 (20:38 +0100)]
Move snapshot parsing to ShardManager
ApplySnapshot is an asynchronous triggered via a message-to-self. This
means that if we are being particularly slow about installing a snapshot
from leader, we could end up parsed user state to be present multiple
times in the pipeline.
Move user state parsing from Follower to ShardManager, so that it
remains in its ByteSource form until we are ready to process it --
thus containing the heap allocation and its application as an atomic
actor work unit.
JIRA: CONTROLLER-2135
Change-Id: I8f09709a8e38bf5a959ef5f02eb8d8377d8399d5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 12 Nov 2024 21:51:33 +0000 (22:51 +0100)]
Refactor SnapshotManager
The state keeping here is atrocious: the class is implemented as a
forwarder to current behavior and the actual implementations are hidden
behind a screen of default implementations.
This patch introduces SnapshotManager.Task as the core state-keeping
anchor. We then have a couple of records which hold state related to the
task.
This flushes out the fact we really have two different persisting paths,
depeding on what triggered it.
JIRA: CONTROLLER-2135
Change-Id: I9b667994d6f3d83ed3cffe3c7375978fb26d68c5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 19 Nov 2024 19:23:08 +0000 (20:23 +0100)]
Improve ImmutableRaftEntryMeta
We really what this to be a value type, hence we are following the lead
of the likes of java.lang.Integer. The constructor is indicidental to
the implementation -- we will remove it as soon as we can be a proper
value type.
Change-Id: I42f8a682e20cc37e50e1c34e0f10cce9c282708a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 14 Nov 2024 10:11:03 +0000 (11:11 +0100)]
Do not use Collections.emptyList()
Use List.of() instead.
Change-Id: If213252489cb4ad4d0ecf4f01ca1b89affc8a29e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 14 Nov 2024 08:33:35 +0000 (09:33 +0100)]
Use TermInfo in Snapshot serialization
Eliminate use of legacy methods in favorof talking to TermInfo directly.
JIRA: CONTROLLER-2127
Change-Id: I5a932c0b6bbc785b99e681168f2631b05cf0f900
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 12 Nov 2024 18:37:36 +0000 (19:37 +0100)]
Make ApplySnapshot a record
This is purely-internal DTO, make it a record.
Change-Id: I4570d9a78362f4dff7d4aceb4b469652396d3643
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 13 Nov 2024 14:42:42 +0000 (15:42 +0100)]
Clean up State.toString()
We are about to give up tight control over toString() callers, let's
make sure we do not cause OOM hazards.
Change-Id: I0d362b03ec4a66cc7bdd56f4ae72d2c1b7ce7f10
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 12 Nov 2024 20:17:01 +0000 (21:17 +0100)]
Promote RaftEntryMeta
This is a well-defined interface, add an immutable implementation
and publish both in raft.spi.
Change-Id: I701427b6adeb6098278ad3d7fdccd2716f8801ee
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 12 Nov 2024 19:48:40 +0000 (20:48 +0100)]
Refactor handleSnapshotMessage()
Use a switch with patterns to dispatch the messages. This forces a
reasonable refactor of COMMIT_SNAPSHOT.
Change-Id: Ia50f92c7129b888ab6c4a7743945a8f17cf55326
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 12 Nov 2024 17:53:59 +0000 (18:53 +0100)]
Refactor sendSnapshotChunk()
Use Optional.isEmpty() to guard an early return. Then minimize the size
of the try/catch block, resuling in another possible early return.
Take advantage of the fields we are accessing, so that we get their
reuse -- which also improves clarity, as we use names that correspond to
InstallSnapshot fields.
JIRA: CONTROLLER-2074
Change-Id: Ibb2f6d9e6be726c2346f6b8358899eae56f7ac21
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 12 Nov 2024 17:35:07 +0000 (18:35 +0100)]
Inline sendSnapshotChunk()
The only caller of this has already much of what is needed at its disposal,
eliminating the need to unwrap snapshotHolder.
Change-Id: Ia99a3baa7f731c3a816a6dd21a6ee1d71cb200bd
JIRA: CONTROLLER-2074
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Tomas Cere [Tue, 25 Jan 2022 11:47:13 +0000 (12:47 +0100)]
Fix intermittent RecoveryIntegrationTest failures
Looks like the two final tell() calls to the leader actor
can be misordered sometimes(perhaps no ordering guaranteed when
outside of actors?). So fix this by waiting until the leader
updates its journal before sending the next payload.
JIRA: CONTROLLER-2024
Change-Id: Icd86ea4e0f45589c0c514b805d6ef5491bf796b3
Signed-off-by: Tomas Cere <tomas.cere@pantheon.tech>
Robert Varga [Mon, 11 Nov 2024 10:24:16 +0000 (11:24 +0100)]
Refactor to get rid of @SuppressFBWarnings
Make sure getContext() is final, so that it can be safely called from
the constructor.
Change-Id: Ic733d70e82ab9d36127d3c88974d4b30f96bf05c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Mon, 11 Nov 2024 09:39:14 +0000 (10:39 +0100)]
Migrate callers of Actor.getSelf()
self() is a final method, making it okay to use in constructor.
Mass-migrate all callers to keep consistency.
Change-Id: I697e0722b1ba5af694692ebbc859f65c4a709c05
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sun, 10 Nov 2024 20:42:47 +0000 (21:42 +0100)]
Eliminate CheckConsensusReached
This is a direct callout from RaftActor to behavior, pretending to be a
message. Add an explicit method instead.
Change-Id: I0f059f1abbe7e9769c9d8288816e67b364f70217
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Fri, 8 Nov 2024 12:23:38 +0000 (13:23 +0100)]
Turn SwitchBehavior into a record
This is a plain DTO, use a record for that, inforcing non-null newState.
Change-Id: I92920303b9a8a8c00c4f31eec23b57b976945b5b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Fri, 8 Nov 2024 12:18:06 +0000 (13:18 +0100)]
Make SwitchShardBehavior a record
This is a plain DTO, use a record for that.
Change-Id: Ic388ce17c6f88a56b72423f963c89da226bce627
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Fri, 8 Nov 2024 12:06:25 +0000 (13:06 +0100)]
Remove deprecated TermInfo methods
This makes a pass at cleaning up methods.
JIRA: CONTROLLER-2127
Change-Id: Ie218f74bcb59d1a4e5b354d62f9b25ea5349a449
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Fri, 8 Nov 2024 01:36:10 +0000 (02:36 +0100)]
Rename cluster.raft.ElectionTerm
This interface really specifies a storage engine, rename it to
raft.spi.TermInfoStore.
JIRA: CONTROLLER-2127
Change-Id: Id295cd43642d525905ccab8b8bf0c29e2c13ec24
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 7 Nov 2024 21:45:48 +0000 (22:45 +0100)]
Introduce cluster.raft.spi.TermInfo
ElectionTerm is quite overloaded: it conflates the definition of
term+votedFor and lifecycle for updating it.
This patch introduces TermInfo as the holder of term+votedFor, leaving
ElectionTerm to be the lifecycle management part.
This ends up cleaning up quite a few interactions, as we usually
interchange atomic TermInfo, not its constituent parts.
JIRA: CONTROLLER-2127
Change-Id: I456a85dc96a01627c89a74d57520a8179dc9b4f9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 7 Nov 2024 17:30:54 +0000 (18:30 +0100)]
Modernize DataServiceIT
Clean up builder use, use local variable type inference,
Optional.orElseThrow() and DataObjectIdentifier.
Change-Id: Iafbc742e936cc98679fc048134abaf69599d7c81
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 7 Nov 2024 17:05:19 +0000 (18:05 +0100)]
Lock down RaftActorBehavior state
A number of things:
- drop 'protected' pretense: we are only serving our package
- expose logName directly
- mark a number of methods final
Change-Id: I46f131fc837388e3e418eb13273c755909bb17af
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 7 Nov 2024 16:00:27 +0000 (17:00 +0100)]
Eliminate AbstractRaftActorBehavior
The split here is quite ugly. Unify (Abstract)RaftActorBehavior and seal
AbstractLeader to enforce consistency.
Change-Id: Ia292b13848ff95ad968c3946db64cf0cd923f979
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 7 Nov 2024 11:45:11 +0000 (12:45 +0100)]
Refactor RaftRPC.toString()
Force a unified layout of toString(), which makes it easier to evolve
subclasses' fields.
Change-Id: I409ffe766feea88f8f935328aa0188dbc0df6bcd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 7 Nov 2024 11:18:31 +0000 (12:18 +0100)]
Eliminate AbstractRaftRPC
The RaftRPC/AbstractRaftRPC split is artificial, let's merge the two
classes, which allows us to seal the entire hierarchy.
Change-Id: I2b50200e7ab286881c63865940db5d866dbda942
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 7 Nov 2024 11:10:05 +0000 (12:10 +0100)]
Modernize CandidateTest
Eliminate an explicit cast in CandidateTest and use List.of().
Change-Id: Ibd7937c8f384023ba58b1cc1c30beb4803abb2fb
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 6 Nov 2024 17:22:17 +0000 (18:22 +0100)]
Do not use Optional in InstallSnapshot
Passing an Optional in method arguments is an early-adopter antipattern,
as is storing it in the fields. Use a plain @Nullable, which makes it a
tad easier to use.
Change-Id: I1acb67d38bb2be561cbc77041a9a1e07ed004b88
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Mon, 4 Nov 2024 11:29:53 +0000 (12:29 +0100)]
Refactor handleInstallSnapshotReply()
We are about to make a few changes to the logic here. Refactor it to
reduce nesting.
JIRA: CONTROLLER-2074
Change-Id: Icb373735fc5960e54b33483994500bfe034ecdf7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Mon, 4 Nov 2024 12:50:39 +0000 (13:50 +0100)]
Refactor handleInstallSnapshot()
We are about to make some changes to the logic here, but before we
embark on that, this patch makes the method more linear, differentiating
the two failure paths.
JIRA: CONTROLLER-2074
Change-Id: Iffc7d494e2f83968c5193dd2d3758d68443a6f6e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Mon, 4 Nov 2024 11:31:40 +0000 (12:31 +0100)]
Remove unneeded SuppressFBWarnings
handleInstallSnapshotReply() is no longer triggering the violation,
remove the annotation.
Change-Id: I7516ca3f635531c6055bde76134b8312f1f0369b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Mon, 4 Nov 2024 08:53:01 +0000 (09:53 +0100)]
Refactor ShardManagerIdentifier
- make this class a plain record, as it only holds a single field
- separate out toString() and toActorName() -- while the two are
aliases, we want to have an explicit method
- move to cluster.datastore.shardmanager
Change-Id: Iceea5ea40e46ccf2f0d0a5c830a5d11c28cd57d4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sun, 3 Nov 2024 22:23:48 +0000 (23:23 +0100)]
Modernize DataTreeCohortRegistrationProxy
Use Pekko Java API where possible and reduce ceremony around
asynchronous execution.
Change-Id: Ia875b6dd454b675974b2e070c4b07f465084ba1c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sun, 3 Nov 2024 22:16:46 +0000 (23:16 +0100)]
Expose ExecutionContextExecutor from Dispatches
Akka/Pekko has seamless integration with Java 8 via CompletionStages,
Duration etc. In order to make it useful, we also need a proper
Executor, not ExecutionContext.
As it turns out, this is as simple as exposing ExecutionContextExecutor
from our underlying MessageDispatcher.
Change-Id: Iadad1ccc12b40ba0716cd438d89c9b47643b0f14
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sun, 3 Nov 2024 21:45:34 +0000 (22:45 +0100)]
Use exhaustive switch in CompositeDataTreeCohort
Eliminate an impossible branch, improving our defensiveness. Also fix a
typo in enum member name.
Change-Id: Ie9b6a51f76f3b1e2efb494edd1c6c4847457c6f0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sun, 3 Nov 2024 19:12:13 +0000 (20:12 +0100)]
Rework FrontendReadWriteTransaction state tracking
Use switch expressions in most places and throw concrete ISEs, so
that it is apparent from the message as to what is going on.
JIRA: CONTROLLER-2131
Change-Id: Ib23ffe5baa3a97232f6f6cf6cbc6f38f109b443f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sun, 3 Nov 2024 17:13:46 +0000 (18:13 +0100)]
Remove abortFromTransactionActor()
We do not have ShardTransaction, hence this code path is completely
unused. Remove it.
JIRA: CONTROLLER-2129
Change-Id: I6709bcde470153dc63072f7ae95519e82fe3355d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sun, 3 Nov 2024 10:15:09 +0000 (11:15 +0100)]
Fix an Akka reference
We really mean Pekko here.
Change-Id: I3f4f891b84c77a1da720407c2add012dec14139a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sun, 3 Nov 2024 09:10:43 +0000 (10:10 +0100)]
Bump Scala to 2.13.15
https://github.com/scala/scala/releases/tag/v2.13.15
Change-Id: I076d60bbb7a2295adf58cc76b4c50a05080d8e83
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sun, 3 Nov 2024 09:00:11 +0000 (10:00 +0100)]
Bump scalatestplus.junit-4-13_2.13 to 3.2.19.0
https://www.scalatest.org/release_notes/3.2.14
https://www.scalatest.org/release_notes/3.2.15
https://www.scalatest.org/release_notes/3.2.16
https://www.scalatest.org/release_notes/3.2.17
https://www.scalatest.org/release_notes/3.2.18
https://www.scalatest.org/release_notes/3.2.19
Change-Id: I291322f0f29e4e1bf926f9adfc9a473dbf42596e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>