diff options
author | Andrew Newdigate <andrew@gitlab.com> | 2018-11-01 21:06:25 +0300 |
---|---|---|
committer | Andrew Newdigate <andrew@gitlab.com> | 2018-11-01 21:06:25 +0300 |
commit | 04efa0b512953d90e125850146759d09fac2d9bc (patch) | |
tree | a4df23c1dff78817c4b50da879b1df96993b4189 | |
parent | 847c81b755b6b4146eb3fa3d5912f3d573739bd1 (diff) |
Fixing the broken build with style fixes
-rw-r--r-- | app/controllers/chaos_controller.rb | 7 | ||||
-rw-r--r-- | changelogs/unreleased/52767-more-chaos-for-gitlab.yml | 5 | ||||
-rw-r--r-- | doc/development/chaos_endpoints.md | 8 |
3 files changed, 11 insertions, 9 deletions
diff --git a/app/controllers/chaos_controller.rb b/app/controllers/chaos_controller.rb index 6593b748130..392814b4275 100644 --- a/app/controllers/chaos_controller.rb +++ b/app/controllers/chaos_controller.rb @@ -13,10 +13,8 @@ class ChaosController < ActionController::Base def cpuspin duration_s = params[:duration_s] ? params[:duration_s].to_i : 30 - end_time = Time.now + duration_s.seconds; - while Time.now < end_time - 10_000.times { } - end + end_time = Time.now + duration_s.seconds + 10_000.times { } while Time.now < end_time render text: "OK", content_type: 'text/plain' end @@ -41,5 +39,4 @@ class ChaosController < ActionController::Base render text: "To experience chaos, please set X-Chaos-Secret header", content_type: 'text/plain', status: 401 end end - end diff --git a/changelogs/unreleased/52767-more-chaos-for-gitlab.yml b/changelogs/unreleased/52767-more-chaos-for-gitlab.yml new file mode 100644 index 00000000000..067777cb7fa --- /dev/null +++ b/changelogs/unreleased/52767-more-chaos-for-gitlab.yml @@ -0,0 +1,5 @@ +--- +title: Add endpoints for simulating certain failure modes in the application +merge_request: 22746 +author: +type: other diff --git a/doc/development/chaos_endpoints.md b/doc/development/chaos_endpoints.md index 4546d1498c0..318a3270675 100644 --- a/doc/development/chaos_endpoints.md +++ b/doc/development/chaos_endpoints.md @@ -41,7 +41,7 @@ To simulate a memory leak in your application, use the `/-/chaos/leakmem` endpoi For example, if your GitLab instance is listening at `localhost:3000`, you could `curl` the endpoint as follows: ```shell -curl http://localhost:3000/-/chaos/leakmem?memory_mb=1024 -H 'X-Chaos-Secret: secret' +curl http://localhost:3000/-/chaos/leakmem?memory_mb=1024 --header 'X-Chaos-Secret: secret' ``` The `memory_mb` parameter tells the application how much memory it should leak. @@ -53,7 +53,7 @@ Note: the memory is not retained after the request, so once its completed, the R This endpoint attempts to fully utilise a single core, at 100%, for the given period. ```shell -curl http://localhost:3000/-/chaos/cpuspin?duration_s=60 -H 'X-Chaos-Secret: secret' +curl http://localhost:3000/-/chaos/cpuspin?duration_s=60 --header 'X-Chaos-Secret: secret' ``` The `duration_s` parameter will configure how long the core is utilised. @@ -65,7 +65,7 @@ Depending on your rack server setup, your request may timeout after a predermine This endpoint is similar to the CPU Spin endpoint but simulates off-processor activity, such backend services of IO. It will sleep for a given duration. ```shell -curl http://localhost:3000/-/chaos/sleep?duration_s=60 -H 'X-Chaos-Secret: secret' +curl http://localhost:3000/-/chaos/sleep?duration_s=60 --header 'X-Chaos-Secret: secret' ``` The `duration_s` parameter will configure how long the request will sleep for. @@ -77,7 +77,7 @@ As with the CPU Spin endpoint, this may lead to your request timing out if durat This endpoint will simulate the unexpected death of a worker process using a `kill` signal. ```shell -curl http://localhost:3000/-/chaos/kill -H 'X-Chaos-Secret: secret' +curl http://localhost:3000/-/chaos/kill --header 'X-Chaos-Secret: secret' ``` Note: since this endpoint uses the `KILL` signal, the worker is not given a chance to cleanup or shutdown. |