[protobuf] internal/benchmarks: make download_benchdata print an error

7 views
Skip to first unread message

Michael Stapelberg (Gerrit)

unread,
Nov 1, 2023, 6:54:48 AM11/1/23
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com

Michael Stapelberg has uploaded this change for review.

View Change

internal/benchmarks: make download_benchdata print an error

Currently, the script fails, and not with a good error message.

related to https://github.com/golang/protobuf/issues/1570

Change-Id: Ia27a895a7ae2f6349bb1262936e4428fa485bb92
---
M internal/benchmarks/download_benchdata.bash
1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/internal/benchmarks/download_benchdata.bash b/internal/benchmarks/download_benchdata.bash
index 30399e7..17f542a 100755
--- a/internal/benchmarks/download_benchdata.bash
+++ b/internal/benchmarks/download_benchdata.bash
@@ -7,11 +7,6 @@
mkdir -p .cache/benchdata
cd .cache/benchdata

-# Download small benchmark datasets.
-PROTOBUF_VERSION=v3.11.4
-curl -s -O https://raw.githubusercontent.com/protocolbuffers/protobuf/$PROTOBUF_VERSION/benchmarks/datasets/google_message1/proto2/dataset.google_message1_proto2.pb
-curl -s -O https://raw.githubusercontent.com/protocolbuffers/protobuf/$PROTOBUF_VERSION/benchmarks/datasets/google_message1/proto3/dataset.google_message1_proto3.pb
-curl -s -O https://raw.githubusercontent.com/protocolbuffers/protobuf/$PROTOBUF_VERSION/benchmarks/datasets/google_message2/dataset.google_message2.pb
-
-# Download large benchmark datasets.
-curl -s https://storage.googleapis.com/protobuf_opensource_benchmark_data/datasets.tar.gz | tar zx
+echo "This script needs to be updated to work with https://github.com/google/fleetbench" >&2
+echo "See https://github.com/golang/protobuf/issues/1570" >&2
+exit 1

To view, visit change 538955. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: newchange
Gerrit-Project: protobuf
Gerrit-Branch: master
Gerrit-Change-Id: Ia27a895a7ae2f6349bb1262936e4428fa485bb92
Gerrit-Change-Number: 538955
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Stapelberg <stape...@google.com>

Michael Stapelberg (Gerrit)

unread,
Nov 1, 2023, 10:48:25 AM11/1/23
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com

Attention is currently required from: Damien Neil, Lasse Folger.

Michael Stapelberg uploaded patch set #2 to this change.

View Change

internal/benchmarks: make download_benchdata print an error

Currently, the script fails, and not with a good error message.



Change-Id: Ia27a895a7ae2f6349bb1262936e4428fa485bb92
---
M internal/benchmarks/download_benchdata.bash
1 file changed, 3 insertions(+), 8 deletions(-)

To view, visit change 538955. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: newpatchset
Gerrit-Project: protobuf
Gerrit-Branch: master
Gerrit-Change-Id: Ia27a895a7ae2f6349bb1262936e4428fa485bb92
Gerrit-Change-Number: 538955
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Stapelberg <stape...@google.com>
Gerrit-Reviewer: Damien Neil <dn...@google.com>
Gerrit-Reviewer: Lasse Folger <lasse...@google.com>
Gerrit-Attention: Damien Neil <dn...@google.com>
Gerrit-Attention: Lasse Folger <lasse...@google.com>

Damien Neil (Gerrit)

unread,
Nov 1, 2023, 6:29:09 PM11/1/23
to Michael Stapelberg, goph...@pubsubhelper.golang.org, Lasse Folger, golang-co...@googlegroups.com

Attention is currently required from: Lasse Folger, Michael Stapelberg.

Patch set 2:Code-Review +2

View Change

    To view, visit change 538955. To unsubscribe, or for help writing mail filters, visit settings.

    Gerrit-MessageType: comment
    Gerrit-Project: protobuf
    Gerrit-Branch: master
    Gerrit-Change-Id: Ia27a895a7ae2f6349bb1262936e4428fa485bb92
    Gerrit-Change-Number: 538955
    Gerrit-PatchSet: 2
    Gerrit-Owner: Michael Stapelberg <stape...@google.com>
    Gerrit-Reviewer: Damien Neil <dn...@google.com>
    Gerrit-Reviewer: Lasse Folger <lasse...@google.com>
    Gerrit-Attention: Michael Stapelberg <stape...@google.com>
    Gerrit-Attention: Lasse Folger <lasse...@google.com>
    Gerrit-Comment-Date: Wed, 01 Nov 2023 22:29:06 +0000
    Gerrit-HasComments: No
    Gerrit-Has-Labels: Yes

    Lasse Folger (Gerrit)

    unread,
    Nov 3, 2023, 4:27:43 AM11/3/23
    to Michael Stapelberg, goph...@pubsubhelper.golang.org, Damien Neil, golang-co...@googlegroups.com

    Attention is currently required from: Michael Stapelberg.

    Patch set 2:Code-Review +2

    View Change

      To view, visit change 538955. To unsubscribe, or for help writing mail filters, visit settings.

      Gerrit-MessageType: comment
      Gerrit-Project: protobuf
      Gerrit-Branch: master
      Gerrit-Change-Id: Ia27a895a7ae2f6349bb1262936e4428fa485bb92
      Gerrit-Change-Number: 538955
      Gerrit-PatchSet: 2
      Gerrit-Owner: Michael Stapelberg <stape...@google.com>
      Gerrit-Reviewer: Damien Neil <dn...@google.com>
      Gerrit-Reviewer: Lasse Folger <lasse...@google.com>
      Gerrit-Attention: Michael Stapelberg <stape...@google.com>
      Gerrit-Comment-Date: Fri, 03 Nov 2023 08:27:36 +0000
      Gerrit-HasComments: No
      Gerrit-Has-Labels: Yes

      Lasse Folger (Gerrit)

      unread,
      Nov 3, 2023, 4:27:48 AM11/3/23
      to Michael Stapelberg, goph...@pubsubhelper.golang.org, golang-...@googlegroups.com, Damien Neil, golang-co...@googlegroups.com

      Lasse Folger submitted this change.

      View Change

      Approvals: Damien Neil: Looks good to me, approved Lasse Folger: Looks good to me, approved
      internal/benchmarks: make download_benchdata print an error

      Currently, the script fails, and not with a good error message.

      related to https://github.com/golang/protobuf/issues/1524

      Change-Id: Ia27a895a7ae2f6349bb1262936e4428fa485bb92
      Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/538955
      Reviewed-by: Damien Neil <dn...@google.com>
      Reviewed-by: Lasse Folger <lasse...@google.com>

      ---
      M internal/benchmarks/download_benchdata.bash
      1 file changed, 3 insertions(+), 8 deletions(-)

      diff --git a/internal/benchmarks/download_benchdata.bash b/internal/benchmarks/download_benchdata.bash
      index 30399e7..17f542a 100755
      --- a/internal/benchmarks/download_benchdata.bash
      +++ b/internal/benchmarks/download_benchdata.bash
      @@ -7,11 +7,6 @@
      mkdir -p .cache/benchdata
      cd .cache/benchdata

      -# Download small benchmark datasets.
      -PROTOBUF_VERSION=v3.11.4
      -curl -s -O https://raw.githubusercontent.com/protocolbuffers/protobuf/$PROTOBUF_VERSION/benchmarks/datasets/google_message1/proto2/dataset.google_message1_proto2.pb
      -curl -s -O https://raw.githubusercontent.com/protocolbuffers/protobuf/$PROTOBUF_VERSION/benchmarks/datasets/google_message1/proto3/dataset.google_message1_proto3.pb
      -curl -s -O https://raw.githubusercontent.com/protocolbuffers/protobuf/$PROTOBUF_VERSION/benchmarks/datasets/google_message2/dataset.google_message2.pb
      -
      -# Download large benchmark datasets.
      -curl -s https://storage.googleapis.com/protobuf_opensource_benchmark_data/datasets.tar.gz | tar zx
      +echo "This script needs to be updated to work with https://github.com/google/fleetbench" >&2
      +echo "See https://github.com/golang/protobuf/issues/1570" >&2
      +exit 1

      To view, visit change 538955. To unsubscribe, or for help writing mail filters, visit settings.

      Gerrit-MessageType: merged
      Gerrit-Project: protobuf
      Gerrit-Branch: master
      Gerrit-Change-Id: Ia27a895a7ae2f6349bb1262936e4428fa485bb92
      Gerrit-Change-Number: 538955
      Gerrit-PatchSet: 3
      Reply all
      Reply to author
      Forward
      0 new messages