Skip to content

refactor(inkless:switch): replace the seal and repair commands with rearm and lower-seal - #872

Open
giuseppelillo wants to merge 3 commits into
mainfrom
claude/classic-diskless-switch-tooling-f604b8
Open

giuseppelillo wants to merge 3 commits into
mainfrom
claude/classic-diskless-switch-tooling-f604b8

Conversation

@giuseppelillo

@giuseppelillo giuseppelillo commented Nov 13, 2026 •

Copy link
Copy Markdown
Contributor

This PR reduces kafka-topic-switch.sh to a read-only state command and two narrow write commands, rearm and lower-seal. It removes every other operator command that writes a seal offset or changes the control plane.

Removed:

  • The seal command, with all its options: --offset with N ≥ 0, -1, and -2, plus --clear-producer-states and --dry-run.
  • The repair command.
  • Every AlterDisklessSwitch input except two: -2 on a pending switch, and a seal lower than the committed seal in phase 1. The ClearProducerStates field is gone, and AlterDisklessSwitchOptions no longer has clearProducerStates.
  • The RepairDisklessLog broker RPC, along with Admin.repairDisklessLog, its broker handler, its control plane code in both implementations, and its metrics.
  • The repair_diskless_log_v1 Postgres function and its types, which migration V32__Remove_repair_diskless_log.sql drops.

New:

  • The rearm --topic T --partition P command. It sends AlterDisklessSwitch with -2, which the controller accepts only while the switch is pending. The controller bumps the leader epoch, so the leader seals again.
  • The lower-seal --topic T --partition P --offset N command. It sends AlterDisklessSwitch with N, which the controller accepts only for a committed seal in phase 1 and a seal that is at least 0 and lower than the committed one. The command rejects a negative offset before it sends the request, because the controller reads -2 as a re-arm. It keeps the recovery in the "Last-known-leader election" section of CLASSIC_TO_DISKLESS_SWITCH.md working: after a last-known-leader election picks a leader whose log ends below the seal, lowering the seal to that leader's log end offset brings the partition back.

Unchanged:

  • The state command.
  • The leader-driven switch flow.

Note

After lower-seal, the seal in KRaft and the diskless log in the control plane disagree, and the records between them are lost.

lower-seal writes the new seal to KRaft only. Every replica truncates its classic log to the new seal. The control plane already has a row for the partition, and the diskless records past the old seal already have their offsets. When the leader sends InitDisklessLog again, the control plane answers already_initialized and changes nothing. So the diskless log still starts at the old seal, and the offsets between the two seals exist in neither log.

For example, ClassicToDisklessSwitchLastKnownLeaderClusterTest commits a seal at offset 20 and then writes diskless records at offsets 20 to 24. A last-known-leader election picks a leader whose log ends at offset 15, so the partition goes offline. After lower-seal --offset 15 and a leader restart:

  • The seal in KRaft is 15.
  • Every replica's classic log ends at offset 15, so it holds offsets 0 to 14.
  • The control plane's diskless log still starts at offset 20.
  • A consumer that reads from offset 0 gets offsets 0 to 14, then 20 to 24. Offsets 15 to 19 are gone, and the broker returns no error for them.

No tool reconciles the two, and nothing needs one: the partition serves every remaining record and finishes the switch. The removed repair command didn't change this either, because it only wrote the control plane's diskless_start_offset column, which nothing reads at runtime.

Before and after

Each row of the following table describes a problem an operator can face, how the tooling handled it before this PR, and how it's handled after. The last column describes what to do in the cases this PR makes impossible.

Problem Before this PR After this PR How to deal with it
A pending switch doesn't progress because the leader isn't driving it, for example after the leader restarted while the switch was pending. seal --offset -2 re-arms the switch. The controller bumps the leader epoch, so the leader seals again and registers the partition for InitDisklessLog. rearm --topic T --partition P does the same thing. It sends AlterDisklessSwitch with -2. Not needed
A pending switch is stuck because the ISR dropped below min.insync.replicas, so the high watermark can't reach the sealed log end offset. seal, with or without --offset N, commits a seal without the leader. The seal carries no producer states, so an idempotent producer that was active before the seal fails with OUT_OF_ORDER_SEQUENCE_NUMBER on its next batch. If the seal is above the high watermark, it includes records that aren't fully replicated. Restart the brokers of the out-of-sync followers. They keep fetching up to the sealed log end offset while the switch is pending, and once they rejoin the ISR, the leader proposes the seal. If they can't come back, lower the topic's min.insync.replicas and run rearm: the leader recomputes its high watermark and proposes the seal with producer states. Adding new replicas doesn't help, because a new replica doesn't fetch until the seal commits. Not needed
A phase 1 partition is offline because a last-known-leader election picked a leader whose log ends below the seal. No other replica can lead, and phase 2 can't start. seal --offset N lowers the seal to the leader's log end offset. The same command also accepts a pending switch, -1, and -2. The documented procedure then runs repair, which writes a control plane column that nothing reads. lower-seal --offset N sends AlterDisklessSwitch with N. The controller accepts it only for a committed seal in phase 1 and a seal lower than the committed one. The procedure has no repair step. In both cases, every replica truncates its classic log to N, the control plane keeps the diskless log starting at the old seal, and the partition loses the records between N and the old seal. A consumer that reads across them gets the diskless records from the old seal on, without an error. Not needed
The committed producer states should be cleared. seal --clear-producer-states never works. The controller builds a record with tags out of order, which can't be serialized. Each attempt makes the active controller resign, and the client gets UNKNOWN_SERVER_ERROR. Not possible. Not needed. The option only applied to a forced seal (--offset N with N ≥ 0), whose seal could disagree with the producer states already committed. The leader commits the seal and the producer states together, from the same log end offset, so they always match.
A pending switch should be canceled, and the partition should go back to classic. seal --offset -1 doesn't revert the partition. The topic keeps diskless.enable=true, so produce takes the diskless path and fails with UNKNOWN_TOPIC_OR_PARTITION, the classic log stays sealed, and the controller guards for a local-only classic prefix stop applying. Nothing can undo it: the controller rejects any later AlterDisklessSwitch for the partition, setting diskless.enable=true again starts no switch, and diskless.enable can't be disabled. Not possible. A switch can only be finished, with rearm or a leader election. The switch must be completed.
The control plane disagrees with the seal in KRaft after an operator lowered the seal. repair sets the control plane's diskless_start_offset to the new seal. Nothing at runtime reads that column, so it changes nothing for produce, fetch, or ListOffsets. No command reconciles them, and nothing needs it. The control plane keeps the diskless log starting at the old seal. A consumer reads the classic records up to the new seal, then the diskless records from the old seal on. See the preceding note. Not needed

Test plan

  • ./gradlew check -x test -x generateJooqClasses and make docs pass, with no uncommitted changes.
  • make vale reports no alerts.
  • These test classes pass: TopicSwitchCommandTest, ReplicationControlManagerInklessTest, RequestResponseTest, ApiKeysTest, MessageTest, RequestQuotaTest, ControllerApisTest, ReplicaManagerInklessTest, AbstractControlPlaneTest subclasses, and AvailabilityGatedControlPlaneTest.
  • InklessTopicTypeSwitcherClusterTest passes. The new testAlterDisklessSwitchRejectsReArmAndNonLowerSealOnCommittedSwitch switches a topic, waits for the seal to commit, and checks that the controller rejects -2, -1, the committed seal, and a higher seal, and keeps the seal.
  • ClassicToDisklessSwitchLastKnownLeaderClusterTest passes in both cases. With loseTail=true, it lowers the seal with alterDisklessSwitch, restarts the leader without running repair, finishes the switch, and reads the expected records from offset 0.
  • The new ReplicationControlManagerInklessTest cases check that alterDisklessSwitch lowers a committed seal in phase 1, keeps the leader epoch and the producer states, and writes a record that survives serialization. They also check that it rejects a seal on a pending switch, a lower seal in phase 2, on a classic topic, or on an unknown partition, a seal that isn't lower than the committed one, and every negative seal offset other than -2.
  • TopicSwitchCommandTest checks that lower-seal rejects -2 and -1 without sending a request.
  • The new testRearmAfterLoweringMinIsrLetsAStuckPendingSwitchReachTheSeal puts a leader in a pending switch with its ISR below min.insync.replicas. Lowering the config leaves the high watermark in place, and the rearm record advances it to the log end offset and registers the partition again.
  • testConsolidatingSwitchSealsRegistersThenStartsConsolidationOnClassicPrefixFlagCommit covers the restarted leader: a first delta from an empty image doesn't register the partition, and the record that rearm writes does.
  • testFetchConsolidatingDisklessSwitchPendingReadsFromUnifiedLogWhenConsolidationEnabled covers consumer reads from a pending partition.

🤖 Generated with Claude Code

@giuseppelillo
giuseppelillo marked this pull request as draft November 13, 2026 15:42
@giuseppelillo
giuseppelillo force-pushed the claude/classic-diskless-switch-tooling-f604b8 branch 2 times, most recently from eec3dd8 to 2f26931 Compare November 16, 2026 14:55
@giuseppelillo giuseppelillo changed the title refactor(inkless:switch): remove the seal and repair operator commands refactor(inkless:switch): replace the seal and repair commands with rearm and lower-seal Nov 16, 2026
@giuseppelillo
giuseppelillo requested a balanced review from Copilot November 16, 2026 15:00
Remove the `seal` and `repair` commands of `kafka-topic-switch.sh`, the
`RepairDisklessLog` RPC with its admin, broker, and control plane code and
metrics, and the `ClearProducerStates` field of `AlterDisklessSwitch`.
Migration `V32` drops the `repair_diskless_log_v1` function and types, and
the jOOQ code is regenerated.

Assisted-by: Claude Opus 5.5
`AlterDisklessSwitch` now accepts two seal offsets and rejects every other
one:

- `-2` re-arms a pending switch. The controller bumps the leader epoch so
  the leader seals again.
- A seal of at least 0 lowers a committed seal in phase 1, and must be
  lower than the committed seal. It keeps the recovery after a
  last-known-leader election picks a leader whose log ends below the seal.

`kafka-topic-switch.sh rearm` sends `-2`, and `lower-seal --offset N`
sends `N`. `lower-seal` rejects a negative offset, because the controller
reads `-2` as a re-arm. The last-known-leader recovery uses `lower-seal`
and has no `repair` step.

Assisted-by: Claude Opus 5.5
…d repair tests

Remove the tests of the `seal` and `repair` commands, `RepairDisklessLog`,
and `ClearProducerStates`. Add tests that check:

- `AlterDisklessSwitch` accepts `-2` only on a pending switch, and a lower
  seal only on a committed seal in phase 1. It rejects every other seal
  offset, and the lower-seal record survives serialization.
- `rearm` and `lower-seal` send the expected seal offset, and `lower-seal`
  rejects a negative offset without sending a request.
- Lowering `min.insync.replicas` and running `rearm` lets a pending switch
  that is stuck below `min.insync.replicas` reach the seal.
- A committed switch rejects a re-arm, an abort, and a seal that isn't
  lower, in a running cluster.

`ClassicToDisklessSwitchLastKnownLeaderClusterTest` lowers the seal with
`alterDisklessSwitch` and no longer runs `repair`.

Assisted-by: Claude Opus 5.5

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔵 Needs a closer look

The intentional AlterDisklessSwitch v0 wire break and PostgreSQL function removal require owner confirmation of deployed-client compatibility and safe mixed-version upgrades and rollbacks.

No open issues 🎉

What changed in this PR

This PR narrows Inkless’s classic-to-diskless recovery tools while preserving the leader-driven switch flow. Operators can re-arm a pending switch or lower a committed phase 1 seal, but can no longer force a pending seal, cancel a switch, or invoke control-plane repair.

Changes:

  • Replace seal and repair with rearm and lower-seal, with matching controller validation and recovery tests.
  • Remove RepairDisklessLog across the client, protocol, broker, and control plane; drop its database function and regenerate jOOQ bindings.
  • Update recovery documentation and metrics references, and intentionally remove ClearProducerStates from the wire format.
File Description
tools/​src/​test/​java/​org/​apache/​kafka/​tools/​TopicSwitchCommandTest.java Tests replacement commands, required arguments, and negative-offset rejection.
tools/​src/​main/​java/​org/​apache/​kafka/​tools/​TopicSwitchCommand.java Implements rearm and lower-seal; preserves state.
streams/​integration-tests/​src/​test/​java/​org/​apache/​kafka/​streams/​integration/​TestingMetricsInterceptingAdminClient.java Removes repair delegation.
storage/​inkless/​src/​test/​java/​io/​aiven/​inkless/​control_plane/​AvailabilityGatedControlPlaneTest.java Removes repair availability assertions.
storage/​inkless/​src/​test/​java/​io/​aiven/​inkless/​control_plane/​AbstractControlPlaneTest.java Removes repair behavior tests.
storage/​inkless/​src/​main/​resources/​db/​migration/​V32__Remove_repair_diskless_log.sql Drops the repair function and associated types.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​UDTs.java Removes repair type registrations.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​RepairDisklessLogResponseV1.java Deletes the generated repair response type.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​RepairDisklessLogRequestV1.java Deletes the generated repair request type.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​RepairDisklessLogResponseV1Record.java Deletes the generated repair response record.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​RepairDisklessLogRequestV1Record.java Deletes the generated repair request record.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​PurgeDeletedLogsResponseV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​PruneBatchesBelowHighestTieredOffsetResponseV2Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​PruneBatchesBelowHighestTieredOffsetResponseV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​PruneBatchesBelowHighestTieredOffsetRequestV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​ListOffsetsResponseV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​ListOffsetsRequestV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​InitDisklessLogResponseV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​InitDisklessLogRequestV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​InitDisklessLogProducerStateV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​FindBatchesResponseV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​FindBatchesRequestV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​EnforceRetentionResponseV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​EnforceRetentionRequestV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​DeleteRecordsResponseV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​DeleteRecordsRequestV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​CommitBatchResponseV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​CommitBatchRequestV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​BatchMetadataV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​BatchInfoV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​AdvanceCrossTierLogStartResponseV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​records/​AdvanceCrossTierLogStartRequestV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​PurgeDeletedLogsResponseV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​PruneBatchesBelowHighestTieredOffsetResponseV2.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​PruneBatchesBelowHighestTieredOffsetResponseV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​PruneBatchesBelowHighestTieredOffsetRequestV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​RepairDisklessLogResponseV1Path.java Deletes the generated repair response path.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​RepairDisklessLogRequestV1Path.java Deletes the generated repair request path.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​PurgeDeletedLogsResponseV1Path.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​PruneBatchesBelowHighestTieredOffsetResponseV2Path.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​PruneBatchesBelowHighestTieredOffsetResponseV1Path.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​PruneBatchesBelowHighestTieredOffsetRequestV1Path.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​ListOffsetsResponseV1Path.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​ListOffsetsRequestV1Path.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​InitDisklessLogResponseV1Path.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​InitDisklessLogRequestV1Path.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​InitDisklessLogProducerStateV1Path.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​FindBatchesResponseV1Path.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​FindBatchesRequestV1Path.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​EnforceRetentionResponseV1Path.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​EnforceRetentionRequestV1Path.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​DeleteRecordsResponseV1Path.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​DeleteRecordsRequestV1Path.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​CommitBatchResponseV1Path.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​CommitBatchRequestV1Path.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​BatchMetadataV1Path.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​BatchInfoV1Path.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​AdvanceCrossTierLogStartResponseV1Path.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​paths/​AdvanceCrossTierLogStartRequestV1Path.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​ListOffsetsResponseV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​ListOffsetsRequestV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​InitDisklessLogResponseV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​InitDisklessLogRequestV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​InitDisklessLogProducerStateV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​FindBatchesResponseV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​FindBatchesRequestV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​EnforceRetentionResponseV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​EnforceRetentionRequestV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​DeleteRecordsResponseV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​DeleteRecordsRequestV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​CommitBatchResponseV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​CommitBatchRequestV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​BatchMetadataV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​BatchInfoV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​AdvanceCrossTierLogStartResponseV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​udt/​AdvanceCrossTierLogStartRequestV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​RepairDisklessLogV1.java Deletes the generated repair function binding.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​records/​RepairDisklessLogV1Record.java Deletes the generated repair function record.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​records/​PurgeDeletedLogsV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​records/​PruneBatchesBelowHighestTieredOffsetV2Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​records/​PruneBatchesBelowHighestTieredOffsetV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​records/​ProducerStateRecord.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​records/​LogsRecord.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​records/​ListOffsetsV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​records/​InitDisklessLogV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​records/​FindBatchesV2Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​records/​FindBatchesV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​records/​FilesRecord.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​records/​EnforceRetentionV2Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​records/​EnforceRetentionV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​records/​DeleteRecordsV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​records/​CommitFileV2Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​records/​CommitFileV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​records/​BatchesRecord.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​records/​AdvanceCrossTierLogStartV1Record.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​PurgeDeletedLogsV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​PruneBatchesBelowHighestTieredOffsetV2.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​PruneBatchesBelowHighestTieredOffsetV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​ProducerState.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​Logs.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​ListOffsetsV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​InitDisklessLogV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​FindBatchesV2.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​FindBatchesV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​Files.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​EnforceRetentionV2.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​EnforceRetentionV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​DeleteRecordsV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​CommitFileV2.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​CommitFileV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​Batches.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​tables/​AdvanceCrossTierLogStartV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​Tables.java Removes repair function accessors.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​routines/​MarkFileToDeleteV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​routines/​FlushCommitRunV2.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​routines/​DeleteTopicV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​routines/​DeleteFilesV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​routines/​DeleteBatchV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​routines/​BatchTimestamp.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​Routines.java Removes repair routine accessors.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​Keys.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​Indexes.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​enums/​PruneBatchesBelowHighestTieredOffsetErrorV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​enums/​ListOffsetsResponseErrorV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​enums/​InitDisklessLogErrorV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​enums/​FindBatchesResponseErrorV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​enums/​FileStateT.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​enums/​FileReasonT.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​enums/​EnforceRetentionResponseErrorV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​enums/​DeleteRecordsResponseErrorV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​enums/​CommitBatchResponseErrorV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​enums/​AdvanceCrossTierLogStartResponseErrorV1.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​Domains.java Updates generated schema metadata to version 32.
storage/​inkless/​src/​main/​jooq/​org/​jooq/​generated/​DefaultSchema.java Removes repair objects from the generated schema.
storage/​inkless/​src/​main/​java/​io/​aiven/​inkless/​control_plane/​RepairDisklessLogResponse.java Deletes the control-plane repair response.
storage/​inkless/​src/​main/​java/​io/​aiven/​inkless/​control_plane/​RepairDisklessLogRequest.java Deletes the control-plane repair request.
storage/​inkless/​src/​main/​java/​io/​aiven/​inkless/​control_plane/​postgres/​RepairDisklessLogJob.java Deletes the Postgres repair job.
storage/​inkless/​src/​main/​java/​io/​aiven/​inkless/​control_plane/​postgres/​PostgresControlPlaneMetrics.java Removes repair query metrics.
storage/​inkless/​src/​main/​java/​io/​aiven/​inkless/​control_plane/​postgres/​PostgresControlPlane.java Removes the Postgres repair entry point.
storage/​inkless/​src/​main/​java/​io/​aiven/​inkless/​control_plane/​InMemoryControlPlane.java Removes the in-memory repair implementation.
storage/​inkless/​src/​main/​java/​io/​aiven/​inkless/​control_plane/​ControlPlane.java Removes repair from the control-plane interface.
storage/​inkless/​src/​main/​java/​io/​aiven/​inkless/​control_plane/​AvailabilityGatedControlPlane.java Removes repair forwarding.
server/​src/​main/​java/​org/​apache/​kafka/​network/​RequestConvertToJson.java Removes repair request and response conversion.
metadata/​src/​test/​java/​org/​apache/​kafka/​controller/​ReplicationControlManagerInklessTest.java Tests re-arm, lower-seal restrictions, and record serialization.
metadata/​src/​main/​java/​org/​apache/​kafka/​controller/​ReplicationControlManager.java Restricts operator changes to pending re-arm and phase 1 seal lowering.
metadata/​src/​main/​java/​org/​apache/​kafka/​controller/​Controller.java Documents the narrowed controller API.
docs/​inkless/​metrics.rst Removes repair metric documentation.
docs/​inkless/​CLASSIC_TO_DISKLESS_SWITCH.md Documents replacement commands and recovery without repair.
core/​src/​test/​scala/​unit/​kafka/​server/​RequestQuotaTest.scala Removes repair request construction.
core/​src/​test/​scala/​unit/​kafka/​server/​ReplicaManagerInklessTest.scala Replaces repair tests with stalled-switch re-arm coverage.
core/​src/​test/​java/​kafka/​server/​InklessTopicTypeSwitcherClusterTest.java Tests rejection of invalid changes after seal commit.
core/​src/​test/​java/​kafka/​server/​ClassicToDisklessSwitchLastKnownLeaderClusterTest.java Exercises lower-seal recovery without repair.
core/​src/​main/​scala/​kafka/​server/​ReplicaManager.scala Removes broker-side control-plane repair logic.
core/​src/​main/​scala/​kafka/​server/​KafkaApis.scala Removes repair request dispatch and handling.
clients/​src/​test/​java/​org/​apache/​kafka/​common/​requests/​RequestResponseTest.java Removes repair protocol test factories.
clients/​src/​test/​java/​org/​apache/​kafka/​clients/​admin/​MockAdminClient.java Removes the repair API stub.
clients/​src/​main/​resources/​common/​message/​RepairDisklessLogResponse.json Deletes the repair response schema.
clients/​src/​main/​resources/​common/​message/​RepairDisklessLogRequest.json Deletes the repair request schema.
clients/​src/​main/​resources/​common/​message/​AlterDisklessSwitchRequest.json Removes ClearProducerStates and documents accepted offsets.
clients/​src/​main/​java/​org/​apache/​kafka/​common/​requests/​RepairDisklessLogResponse.java Deletes the repair protocol response.
clients/​src/​main/​java/​org/​apache/​kafka/​common/​requests/​RepairDisklessLogRequest.java Deletes the repair protocol request.
clients/​src/​main/​java/​org/​apache/​kafka/​common/​requests/​AbstractResponse.java Removes repair response parsing.
clients/​src/​main/​java/​org/​apache/​kafka/​common/​requests/​AbstractRequest.java Removes repair request parsing.
clients/​src/​main/​java/​org/​apache/​kafka/​common/​protocol/​ApiKeys.java Removes the repair API key registration.
clients/​src/​main/​java/​org/​apache/​kafka/​clients/​admin/​RepairDisklessLogResult.java Deletes the repair result API.
clients/​src/​main/​java/​org/​apache/​kafka/​clients/​admin/​RepairDisklessLogOptions.java Deletes the repair options API.
clients/​src/​main/​java/​org/​apache/​kafka/​clients/​admin/​KafkaAdminClient.java Removes repair calls and producer-state clearing.
clients/​src/​main/​java/​org/​apache/​kafka/​clients/​admin/​ForwardingAdmin.java Removes repair delegation.
clients/​src/​main/​java/​org/​apache/​kafka/​clients/​admin/​AlterDisklessSwitchOptions.java Removes the producer-state clearing option.
clients/​src/​main/​java/​org/​apache/​kafka/​clients/​admin/​Admin.java Removes repair APIs and documents the narrowed switch operations.

Review effort: Balanced

@giuseppelillo
giuseppelillo force-pushed the claude/classic-diskless-switch-tooling-f604b8 branch from 2f26931 to 9080f4d Compare November 16, 2026 15:08
@giuseppelillo
giuseppelillo marked this pull request as ready for review November 16, 2026 15:27
@giuseppelillo
giuseppelillo requested a review from jeqo November 16, 2026 15:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants