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>
Robert Varga [Sat, 2 Nov 2024 23:09:41 +0000 (00:09 +0100)]
Ditch scala-java8-compat
We have migrated away from using scala-java8-compat, remove the
dependency.
Change-Id: Ia11c9aa68ec8a47b54ea3fae2d63d323c8a2b2ae
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sat, 2 Nov 2024 23:03:53 +0000 (00:03 +0100)]
Migrate away from scala.compat.java8.FutureConverters
Use an OnComplete to dispatch the future without the use of
FutureConverters.
While we are here, also clean up interactions with
scala.concurrent.Future, so that we do not reference various
Promise-based things.
Change-Id: Iae5ff9e44ef4017409db66d34df4b00df919b68f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sat, 2 Nov 2024 16:13:43 +0000 (17:13 +0100)]
Add ShardDataTree.retire()
The only reason for cohortIterator() is retiring a client. Encapsulate
the logic in ShardDataTree.
JIRA: CONTROLLER-2131
Change-Id: I45a3c48a5e462469f1f2919dfb180ca8d33c72ba
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sun, 3 Nov 2024 01:44:36 +0000 (02:44 +0100)]
Reduce use of Scala in ShardDataTreeListenerInfoMXBeanImpl
Use CompletionStages, even when they are a pain for this particular use
case.
Change-Id: I49ff00fd86df025174533e024092f5a3048250df
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sat, 2 Nov 2024 17:42:52 +0000 (18:42 +0100)]
Modernize CompositeDataTreeCohort
Use the various Java features to simplify code. Also use @Nullable
instead of optional, as it leads to simpler callers.
Also use scala.jdk.javaapi.FutureConverters instead of legacy
scala.compat.java8.FutureConverters, with routing through
callbackExecutor.
JIRA: CONTROLLER-2131
Change-Id: I2a47d01ab95862efeef40debd52e8f6ca40b601d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sat, 2 Nov 2024 11:31:36 +0000 (12:31 +0100)]
Rename (Simple)ShardDataTreeCohort
Let us use (Simple,Chained}CommitCohort naming throughout, so that do
not need to deal with a mouthful.
JIRA: CONTROLLER-2131
Change-Id: I04a37e000af74f087786c6f4fc8cee8ebdfe7c50
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sat, 2 Nov 2024 10:15:16 +0000 (11:15 +0100)]
Refactor ShardDataTreeCohort
Move all logic from SimpleShardDataTreeCohort into ShardDataTreeCohort,
so we can use ChainedCommitCohort in ShardDataTree queues.
This leads to a consistent view of cohorts, i.e.
ShardDataTreeTransactionChain.createReadyCohort() returns the same
cohort as is present it the queue.
JIRA: CONTROLLER-2131
Change-Id: Idb391ce8db69ddfcf530e7679761de414df0165e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Fri, 1 Nov 2024 14:34:34 +0000 (15:34 +0100)]
Eliminate ShardDataTree.CommitEntry
We are only ever carrying SimpleShardDataTreeCohorts and keep additional
last access time.
Integrate the last access time into SimpleShardDataTreeCohort,
eliminating one level of indirection.
JIRA: CONTROLLER-2131
Change-Id: I3a1e7be49cc0ddcdb92e90e37ce17489ebeaa139
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Fri, 1 Nov 2024 11:04:14 +0000 (12:04 +0100)]
Refactor ShardDataTree.processNextPending()
This is a match with possible removal of stale entries. Reduce confusion
by renaming it to findFirstEntry() and returning a nullable CohortEntry.
Callers then perform a simple null check instead of passing down a
lambda.
JIRA: CONTROLLER-2131
Change-Id: I39e35b6374ef1aa6d6c0c8bc2e32dd4d91263de6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sat, 2 Nov 2024 09:42:57 +0000 (10:42 +0100)]
Centralize StandaloneFrontendHistory identifier
We have three callsites using historyId == 0. Centralize this assumption
in a dedicated method.
JIRA: CONTROLLER-2131
Change-Id: I36a02be078c6e9ad96fef44eee13283d00322562
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Fri, 1 Nov 2024 10:12:02 +0000 (11:12 +0100)]
FrontendClientMetadata is a plain record
This is an immutable DTO: annotate it and make it a record.
Change-Id: I19ad27fad4821a86c6742b48cc1b41638ad60503
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Fri, 1 Nov 2024 09:59:22 +0000 (10:59 +0100)]
Remove FrontendClientMetadataBuilder.Disabled
Since metadata tracking cannot be disabled, it does not make sense to
have two implementations. Remove .Disabled and inline .Enabled into
FrontendClientMetadataBuilder, making it a final class.
Also improve annotations a bit.
Change-Id: Ie39ff1aa1a082fbf2714daa9dfcda49374f48b2d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Mon, 28 Oct 2024 00:28:37 +0000 (01:28 +0100)]
Eliminate Ask-based messages
Since we are not servicing the messages, we can remove them.
JIRA: CONTROLLER-2129
Change-Id: Ia46ae004ef42391ee772891bdd7c63d666ae8456
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Mon, 28 Oct 2024 00:19:38 +0000 (01:19 +0100)]
Eliminate ask-based support from Shard
This eliminates all the moving pieces in production code, leaving only
messages.
We also remove the remaining tests, notably ShardCommitCoordinationTest,
ShardTransactionFailureTest and ShardTransactionTest.
Replacement for ShardCommitCoordinationTest will come via a separate
issue, as we need to revisit how ShardDataTree.pendingTransactions work,
now that we only have properly-coordinated can-commit/pre-commit stages.
Replacement for ShardTransaction(Failure)Test will be submitted in a
separate patch.
JIRA: CONTROLLER-2129
Change-Id: I0161f0291fc5b27779c8304456cac800ac7c9e90
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Fri, 1 Nov 2024 08:46:40 +0000 (09:46 +0100)]
Remove unnecessary checkReady()
We have already asserted state and have tthe ready handle -- use it
directly without touching state again.
Change-Id: Ic227300e83bb2171a8ed287aa5e007f8edd12aed
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 31 Oct 2024 10:44:59 +0000 (11:44 +0100)]
Remove ActorUtils.broadcast()
This method is not used anywhere: remove it.
Change-Id: Icf3bb19517516685e1ce6149123a7f5c4a57d1d0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 30 Oct 2024 16:32:18 +0000 (17:32 +0100)]
Isolate Actor.getSender() references
We *really* want to use replyTo-in-request pattern, so that we can
disconnect actors from their behaviours (a la Akka Typed).
In order to do that, we must get a handle on which places are relying on
Actor.sender() and hence this patch.
We mass-migrate callers of Actor.sender() to Actor.getSender() and
override AbstractActor.getSender() to be deprecated for removal -- which
flags all callsites with a deprecation warning.
Change-Id: Ib62d3ce90e8a345ea54c88f226ba0507676ef89c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 30 Oct 2024 13:53:44 +0000 (14:53 +0100)]
Use replyTo in GetBehaviorState
This a test message, refactor it to use replyTo, ditching a getSender()
caller.
While we are here, modernize things -- notably using records and record
patterns.
Change-Id: Id0294e4359d0660f6c850e421cc59b8b3b0da168
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 31 Oct 2024 10:36:07 +0000 (11:36 +0100)]
Remove AbstractTest.waitOnAsyncTask()
This method is unused and relies on FutureConverters: remove it.
Change-Id: I5a942019afc2796b451295d889c349c7a3130647
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 31 Oct 2024 10:33:11 +0000 (11:33 +0100)]
Remove common.actor.ExplicitAsk
This class is completely unused, remove it.
Change-Id: Ie67d7757c3500a3c9351e4acc7bec39307222b58
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 31 Oct 2024 10:12:23 +0000 (11:12 +0100)]
Remove users of common.actor.ExplicitAsk
Akka's Java-based APIs work as they should, so ditch users of
ExplicitAsk and deprecate it for removal.
Change-Id: Icc2a21df26368f06b42c9c3978f289abce40cfde
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 29 Oct 2024 17:11:16 +0000 (18:11 +0100)]
Modernize TestShard a bit
Use switch to dispatch messages and various other small cleanups.
Change-Id: I107d949eb79ddf6d172476edb4a5d3d20cfca78f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 30 Oct 2024 10:49:32 +0000 (11:49 +0100)]
Modernize DataTreeChangeListenerActor a bit
Use a switch expression and add a FIXME around the use of getSender().
Change-Id: Ic9f25cb25499a9ee0e805e0b39a6da5d24e6a231
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 30 Oct 2024 10:46:44 +0000 (11:46 +0100)]
ElectionTerm is always present
Add a @NonNull to indicate term information is always present.
Change-Id: Id57ec8366ec4be8863c7bb91a5bfe6238acf59a0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 29 Oct 2024 17:41:49 +0000 (18:41 +0100)]
Clean up AbstractShardBackendResolver
Multiple things:
- rename ShardState to ResolvingBackendInfo
- seal and make methods final
- use AbstractRegistration to allow multi-registration
- use enhanced switch where obvious
Change-Id: I68e5ad47b8c7f87201b329eaab73e66063305874
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 29 Oct 2024 15:56:26 +0000 (16:56 +0100)]
Use scheduleWithFixedDelay() for commit timeout
Remove use of deprecated methods by using Java's Duration and pick the
superior strategy to prevent bursts.
Change-Id: Ib999135c503bc864081e5ad8f9f8326f1bc5987d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Fri, 25 Oct 2024 20:40:43 +0000 (22:40 +0200)]
Migrate ShardTest et al. to use cds-access-api
This patch adds ShardTestKit.connect() which returns
a ShardTestConnection, which we use to drive Shard through
cds-access-api.
Also mass-migrate tests to use this facility, minimizing ask-based
protocol use in tests.
JIRA: CONTROLLER-2129
Change-Id: I9e1ddb31602c24f10ab5425f18b00f4ea9d28ca0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Fri, 25 Oct 2024 21:29:03 +0000 (23:29 +0200)]
Fix ShardDataTree transaction counters
ShardDataTree is not consistently updating its counters, fix that.
Change-Id: I08db7ea2d3735eaedd8de6efbae29315f7b84d04
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Mon, 28 Oct 2024 20:24:53 +0000 (21:24 +0100)]
Use a switch expression to dispatch server configuration
RaftActorServerConfigurationSupport uses an if/else cascade, which we
can easily replace with switch expression.
Change-Id: Ib570d8a3dd2ddac1d8dbe7ba3907b19875fb99c1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Mon, 28 Oct 2024 20:23:52 +0000 (21:23 +0100)]
Use a swtich to dispatch recovery messages
RaftActorRecoverySupport has an if/else cascade, replace it with switch.
Change-Id: I278b04fd0889f10d2789daab376e3d83bcc2edfd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sat, 26 Oct 2024 10:21:22 +0000 (12:21 +0200)]
Refactor ShardStats
We have two views here:
- ShardStatsMXBean, which is mostly read-only
- ShardStats, which is updatable
Separate the two, with ShardStats being really holder of counters etc.
This allows us to successfully wire Shard(DataTree) even then mocking.
Change-Id: Ie902a7cf8a9458285d4a9efeed3c6fe4659fb08a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sat, 26 Oct 2024 13:01:46 +0000 (15:01 +0200)]
Remove superfluous ShardTest tests
testCreateTransaction(OnChain)'s functionality has no
equivalent in Tell-based protocol. Remove these both.
testBatchedModificationsReadyWithIncorrectTotalMessageCount() tests just
an ask-based ordering specific -- we account for that through Envelope
sequencing instead.
testOnBatchedModificationsWhenNotLeader() is not applicable -- this test
scenario indicates NotLeaderException during connect -- and we already
check for that.
JIRA: CONTROLLER-2129
Change-Id: I7e19cc63a99873e8190c69aacb9bd3997df679cd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Mon, 28 Oct 2024 16:24:31 +0000 (17:24 +0100)]
Migrate ModuleShardBackendResolverTest to JUnit5
Clean up the test, its mocking and its use of futures -- eliminating
warnings and hopefully stabilizing testGetBackendInfoFail().
Change-Id: I5989ec98f89ab58ca9a1dbab258e51043cde9907
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Mon, 28 Oct 2024 12:57:13 +0000 (13:57 +0100)]
Add RegisterForShardAvailabilityChanges.toString()
Make it easier to identify registration by printing where the callback
points to.
Change-Id: Id969e1dbd8b27e6c50c712028c890d9e1b9f7471
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Mon, 28 Oct 2024 09:40:40 +0000 (10:40 +0100)]
Modernize TransactionTester
Use assertInstanceOf() and make the code smaller.
Change-Id: I2be41f7d9484c3a006ce8d80b0bc09114a6dad85
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Mon, 28 Oct 2024 02:16:32 +0000 (03:16 +0100)]
Change RaftActor.getRoleChangeNotifier()
Rename this method to roleChangeNotifier() and return a @Nullable, which
makes it easier to interact with.
Change-Id: I707b40b95a94a6fc35ba871ece088d3a9f2ecb15
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>