packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ostree/trivial-httpd: Add --random-408s command line option 

This is exactly like the --random-500s option, except that it will cause
error 408 (request timeout) to be returned, rather than error 500
(internal server error).

This will be used in a following commit to test pull behaviour when
timeouts occur.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Closes: #1594
Approved by: jlebon
This commit is contained in:
Philip Withnall 2018-05-28 16:24:33 +01:00 committed by Atomic Bot
parent 224f3cdd24
commit 97c348d65b
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ostree/ostree-trivial-httpd.c
View File

@ -45,11 +45,14 @@ static int opt_random_500s_percentage;
/* We have a strong upper bound for any unlikely /* We have a strong upper bound for any unlikely
* cases involving repeated random 500s. */ * cases involving repeated random 500s. */
static int opt_random_500s_max = 100; static int opt_random_500s_max = 100;
static int opt_random_408s_percentage;
static int opt_random_408s_max = 100;
static gint opt_port = 0; static gint opt_port = 0;
static gchar **opt_expected_cookies; static gchar **opt_expected_cookies;
static gchar **opt_expected_headers; static gchar **opt_expected_headers;
static guint emitted_random_500s_count = 0; static guint emitted_random_500s_count = 0;
static guint emitted_random_408s_count = 0;
typedef struct { typedef struct {
int root_dfd; int root_dfd;
@ -70,6 +73,8 @@ static GOptionEntry options[] = {
{ "force-range-requests", 0, 0, G_OPTION_ARG_NONE, &opt_force_ranges, "Force range requests by only serving half of files", NULL }, { "force-range-requests", 0, 0, G_OPTION_ARG_NONE, &opt_force_ranges, "Force range requests by only serving half of files", NULL },
{ "random-500s", 0, 0, G_OPTION_ARG_INT, &opt_random_500s_percentage, "Generate random HTTP 500 errors approximately for PERCENTAGE requests", "PERCENTAGE" }, { "random-500s", 0, 0, G_OPTION_ARG_INT, &opt_random_500s_percentage, "Generate random HTTP 500 errors approximately for PERCENTAGE requests", "PERCENTAGE" },
{ "random-500s-max", 0, 0, G_OPTION_ARG_INT, &opt_random_500s_max, "Limit HTTP 500 errors to MAX (default 100)", "MAX" }, { "random-500s-max", 0, 0, G_OPTION_ARG_INT, &opt_random_500s_max, "Limit HTTP 500 errors to MAX (default 100)", "MAX" },
{ "random-408s", 0, 0, G_OPTION_ARG_INT, &opt_random_408s_percentage, "Generate random HTTP 408 errors approximately for PERCENTAGE requests", "PERCENTAGE" },
{ "random-408s-max", 0, 0, G_OPTION_ARG_INT, &opt_random_408s_max, "Limit HTTP 408 errors to MAX (default 100)", "MAX" },
{ "log-file", 0, 0, G_OPTION_ARG_FILENAME, &opt_log, "Put logs here (use - for stdout)", "PATH" }, { "log-file", 0, 0, G_OPTION_ARG_FILENAME, &opt_log, "Put logs here (use - for stdout)", "PATH" },
{ "expected-cookies", 0, 0, G_OPTION_ARG_STRING_ARRAY, &opt_expected_cookies, "Expect given cookies in the http request", "KEY=VALUE" }, { "expected-cookies", 0, 0, G_OPTION_ARG_STRING_ARRAY, &opt_expected_cookies, "Expect given cookies in the http request", "KEY=VALUE" },
{ "expected-header", 0, 0, G_OPTION_ARG_STRING_ARRAY, &opt_expected_headers, "Expect given headers in the http request", "KEY=VALUE" }, { "expected-header", 0, 0, G_OPTION_ARG_STRING_ARRAY, &opt_expected_headers, "Expect given headers in the http request", "KEY=VALUE" },
@ -291,6 +296,14 @@ do_get (OtTrivialHttpd *self,
soup_message_set_status (msg, SOUP_STATUS_INTERNAL_SERVER_ERROR); soup_message_set_status (msg, SOUP_STATUS_INTERNAL_SERVER_ERROR);
goto out; goto out;
} }
else if (opt_random_408s_percentage > 0 &&
emitted_random_408s_count < opt_random_408s_max &&
g_random_int_range (0, 100) < opt_random_408s_percentage)
{
emitted_random_408s_count++;
soup_message_set_status (msg, SOUP_STATUS_REQUEST_TIMEOUT);
goto out;
}
while (path[0] == '/') while (path[0] == '/')
path++; path++;
@ -511,6 +524,13 @@ run (int argc, char **argv, GCancellable *cancellable, GError **error)
goto out; goto out;
} }
if (!(opt_random_408s_percentage >= 0 && opt_random_408s_percentage <= 99))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Invalid --random-408s=%u", opt_random_408s_percentage);
goto out;
}
if (opt_log) if (opt_log)
{ {
GOutputStream *stream = NULL; GOutputStream *stream = NULL;