-
Notifications
You must be signed in to change notification settings - Fork 53
Presto plugin executor #69
Changes from 13 commits
e5b6ccb
c0f71da
90478fd
0211489
526c3ac
ebcf04a
39a3a3c
2379221
c87dbd5
7ba7cc7
4baecf2
cd07b27
574a3cc
352ac58
f48673f
4dff686
2898c2c
23b3eb2
a3810ac
8a1954a
859d50f
177e7f9
76d0e96
7a5f2d6
7325020
78ac9ff
e639f60
3e87ce4
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
package client | ||
EngHabu marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
import ( | ||
"context" | ||
"net/http" | ||
"net/url" | ||
|
||
"time" | ||
|
||
"github.com/lyft/flyteplugins/go/tasks/plugins/presto/config" | ||
) | ||
|
||
const ( | ||
httpRequestTimeoutSecs = 30 | ||
) | ||
|
||
type noopPrestoClient struct { | ||
client *http.Client | ||
environment *url.URL | ||
} | ||
|
||
// Contains information needed to execute a Presto query | ||
type PrestoExecuteArgs struct { | ||
RoutingGroup string `json:"routingGroup,omitempty"` | ||
Catalog string `json:"catalog,omitempty"` | ||
Schema string `json:"schema,omitempty"` | ||
Source string `json:"source,omitempty"` | ||
} | ||
|
||
// Representation of a response after submitting a query to Presto | ||
type PrestoExecuteResponse struct { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: add json tags |
||
ID string | ||
Status PrestoStatus | ||
NextURI string | ||
} | ||
|
||
//go:generate mockery -all -case=snake | ||
|
||
// Interface to interact with PrestoClient for Presto tasks | ||
type PrestoClient interface { | ||
// Submits a query to Presto | ||
ExecuteCommand(ctx context.Context, commandStr string, executeArgs PrestoExecuteArgs) (interface{}, error) | ||
|
||
// Cancels a currently running Presto query | ||
KillCommand(ctx context.Context, commandID string) error | ||
|
||
// Gets the status of a Presto query | ||
GetCommandStatus(ctx context.Context, commandID string) (PrestoStatus, error) | ||
} | ||
|
||
func (p noopPrestoClient) ExecuteCommand( | ||
ctx context.Context, | ||
queryStr string, | ||
executeArgs PrestoExecuteArgs) (interface{}, error) { | ||
|
||
return PrestoExecuteResponse{}, nil | ||
} | ||
|
||
func (p noopPrestoClient) KillCommand(ctx context.Context, commandID string) error { | ||
return nil | ||
} | ||
|
||
func (p noopPrestoClient) GetCommandStatus(ctx context.Context, commandID string) (PrestoStatus, error) { | ||
return NewPrestoStatus(ctx, "UNKNOWN"), nil | ||
} | ||
|
||
func NewNoopPrestoClient(cfg *config.Config) PrestoClient { | ||
return &noopPrestoClient{ | ||
client: &http.Client{Timeout: httpRequestTimeoutSecs * time.Second}, | ||
environment: cfg.Environment.ResolveReference(&cfg.Environment.URL), | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
package client | ||
|
||
import ( | ||
"context" | ||
"strings" | ||
|
||
"github.com/lyft/flytestdlib/logger" | ||
) | ||
|
||
type PrestoStatus string | ||
|
||
// This type is meant only to encapsulate the response coming from Presto as a type, it is | ||
// not meant to be stored locally. | ||
const ( | ||
PrestoStatusUnknown PrestoStatus = "UNKNOWN" | ||
PrestoStatusQueued PrestoStatus = "QUEUED" | ||
PrestoStatusRunning PrestoStatus = "RUNNING" | ||
PrestoStatusFinished PrestoStatus = "FINISHED" | ||
PrestoStatusFailed PrestoStatus = "FAILED" | ||
PrestoStatusCancelled PrestoStatus = "CANCELLED" | ||
) | ||
|
||
var PrestoStatuses = map[PrestoStatus]struct{}{ | ||
EngHabu marked this conversation as resolved.
Show resolved
Hide resolved
|
||
PrestoStatusUnknown: {}, | ||
PrestoStatusQueued: {}, | ||
PrestoStatusRunning: {}, | ||
PrestoStatusFinished: {}, | ||
PrestoStatusFailed: {}, | ||
PrestoStatusCancelled: {}, | ||
} | ||
|
||
func NewPrestoStatus(ctx context.Context, state string) PrestoStatus { | ||
upperCased := strings.ToUpper(state) | ||
if strings.Contains(upperCased, "FAILED") { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why is failed singled out? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not entirely sure, I sort of copied this from the existing qubole_status. Probably not necessary to single this out. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Actually, I think it was needed because Hive/Qubole has different error/failure modes and I think this maps them all to a single Failure/Error on the Flyte side. Going to leave this in for now There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add this as a comment? |
||
return PrestoStatusFailed | ||
} else if _, ok := PrestoStatuses[PrestoStatus(upperCased)]; ok { | ||
return PrestoStatus(upperCased) | ||
} else { | ||
logger.Warnf(ctx, "Invalid Presto Status found: %v", state) | ||
return PrestoStatusUnknown | ||
} | ||
} |
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,80 @@ | ||||||
package config | ||||||
|
||||||
//go:generate pflags Config --default-var=defaultConfig | ||||||
|
||||||
import ( | ||||||
"context" | ||||||
"net/url" | ||||||
"time" | ||||||
|
||||||
"github.com/lyft/flytestdlib/config" | ||||||
"github.com/lyft/flytestdlib/logger" | ||||||
|
||||||
pluginsConfig "github.com/lyft/flyteplugins/go/tasks/config" | ||||||
) | ||||||
|
||||||
const prestoConfigSectionKey = "presto" | ||||||
|
||||||
func URLMustParse(s string) config.URL { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. lower case?
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I made it public because I call the method in one of the unit test There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I like URL. |
||||||
r, err := url.Parse(s) | ||||||
if err != nil { | ||||||
logger.Panicf(context.TODO(), "Bad Presto URL Specified as default, error: %s", err) | ||||||
} | ||||||
if r == nil { | ||||||
logger.Panicf(context.TODO(), "Nil Presto URL specified.", err) | ||||||
} | ||||||
return config.URL{URL: *r} | ||||||
} | ||||||
|
||||||
type RoutingGroupConfig struct { | ||||||
Name string `json:"name" pflag:",The name of a given Presto routing group"` | ||||||
Limit int `json:"limit" pflag:",Resource quota (in the number of outstanding requests) of the routing group"` | ||||||
ProjectScopeQuotaProportionCap float64 `json:"projectScopeQuotaProportionCap" pflag:",A floating point number between 0 and 1, specifying the maximum proportion of quotas allowed to allocate to a project in the routing group"` | ||||||
NamespaceScopeQuotaProportionCap float64 `json:"namespaceScopeQuotaProportionCap" pflag:",A floating point number between 0 and 1, specifying the maximum proportion of quotas allowed to allocate to a namespace in the routing group"` | ||||||
} | ||||||
|
||||||
type RateLimiter struct { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In light of the other conversations we've had, should we rename this struct? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sure. How does There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. sure |
||||||
Name string `json:"name" pflag:",The name of the rate limiter"` | ||||||
SyncPeriod config.Duration `json:"syncPeriod" pflag:",The duration to wait before the cache is refreshed again"` | ||||||
Workers int `json:"workers" pflag:",Number of parallel workers to refresh the cache"` | ||||||
LruCacheSize int `json:"lruCacheSize" pflag:",Size of the cache"` | ||||||
MetricScope string `json:"metricScope" pflag:",The prefix in Prometheus used to track metrics related to Presto"` | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think you need this... you just create it as a const in your code There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is part of the change for one of your earlier comments where we should make the cache/rate limiter configurable. Are there things that should be configurable and others that shouldnt? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah, I would say you should drop Name and MetricScope from here... |
||||||
} | ||||||
|
||||||
var ( | ||||||
defaultConfig = Config{ | ||||||
Environment: URLMustParse(""), | ||||||
DefaultRoutingGroup: "adhoc", | ||||||
AwsS3ShardFormatter: "", | ||||||
AwsS3ShardCount: 2, | ||||||
RoutingGroupConfigs: []RoutingGroupConfig{{Name: "adhoc", Limit: 250}, {Name: "etl", Limit: 100}}, | ||||||
RateLimiter: RateLimiter{ | ||||||
Name: "presto", | ||||||
SyncPeriod: config.Duration{Duration: 3 * time.Second}, | ||||||
Workers: 15, | ||||||
LruCacheSize: 2000, | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
MetricScope: "presto", | ||||||
}, | ||||||
} | ||||||
|
||||||
prestoConfigSection = pluginsConfig.MustRegisterSubSection(prestoConfigSectionKey, &defaultConfig) | ||||||
) | ||||||
|
||||||
// Presto plugin configs | ||||||
type Config struct { | ||||||
Environment config.URL `json:"environment" pflag:",Environment endpoint for Presto to use"` | ||||||
DefaultRoutingGroup string `json:"defaultRoutingGroup" pflag:",Default Presto routing group"` | ||||||
AwsS3ShardFormatter string `json:"awsS3ShardFormatter" pflag:", S3 bucket prefix where Presto results will be stored"` | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Are we limited to S3? Flyte in general is storage agnostic There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In this case, we would be limited by whatever Presto supports in terms of external tables. I'm not very familiar with Flyte's generic storage model. Do you have any ideas of how I might abstract this? Currently, this logic of generating random paths is handled by flytekit but I'm not sure if the logic there is very generic as it appeared to be tied to S3. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It looks like you can. |
||||||
AwsS3ShardCount int `json:"awsS3ShardCount" pflag:", Number of characters for the S3 bucket shard prefix"` | ||||||
RoutingGroupConfigs []RoutingGroupConfig `json:"routingGroupConfigs" pflag:"-,A list of cluster configs. Each of the configs corresponds to a service cluster"` | ||||||
RateLimiter RateLimiter `json:"rateLimiter" pflag:"Rate limiter config"` | ||||||
} | ||||||
|
||||||
// Retrieves the current config value or default. | ||||||
func GetPrestoConfig() *Config { | ||||||
return prestoConfigSection.GetConfig().(*Config) | ||||||
} | ||||||
|
||||||
func SetPrestoConfig(cfg *Config) error { | ||||||
return prestoConfigSection.SetConfig(cfg) | ||||||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is just a noop Presto client for the open-source version. There will be a separate commit for one based on Mozart