[JUJU-1950] Use the new lease store in the lease manager

agent/agentbootstrap/bootstrap.go

@@ -6,9 +6,7 @@ package agentbootstrap
 import (
 	stdcontext "context"
 	"fmt"
-	"path/filepath"
 
-	coreraft "github.com/hashicorp/raft"
 	"github.com/juju/clock"
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
@@ -27,7 +25,6 @@ import (
 	"github.com/juju/juju/core/instance"
 	"github.com/juju/juju/core/model"
 	corenetwork "github.com/juju/juju/core/network"
-	"github.com/juju/juju/core/raft/queue"
 	"github.com/juju/juju/core/series"
 	"github.com/juju/juju/database"
 	"github.com/juju/juju/environs"
@@ -39,7 +36,6 @@ import (
 	"github.com/juju/juju/network"
 	"github.com/juju/juju/state"
 	"github.com/juju/juju/storage"
-	"github.com/juju/juju/worker/raft"
 )
 
 var logger = loggo.GetLogger("juju.agent.agentbootstrap")
@@ -110,10 +106,6 @@ func InitializeState(
 	info.Tag = nil
 	info.Password = c.OldPassword()
 
-	if err := initRaft(c); err != nil {
-		return nil, errors.Trace(err)
-	}
-
 	if err := database.BootstrapDqlite(stdcontext.TODO(), database.NewOptionFactory(c, logger), logger); err != nil {
 		return nil, errors.Trace(err)
 	}
@@ -406,17 +398,6 @@ func getEnviron(
 	return environs.Open(stdcontext.TODO(), provider, openParams)
 }
 
-func initRaft(agentConfig agent.Config) error {
-	raftDir := filepath.Join(agentConfig.DataDir(), "raft")
-	return raft.Bootstrap(raft.Config{
-		Clock:      clock.WallClock,
-		StorageDir: raftDir,
-		Logger:     logger,
-		LocalID:    coreraft.ServerID(agentConfig.Tag().Id()),
-		Queue:      queue.NewOpQueue(clock.WallClock),
-	})
-}
-
 // initMongo dials the initial MongoDB connection, setting a
 // password for the admin user, and returning the session.
 func initMongo(info mongo.Info, dialOpts mongo.DialOpts, password string) (*mgo.Session, error) {

apiserver/allfacades.go

@@ -98,7 +98,6 @@ import (
 	"github.com/juju/juju/apiserver/facades/controller/metricsmanager"
 	"github.com/juju/juju/apiserver/facades/controller/migrationmaster"
 	"github.com/juju/juju/apiserver/facades/controller/migrationtarget"
-	"github.com/juju/juju/apiserver/facades/controller/raftlease"
 	"github.com/juju/juju/apiserver/facades/controller/remoterelations"
 	"github.com/juju/juju/apiserver/facades/controller/singular"
 	"github.com/juju/juju/apiserver/facades/controller/statushistory"
@@ -187,7 +186,6 @@ func AllFacades() *facade.Registry {
 	payloadshookcontext.Register(registry)
 	provisioner.Register(registry)
 	proxyupdater.Register(registry)
-	raftlease.Register(registry)
 	reboot.Register(registry)
 	remoterelations.Register(registry)
 	resources.Register(registry)

apiserver/apiserver.go

@@ -199,10 +199,6 @@ type ServerConfig struct {
 	// ExecEmbeddedCommand is a function which creates an embedded Juju CLI instance.
 	ExecEmbeddedCommand ExecEmbeddedCommandFunc
 
-	// RaftOpQueue is used by the API to apply operations to the raft
-	// instance.
-	RaftOpQueue Queue
-
 	// CharmhubHTTPClient is the HTTP client used for Charmhub API requests.
 	CharmhubHTTPClient facade.HTTPClient
 }
@@ -253,9 +249,6 @@ func (c ServerConfig) Validate() error {
 	if c.MetricsCollector == nil {
 		return errors.NotValidf("missing MetricsCollector")
 	}
-	if c.RaftOpQueue == nil {
-		return errors.NotValidf("missing RaftOpQueue")
-	}
 	return nil
 }
 
@@ -303,7 +296,6 @@ func newServer(cfg ServerConfig) (_ *Server, err error) {
 		presence:            cfg.Presence,
 		leaseManager:        cfg.LeaseManager,
 		controllerConfig:    controllerConfig,
-		raftOpQueue:         cfg.RaftOpQueue,
 		logger:              loggo.GetLogger("juju.apiserver"),
 		charmhubHTTPClient:  cfg.CharmhubHTTPClient,
 	})

apiserver/apiserver_test.go

@@ -16,7 +16,6 @@ import (
 
 	"github.com/gorilla/websocket"
 	"github.com/juju/clock"
-	"github.com/juju/clock/testclock"
 	"github.com/juju/cmd/v3"
 	"github.com/juju/collections/set"
 	jujuhttp "github.com/juju/http/v2"
@@ -40,7 +39,6 @@ import (
 	"github.com/juju/juju/core/cache"
 	corelogger "github.com/juju/juju/core/logger"
 	"github.com/juju/juju/core/presence"
-	"github.com/juju/juju/core/raft/queue"
 	"github.com/juju/juju/jujuclient"
 	psapiserver "github.com/juju/juju/pubsub/apiserver"
 	"github.com/juju/juju/pubsub/centralhub"
@@ -180,8 +178,7 @@ func (s *apiserverConfigFixture) SetUpTest(c *gc.C) {
 			}
 			return 0
 		},
-		SysLogger:   noopSysLogger{},
-		RaftOpQueue: queue.NewOpQueue(testclock.NewClock(time.Now())),
+		SysLogger: noopSysLogger{},
 	}
 }
 

apiserver/errors/errors.go

@@ -128,8 +128,6 @@ func ServerErrorAndStatus(err error) (*params.Error, int) {
 		status = http.StatusConflict
 	case params.CodeNotLeader:
 		status = http.StatusTemporaryRedirect
-	case params.CodeLeaseError:
-		status = leaseStatusCode(err1)
 	}
 	return err1, status
 }
@@ -252,9 +250,6 @@ func ServerError(err error) *params.Error {
 		info = notLeaderError.AsMap()
 	case errors.Is(err, DeadlineExceededError):
 		code = params.CodeDeadlineExceeded
-	case lease.IsLeaseError(err):
-		code = params.CodeLeaseError
-		info = leaseErrorInfoMap(err)
 	default:
 		code = params.ErrCode(err)
 	}
@@ -347,8 +342,6 @@ func RestoreError(err error) error {
 		return NewNotLeaderError(serverAddress, serverID)
 	case params.IsCodeDeadlineExceeded(err):
 		return fmt.Errorf(msg+"%w", errors.Hide(DeadlineExceededError))
-	case params.IsLeaseError(err):
-		return rehydrateLeaseError(err)
 	case params.IsCodeTryAgain(err):
 		return ErrTryAgain
 	default:

apiserver/errors/errors_test.go

@@ -269,51 +269,12 @@ var errorTransformTests = []struct {
 	err:    apiservererrors.DeadlineExceededError,
 	code:   params.CodeDeadlineExceeded,
 	status: http.StatusInternalServerError,
-}, {
-	err:        lease.ErrHeld,
-	code:       params.CodeLeaseError,
-	status:     http.StatusBadRequest,
-	helperFunc: leaseErrHelperFunc(lease.ErrHeld),
-}, {
-	err:        lease.ErrInvalid,
-	code:       params.CodeLeaseError,
-	status:     http.StatusBadRequest,
-	helperFunc: leaseErrHelperFunc(lease.ErrInvalid),
-}, {
-	err:        lease.ErrTimeout,
-	code:       params.CodeLeaseError,
-	status:     http.StatusInternalServerError,
-	helperFunc: leaseErrHelperFunc(lease.ErrTimeout),
-}, {
-	err:        lease.ErrNotHeld,
-	code:       params.CodeLeaseError,
-	status:     http.StatusBadRequest,
-	helperFunc: leaseErrHelperFunc(lease.ErrNotHeld),
-}, {
-	err:        lease.ErrDropped,
-	code:       params.CodeLeaseError,
-	status:     http.StatusInternalServerError,
-	helperFunc: leaseErrHelperFunc(lease.ErrDropped),
 }, {
 	err:    nil,
 	code:   "",
 	status: http.StatusOK,
 }}
 
-func leaseErrHelperFunc(leaseErr error) func(error) bool {
-	return func(err error) bool {
-		err1, ok := err.(*params.Error)
-		if !ok {
-			return false
-		}
-		m := apiservererrors.LeaseErrorInfoMap(leaseErr)
-		if err1.Info == nil || !reflect.DeepEqual(err1.Info, m) {
-			return false
-		}
-		return true
-	}
-}
-
 var sampleMacaroon = func() *macaroon.Macaroon {
 	m, err := macaroon.New([]byte("key"), []byte("id"), "loc", macaroon.LatestVersion)
 	if err != nil {

apiserver/facade/facadetest/context.go

@@ -34,7 +34,6 @@ type Context struct {
 	LeadershipPinner_   leadership.Pinner
 	LeadershipReader_   leadership.Reader
 	SingularClaimer_    lease.Claimer
-	Raft_               facade.RaftContext
 	CharmhubHTTPClient_ facade.HTTPClient
 	// Identity is not part of the facade.Context interface, but is instead
 	// used to make sure that the context objects are the same.
@@ -132,7 +131,7 @@ func (context Context) LeadershipPinner(modelUUID string) (leadership.Pinner, er
 	return context.LeadershipPinner_, nil
 }
 
-// LeadershipPinner implements facade.Context.
+// LeadershipReader implements facade.Context.
 func (context Context) LeadershipReader(modelUUID string) (leadership.Reader, error) {
 	return context.LeadershipReader_, nil
 }
@@ -142,10 +141,6 @@ func (context Context) SingularClaimer() (lease.Claimer, error) {
 	return context.SingularClaimer_, nil
 }
 
-func (context Context) Raft() facade.RaftContext {
-	return context.Raft_
-}
-
 func (context Context) HTTPClient(purpose facade.HTTPClientPurpose) facade.HTTPClient {
 	switch purpose {
 	case facade.CharmhubHTTPClient:

apiserver/facade/interface.go

@@ -4,7 +4,6 @@
 package facade
 
 import (
-	"context"
 	"net/http"
 	"net/url"
 	"time"
@@ -17,7 +16,6 @@ import (
 	"github.com/juju/juju/core/multiwatcher"
 	"github.com/juju/juju/core/permission"
 	"github.com/juju/juju/core/presence"
-	"github.com/juju/juju/core/raftlease"
 	"github.com/juju/juju/state"
 )
 
@@ -58,18 +56,6 @@ type LeadershipContext interface {
 	SingularClaimer() (lease.Claimer, error)
 }
 
-// RaftContext describes methods for handling raft related capabilities.
-type RaftContext interface {
-
-	// ApplyLease attempts to apply the command on to the raft FSM. It only
-	// takes a command and enqueues that against the raft instance. If the raft
-	// instance is already processing a application, then back pressure is
-	// applied to the caller and a ErrEnqueueDeadlineExceeded will be sent.
-	// It's up to the caller to retry or drop depending on how the retry
-	// algorithm is implemented.
-	ApplyLease(context.Context, raftlease.Command) error
-}
-
 // Context exposes useful capabilities to a Facade.
 type Context interface {
 	// TODO (stickupkid): This shouldn't be embedded, instead this should be
@@ -158,9 +144,6 @@ type Context interface {
 	// RequestRecorder defines a metrics collector for outbound requests.
 	RequestRecorder() RequestRecorder
 
-	// Raft returns a lease context for managing raft.
-	Raft() RaftContext
-
 	// HTTPClient returns an HTTP client to use for the given purpose.
 	HTTPClient(purpose HTTPClientPurpose) HTTPClient
 }