scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-09-11 15:21:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Cleanup etcd dir"

Browse source 
This reverts commit 886ba15e88.
This commit is contained in:
Kuba Podgórski 2021-01-15 17:50:34 +01:00
parent 886ba15e88
commit ba7108dedb
8 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
etcd/embed.go
View file

@ -106,6 +106,7 @@ func (e *Etcd) Close() error {
e.e.Server.Stop()
e.e.Close()
<-e.e.Server.StopNotify()
// os.RemoveAll(e.options.Dir)
}
return nil

6
executor_test.go
View file

@ -3265,7 +3265,7 @@ func TestExecutor_Execute_ErrMaxWritesPerRequest(t *testing.T) {
c := test.MustNewCluster(t, 1)
defer c.Close()
c.GetNode(0).Config.MaxWritesPerRequest = 3
err := c.Start(t)
err := c.Start()
if err != nil {
t.Fatal(err)
}
@ -4498,7 +4498,7 @@ func benchmarkExistence(nn bool, b *testing.B) {
if err != nil {
b.Fatalf("getting temp dir: %v", err)
}
err = c.Start(b)
err = c.Start()
if err != nil {
b.Fatalf("starting cluster: %v", err)
}
@ -5910,7 +5910,7 @@ func BenchmarkGroupBy(b *testing.B) {
if err != nil {
b.Fatalf("getting temp dir: %v", err)
}
err = c.Start(b)
err = c.Start()
if err != nil {
b.Fatalf("starting cluster: %v", err)
}

12
holder_test.go
View file

@ -436,7 +436,7 @@ func TestHolderSyncer_SyncHolder(t *testing.T) {
c.GetNode(0).Config.AntiEntropy.Interval = 0
c.GetNode(1).Config.Cluster.ReplicaN = 2
c.GetNode(1).Config.AntiEntropy.Interval = 0
err := c.Start(t)
err := c.Start()
if err != nil {
t.Fatalf("starting cluster: %v", err)
@ -550,7 +550,7 @@ func TestHolderSyncer_BlockIteratorLimits(t *testing.T) {
c.GetNode(1).Config.AntiEntropy.Interval = 0
c.GetNode(2).Config.Cluster.ReplicaN = 3
c.GetNode(2).Config.AntiEntropy.Interval = 0
err := c.Start(t)
err := c.Start()
if err != nil {
t.Fatalf("starting cluster: %v", err)
}
@ -605,7 +605,7 @@ func TestHolderSyncer_Clears(t *testing.T) {
c.GetNode(0).Config.AntiEntropy.Interval = 0
c.GetNode(1).Config.Cluster.ReplicaN = 3
c.GetNode(1).Config.AntiEntropy.Interval = 0
err := c.Start(t)
err := c.Start()
if err != nil {
t.Fatalf("starting cluster: %v", err)
}
@ -654,7 +654,7 @@ func TestHolderSyncer_TimeQuantum(t *testing.T) {
c.GetNode(0).Config.AntiEntropy.Interval = 0
c.GetNode(1).Config.Cluster.ReplicaN = 2
c.GetNode(1).Config.AntiEntropy.Interval = 0
err := c.Start(t)
err := c.Start()
if err != nil {
t.Fatalf("starting cluster: %v", err)
}
@ -707,7 +707,7 @@ func TestHolderSyncer_IntField(t *testing.T) {
c.GetNode(0).Config.AntiEntropy.Interval = 0
c.GetNode(1).Config.Cluster.ReplicaN = 2
c.GetNode(1).Config.AntiEntropy.Interval = 0
err := c.Start(t)
err := c.Start()
if err != nil {
t.Fatalf("starting cluster: %v", err)
}
@ -765,7 +765,7 @@ func TestHolderSyncer_IntField(t *testing.T) {
c.GetNode(0).Config.AntiEntropy.Interval = 0
c.GetNode(1).Config.Cluster.ReplicaN = 2
c.GetNode(1).Config.AntiEntropy.Interval = 0
err := c.Start(t)
err := c.Start()
if err != nil {
t.Fatalf("starting cluster: %v", err)
}

4
http/client_test.go
View file

@ -419,7 +419,7 @@ func TestClient_ImportColumnAttrs(t *testing.T) {
for _, c := range cluster.Nodes {
c.Config.Cluster.ReplicaN = 2
}
err := cluster.Start(t)
err := cluster.Start()
if err != nil {
t.Fatalf("starting cluster: %v", err)
}
@ -593,7 +593,7 @@ func TestClient_ImportRoaring_MultiView(t *testing.T) {
for _, c := range cluster.Nodes {
c.Config.Cluster.ReplicaN = 2
}
err := cluster.Start(t)
err := cluster.Start()
if err != nil {
t.Fatalf("starting cluster: %v", err)
}

16
server/cluster_test.go
View file

@ -186,7 +186,7 @@ func TestClusterResize_AddNode(t *testing.T) {
m1.Config.Gossip.Seeds = []string{seed}
if err := port.GetPorts(func(ports []int) error {
portsCfg := test.GenPortsConfig(t, test.NewPorts(ports))
portsCfg := test.GenPortsConfig(test.NewPorts(ports))
m1.Config.Gossip.Port = portsCfg[0].Gossip.Port
m1.Config.DisCo = portsCfg[0].DisCo
@ -243,7 +243,7 @@ func TestClusterResize_AddNode(t *testing.T) {
m1.Config.Gossip.Seeds = []string{seed}
if err := port.GetPorts(func(ports []int) error {
portsCfg := test.GenPortsConfig(t, test.NewPorts(ports))
portsCfg := test.GenPortsConfig(test.NewPorts(ports))
m1.Config.Gossip.Port = portsCfg[0].Gossip.Port
m1.Config.DisCo = portsCfg[0].DisCo
@ -299,7 +299,7 @@ func TestClusterResize_AddNode(t *testing.T) {
m1.Config.Gossip.Seeds = []string{seed}
if err := port.GetPorts(func(ports []int) error {
portsCfg := test.GenPortsConfig(t, test.NewPorts(ports))
portsCfg := test.GenPortsConfig(test.NewPorts(ports))
m1.Config.Gossip.Port = portsCfg[0].Gossip.Port
m1.Config.DisCo = portsCfg[0].DisCo
@ -361,7 +361,7 @@ func TestClusterResize_AddNode(t *testing.T) {
m1.Config.Gossip.Seeds = []string{seed}
if err := port.GetPorts(func(ports []int) error {
portsCfg := test.GenPortsConfig(t, test.NewPorts(ports))
portsCfg := test.GenPortsConfig(test.NewPorts(ports))
m1.Config.Gossip.Port = portsCfg[0].Gossip.Port
m1.Config.DisCo = portsCfg[0].DisCo
@ -417,7 +417,7 @@ func TestClusterResize_AddNodeConcurrentIndex(t *testing.T) {
m1 := test.NewCommandNode(t, false)
m1.Config.Gossip.Seeds = []string{seed}
if err := port.GetPorts(func(ports []int) error {
portsCfg := test.GenPortsConfig(t, test.NewPorts(ports))
portsCfg := test.GenPortsConfig(test.NewPorts(ports))
m1.Config.Gossip.Port = portsCfg[0].Gossip.Port
m1.Config.DisCo = portsCfg[0].DisCo
@ -475,7 +475,7 @@ func TestClusterResize_AddNodeConcurrentIndex(t *testing.T) {
m1 := test.NewCommandNode(t, false)
m1.Config.Gossip.Seeds = []string{seed}
if err := port.GetPorts(func(ports []int) error {
portsCfg := test.GenPortsConfig(t, test.NewPorts(ports))
portsCfg := test.GenPortsConfig(test.NewPorts(ports))
m1.Config.Gossip.Port = portsCfg[0].Gossip.Port
m1.Config.DisCo = portsCfg[0].DisCo
@ -539,7 +539,7 @@ func TestClusterResize_AddNodeConcurrentIndex(t *testing.T) {
m1 := test.NewCommandNode(t, false)
m1.Config.Gossip.Seeds = []string{seed}
if err := port.GetPorts(func(ports []int) error {
portsCfg := test.GenPortsConfig(t, test.NewPorts(ports))
portsCfg := test.GenPortsConfig(test.NewPorts(ports))
m1.Config.Gossip.Port = portsCfg[0].Gossip.Port
m1.Config.DisCo = portsCfg[0].DisCo
@ -601,7 +601,7 @@ func TestClusterResize_AddNodeConcurrentIndex(t *testing.T) {
m1 := test.NewCommandNode(t, false)
m1.Config.Gossip.Seeds = []string{seed}
if err := port.GetPorts(func(ports []int) error {
portsCfg := test.GenPortsConfig(t, test.NewPorts(ports))
portsCfg := test.GenPortsConfig(test.NewPorts(ports))
m1.Config.Gossip.Port = portsCfg[0].Gossip.Port
m1.Config.DisCo = portsCfg[0].DisCo

6
server/server_test.go
View file

@ -671,7 +671,7 @@ func TestClusteringNodesReplica2(t *testing.T) {
for _, c := range cluster.Nodes {
c.Config.Cluster.ReplicaN = 2
}
err := cluster.Start(t)
err := cluster.Start()
if err != nil {
t.Fatalf("starting cluster: %v", err)
}
@ -758,7 +758,7 @@ func TestRemoveNodeAfterItDies(t *testing.T) {
for _, c := range cluster.Nodes {
c.Config.Cluster.ReplicaN = 2
}
err := cluster.Start(t)
err := cluster.Start()
if err != nil {
t.Fatalf("starting cluster: %v", err)
}
@ -807,7 +807,7 @@ func TestRemoveConcurrentIndexCreation(t *testing.T) {
for _, c := range cluster.Nodes {
c.Config.Cluster.ReplicaN = 2
}
err := cluster.Start(t)
err := cluster.Start()
if err != nil {
t.Fatalf("starting cluster: %v", err)
}

6
test/cluster.go
View file

@ -243,10 +243,10 @@ func (c *Cluster) CreateField(t testing.TB, index string, iopts pilosa.IndexOpti
}
// Start runs a Cluster
func (c *Cluster) Start(tb testing.TB) error {
func (c *Cluster) Start() error {
var eg errgroup.Group
err := port.GetPorts(func(ports []int) error {
portsCfg := GenPortsConfig(tb, NewPorts(ports))
portsCfg := GenPortsConfig(NewPorts(ports))
var gossipSeeds []string
for i, cc := range c.Nodes {
@ -413,7 +413,7 @@ func newCluster(tb testing.TB, size int, opts ...[]server.CommandOption) (*Clust
func MustRunCluster(tb testing.TB, size int, opts ...[]server.CommandOption) *Cluster {
cluster := MustNewCluster(tb, size, opts...)
err := cluster.Start(tb)
err := cluster.Start()
if err != nil {
tb.Fatalf("run cluster: %v", err)
}

7
test/disco.go
View file

@ -16,15 +16,14 @@ package test
import (
"fmt"
"io/ioutil"
"strings"
"testing"
"time"
"github.com/pilosa/pilosa/v2/etcd"
"github.com/pilosa/pilosa/v2/gossip"
"github.com/pilosa/pilosa/v2/server"
"github.com/pilosa/pilosa/v2/test/port"
"github.com/pilosa/pilosa/v2/testhook"
)
type Ports struct {
@ -33,7 +32,7 @@ type Ports struct {
}
//GenPortsConfig creates specific configuration for etcd.
func GenPortsConfig(tb testing.TB, ports []Ports) []*server.Config {
func GenPortsConfig(ports []Ports) []*server.Config {
cfgs := make([]*server.Config, len(ports))
clusterURLs := make([]string, len(ports))
for i := range cfgs {
@ -43,7 +42,7 @@ func GenPortsConfig(tb testing.TB, ports []Ports) []*server.Config {
lClientURL = fmt.Sprintf("http://localhost:%d", ports[i].Client)
lPeerURL = fmt.Sprintf("http://localhost:%d", ports[i].Peer)
discoDir := ""
if d, err := testhook.TempDir(tb, "disco."); err == nil {
if d, err := ioutil.TempDir("/tmp", "disco."); err == nil {
discoDir = d
}