feat(v2 upgrade/engineapi): add replicaName parameter to ReplicaRemove()

Longhorn 9104 Signed-off-by: Derek Su <[email protected]>
derekbit · Dec 15, 2024 · 426022e · 426022e
1 parent 8ca5078
commit 426022e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/engineapi/engine.go b/engineapi/engine.go
@@ -177,7 +177,7 @@ func (e *EngineBinary) ReplicaAdd(engine *longhorn.Engine, replicaName, url stri
 
 // ReplicaRemove calls engine binary
 // TODO: Deprecated, replaced by gRPC proxy
-func (e *EngineBinary) ReplicaRemove(engine *longhorn.Engine, url string) error {
+func (e *EngineBinary) ReplicaRemove(engine *longhorn.Engine, url, replicaName string) error {
 	if err := ValidateReplicaURL(url); err != nil {
 		return err
 	}

diff --git a/engineapi/enginesim.go b/engineapi/enginesim.go
@@ -143,14 +143,14 @@ func (e *EngineSimulator) ReplicaAdd(engine *longhorn.Engine, replicaName, url s
 	return nil
 }
 
-func (e *EngineSimulator) ReplicaRemove(engine *longhorn.Engine, addr string) error {
+func (e *EngineSimulator) ReplicaRemove(engine *longhorn.Engine, replicaAddress, replicaName string) error {
 	e.mutex.Lock()
 	defer e.mutex.Unlock()
 
-	if e.replicas[addr] == nil {
-		return fmt.Errorf("unable to find replica %v", addr)
+	if e.replicas[replicaAddress] == nil {
+		return fmt.Errorf("unable to find replica %v", replicaAddress)
 	}
-	delete(e.replicas, addr)
+	delete(e.replicas, replicaAddress)
 	return nil
 }
 

diff --git a/engineapi/enginesim_test.go b/engineapi/enginesim_test.go
@@ -56,7 +56,7 @@ func (s *TestSuite) TestBasic(c *C) {
 	c.Assert(replicas[Replica1Addr].Mode, Equals, longhorn.ReplicaModeRW)
 	c.Assert(replicas[Replica2Addr].Mode, Equals, longhorn.ReplicaModeRW)
 
-	err = sim.ReplicaRemove(e, Replica2Addr)
+	err = sim.ReplicaRemove(e, Replica2Addr, "")
 	c.Assert(err, IsNil)
 
 	replicas, err = sim.ReplicaList(e)

diff --git a/engineapi/proxy_replica.go b/engineapi/proxy_replica.go
@@ -12,8 +12,8 @@ func (p *Proxy) ReplicaAdd(e *longhorn.Engine, replicaName, replicaAddress strin
 		int(replicaFileSyncHTTPClientTimeout), fastSync, localSync, grpcTimeoutSeconds)
 }
 
-func (p *Proxy) ReplicaRemove(e *longhorn.Engine, address string) (err error) {
-	return p.grpcClient.ReplicaRemove(string(e.Spec.DataEngine), p.DirectToURL(e), e.Name, address, "")
+func (p *Proxy) ReplicaRemove(e *longhorn.Engine, replicaAddress, replicaName string) (err error) {
+	return p.grpcClient.ReplicaRemove(string(e.Spec.DataEngine), p.DirectToURL(e), e.Name, replicaAddress, replicaName)
 }
 
 func (p *Proxy) ReplicaList(e *longhorn.Engine) (replicas map[string]*Replica, err error) {

diff --git a/engineapi/types.go b/engineapi/types.go
@@ -87,7 +87,7 @@ type EngineClient interface {
 
 	ReplicaList(*longhorn.Engine) (map[string]*Replica, error)
 	ReplicaAdd(engine *longhorn.Engine, replicaName, url string, isRestoreVolume, fastSync bool, localSync *etypes.FileLocalSync, replicaFileSyncHTTPClientTimeout, grpcTimeoutSeconds int64) error
-	ReplicaRemove(engine *longhorn.Engine, url string) error
+	ReplicaRemove(engine *longhorn.Engine, url, replicaName string) error
 	ReplicaRebuildStatus(*longhorn.Engine) (map[string]*longhorn.RebuildStatus, error)
 	ReplicaRebuildVerify(engine *longhorn.Engine, replicaName, url string) error
 	ReplicaModeUpdate(engine *longhorn.Engine, url string, mode string) error