Skip to content
This repository has been archived by the owner on Oct 9, 2023. It is now read-only.

Adjust Catalog logs #9

Merged
merged 3 commits into from
Sep 13, 2019
Merged

Adjust Catalog logs #9

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4729c1d
Adjust logging levels
chanadian Sep 13, 2019
08dd99f
correct metadata to pass workflow exec name
chanadian Sep 13, 2019
841ff8f
Clarify key name for execution name
chanadian Sep 13, 2019
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
14 changes: 7 additions & 7 deletions pkg/controller/catalog/datacatalog/datacatalog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

const (
taskVersionKey = "task-version"
taskExecKey = "execution-name"
wfExecNameKey = "execution-name"
)

// This is the client that caches task executions to DataCatalog service.
Expand Down Expand Up @@ -108,7 +108,7 @@ func (m *CatalogClient) Get(ctx context.Context, task *core.TaskTemplate, inputP

dataset, err := m.getDataset(ctx, task)
if err != nil {
logger.Errorf(ctx, "DataCatalog failed to get dataset for task %+v, err: %+v", task, err)
logger.Debugf(ctx, "DataCatalog failed to get dataset for task %+v, err: %+v", task.Id, err)
return nil, err
}

Expand All @@ -120,7 +120,7 @@ func (m *CatalogClient) Get(ctx context.Context, task *core.TaskTemplate, inputP

artifact, err := m.getArtifactByTag(ctx, tag, dataset)
if err != nil {
logger.Errorf(ctx, "DataCatalog failed to get artifact by tag %+v, err: %+v", tag, err)
logger.Debugf(ctx, "DataCatalog failed to get artifact by tag %+v, err: %+v", tag, err)
return nil, err
}
logger.Debugf(ctx, "Artifact found %v from tag %v", artifact, tag)
Expand All @@ -131,7 +131,7 @@ func (m *CatalogClient) Get(ctx context.Context, task *core.TaskTemplate, inputP
return nil, err
}

logger.Debugf(ctx, "Cached %v artifact outputs from artifact %v", len(outputs.Literals), artifact.Id)
logger.Debugf(ctx, "Retrieved %v artifact outputs from artifact %v", len(outputs.Literals), artifact.Id)
return outputs, nil
}

Expand Down Expand Up @@ -179,7 +179,7 @@ func (m *CatalogClient) Put(ctx context.Context, task *core.TaskTemplate, execID
metadata := &datacatalog.Metadata{
KeyMap: map[string]string{
taskVersionKey: task.Id.Version,
taskExecKey: execID.NodeExecutionId.NodeId,
wfExecNameKey: execID.NodeExecutionId.ExecutionId.Name,
},
}
newDataset := &datacatalog.Dataset{
Expand Down Expand Up @@ -227,7 +227,7 @@ func (m *CatalogClient) Put(ctx context.Context, task *core.TaskTemplate, execID
// Tag the artifact since it is the cached artifact
tagName, err := transformer.GenerateArtifactTagName(ctx, inputs)
if err != nil {
logger.Errorf(ctx, "Failed to create tag for artifact %+v, err: %+v", cachedArtifact.Id, err)
logger.Errorf(ctx, "Failed to generate tag for artifact %+v, err: %+v", cachedArtifact.Id, err)
return err
}
logger.Debugf(ctx, "Created tag: %v, for task: %v", tagName, task.Id)
Expand All @@ -241,7 +241,7 @@ func (m *CatalogClient) Put(ctx context.Context, task *core.TaskTemplate, execID
_, err = m.client.AddTag(ctx, &datacatalog.AddTagRequest{Tag: tag})
if err != nil {
if status.Code(err) == codes.AlreadyExists {
logger.Errorf(ctx, "Tag %v already exists for Artifact %v (idempotent)", tagName, cachedArtifact.Id)
logger.Warnf(ctx, "Tag %v already exists for Artifact %v (idempotent)", tagName, cachedArtifact.Id)
}

logger.Errorf(ctx, "Failed to add tag %+v for artifact %+v, err: %+v", tagName, cachedArtifact.Id, err)
Expand Down