diff --git a/server.go b/server.go index 6cd313dc0..61e4838a1 100644 --- a/server.go +++ b/server.go @@ -337,20 +337,20 @@ func (s *Server) Open() error { // Initialize id-key storage. if err := s.holder.translateFile.Open(); err != nil { - return err + return errors.Wrap(err, "opening TranslateFile") } // Open Cluster management. if err := s.cluster.waitForStarted(); err != nil { - return fmt.Errorf("opening Cluster: %v", err) + return errors.Wrap(err, "opening Cluster") } // Open holder. if err := s.holder.Open(); err != nil { - return fmt.Errorf("opening Holder: %v", err) + return errors.Wrap(err, "opening Holder") } if err := s.cluster.setNodeState(nodeStateReady); err != nil { - return fmt.Errorf("setting nodeState: %v", err) + return errors.Wrap(err, "setting nodeState") } // Listen for joining nodes. diff --git a/test/pilosa.go b/test/pilosa.go index f8f60eebe..27331d53f 100644 --- a/test/pilosa.go +++ b/test/pilosa.go @@ -63,17 +63,13 @@ func newCommand(opts ...server.CommandOption) *Command { // does not fail on 32-bit systems. opts = append([]server.CommandOption{ server.OptCommandCloseTimeout(time.Millisecond * 2), - server.OptCommandServerOptions( - pilosa.OptServerTranslateFileMapSize( - 2 << 25, - ), - ), }, opts...) m := &Command{commandOptions: opts} m.Command = server.NewCommand(bytes.NewReader(nil), ioutil.Discard, ioutil.Discard, opts...) m.Config.DataDir = path m.Config.Bind = "http://localhost:0" m.Config.Cluster.Disabled = true + m.Config.Translation.MapSize = 100000 if testing.Verbose() { m.Command.Stdout = os.Stdout diff --git a/translate.go b/translate.go index 2ef289f45..cb16de929 100644 --- a/translate.go +++ b/translate.go @@ -131,20 +131,20 @@ func NewTranslateFile(opts ...TranslateFileOption) *TranslateFile { func (s *TranslateFile) Open() (err error) { // Open writer & buffered writer. if err := os.MkdirAll(filepath.Dir(s.Path), 0777); err != nil { - return err + return errors.Wrapf(err, "mkdir %s", filepath.Dir(s.Path)) } else if s.file, err = os.OpenFile(s.Path, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666); err != nil { - return err + return errors.Wrapf(err, "open file %s", s.Path) } s.w = bufio.NewWriter(s.file) // Memory map data file. if s.data, err = syscall.Mmap(int(s.file.Fd()), 0, s.mapSize, syscall.PROT_READ, syscall.MAP_SHARED); err != nil { - return err + return errors.Wrapf(err, "creating Mmap (size: %d)", s.mapSize) } // Replay the log. if err := s.replayEntries(); err != nil { - return err + return errors.Wrap(err, "replaying log entries") } // Listen to primaryStoreEvents channel.