[
https://issues.apache.org/jira/browse/BEAM-12140?focusedWorklogId=590705&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-590705
]
ASF GitHub Bot logged work on BEAM-12140:
-----------------------------------------
Author: ASF GitHub Bot
Created on: 28/Apr/21 22:02
Start Date: 28/Apr/21 22:02
Worklog Time Spent: 10m
Work Description: robertwb commented on a change in pull request #14491:
URL: https://github.com/apache/beam/pull/14491#discussion_r622593537
##########
File path: sdks/python/apache_beam/runners/dataflow/internal/apiclient.py
##########
@@ -588,11 +589,26 @@ def _stage_resources(self, pipeline, options):
'Found duplicated artifact: %s (%s)',
type_payload.path,
type_payload.sha256)
+ staged_name = hashs[type_payload.sha256]
Review comment:
Nit: the plural of hash is hashes.
##########
File path: sdks/python/apache_beam/runners/dataflow/internal/apiclient.py
##########
@@ -588,11 +588,25 @@ def _stage_resources(self, pipeline, options):
'Found duplicated artifact: %s (%s)',
type_payload.path,
type_payload.sha256)
+ staged_name = hashs[type_payload.sha256]
dep.role_payload = beam_runner_api_pb2.ArtifactStagingToRolePayload(
- staged_name=hashs[type_payload.sha256]).SerializeToString()
+ staged_name=staged_name).SerializeToString()
else:
- resources.append((type_payload.path, role_payload.staged_name))
- hashs[type_payload.sha256] = role_payload.staged_name
+ staged_name = role_payload.staged_name
+ resources.append((type_payload.path, staged_name))
+ hashs[type_payload.sha256] = staged_name
+
+ if google_cloud_options.staging_location.startswith('gs://'):
+ dep.type_urn = common_urns.artifact_types.URL.urn
+ dep.type_payload = beam_runner_api_pb2.ArtifactUrlPayload(
+ url=FileSystems.join(
+ google_cloud_options.staging_location,
+ staged_name)).SerializeToString()
+ else:
+ dep.type_payload = beam_runner_api_pb2.ArtifactFilePayload(
Review comment:
I think ArtifactFilePayload should be used for anything that FileSystems
understands. URL would be used for artifacts on systems like PyPy, Maven
Central, etc.
##########
File path: sdks/python/apache_beam/runners/dataflow/internal/apiclient.py
##########
@@ -588,11 +588,25 @@ def _stage_resources(self, pipeline, options):
'Found duplicated artifact: %s (%s)',
type_payload.path,
type_payload.sha256)
+ staged_name = hashs[type_payload.sha256]
dep.role_payload = beam_runner_api_pb2.ArtifactStagingToRolePayload(
- staged_name=hashs[type_payload.sha256]).SerializeToString()
+ staged_name=staged_name).SerializeToString()
else:
- resources.append((type_payload.path, role_payload.staged_name))
- hashs[type_payload.sha256] = role_payload.staged_name
+ staged_name = role_payload.staged_name
+ resources.append((type_payload.path, staged_name))
+ hashs[type_payload.sha256] = staged_name
+
+ if google_cloud_options.staging_location.startswith('gs://'):
+ dep.type_urn = common_urns.artifact_types.URL.urn
+ dep.type_payload = beam_runner_api_pb2.ArtifactUrlPayload(
+ url=FileSystems.join(
+ google_cloud_options.staging_location,
+ staged_name)).SerializeToString()
+ else:
+ dep.type_payload = beam_runner_api_pb2.ArtifactFilePayload(
Review comment:
Also, keeping the hash around for validation (as we can do with file) is
good too.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 590705)
Time Spent: 2h 50m (was: 2h 40m)
> Update artifact information when staging artifacts to gcs for Dataflow
> ----------------------------------------------------------------------
>
> Key: BEAM-12140
> URL: https://issues.apache.org/jira/browse/BEAM-12140
> Project: Beam
> Issue Type: Improvement
> Components: cross-language, runner-dataflow
> Reporter: Heejong Lee
> Assignee: Heejong Lee
> Priority: P2
> Time Spent: 2h 50m
> Remaining Estimate: 0h
>
> Update artifact information when staging artifacts to gcs for Dataflow
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
