diff --git a/server.go b/server.go index 7e0690c30..d3926ab23 100644 --- a/server.go +++ b/server.go @@ -634,7 +634,7 @@ func (s *Server) monitorResetTranslationSync() { s.wg.Add(1) go func() { // Obtaining this lock ensures that there is only - // once instance of resetTranslationSync() running + // one instance of resetTranslationSync() running // at once. s.syncer.mu.Lock() defer s.syncer.mu.Unlock() diff --git a/server/server.go b/server/server.go index 5d12a745c..5ff688096 100644 --- a/server/server.go +++ b/server/server.go @@ -87,7 +87,6 @@ type Command struct { listenURI *pilosa.URI tlsConfig *tls.Config closeTimeout time.Duration - noSleep bool serverOptions []pilosa.ServerOption } @@ -115,17 +114,6 @@ func OptCommandConfig(config *Config) CommandOption { } } -// OptCommandNoSleep disables the 5 second sleep for non-coordinator -// nodes on startup. See https://github.com/molecula/pilosa/issues/266 -// This option should only be used by tests, and expect it to be -// deprecated. -func OptCommandNoSleep() CommandOption { - return func(c *Command) error { - c.noSleep = true - return nil - } -} - // NewCommand returns a new instance of Main. func NewCommand(stdin io.Reader, stdout, stderr io.Writer, opts ...CommandOption) *Command { c := &Command{ diff --git a/test/pilosa.go b/test/pilosa.go index 6903a2010..6963f635f 100644 --- a/test/pilosa.go +++ b/test/pilosa.go @@ -65,7 +65,6 @@ func newCommand(opts ...server.CommandOption) *Command { // does not fail on 32-bit systems. opts = append([]server.CommandOption{ server.OptCommandCloseTimeout(time.Millisecond * 2), - server.OptCommandNoSleep(), }, opts...) m := &Command{commandOptions: opts} m.Command = server.NewCommand(bytes.NewReader(nil), ioutil.Discard, ioutil.Discard, opts...)