Skip to content

Commit

Permalink
Merge pull request #9856 from pliu/backup_restore_parallel_compression
Browse files Browse the repository at this point in the history
Parallelize compression/decompression during backup and restore
  • Loading branch information
e-dard authored and jacobmarble committed Jun 27, 2018
1 parent d17509d commit 4544d7a
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 3 deletions.
1 change: 1 addition & 0 deletions Godeps
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ github.com/influxdata/yamux 1f58ded512de5feabbe30b60c7d33a7a896c5f16
github.com/influxdata/yarpc f0da2db138cad2fb425541938fc28dd5a5bc6918
github.com/jsternberg/zap-logfmt ac4bd917e18a4548ce6e0e765b29a4e7f397b0b6
github.com/jwilder/encoding b4e1701a28efcc637d9afcca7d38e495fe909a09
github.com/klauspost/pgzip 0bf5dcad4ada2814c3c00f996a982270bb81a506
github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c
github.com/matttproud/golang_protobuf_extensions 3247c84500bff8d9fb6d579d800f20b3e091582c
github.com/mschoch/smat 90eadee771aeab36e8bf796039b8c261bebebe4f
Expand Down
26 changes: 25 additions & 1 deletion Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@
name = "github.com/prometheus/client_golang"
revision = "661e31bf844dfca9aeba15f27ea8aa0d485ad212"

[[constraint]]
name = "github.com/klauspost/pgzip"
version = "1.1.0"

[prune]
go-tests = true
unused-packages = true
1 change: 1 addition & 0 deletions LICENSE_OF_DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
- github.com/influxdata/yarpc [MIT LICENSE](https://github.com/influxdata/yarpc/blob/master/LICENSE)
- github.com/jsternberg/zap-logfmt [MIT LICENSE](https://github.com/jsternberg/zap-logfmt/blob/master/LICENSE)
- github.com/jwilder/encoding [MIT LICENSE](https://github.com/jwilder/encoding/blob/master/LICENSE)
- github.com/klauspost/pgzip [MIT LICENSE](https://github.com/klauspost/pgzip/blob/master/LICENSE)
- github.com/mattn/go-isatty [MIT LICENSE](https://github.com/mattn/go-isatty/blob/master/LICENSE)
- github.com/matttproud/golang_protobuf_extensions [APACHE LICENSE](https://github.com/matttproud/golang_protobuf_extensions/blob/master/LICENSE)
- github.com/opentracing/opentracing-go [MIT LICENSE](https://github.com/opentracing/opentracing-go/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion cmd/influxd/backup/backup.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
package backup

import (
"compress/gzip"
"encoding/binary"
"encoding/json"
"errors"
Expand All @@ -20,6 +19,7 @@ import (
"github.com/influxdata/influxdb/cmd/influxd/backup_util"
"github.com/influxdata/influxdb/services/snapshotter"
"github.com/influxdata/influxdb/tcp"
gzip "github.com/klauspost/pgzip"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/influxd/restore/restore.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"strconv"
"strings"

"compress/gzip"
gzip "github.com/klauspost/pgzip"

"github.com/influxdata/influxdb/cmd/influxd/backup_util"
tarstream "github.com/influxdata/influxdb/pkg/tar"
Expand Down

0 comments on commit 4544d7a

Please sign in to comment.