From 8459b13ab3ea9ad1fb4b7ab3f09b044e7767a4c8 Mon Sep 17 00:00:00 2001 From: Alex Leach Date: Fri, 18 Jun 2021 13:32:53 +0000 Subject: [PATCH] Remove any refererence to `traefik_toml` or `TraefikTomlProxy` from the documentation, examples and performance test suite. These are replaced by `traefik_file` and `TraefikFileProviderProxy`, respectively. --- README.md | 2 +- docs/source/api/index.rst | 4 +- docs/source/index.rst | 4 +- docs/source/install.md | 14 +++--- ...nfig_toml.py => jupyterhub_config_file.py} | 10 ++--- performance/ProxyPerformance.ipynb | 44 +++++++++---------- performance/perf_utils.py | 16 +++---- performance/run_benchmark.sh | 10 ++--- performance/run_benchmark_sequential.sh | 4 +- 9 files changed, 54 insertions(+), 54 deletions(-) rename examples/{jupyterhub_config_toml.py => jupyterhub_config_file.py} (55%) diff --git a/README.md b/README.md index 6dbc2782..5d0fadf7 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ The [documentation](https://jupyterhub-traefik-proxy.readthedocs.io) contains a guide](https://jupyterhub-traefik-proxy.readthedocs.io/en/latest/install.html) with examples for the three different implementations. -* [For TraefikFileProviderProxy](https://jupyterhub-traefik-proxy.readthedocs.io/en/latest/toml.html#example-setup) +* [For TraefikFileProviderProxy](https://jupyterhub-traefik-proxy.readthedocs.io/en/latest/file.html#example-setup) * [For TraefikEtcdProxy](https://jupyterhub-traefik-proxy.readthedocs.io/en/latest/etcd.html#example-setup) * [For TraefikConsulProxy](https://jupyterhub-traefik-proxy.readthedocs.io/en/latest/consul.html#example-setup) diff --git a/docs/source/api/index.rst b/docs/source/api/index.rst index 8579deac..08896f54 100644 --- a/docs/source/api/index.rst +++ b/docs/source/api/index.rst @@ -15,10 +15,10 @@ Module: :mod:`jupyterhub_traefik_proxy` .. autoconfigurable:: TraefikProxy :members: -:class:`TraefikTomlProxy` +:class:`TraefikFileProviderProxy` ------------------------- -.. autoconfigurable:: TraefikTomlProxy +.. autoconfigurable:: TraefikFileProviderProxy :members: :class:`TKvProxy` diff --git a/docs/source/index.rst b/docs/source/index.rst index d4750855..0f73a31e 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -20,7 +20,7 @@ Moreover it offers *HTTPS* support through a straight-forward `ACME (Let's Encry There are three versions for the proxy, depending on how traefik stores the routes: * *for* **smaller**, *single-node deployments*: - * TraefikTomlProxy + * TraefikFileProviderProxy * *for* **distributed** *setups*: * TraefikEtcdProxy * TraefikConsulProxy @@ -39,7 +39,7 @@ Getting Started .. toctree:: :maxdepth: 1 - toml + fileprovider etcd consul diff --git a/docs/source/install.md b/docs/source/install.md index af1dd013..d5ea9858 100644 --- a/docs/source/install.md +++ b/docs/source/install.md @@ -69,7 +69,7 @@ ## Enabling traefik-proxy in JupyterHub -[TraefikTomlProxy](https://github.com/jupyterhub/traefik-proxy/blob/master/jupyterhub_traefik_proxy/toml.py), [TraefikEtcdProxy](https://github.com/jupyterhub/traefik-proxy/blob/master/jupyterhub_traefik_proxy/etcd.py) and [TraefikConsulProxy](https://github.com/jupyterhub/traefik-proxy/blob/master/jupyterhub_traefik_proxy/consul.py) are custom proxy implementations that subclass [Proxy](https://github.com/jupyterhub/jupyterhub/blob/master/jupyterhub/proxy.py) and can register in JupyterHub config using `c.JupyterHub.proxy_class` entrypoint. +[TraefikFileProviderProxy](https://github.com/jupyterhub/traefik-proxy/blob/Traefik_v2/jupyterhub_traefik_proxy/fileprovider.py), [TraefikEtcdProxy](https://github.com/jupyterhub/traefik-proxy/blob/Traefik_v2/jupyterhub_traefik_proxy/etcd.py) and [TraefikConsulProxy](https://github.com/jupyterhub/traefik-proxy/blob/Traefik_v2/jupyterhub_traefik_proxy/consul.py) are custom proxy implementations that subclass [Proxy](https://github.com/jupyterhub/jupyterhub/blob/Traefik_v2/jupyterhub/proxy.py) and can register in JupyterHub config using `c.JupyterHub.proxy_class` entrypoint. On startup, JupyterHub will look by default for a configuration file, *jupyterhub_config.py*, in the current working directory. If the configuration file is not in the current working directory, you can load a specific config file and start JupyterHub using: @@ -78,13 +78,13 @@ you can load a specific config file and start JupyterHub using: $ jupyterhub -f /path/to/jupyterhub_config.py ``` -There is an example configuration file [here](https://github.com/jupyterhub/traefik-proxy/blob/master/examples/jupyterhub_config.py) that configures JupyterHub to run with *TraefikEtcdProxy* as the proxy and uses dummyauthenticator and simplespawner to enable testing without administrative privileges. +There is an example configuration file [here](https://github.com/jupyterhub/traefik-proxy/blob/Traefik_v2/examples/jupyterhub_config.py) that configures JupyterHub to run with *TraefikEtcdProxy* as the proxy and uses dummyauthenticator and simplespawner to enable testing without administrative privileges. In *jupyterhub_config.py*: ``` -c.JupyterHub.proxy_class = "traefik_toml" -# will configure JupyterHub to run with TraefikTomlProxy +c.JupyterHub.proxy_class = "traefik_file" +# will configure JupyterHub to run with TraefikFileProviderProxy ``` ``` @@ -110,9 +110,9 @@ c.JupyterHub.proxy_class = "traefik_consul" The port on which traefik-proxy's api will run, as well as the username and password used for authenticating, can be passed to the proxy through `jupyterhub_config.py`, e.g.: ``` - c.TraefikTomlProxy.traefik_api_url = "http://127.0.0.1:8099" - c.TraefikTomlProxy.traefik_api_password = "admin" - c.TraefikTomlProxy.traefik_api_username = "admin" + c.TraefikFileProviderProxy.traefik_api_url = "http://127.0.0.1:8099" + c.TraefikFileProviderProxy.traefik_api_password = "admin" + c.TraefikFileProviderProxy.traefik_api_username = "admin" ``` Check out TraefikProxy's **API Reference** for more configuration options.

diff --git a/examples/jupyterhub_config_toml.py b/examples/jupyterhub_config_file.py similarity index 55% rename from examples/jupyterhub_config_toml.py rename to examples/jupyterhub_config_file.py index b17ca1f3..927ea54d 100644 --- a/examples/jupyterhub_config_toml.py +++ b/examples/jupyterhub_config_file.py @@ -1,6 +1,6 @@ """sample jupyterhub config file for testing -configures jupyterhub to run with traefik_toml. +configures jupyterhub to run with traefik_file. configures jupyterhub with dummyauthenticator and simplespawner to enable testing without administrative privileges. @@ -8,10 +8,10 @@ requires jupyterhub 1.0.dev """ -c.JupyterHub.proxy_class = "traefik_toml" -c.TraefikTomlProxy.traefik_api_username = "admin" -c.TraefikTomlProxy.traefik_api_password = "admin" -c.TraefikTomlProxy.traefik_log_level = "INFO" +c.JupyterHub.proxy_class = "traefik_file" +c.TraefikFileProviderProxy.traefik_api_username = "admin" +c.TraefikFileProviderProxy.traefik_api_password = "admin" +c.TraefikFileProviderProxy.traefik_log_level = "INFO" # use dummy and simple auth/spawner for testing c.JupyterHub.authenticator_class = "dummy" diff --git a/performance/ProxyPerformance.ipynb b/performance/ProxyPerformance.ipynb index 24305ecf..7c09b475 100644 --- a/performance/ProxyPerformance.ipynb +++ b/performance/ProxyPerformance.ipynb @@ -31,14 +31,14 @@ "metadata": {}, "outputs": [], "source": [ - "toml_df_concurrent = pd.read_csv('~/results/toml_methods_concurrent.csv')\n", + "file_df_concurrent = pd.read_csv('~/results/file_methods_concurrent.csv')\n", "etcd_df_concurrent = pd.read_csv('~/results/etcd_methods_concurrent.csv')\n", "chp_df_concurrent = pd.read_csv('~/results/chp_methods_concurrent.csv')\n", "consul_df_concurrent = pd.read_csv('~/results/consul_methods_concurrent.csv')\n", "patched_consul_df_concurrent = pd.read_csv('~/results/patched_consul_methods_concurrent.csv')\n", "patched_consul_df_concurrent = patched_consul_df_concurrent.replace('ConsulProxy', 'PatchedConsulProxy')\n", "\n", - "frames = [toml_df_concurrent, etcd_df_concurrent, consul_df_concurrent,\n", + "frames = [file_df_concurrent, etcd_df_concurrent, consul_df_concurrent,\n", " patched_consul_df_concurrent, chp_df_concurrent]\n", "proxies_df_concurrent = pd.concat(frames)" ] @@ -179,7 +179,7 @@ ], "source": [ "fig, ax = plt.subplots()\n", - "plot_proxy_method_perf(ax, proxies_df_concurrent, \"TomlProxy\", \"add\", \"concurrent\")\n", + "plot_proxy_method_perf(ax, proxies_df_concurrent, \"FileProviderProxy\", \"add\", \"concurrent\")\n", "plt.gca().set_ylabel(\"Time (s)\")\n", "\n", "fig, ax = plt.subplots()\n", @@ -301,7 +301,7 @@ ], "source": [ "fig, ax = plt.subplots()\n", - "plot_proxy_method_perf(ax, proxies_df_concurrent, \"TomlProxy\", \"delete\", \"concurrent\")\n", + "plot_proxy_method_perf(ax, proxies_df_concurrent, \"FileProviderProxy\", \"delete\", \"concurrent\")\n", "plt.gca().set_ylabel(\"Time (s)\")\n", "\n", "fig, ax = plt.subplots()\n", @@ -421,7 +421,7 @@ ], "source": [ "fig, ax = plt.subplots()\n", - "plot_proxy_method_perf(ax, proxies_df_concurrent, \"TomlProxy\", \"get_all\", \"concurrent\")\n", + "plot_proxy_method_perf(ax, proxies_df_concurrent, \"FileProviderProxy\", \"get_all\", \"concurrent\")\n", "plt.gca().set_xlabel(\"Iteration no\")\n", "plt.gca().set_ylabel(\"Time (s)\")\n", "\n", @@ -459,7 +459,7 @@ "metadata": {}, "outputs": [], "source": [ - "toml_df_seq = pd.read_csv('~/results/toml_methods_sequential.csv')\n", + "file_df_seq = pd.read_csv('~/results/file_methods_sequential.csv')\n", "etcd_df_seq = pd.read_csv('~/results/etcd_methods_sequential.csv')\n", "chp_df_seq = pd.read_csv('~/results/chp_methods_sequential.csv')\n", "consul_df_seq = pd.read_csv('~/results/consul_methods_sequential.csv')\n", @@ -467,7 +467,7 @@ "patched_consul_df_seq = patched_consul_df_seq.replace('ConsulProxy', 'PatchedConsulProxy')\n", "\n", "\n", - "frames = [toml_df_seq, etcd_df_seq, consul_df_seq, patched_consul_df_seq, chp_df_seq]\n", + "frames = [file_df_seq, etcd_df_seq, consul_df_seq, patched_consul_df_seq, chp_df_seq]\n", "proxies_df_seq = pd.concat(frames)" ] }, @@ -579,7 +579,7 @@ ], "source": [ "fig, ax = plt.subplots()\n", - "plot_proxy_method_perf(ax, proxies_df_seq, \"TomlProxy\", \"add\", \"sequential\")\n", + "plot_proxy_method_perf(ax, proxies_df_seq, \"FileProviderProxy\", \"add\", \"sequential\")\n", "plt.gca().set_ylabel(\"Time (s)\")\n", "\n", "fig, ax = plt.subplots()\n", @@ -703,7 +703,7 @@ ], "source": [ "fig, ax = plt.subplots()\n", - "plot_proxy_method_perf(ax, proxies_df_seq, \"TomlProxy\", \"delete\", \"sequential\")\n", + "plot_proxy_method_perf(ax, proxies_df_seq, \"FileProviderProxy\", \"delete\", \"sequential\")\n", "plt.gca().invert_xaxis()\n", "plt.gca().set_ylabel(\"Time (s)\")\n", "\n", @@ -815,7 +815,7 @@ ], "source": [ "fig, ax = plt.subplots()\n", - "plot_proxy_method_perf(ax, proxies_df_seq, \"TomlProxy\", \"get_all\", \"sequential\")\n", + "plot_proxy_method_perf(ax, proxies_df_seq, \"FileProviderProxy\", \"get_all\", \"sequential\")\n", "plt.gca().set_ylabel(\"Time (s)\")\n", "\n", "fig, ax = plt.subplots()\n", @@ -1105,52 +1105,52 @@ "%matplotlib inline\n", "fig, ax = plt.subplots()\n", "plot_proxy_method_perf(ax, proxies_df_seq, \"CHP\", \"add\", \"sequential\", \"Proxies\", \"cpu_time\", \"blue\")\n", - "plot_proxy_method_perf(ax, proxies_df_seq, \"TomlProxy\", \"add\", \"sequential\", \"Proxies\", \"cpu_time\", \"orange\")\n", + "plot_proxy_method_perf(ax, proxies_df_seq, \"FileProviderProxy\", \"add\", \"sequential\", \"Proxies\", \"cpu_time\", \"orange\")\n", "plot_proxy_method_perf(ax, proxies_df_seq, \"EtcdProxy\", \"add\", \"sequential\", \"Proxies\", \"cpu_time\", \"green\")\n", "plot_proxy_method_perf(ax, proxies_df_seq, \"ConsulProxy\", \"add\", \"sequential\", \"Proxies\", \"cpu_time\", \"red\")\n", - "plt.gca().legend(('CHP','TomlProxy', 'EtcdProxy', 'ConsulProxy'))\n", + "plt.gca().legend(('CHP','FileProviderProxy', 'EtcdProxy', 'ConsulProxy'))\n", "plt.gca().set_ylabel(\"CPU Time (s)\")\n", "\n", "fig, ax = plt.subplots()\n", "plot_proxy_method_perf(ax, proxies_df_concurrent, \"CHP\", \"add\", \"concurrent\", \"Proxies\", \"cpu_time\", \"blue\")\n", - "plot_proxy_method_perf(ax, proxies_df_concurrent, \"TomlProxy\", \"add\", \"concurrent\", \"Proxies\", \"cpu_time\", \"orange\")\n", + "plot_proxy_method_perf(ax, proxies_df_concurrent, \"FileProviderProxy\", \"add\", \"concurrent\", \"Proxies\", \"cpu_time\", \"orange\")\n", "plot_proxy_method_perf(ax, proxies_df_concurrent, \"EtcdProxy\", \"add\", \"concurrent\", \"Proxies\", \"cpu_time\", \"green\")\n", "plot_proxy_method_perf(ax, proxies_df_concurrent, \"ConsulProxy\", \"add\", \"concurrent\", \"Proxies\", \"cpu_time\", \"red\")\n", - "plt.gca().legend(('CHP','TomlProxy', 'EtcdProxy', 'ConsulProxy'))\n", + "plt.gca().legend(('CHP','FileProviderProxy', 'EtcdProxy', 'ConsulProxy'))\n", "plt.gca().set_ylabel(\"CPU Time (s)\")\n", "\n", "#DELETE\n", "fig, ax = plt.subplots()\n", "plot_proxy_method_perf(ax, proxies_df_seq, \"CHP\", \"delete\", \"sequential\", \"Proxies\", \"cpu_time\", \"blue\")\n", - "plot_proxy_method_perf(ax, proxies_df_seq, \"TomlProxy\", \"delete\", \"sequential\", \"Proxies\", \"cpu_time\", \"orange\")\n", + "plot_proxy_method_perf(ax, proxies_df_seq, \"FileProviderProxy\", \"delete\", \"sequential\", \"Proxies\", \"cpu_time\", \"orange\")\n", "plot_proxy_method_perf(ax, proxies_df_seq, \"EtcdProxy\", \"delete\", \"sequential\", \"Proxies\", \"cpu_time\", \"green\")\n", "plot_proxy_method_perf(ax, proxies_df_seq, \"ConsulProxy\", \"delete\", \"sequential\", \"Proxies\", \"cpu_time\", \"red\")\n", - "plt.gca().legend(('CHP','TomlProxy', 'EtcdProxy', 'ConsulProxy'))\n", + "plt.gca().legend(('CHP','FileProviderProxy', 'EtcdProxy', 'ConsulProxy'))\n", "plt.gca().set_ylabel(\"CPU Time (s)\")\n", "\n", "fig, ax = plt.subplots()\n", "plot_proxy_method_perf(ax, proxies_df_concurrent, \"CHP\", \"delete\", \"concurrent\", \"Proxies\", \"cpu_time\", \"blue\")\n", - "plot_proxy_method_perf(ax, proxies_df_concurrent, \"TomlProxy\", \"delete\", \"concurrent\", \"Proxies\", \"cpu_time\", \"orange\")\n", + "plot_proxy_method_perf(ax, proxies_df_concurrent, \"FileProviderProxy\", \"delete\", \"concurrent\", \"Proxies\", \"cpu_time\", \"orange\")\n", "plot_proxy_method_perf(ax, proxies_df_concurrent, \"EtcdProxy\", \"delete\", \"concurrent\", \"Proxies\", \"cpu_time\", \"green\")\n", "plot_proxy_method_perf(ax, proxies_df_concurrent, \"ConsulProxy\", \"delete\", \"concurrent\", \"Proxies\", \"cpu_time\", \"red\")\n", - "plt.gca().legend(('CHP','TomlProxy', 'EtcdProxy', 'ConsulProxy'))\n", + "plt.gca().legend(('CHP','FileProviderProxy', 'EtcdProxy', 'ConsulProxy'))\n", "plt.gca().set_ylabel(\"CPU Time (s)\")\n", "\n", "#Get all\n", "fig, ax = plt.subplots()\n", "plot_proxy_method_perf(ax, proxies_df_seq, \"CHP\", \"get_all\", \"sequential\", \"Proxies\", \"cpu_time\", \"blue\")\n", - "plot_proxy_method_perf(ax, proxies_df_seq, \"TomlProxy\", \"get_all\", \"sequential\", \"Proxies\", \"cpu_time\", \"orange\")\n", + "plot_proxy_method_perf(ax, proxies_df_seq, \"FileProviderProxy\", \"get_all\", \"sequential\", \"Proxies\", \"cpu_time\", \"orange\")\n", "plot_proxy_method_perf(ax, proxies_df_seq, \"EtcdProxy\", \"get_all\", \"sequential\", \"Proxies\", \"cpu_time\", \"green\")\n", "plot_proxy_method_perf(ax, proxies_df_seq, \"ConsulProxy\", \"get_all\", \"sequential\", \"Proxies\", \"cpu_time\", \"red\")\n", - "plt.gca().legend(('CHP','TomlProxy', 'EtcdProxy', 'ConsulProxy'))\n", + "plt.gca().legend(('CHP','FileProviderProxy', 'EtcdProxy', 'ConsulProxy'))\n", "plt.gca().set_ylabel(\"CPU Time (s)\")\n", "\n", "fig, ax = plt.subplots()\n", "plot_proxy_method_perf(ax, proxies_df_concurrent, \"CHP\", \"get_all\", \"concurrent\", \"Proxies\", \"cpu_time\", \"blue\")\n", - "plot_proxy_method_perf(ax, proxies_df_concurrent, \"TomlProxy\", \"get_all\", \"concurrent\", \"Proxies\", \"cpu_time\", \"orange\")\n", + "plot_proxy_method_perf(ax, proxies_df_concurrent, \"FileProviderProxy\", \"get_all\", \"concurrent\", \"Proxies\", \"cpu_time\", \"orange\")\n", "plot_proxy_method_perf(ax, proxies_df_concurrent, \"EtcdProxy\", \"get_all\", \"concurrent\", \"Proxies\", \"cpu_time\", \"green\")\n", "plot_proxy_method_perf(ax, proxies_df_concurrent, \"ConsulProxy\", \"get_all\", \"concurrent\", \"Proxies\", \"cpu_time\", \"red\")\n", - "plt.gca().legend(('CHP','TomlProxy', 'EtcdProxy', \"ConsulProxy\"))\n", + "plt.gca().legend(('CHP','FileProviderProxy', 'EtcdProxy', \"ConsulProxy\"))\n", "plt.gca().set_ylabel(\"CPU Time (s)\")" ] }, diff --git a/performance/perf_utils.py b/performance/perf_utils.py index 12ff21d0..fa5f62bc 100644 --- a/performance/perf_utils.py +++ b/performance/perf_utils.py @@ -10,7 +10,7 @@ from jupyterhub.proxy import ConfigurableHTTPProxy from jupyterhub_traefik_proxy import TraefikConsulProxy from jupyterhub_traefik_proxy import TraefikEtcdProxy -from jupyterhub_traefik_proxy import TraefikTomlProxy +from jupyterhub_traefik_proxy import TraefikFileProviderProxy def configure_argument_parser(): @@ -73,12 +73,12 @@ def configure_argument_parser(): parser.add_argument( "--proxy", dest="proxy_class", - default="TomlProxy", + default="FileProxy", help=textwrap.dedent( """\ Proxy class to analyze. Available proxies: - -TomlProxy + -FileProxy -EtcdProxy -ConsulProxy -CHP @@ -216,9 +216,9 @@ async def no_auth_etcd_proxy(): return proxy -async def toml_proxy(): - """Function returning a configured TraefikTomlProxy""" - proxy = TraefikTomlProxy( +async def file_proxy(): + """Function returning a configured TraefikFileProviderProxy""" + proxy = TraefikFileProviderProxy( public_url="http://127.0.0.1:8000", traefik_api_password="admin", traefik_api_username="admin", @@ -248,8 +248,8 @@ async def configurable_http_proxy(): async def get_proxy(proxy_class): - if proxy_class == "TomlProxy": - proxy = await toml_proxy() + if proxy_class == "FileProxy": + proxy = await file_proxy() elif proxy_class == "EtcdProxy": proxy = await no_auth_etcd_proxy() elif proxy_class == "ConsulProxy": diff --git a/performance/run_benchmark.sh b/performance/run_benchmark.sh index 39c9a829..cd927264 100755 --- a/performance/run_benchmark.sh +++ b/performance/run_benchmark.sh @@ -1,8 +1,8 @@ #!/bin/sh #CHP methods performance python3 -m performance.check_perf --measure=methods --proxy=CHP --iterations=4 --routes_number=500 --concurrent --output=./results/chp_methods_concurrent.csv -# TomlProxy methods performance - throttle = 2s -python3 -m performance.check_perf --measure=methods --proxy=TomlProxy --iterations=4 --routes_number=500 --concurrent --output=./results/toml_methods_concurrent.csv +# FileProxy methods performance - throttle = 2s +python3 -m performance.check_perf --measure=methods --proxy=FileProxy --iterations=4 --routes_number=500 --concurrent --output=./results/file_methods_concurrent.csv # EtcdProxy methods performance - throttle = 2s #start etcd: etcd &>/dev/null & @@ -17,7 +17,7 @@ python3 ./performance/dummy_http_server.py 9001 & #port 9001 python3 ./performance/dummy_ws_server.py & #port 9000 python3 -m performance.check_perf --measure=http_throughput_small --proxy=CHP --concurrent_requests_number=10 --backend_port=9001 --output=./results/http_throughput_small.csv -python3 -m performance.check_perf --measure=http_throughput_small --proxy=TomlProxy --concurrent_requests_number=10 --backend_port=9001 --output=./results/http_throughput_small.csv +python3 -m performance.check_perf --measure=http_throughput_small --proxy=FileProxy --concurrent_requests_number=10 --backend_port=9001 --output=./results/http_throughput_small.csv #start etcd: etcd &>/dev/null & python3 -m performance.check_perf --measure=http_throughput_small --proxy=EtcdProxy --concurrent_requests_number=10 --backend_port=9001 --output=./results/http_throughput_small.csv @@ -26,7 +26,7 @@ pkill etcd -rf default.etcd/ python3 -m performance.check_perf --measure=http_throughput_large --proxy=CHP --concurrent_requests_number=10 --backend_port=9001 --output=./results/http_throughput_large.csv -python3 -m performance.check_perf --measure=http_throughput_large --proxy=TomlProxy --concurrent_requests_number=10 --backend_port=9001 --output=./results/http_throughput_large.csv +python3 -m performance.check_perf --measure=http_throughput_large --proxy=FileProxy --concurrent_requests_number=10 --backend_port=9001 --output=./results/http_throughput_large.csv #start etcd: etcd &>/dev/null & python3 -m performance.check_perf --measure=http_throughput_large --proxy=EtcdProxy --concurrent_requests_number=10 --backend_port=9001 --output=./results/http_throughput_large.csv @@ -35,7 +35,7 @@ pkill etcd -rf default.etcd/ python3 -m performance.check_perf --measure=ws_throughput --proxy=CHP --concurrent_requests_number=10 --output=./results/ws_throughput.csv -python3 -m performance.check_perf --measure=ws_throughput --proxy=TomlProxy --concurrent_requests_number=10 --output=./results/ws_throughput.csv +python3 -m performance.check_perf --measure=ws_throughput --proxy=FileProxy --concurrent_requests_number=10 --output=./results/ws_throughput.csv #start etcd: etcd &>/dev/null & python3 -m performance.check_perf --measure=ws_throughput --proxy=EtcdProxy --concurrent_requests_number=10 --output=./results/ws_throughput.csv diff --git a/performance/run_benchmark_sequential.sh b/performance/run_benchmark_sequential.sh index 09243916..202cedff 100755 --- a/performance/run_benchmark_sequential.sh +++ b/performance/run_benchmark_sequential.sh @@ -1,8 +1,8 @@ #!/bin/sh #CHP methods performance python3 -m performance.check_perf --measure=methods --proxy=CHP --iterations=2 --routes_number=500 --sequential --output=./results/chp_methods_sequential.csv -# TomlProxy methods performance - run with throttle = 0s -python3 -m performance.check_perf --measure=methods --proxy=TomlProxy --iterations=2 --routes_number=500 --sequential --output=./results/toml_methods_sequential.csv +# FileProxy methods performance - run with throttle = 0s +python3 -m performance.check_perf --measure=methods --proxy=FileProxy --iterations=2 --routes_number=500 --sequential --output=./results/toml_methods_sequential.csv # EtcdProxy methods performance - run with throttle = 0s #start etcd: etcd &> /dev/null &