mirror/kopia
1
0
Fork 0
mirror of https://github.com/kopia/kopia.git synced 2026-05-19 20:24:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

gcs tweaks for performance

Browse Source
This commit is contained in:
Jarek Kowalski
2016-06-04 07:53:07 -07:00
parent b9912a595f
commit 7252b779d7
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
blob/gcs.go
View File

@@ -72,7 +72,7 @@ func (gcs *gcsStorage) GetBlock(b string) ([]byte, error) {
v, err := gcs.objectsService.Get(gcs.BucketName, gcs.getObjectNameString(b)).Download()
if err != nil {
if err, ok := err.(*googleapi.Error); ok {
if err.Code == 404 {
if err.Code == http.StatusNotFound {
return nil, ErrBlockNotFound
}
}
@@ -86,23 +86,25 @@ func (gcs *gcsStorage) GetBlock(b string) ([]byte, error) {
}
func (gcs *gcsStorage) PutBlock(b string, data io.ReadCloser, options PutOptions) error {
defer data.Close()
object := gcsclient.Object{
Name: gcs.getObjectNameString(b),
}
defer data.Close()
t0 := time.Now()
call := gcs.objectsService.Insert(gcs.BucketName, &object).Media(data)
if !options.Overwrite {
if ok, _ := gcs.BlockExists(b); ok {
return nil
}
call = call.IfGenerationMatch(0)
}
_, err := call.Do()
dt := time.Since(t0)
log.Printf("PutBlock completed in %v and returned %v", dt, err)
if err != nil {
if err, ok := err.(*googleapi.Error); ok {
if err.Code == 412 {
if err.Code == http.StatusPreconditionFailed {
// Condition not met indicates that the block already exists.
return nil
}
@@ -206,6 +208,8 @@ func saveToken(file string, token *oauth2.Token) {
func NewGCSStorage(options *GCSStorageOptions) (Storage, error) {
ctx := context.TODO()
//ctx = httptrace.WithClientTrace(ctx, &httptrace.ClientTrace{})
gcs := &gcsStorage{
GCSStorageOptions: *options,
}
@@ -226,7 +230,7 @@ func NewGCSStorage(options *GCSStorageOptions) (Storage, error) {
var err error
if !gcs.IgnoreDefaultCredentials {
client, _ = google.DefaultClient(context.TODO(), scope)
client, _ = google.DefaultClient(ctx, scope)
}
if client == nil {