Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move copy functions to input_copy #467

Merged
merged 1 commit into from
Feb 16, 2023
Merged

Move copy functions to input_copy #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions clients/input_copy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@ import (
"context"
"errors"
"fmt"
"io"
"net/http"
"net/url"
"time"

xerrors "github.com/livepeer/catalyst-api/errors"
"github.com/livepeer/catalyst-api/log"
"github.com/livepeer/catalyst-api/video"
"github.com/livepeer/go-tools/drivers"
)

type InputCopy struct {
Expand Down Expand Up @@ -64,3 +69,54 @@ func (s *InputCopy) CopyInputToS3(args TranscodeJobArgs, s3HTTPTransferURL *url.
args.InputFile = s3URL
return args, nil
}

func CopyFile(ctx context.Context, sourceURL, destOSBaseURL, filename, requestID string) (int64, error) {
ctx, cancel := context.WithTimeout(ctx, 10*time.Minute)
defer cancel()
writtenBytes := ByteAccumulatorWriter{count: 0}
c, err := getFile(ctx, sourceURL, requestID)
if err != nil {
return writtenBytes.count, fmt.Errorf("download error: %w", err)
}
defer c.Close()

content := io.TeeReader(c, &writtenBytes)

err = UploadToOSURL(destOSBaseURL, filename, content, 5*time.Minute)
if err != nil {
return writtenBytes.count, fmt.Errorf("upload error: %w", err)
}

return writtenBytes.count, nil
}

func getFile(ctx context.Context, url, requestID string) (io.ReadCloser, error) {
_, err := drivers.ParseOSURL(url, true)
if err == nil {
return DownloadOSURL(url)
} else if IsDStorageResource(url) {
return DownloadDStorageFromGatewayList(url, requestID)
} else {
return getFileHTTP(ctx, url)
}
}

func getFileHTTP(ctx context.Context, url string) (io.ReadCloser, error) {
req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
if err != nil {
return nil, xerrors.Unretriable(fmt.Errorf("error creating http request: %w", err))
}
resp, err := retryableHttpClient.Do(req)
if err != nil {
return nil, fmt.Errorf("error on import request: %w", err)
}
if resp.StatusCode >= 300 {
resp.Body.Close()
err := fmt.Errorf("bad status code from import request: %d %s", resp.StatusCode, resp.Status)
if resp.StatusCode < 500 {
err = xerrors.Unretriable(err)
}
return nil, err
}
return resp.Body, nil
}
54 changes: 0 additions & 54 deletions clients/mediaconvert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"context"
"errors"
"fmt"
"io"
"net/http"
"net/url"
"path"
Expand All @@ -17,10 +16,8 @@ import (
"github.com/aws/aws-sdk-go/service/mediaconvert"
"github.com/aws/aws-sdk-go/service/s3"
"github.com/hashicorp/go-retryablehttp"
xerrors "github.com/livepeer/catalyst-api/errors"
"github.com/livepeer/catalyst-api/log"
"github.com/livepeer/catalyst-api/video"
"github.com/livepeer/go-tools/drivers"
"golang.org/x/sync/errgroup"
)

Expand Down Expand Up @@ -408,57 +405,6 @@ func output(container, name string, height, maxBitrate int64) *mediaconvert.Outp
}
}

func getFile(ctx context.Context, url, requestID string) (io.ReadCloser, error) {
_, err := drivers.ParseOSURL(url, true)
if err == nil {
return DownloadOSURL(url)
} else if IsDStorageResource(url) {
return DownloadDStorageFromGatewayList(url, requestID)
} else {
return getFileHTTP(ctx, url)
}
}

func getFileHTTP(ctx context.Context, url string) (io.ReadCloser, error) {
req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
if err != nil {
return nil, xerrors.Unretriable(fmt.Errorf("error creating http request: %w", err))
}
resp, err := retryableHttpClient.Do(req)
if err != nil {
return nil, fmt.Errorf("error on import request: %w", err)
}
if resp.StatusCode >= 300 {
resp.Body.Close()
err := fmt.Errorf("bad status code from import request: %d %s", resp.StatusCode, resp.Status)
if resp.StatusCode < 500 {
err = xerrors.Unretriable(err)
}
return nil, err
}
return resp.Body, nil
}

func CopyFile(ctx context.Context, sourceURL, destOSBaseURL, filename, requestID string) (int64, error) {
ctx, cancel := context.WithTimeout(ctx, 10*time.Minute)
defer cancel()
writtenBytes := ByteAccumulatorWriter{count: 0}
c, err := getFile(ctx, sourceURL, requestID)
if err != nil {
return writtenBytes.count, fmt.Errorf("download error: %w", err)
}
defer c.Close()

content := io.TeeReader(c, &writtenBytes)

err = UploadToOSURL(destOSBaseURL, filename, content, 5*time.Minute)
if err != nil {
return writtenBytes.count, fmt.Errorf("upload error: %w", err)
}

return writtenBytes.count, nil
}

func copyDir(source, dest *url.URL, args TranscodeJobArgs) error {
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
defer cancel()
Expand Down