This is an automated email from the ASF dual-hosted git repository. pabloem pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push: new 02460e2 [BEAM-13737][Playground] Update logic of receiving precompiled objects; Increase timeout; new 0c587e3 Merge pull request #16620 from [BEAM-13737][Playground] Local retrieving of example objects may fail with context deadline 02460e2 is described below commit 02460e28d010d6b27b918e0e421849835e2ddf49 Author: AydarZaynutdinov <aydar.zaynutdi...@akvelon.com> AuthorDate: Wed Jan 26 16:04:46 2022 +0300 [BEAM-13737][Playground] Update logic of receiving precompiled objects; Increase timeout; --- .../backend/internal/cloud_bucket/precompiled_objects.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/playground/backend/internal/cloud_bucket/precompiled_objects.go b/playground/backend/internal/cloud_bucket/precompiled_objects.go index 4d36369..cb7cd10 100644 --- a/playground/backend/internal/cloud_bucket/precompiled_objects.go +++ b/playground/backend/internal/cloud_bucket/precompiled_objects.go @@ -36,7 +36,7 @@ const ( OutputExtension = "output" LogsExtension = "log" MetaInfoName = "meta.info" - Timeout = time.Second * 10 + Timeout = time.Minute javaExtension = "java" goExtension = "go" pyExtension = "py" @@ -146,6 +146,7 @@ func (cd *CloudStorage) GetPrecompiledObjects(ctx context.Context, targetSdk pb. if err != nil { return nil, err } + metaFiles := make(map[string][]byte, 0) for objectDir := range dirs { infoPath := filepath.Join(objectDir, MetaInfoName) // helping file with information about this object rc, err := bucket.Object(infoPath).NewReader(ctx) @@ -153,13 +154,18 @@ func (cd *CloudStorage) GetPrecompiledObjects(ctx context.Context, targetSdk pb. logger.Errorf("Object(%q).NewReader: %v", infoPath, err.Error()) continue } - data, err := ioutil.ReadAll(rc) + metaFile, err := ioutil.ReadAll(rc) if err != nil { logger.Errorf("ioutil.ReadAll: %v", err.Error()) continue } + metaFiles[objectDir] = metaFile + rc.Close() + } + + for objectDir, metaFile := range metaFiles { precompiledObject := ObjectInfo{} - err = json.Unmarshal(data, &precompiledObject) + err = json.Unmarshal(metaFile, &precompiledObject) if err != nil { logger.Errorf("json.Unmarshal: %v", err.Error()) continue @@ -169,7 +175,6 @@ func (cd *CloudStorage) GetPrecompiledObjects(ctx context.Context, targetSdk pb. appendPrecompiledObject(precompiledObject, &precompiledObjects, objectDir, objectCategory) } } - rc.Close() } return &precompiledObjects, nil }