Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix build break

pull/5428/head
David Norton 2016-01-20 14:06:50 -05:00
parent 177ce33b02
commit 19c79af840
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/influxd/restore/restore.go
View File

@ -15,7 +15,6 @@ import (
"github.com/influxdb/influxdb/cmd/influxd/backup"
"github.com/influxdb/influxdb/services/meta"
"github.com/influxdb/influxdb/snapshot"
)
// Command represents the program execution for "influxd restore".
@ -127,7 +126,7 @@ func (cmd *Command) ensureStopped() error {
// unpackMeta reads the metadata from the backup directory and initializes a raft
// cluster and replaces the root metadata.
func (cmd *Command) unpackMeta(mr *snapshot.MultiReader, sf snapshot.File, config *Config) error {
func (cmd *Command) unpackMeta() error {
// find the meta file
metaFiles, err := filepath.Glob(filepath.Join(cmd.backupFilesPath, backup.Metafile+".*"))
if err != nil {
@ -159,11 +158,11 @@ func (cmd *Command) unpackMeta(mr *snapshot.MultiReader, sf snapshot.File, confi
}
// Copy meta config and remove peers so it starts in single mode.
c := config.Meta
c := cmd.MetaConfig
c.JoinPeers = nil
// Initialize meta store.
store := meta.NewService(config.Meta)
store := meta.NewService(c)
store.RaftListener = newNopListener()
// Open the meta store.