Skip to content

Commit 05f7b3b

Browse files
authored
Merge pull request juju#18485 from manadart/dqlite-remove-pruner
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 ```
2 parents 8617f38 + 494a0aa commit 05f7b3b

38 files changed

+2
-1928
lines changed

api/controller/actionpruner/doc.go

Lines changed: 0 additions & 6 deletions
This file was deleted.

api/controller/actionpruner/package_test.go

Lines changed: 0 additions & 22 deletions
This file was deleted.

api/controller/actionpruner/pruner.go

Lines changed: 0 additions & 34 deletions
This file was deleted.

api/controller/actionpruner/pruner_test.go

Lines changed: 0 additions & 38 deletions
This file was deleted.

api/controller/statushistory/package_test.go

Lines changed: 0 additions & 14 deletions
This file was deleted.

api/controller/statushistory/pruner.go

Lines changed: 0 additions & 41 deletions
This file was deleted.

api/controller/statushistory/pruner_test.go

Lines changed: 0 additions & 44 deletions
This file was deleted.

api/facadeversions.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ func SupportedFacadeVersions() facades.FacadeVersions {
2222
// We no longer support facade versions at 0.
2323
var facadeVersions = facades.FacadeVersions{
2424
"Action": {7},
25-
"ActionPruner": {2},
2625
"Agent": {3},
2726
"AgentLifeFlag": {1},
2827
"AgentTools": {1},
@@ -113,7 +112,6 @@ var facadeVersions = facades.FacadeVersions{
113112
"Singular": {2},
114113
"Spaces": {6},
115114
"SSHClient": {4},
116-
"StatusHistory": {3},
117115
"Storage": {6},
118116
"StorageProvisioner": {4},
119117
"StringsWatcher": {1},

apiserver/allfacades.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ import (
6666
"github.com/juju/juju/apiserver/facades/client/storage"
6767
"github.com/juju/juju/apiserver/facades/client/subnets"
6868
"github.com/juju/juju/apiserver/facades/client/usermanager"
69-
"github.com/juju/juju/apiserver/facades/controller/actionpruner"
7069
"github.com/juju/juju/apiserver/facades/controller/agenttools"
7170
"github.com/juju/juju/apiserver/facades/controller/applicationscaler"
7271
"github.com/juju/juju/apiserver/facades/controller/caasapplicationprovisioner"
@@ -93,7 +92,6 @@ import (
9392
"github.com/juju/juju/apiserver/facades/controller/remoterelations"
9493
"github.com/juju/juju/apiserver/facades/controller/secretbackendmanager"
9594
"github.com/juju/juju/apiserver/facades/controller/singular"
96-
"github.com/juju/juju/apiserver/facades/controller/statushistory"
9795
"github.com/juju/juju/apiserver/facades/controller/undertaker"
9896
"github.com/juju/juju/apiserver/facades/controller/usersecrets"
9997
"github.com/juju/juju/apiserver/facades/controller/usersecretsdrain"
@@ -168,7 +166,6 @@ func AllFacades() *facade.Registry {
168166
registry := new(facade.Registry)
169167

170168
action.Register(registry)
171-
actionpruner.Register(registry)
172169
agent.Register(registry)
173170
agenttools.Register(registry)
174171
annotations.Register(registry)
@@ -250,7 +247,6 @@ func AllFacades() *facade.Registry {
250247
usersecretsdrain.Register(registry)
251248
sshclient.Register(registry)
252249
spaces.Register(registry)
253-
statushistory.Register(registry)
254250
storage.Register(registry)
255251
storageprovisioner.Register(registry)
256252
subnets.Register(registry)

apiserver/facades/controller/actionpruner/export_test.go

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)