-
Notifications
You must be signed in to change notification settings - Fork 681
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.
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
[flytepropeller][flyteadmin] Streaming Decks V2 #6053
base: master
Are you sure you want to change the base?
Changes from 13 commits
54aa165
9ed6b6e
4b4f6bd
dd774cb
0bb8e91
25fea29
4e24e91
8d1d0e4
31853bb
4068043
65b6efe
137579f
04f7fbc
aa56d64
a16851f
7314455
19498f5
74f595f
3bd3336
f6d8493
4b56e52
db4b19e
2737251
564dc5f
69ba94e
c992eae
0b91b5c
1d18265
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||||
---|---|---|---|---|---|---|---|---|
|
@@ -41,6 +41,13 @@ | |||||||
|
||||||||
const pluginContextKey = contextutils.Key("plugin") | ||||||||
|
||||||||
type DeckStatus int | ||||||||
|
||||||||
const ( | ||||||||
DeckUnknown DeckStatus = iota | ||||||||
DeckEnabled | ||||||||
) | ||||||||
|
||||||||
type metrics struct { | ||||||||
pluginPanics labeled.Counter | ||||||||
unsupportedTaskType labeled.Counter | ||||||||
|
@@ -71,10 +78,47 @@ | |||||||
return taskType + "_" + pluginID | ||||||||
} | ||||||||
|
||||||||
func (p *pluginRequestedTransition) CacheHit(outputPath storage.DataReference, deckPath *storage.DataReference, entry catalog.Entry) { | ||||||||
func (p *pluginRequestedTransition) AddDeckURI(tCtx *taskExecutionContext) { | ||||||||
var deckURI *storage.DataReference | ||||||||
deckURIValue := tCtx.ow.GetDeckPath() | ||||||||
deckURI = &deckURIValue | ||||||||
|
||||||||
if p.execInfo.OutputInfo == nil { | ||||||||
p.execInfo.OutputInfo = &handler.OutputInfo{} | ||||||||
} | ||||||||
|
||||||||
p.execInfo.OutputInfo.DeckURI = deckURI | ||||||||
} | ||||||||
|
||||||||
func (p *pluginRequestedTransition) AddDeckURIIfDeckExists(ctx context.Context, tCtx *taskExecutionContext) error { | ||||||||
reader := tCtx.ow.GetReader() | ||||||||
if reader == nil && p.execInfo.OutputInfo != nil { | ||||||||
p.execInfo.OutputInfo.DeckURI = nil | ||||||||
return nil | ||||||||
} | ||||||||
|
||||||||
exists, err := reader.DeckExists(ctx) | ||||||||
if err != nil { | ||||||||
logger.Errorf(ctx, "Failed to check deck file existence. Error: %v", err) | ||||||||
return regErrors.Wrapf(err, "failed to check existence of deck file") | ||||||||
} | ||||||||
|
||||||||
if p.execInfo.OutputInfo == nil { | ||||||||
p.execInfo.OutputInfo = &handler.OutputInfo{} | ||||||||
} | ||||||||
|
||||||||
if exists { | ||||||||
deckURIValue := tCtx.ow.GetDeckPath() | ||||||||
p.execInfo.OutputInfo.DeckURI = &deckURIValue | ||||||||
} | ||||||||
|
||||||||
return nil | ||||||||
} | ||||||||
|
||||||||
func (p *pluginRequestedTransition) CacheHit(outputPath storage.DataReference, entry catalog.Entry) { | ||||||||
eapolinario marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||||
p.ttype = handler.TransitionTypeEphemeral | ||||||||
p.pInfo = pluginCore.PhaseInfoSuccess(nil) | ||||||||
p.ObserveSuccess(outputPath, deckPath, &event.TaskNodeMetadata{CacheStatus: entry.GetStatus().GetCacheStatus(), CatalogKey: entry.GetStatus().GetMetadata()}) | ||||||||
p.ObserveSuccess(outputPath, &event.TaskNodeMetadata{CacheStatus: entry.GetStatus().GetCacheStatus(), CatalogKey: entry.GetStatus().GetMetadata()}) | ||||||||
} | ||||||||
|
||||||||
func (p *pluginRequestedTransition) PopulateCacheInfo(entry catalog.Entry) { | ||||||||
|
@@ -144,10 +188,13 @@ | |||||||
return ToTaskExecutionEvent(input) | ||||||||
} | ||||||||
|
||||||||
func (p *pluginRequestedTransition) ObserveSuccess(outputPath storage.DataReference, deckPath *storage.DataReference, taskMetadata *event.TaskNodeMetadata) { | ||||||||
p.execInfo.OutputInfo = &handler.OutputInfo{ | ||||||||
OutputURI: outputPath, | ||||||||
DeckURI: deckPath, | ||||||||
func (p *pluginRequestedTransition) ObserveSuccess(outputPath storage.DataReference, taskMetadata *event.TaskNodeMetadata) { | ||||||||
if p.execInfo.OutputInfo == nil { | ||||||||
p.execInfo.OutputInfo = &handler.OutputInfo{ | ||||||||
OutputURI: outputPath, | ||||||||
} | ||||||||
} else { | ||||||||
p.execInfo.OutputInfo.OutputURI = outputPath | ||||||||
Comment on lines
+187
to
+193
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. Consider validating OutputURI before update
Consider checking if the Code suggestionCheck the AI-generated fix before applying
Code Review Run #ecb1b4 Is this a valid issue, or was it incorrectly flagged by the Agent?
|
||||||||
} | ||||||||
|
||||||||
p.execInfo.TaskNodeInfo = &handler.TaskNodeInfo{ | ||||||||
|
@@ -171,7 +218,8 @@ | |||||||
} | ||||||||
|
||||||||
logger.Debugf(ctx, "Task still running") | ||||||||
return handler.DoTransition(p.ttype, handler.PhaseInfoRunning(nil)), nil | ||||||||
// Here will send the deck uri to flyteadmin | ||||||||
return handler.DoTransition(p.ttype, handler.PhaseInfoRunning(&p.execInfo)), nil | ||||||||
} | ||||||||
|
||||||||
// The plugin interface available especially for testing. | ||||||||
|
@@ -380,6 +428,32 @@ | |||||||
return t.taskMetricsMap[metricNameKey], nil | ||||||||
} | ||||||||
|
||||||||
func GetDeckStatus(ctx context.Context, tCtx *taskExecutionContext) (DeckStatus, error) { | ||||||||
// GetDeckStatus determines whether a task generates a deck based on its execution context. | ||||||||
// | ||||||||
// This function ensures backward compatibility with older Flytekit versions using the following logic: | ||||||||
// 1. For Flytekit > 1.14.3, the task template's metadata includes the `generates_deck` flag: | ||||||||
// - If `generates_deck` is set to true, it indicates that the task generates a deck, and DeckEnabled is returned. | ||||||||
// 2. If `generates_deck` is set to false or is not set (likely from older Flytekit versions): | ||||||||
// - DeckUnknown is returned as a placeholder status. | ||||||||
// - In terminal states, a HEAD request can be made to check if the deck file exists. | ||||||||
// | ||||||||
// In future implementations, a `DeckDisabled` status could be introduced for better performance optimization: | ||||||||
// - This would eliminate the need for a HEAD request in the final phase. | ||||||||
// - However, the tradeoff is that a new field would need to be added to FlyteIDL to support this behavior. | ||||||||
|
||||||||
template, err := tCtx.tr.Read(ctx) | ||||||||
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. Better comments! |
||||||||
if err != nil { | ||||||||
return DeckUnknown, regErrors.Wrapf(err, "failed to read task template") | ||||||||
} | ||||||||
|
||||||||
if template.GetMetadata().GetGeneratesDeck() { | ||||||||
return DeckEnabled, nil | ||||||||
} | ||||||||
|
||||||||
return DeckUnknown, nil | ||||||||
} | ||||||||
|
||||||||
func (t Handler) invokePlugin(ctx context.Context, p pluginCore.Plugin, tCtx *taskExecutionContext, ts handler.TaskNodeState) (*pluginRequestedTransition, error) { | ||||||||
pluginTrns := &pluginRequestedTransition{} | ||||||||
|
||||||||
|
@@ -464,8 +538,26 @@ | |||||||
} | ||||||||
} | ||||||||
|
||||||||
// Regardless of the observed phase, we always add the DeckUri to support real-time deck functionality. | ||||||||
// The deck should be accessible even if the task is still running or has failed. | ||||||||
// It's possible that the deck URI may not exist in remote storage yet or will never exist. | ||||||||
// So, it is console's responsibility to handle the case when the deck URI actually does not exist. | ||||||||
deckStatus, err := GetDeckStatus(ctx, tCtx) | ||||||||
if err != nil { | ||||||||
return nil, err | ||||||||
} | ||||||||
if deckStatus == DeckEnabled { | ||||||||
pluginTrns.AddDeckURI(tCtx) | ||||||||
} | ||||||||
|
||||||||
switch pluginTrns.pInfo.Phase() { | ||||||||
case pluginCore.PhaseSuccess: | ||||||||
if deckStatus == DeckUnknown { | ||||||||
err = pluginTrns.AddDeckURIIfDeckExists(ctx, tCtx) | ||||||||
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. Shouldn't we always check if the file exists in the terminal state? if flytekit fails to generate a deck for some reasons, we should not add deck_uri to the output info, right 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. What are the concerns with having a 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. Hi, @eapolinario Yes, but FlyteConsole currently needs to make an additional call to check if the task is in a terminal phase. I think it's better to handle all the logic in Propeller, as this would make maintenance easier. It would also simplify FlyteConsole's implementation. In summary: |
||||||||
} | ||||||||
if err != nil { | ||||||||
return pluginTrns, err | ||||||||
} | ||||||||
// ------------------------------------- | ||||||||
// TODO: @kumare create Issue# Remove the code after we use closures to handle dynamic nodes | ||||||||
// This code only exists to support Dynamic tasks. Eventually dynamic tasks will use closure nodes to execute | ||||||||
|
@@ -501,25 +593,21 @@ | |||||||
CheckpointUri: tCtx.ow.GetCheckpointPrefix().String(), | ||||||||
}) | ||||||||
} else { | ||||||||
var deckURI *storage.DataReference | ||||||||
if tCtx.ow.GetReader() != nil { | ||||||||
exists, err := tCtx.ow.GetReader().DeckExists(ctx) | ||||||||
if err != nil { | ||||||||
logger.Errorf(ctx, "Failed to check deck file existence. Error: %v", err) | ||||||||
return pluginTrns, regErrors.Wrapf(err, "failed to check existence of deck file") | ||||||||
} else if exists { | ||||||||
deckURIValue := tCtx.ow.GetDeckPath() | ||||||||
deckURI = &deckURIValue | ||||||||
} | ||||||||
} | ||||||||
pluginTrns.ObserveSuccess(tCtx.ow.GetOutputPath(), deckURI, | ||||||||
pluginTrns.ObserveSuccess(tCtx.ow.GetOutputPath(), | ||||||||
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. Consider impact of method signature change
The Code suggestionCheck the AI-generated fix before applying
Suggested change
Code Review Run #ecb1b4 Is this a valid issue, or was it incorrectly flagged by the Agent?
|
||||||||
&event.TaskNodeMetadata{ | ||||||||
CheckpointUri: tCtx.ow.GetCheckpointPrefix().String(), | ||||||||
}) | ||||||||
} | ||||||||
case pluginCore.PhaseRetryableFailure: | ||||||||
fallthrough | ||||||||
case pluginCore.PhasePermanentFailure: | ||||||||
// This is for backward compatibility with older Flytekit versions. | ||||||||
if deckStatus == DeckUnknown { | ||||||||
err = pluginTrns.AddDeckURIIfDeckExists(ctx, tCtx) | ||||||||
} | ||||||||
if err != nil { | ||||||||
return pluginTrns, err | ||||||||
} | ||||||||
pluginTrns.ObservedFailure( | ||||||||
&event.TaskNodeMetadata{ | ||||||||
CheckpointUri: tCtx.ow.GetCheckpointPrefix().String(), | ||||||||
|
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.
Can you add a test here showing that the deck uri also shows up in the case of failed executions?
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.
updated!
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.
https://github.com/flyteorg/flyte/pull/6053/files#diff-a54d30dd5d924cda2f14ca936e4173fc9a263079552e66c2c1c196001631ae96R201-R231