Merge pull request #158 from saeid-a/feat/region-remove-peer

Region RemovePeer function implementation (#126)
ByteStorage · Jul 6, 2023 · c585ca3 · c585ca3
2 parents a9243eb + 8774906
commit c585ca3
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 1 deletion.
diff --git a/cluster/region/region.go b/cluster/region/region.go
@@ -112,7 +112,15 @@ func (r *region) AddPeer(peer string) error {
 }
 
 func (r *region) RemovePeer(peer string) error {
-	panic("implement me")
+	r.mu.RLock()
+	defer r.mu.RUnlock()
+	for i := 0; i < len(r.peers); i++ {
+		if r.peers[i] == peer {
+			r.peers = append(r.peers[:i], r.peers[i+1:]...)
+			return r.raft.DemoteVoter(raft.ServerID(peer), 0, 0).Error()
+		}
+	}
+	return errors.New("the specified peer does not exist")
 }
 
 func (r *region) GetSize() int64 {

diff --git a/cluster/region/region_test.go b/cluster/region/region_test.go
@@ -125,6 +125,35 @@ func TestRegion_GetSize(t *testing.T) {
 	assert.Equal(t, int64(100), size)
 }
 
+func TestRegion_RemovePeer(t *testing.T) {
+	// Create a test region instance
+	region := NewTestRegion()
+	_ = []struct {
+		name          string
+		peers         []string
+		peerToAdd     string
+		expectedPeers []string
+		expectError   bool
+	}{
+		{
+			name:          "remove a peer",
+			peers:         region.GetPeers(),
+			peerToAdd:     "peer2",
+			expectedPeers: []string{"peer1"},
+			expectError:   false,
+		},
+		{
+			name:          "remove a non existing peer",
+			peers:         region.GetPeers(),
+			peerToAdd:     "peer3",
+			expectedPeers: []string{"peer1", "peer2"},
+			expectError:   true,
+		},
+	}
+	destroyRegion(region)
+
+}
+
 func TestRegion_AddPeer(t *testing.T) {
 	// Create a test region instance
 	region := NewTestRegion()