From a100a38b4a66d1fd7ad59457d43d5ac3868f1897 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Podg=C3=B3rski?= <kuba--@users.noreply.github.com>
Date: Thu, 14 Jan 2021 17:47:06 +0100
Subject: [PATCH] don't close disco on Server.Close

---
 server.go       | 6 +++---
 test/cluster.go | 7 -------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/server.go b/server.go
index 807508140..034b5045f 100644
--- a/server.go
+++ b/server.go
@@ -688,13 +688,13 @@ func (s *Server) Close() error {
 	var errhs error
 	var errc error
 
-	if s.disCo != nil {
-		errd = s.disCo.Close()
-	}
 	if s.cluster != nil {
 		errc = s.cluster.close()
 	}
 	errhs = s.syncer.stopTranslationSync()
+	// if s.disCo != nil {
+	// 	errd = s.disCo.Close()
+	// }
 	if s.holder != nil {
 		errh = s.holder.Close()
 	}
diff --git a/test/cluster.go b/test/cluster.go
index e7a5254ae..5b941dcf6 100644
--- a/test/cluster.go
+++ b/test/cluster.go
@@ -421,13 +421,6 @@ func MustRunCluster(tb testing.TB, size int, opts ...[]server.CommandOption) *Cl
 	return cluster
 }
 
-func appendOpts(opts [][]server.CommandOption, cfgs []*server.Config) [][]server.CommandOption {
-	for i := range opts {
-		opts[i] = append(opts[i], server.OptCommandConfig(cfgs[i]))
-	}
-	return opts
-}
-
 // prependOpts applies prependTestServerOpts to each of the ops (one per
 // node, or one for the entire cluser).
 func prependOpts(opts [][]server.CommandOption, size int) [][]server.CommandOption {