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

feat: add support for gzip request bodies in restore API (#21676)

pull/21685/head
Daniel Moran 2021-06-14 11:52:31 -04:00 committed by GitHub
parent 3e3e77ed1d
commit a216501723
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
http/middleware.go
View File

@ -147,6 +147,7 @@ var blacklistEndpoints = map[string]isValidMethodFn{
prefixNotificationEndpoints: ignoreMethod("POST"),
notificationEndpointsIDPath: ignoreMethod("PUT"),
restoreKVPath: ignoreMethod(),
restoreSqlPath: ignoreMethod(),
restoreBucketPath: ignoreMethod(),
restoreShardPath: ignoreMethod(),
}

52
http/restore_service.go
View File

@ -2,6 +2,7 @@ package http
import (
"bytes"
"compress/gzip"
"context"
"encoding/json"
"fmt"
@ -81,7 +82,22 @@ func (h *RestoreHandler) handleRestoreKVStore(w http.ResponseWriter, r *http.Req
ctx := r.Context()
if err := h.RestoreService.RestoreKVStore(ctx, r.Body); err != nil {
var kvBytes io.Reader = r.Body
if r.Header.Get("Content-Encoding") == "gzip" {
gzr, err := gzip.NewReader(kvBytes)
if err != nil {
err = &errors.Error{
Code: errors.EInvalid,
Msg: "failed to decode gzip request body",
Err: err,
}
h.HandleHTTPError(ctx, err, w)
}
defer gzr.Close()
kvBytes = gzr
}
if err := h.RestoreService.RestoreKVStore(ctx, kvBytes); err != nil {
h.HandleHTTPError(ctx, err, w)
return
}
@ -93,7 +109,22 @@ func (h *RestoreHandler) handleRestoreSqlStore(w http.ResponseWriter, r *http.Re
ctx := r.Context()
if err := h.SqlBackupRestoreService.RestoreSqlStore(ctx, r.Body); err != nil {
var sqlBytes io.Reader = r.Body
if r.Header.Get("Content-Encoding") == "gzip" {
gzr, err := gzip.NewReader(sqlBytes)
if err != nil {
err = &errors.Error{
Code: errors.EInvalid,
Msg: "failed to decode gzip request body",
Err: err,
}
h.HandleHTTPError(ctx, err, w)
}
defer gzr.Close()
sqlBytes = gzr
}
if err := h.SqlBackupRestoreService.RestoreSqlStore(ctx, sqlBytes); err != nil {
h.HandleHTTPError(ctx, err, w)
return
}
@ -144,7 +175,22 @@ func (h *RestoreHandler) handleRestoreShard(w http.ResponseWriter, r *http.Reque
return
}
if err := h.RestoreService.RestoreShard(ctx, shardID, r.Body); err != nil {
var tsmBytes io.Reader = r.Body
if r.Header.Get("Content-Encoding") == "gzip" {
gzr, err := gzip.NewReader(tsmBytes)
if err != nil {
err = &errors.Error{
Code: errors.EInvalid,
Msg: "failed to decode gzip request body",
Err: err,
}
h.HandleHTTPError(ctx, err, w)
}
defer gzr.Close()
tsmBytes = gzr
}
if err := h.RestoreService.RestoreShard(ctx, shardID, tsmBytes); err != nil {
h.HandleHTTPError(ctx, err, w)
return
}