Skip to content

Commit

Permalink
Merge pull request juju#18485 from manadart/dqlite-remove-pruner
Browse files Browse the repository at this point in the history
juju#18485

The pruner workers for status history and actions will not exist in their current form under Dqlite.

They are removed, along with their clients, APIs, state logic and tests.

## QA steps

```sh
$ juju bootstrap lxd test
$ juju add-model default
$ juju deploy ubuntu
$ juju remove-application ubuntu --force
```
  • Loading branch information
jujubot authored Dec 5, 2024
2 parents 8617f38 + 494a0aa commit 05f7b3b
Show file tree
Hide file tree
Showing 38 changed files with 2 additions and 1,928 deletions.
6 changes: 0 additions & 6 deletions api/controller/actionpruner/doc.go

This file was deleted.

22 changes: 0 additions & 22 deletions api/controller/actionpruner/package_test.go

This file was deleted.

34 changes: 0 additions & 34 deletions api/controller/actionpruner/pruner.go

This file was deleted.

38 changes: 0 additions & 38 deletions api/controller/actionpruner/pruner_test.go

This file was deleted.

14 changes: 0 additions & 14 deletions api/controller/statushistory/package_test.go

This file was deleted.

41 changes: 0 additions & 41 deletions api/controller/statushistory/pruner.go

This file was deleted.

44 changes: 0 additions & 44 deletions api/controller/statushistory/pruner_test.go

This file was deleted.

2 changes: 0 additions & 2 deletions api/facadeversions.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ func SupportedFacadeVersions() facades.FacadeVersions {
// We no longer support facade versions at 0.
var facadeVersions = facades.FacadeVersions{
"Action": {7},
"ActionPruner": {2},
"Agent": {3},
"AgentLifeFlag": {1},
"AgentTools": {1},
Expand Down Expand Up @@ -113,7 +112,6 @@ var facadeVersions = facades.FacadeVersions{
"Singular": {2},
"Spaces": {6},
"SSHClient": {4},
"StatusHistory": {3},
"Storage": {6},
"StorageProvisioner": {4},
"StringsWatcher": {1},
Expand Down
4 changes: 0 additions & 4 deletions apiserver/allfacades.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ import (
"github.com/juju/juju/apiserver/facades/client/storage"
"github.com/juju/juju/apiserver/facades/client/subnets"
"github.com/juju/juju/apiserver/facades/client/usermanager"
"github.com/juju/juju/apiserver/facades/controller/actionpruner"
"github.com/juju/juju/apiserver/facades/controller/agenttools"
"github.com/juju/juju/apiserver/facades/controller/applicationscaler"
"github.com/juju/juju/apiserver/facades/controller/caasapplicationprovisioner"
Expand All @@ -93,7 +92,6 @@ import (
"github.com/juju/juju/apiserver/facades/controller/remoterelations"
"github.com/juju/juju/apiserver/facades/controller/secretbackendmanager"
"github.com/juju/juju/apiserver/facades/controller/singular"
"github.com/juju/juju/apiserver/facades/controller/statushistory"
"github.com/juju/juju/apiserver/facades/controller/undertaker"
"github.com/juju/juju/apiserver/facades/controller/usersecrets"
"github.com/juju/juju/apiserver/facades/controller/usersecretsdrain"
Expand Down Expand Up @@ -168,7 +166,6 @@ func AllFacades() *facade.Registry {
registry := new(facade.Registry)

action.Register(registry)
actionpruner.Register(registry)
agent.Register(registry)
agenttools.Register(registry)
annotations.Register(registry)
Expand Down Expand Up @@ -250,7 +247,6 @@ func AllFacades() *facade.Registry {
usersecretsdrain.Register(registry)
sshclient.Register(registry)
spaces.Register(registry)
statushistory.Register(registry)
storage.Register(registry)
storageprovisioner.Register(registry)
subnets.Register(registry)
Expand Down
8 changes: 0 additions & 8 deletions apiserver/facades/controller/actionpruner/export_test.go

This file was deleted.

14 changes: 0 additions & 14 deletions apiserver/facades/controller/actionpruner/package_test.go

This file was deleted.

33 changes: 0 additions & 33 deletions apiserver/facades/controller/actionpruner/pruner.go

This file was deleted.

61 changes: 0 additions & 61 deletions apiserver/facades/controller/actionpruner/pruner_test.go

This file was deleted.

Loading

0 comments on commit 05f7b3b

Please sign in to comment.