Skip to content

Commit f847a7f

Browse files
paulosjcapaulosjca
committed
[benchmark] Delete references to node_purejs from performance benchmarks.
There is only one supported implementation for performance benchmarks, so the name is unified to `node` (previously `node_purejs`).
1 parent 7e63a2f commit f847a7f

File tree

7 files changed

+22
-56
lines changed

7 files changed

+22
-56
lines changed

‎tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ buildConfigs() {
111111
--prefix="${LOAD_TEST_PREFIX}" -u "${UNIQUE_IDENTIFIER}" -u "${pool}" \
112112
-a pool="${pool}" --category=scalable \
113113
--allow_client_language=c++ --allow_server_language=c++ \
114-
--allow_server_language=node \
115114
-o "loadtest_with_prebuilt_workers_${pool}.yaml"
116115
}
117116

@@ -141,7 +140,7 @@ configLangArgs32core+=( -l java )
141140
runnerLangArgs+=( -l "java:${GRPC_JAVA_REPO}:${GRPC_JAVA_COMMIT}" )
142141

143142
# node
144-
configLangArgs8core+=( -l node_purejs ) # 8-core only.
143+
configLangArgs8core+=( -l node ) # 8-core only.
145144
runnerLangArgs+=( -l "node:${GRPC_NODE_REPO}:${GRPC_NODE_COMMIT}" )
146145

147146
# python

‎tools/run_tests/performance/README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,26 @@ The following example counts scenarios in the `scalable` category:
3434
$ ./tools/run_tests/performance/scenario_config_exporter.py --count_scenarios --category=scalable
3535
Scenario count for all languages (category: scalable):
3636
Count Language Client Server Categories
37-
77 c++ scalable
37+
56 c++ scalable
3838
19 python_asyncio scalable
3939
16 java scalable
4040
12 go scalable
41-
12 node node scalable
42-
12 node_purejs node scalable
41+
12 node scalable
4342
9 csharp scalable
43+
9 dotnet scalable
4444
7 python scalable
4545
5 ruby scalable
4646
4 csharp c++ scalable
47+
4 dotnet c++ scalable
4748
4 php7 c++ scalable
4849
4 php7_protobuf_c c++ scalable
4950
3 python_asyncio c++ scalable
5051
2 ruby c++ scalable
5152
2 python c++ scalable
5253
1 csharp c++ scalable
54+
1 dotnet c++ scalable
5355
54-
189 total scenarios (category: scalable)
56+
170 total scenarios (category: scalable)
5557
```
5658

5759
Client and server languages are only set for cross-language scenarios, where the

‎tools/run_tests/performance/build_performance.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ do
6666
# See https://github.com/grpc/grpc/issues/11581
6767
(cd third_party/zlib; git checkout zconf.h)
6868
;;
69-
"node"|"node_purejs")
69+
"node")
7070
tools/run_tests/performance/build_performance_node.sh
7171
;;
7272
"python")

‎tools/run_tests/performance/loadtest_config.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@
4747

4848
def safe_name(language: str) -> str:
4949
"""Returns a name that is safe to use in labels and file names."""
50-
# The language "node_purejs" differs from "node" only in the scenarios
51-
# covered, so it is treated the same as "node".
52-
if language == "node_purejs":
53-
return scenario_config.LANGUAGES["node"].safename
5450
return scenario_config.LANGUAGES[language].safename
5551

5652

‎tools/run_tests/performance/loadtest_examples.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ basic_example() {
105105
-s client_pool= -s server_pool= -s big_query_table= \
106106
-s timeout_seconds=900 --prefix=examples -u basic -r "^${scenario}$" \
107107
--allow_client_language=c++ --allow_server_language=c++ \
108-
--allow_server_language=node \
109108
-o "${outputdir}/${outputfile}"
110109
echo "Created example: ${outputdir}/${outputfile}"
111110
}
@@ -127,7 +126,6 @@ prebuilt_example() {
127126
-s prebuilt_image_tag="\${prebuilt_image_tag}" --prefix=examples -u prebuilt \
128127
-a pool="\${workers_pool}" -r "^${scenario}$" \
129128
--allow_client_language=c++ --allow_server_language=c++ \
130-
--allow_server_language=node \
131129
-o "${outputdir}/${outputfile}"
132130
echo "Created example: ${outputdir}/${outputfile}"
133131
}
@@ -150,7 +148,6 @@ psm_basic_example() {
150148
-s timeout_seconds=900 --prefix=psm-examples -u "${uniquifier}" -r "^${scenario}$" \
151149
-a enablePrometheus=true \
152150
--allow_client_language=c++ --allow_server_language=c++ \
153-
--allow_server_language=node \
154151
--client_channels=8 \
155152
--category=psm \
156153
--server_threads=16 \
@@ -181,7 +178,6 @@ psm_prebuilt_example() {
181178
-a pool="\${workers_pool}" \
182179
-a enablePrometheus=true \
183180
--allow_client_language=c++ --allow_server_language=c++ \
184-
--allow_server_language=node \
185181
--client_channels=8 \
186182
--category=psm \
187183
--server_threads=16 \

‎tools/run_tests/performance/scenario_config.py

Lines changed: 13 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1659,33 +1659,23 @@ def __str__(self):
16591659

16601660

16611661
class NodeLanguage(Language):
1662-
def __init__(self, node_purejs=False):
1663-
super().__init__()
1664-
self.node_purejs = node_purejs
1665-
16661662
def worker_cmdline(self):
1667-
fixture = "native_js" if self.node_purejs else "native_native"
1663+
fixture = "native_js"
16681664
return [
16691665
"tools/run_tests/performance/run_worker_node.sh",
16701666
fixture,
16711667
"--benchmark_impl=grpc",
16721668
]
16731669

16741670
def worker_port_offset(self):
1675-
if self.node_purejs:
1676-
return 1100
1677-
return 1000
1671+
return 1100
16781672

16791673
def scenarios(self):
1680-
node_implementation = "node_purejs" if self.node_purejs else "node"
1681-
16821674
yield _ping_pong_scenario(
1683-
"%s_to_node_protobuf_async_unary_5000rpcs_1KB_psm"
1684-
% (node_implementation),
1675+
"node_to_node_protobuf_async_unary_5000rpcs_1KB_psm",
16851676
rpc_type="UNARY",
16861677
client_type="ASYNC_CLIENT",
16871678
server_type="ASYNC_SERVER",
1688-
server_language="node",
16891679
req_size=1024,
16901680
resp_size=1024,
16911681
outstanding=5000,
@@ -1701,72 +1691,63 @@ def scenarios(self):
17011691
smoketest_categories = ([SMOKETEST] if secure else []) + [SCALABLE]
17021692

17031693
yield _ping_pong_scenario(
1704-
"%s_to_node_generic_async_streaming_ping_pong_%s"
1705-
% (node_implementation, secstr),
1694+
"node_to_node_generic_async_streaming_ping_pong_%s" % secstr,
17061695
rpc_type="STREAMING",
17071696
client_type="ASYNC_CLIENT",
17081697
server_type="ASYNC_GENERIC_SERVER",
1709-
server_language="node",
17101698
use_generic_payload=True,
17111699
async_server_threads=1,
17121700
secure=secure,
17131701
categories=smoketest_categories,
17141702
)
17151703

17161704
yield _ping_pong_scenario(
1717-
"%s_to_node_protobuf_async_streaming_ping_pong_%s"
1718-
% (node_implementation, secstr),
1705+
"node_to_node_protobuf_async_streaming_ping_pong_%s" % secstr,
17191706
rpc_type="STREAMING",
17201707
client_type="ASYNC_CLIENT",
17211708
server_type="ASYNC_SERVER",
1722-
server_language="node",
17231709
async_server_threads=1,
17241710
secure=secure,
17251711
)
17261712

17271713
yield _ping_pong_scenario(
1728-
"%s_to_node_protobuf_async_unary_ping_pong_%s"
1729-
% (node_implementation, secstr),
1714+
"node_to_node_protobuf_async_unary_ping_pong_%s" % secstr,
17301715
rpc_type="UNARY",
17311716
client_type="ASYNC_CLIENT",
17321717
server_type="ASYNC_SERVER",
1733-
server_language="node",
17341718
async_server_threads=1,
17351719
secure=secure,
17361720
categories=smoketest_categories,
17371721
)
17381722

17391723
yield _ping_pong_scenario(
1740-
"%s_to_node_protobuf_async_unary_qps_unconstrained_%s"
1741-
% (node_implementation, secstr),
1724+
"node_to_node_protobuf_async_unary_qps_unconstrained_%s"
1725+
% secstr,
17421726
rpc_type="UNARY",
17431727
client_type="ASYNC_CLIENT",
17441728
server_type="ASYNC_SERVER",
1745-
server_language="node",
17461729
unconstrained_client="async",
17471730
secure=secure,
17481731
categories=smoketest_categories + [SCALABLE],
17491732
)
17501733

17511734
yield _ping_pong_scenario(
1752-
"%s_to_node_protobuf_async_streaming_qps_unconstrained_%s"
1753-
% (node_implementation, secstr),
1735+
"node_to_node_protobuf_async_streaming_qps_unconstrained_%s"
1736+
% secstr,
17541737
rpc_type="STREAMING",
17551738
client_type="ASYNC_CLIENT",
17561739
server_type="ASYNC_SERVER",
1757-
server_language="node",
17581740
unconstrained_client="async",
17591741
secure=secure,
17601742
categories=[SCALABLE],
17611743
)
17621744

17631745
yield _ping_pong_scenario(
1764-
"%s_to_node_generic_async_streaming_qps_unconstrained_%s"
1765-
% (node_implementation, secstr),
1746+
"node_to_node_generic_async_streaming_qps_unconstrained_%s"
1747+
% secstr,
17661748
rpc_type="STREAMING",
17671749
client_type="ASYNC_CLIENT",
17681750
server_type="ASYNC_GENERIC_SERVER",
1769-
server_language="node",
17701751
unconstrained_client="async",
17711752
use_generic_payload=True,
17721753
secure=secure,
@@ -1776,8 +1757,6 @@ def scenarios(self):
17761757
# TODO(murgatroid99): add scenarios node vs C++
17771758

17781759
def __str__(self):
1779-
if self.node_purejs:
1780-
return "node_purejs"
17811760
return "node"
17821761

17831762

@@ -1792,6 +1771,5 @@ def __str__(self):
17921771
"python": PythonLanguage(),
17931772
"python_asyncio": PythonAsyncIOLanguage(),
17941773
"go": GoLanguage(),
1795-
"node": NodeLanguage(),
1796-
"node_purejs": NodeLanguage(node_purejs=True),
1774+
"node": NodeLanguage(), # 'node' means 'node_purejs'.
17971775
}

‎tools/run_tests/run_performance_tests.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,11 @@
2020
import collections
2121
import itertools
2222
import json
23-
import multiprocessing
2423
import os
2524
import pipes
2625
import re
27-
import subprocess
2826
import sys
29-
import tempfile
3027
import time
31-
import traceback
32-
import uuid
3328

3429
import six
3530

@@ -216,7 +211,7 @@ def archive_repo(languages):
216211
cmdline.append("../grpc-java")
217212
if "go" in languages:
218213
cmdline.append("../grpc-go")
219-
if "node" in languages or "node_purejs" in languages:
214+
if "node" in languages:
220215
cmdline.append("../grpc-node")
221216

222217
archive_job = jobset.JobSpec(

0 commit comments

Comments
 (0)