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]
