centralize noreply code more

was double-checking for noreply since we now grab it during the initial
parsing. defaults to allowing noreply and maybe some functions should
force-disable it?

Author: dormando

proto_parser.c

@@ -385,13 +385,12 @@ static void pout_string(mc_resp *resp, const char *str) {
     bool skip = resp->skip;
     assert(resp != NULL);
 
-    // if response was original filled with something, but we're now writing
+    // if response was originally filled with something, but we're now writing
     // out an error or similar, have to reset the object first.
     resp_reset(resp);
 
     // We blank the response "just in case", but if we're not intending on
     // sending it lets not rewrite it.
-    // FIXME: do noreply and skip need to be separate?
     if (skip || resp->noreply) {
         resp->skip = true;
         return;
@@ -742,7 +741,6 @@ item *process_update_cmd_start(LIBEVENT_THREAD *t, mcp_parser_t *pr, mc_resp *re
     item *it;
 
     assert(resp != NULL);
-    resp->noreply = pr->noreply;
 
     if (nkey > KEY_MAX_LENGTH) {
         pout_string(resp, "CLIENT_ERROR bad command line format");
@@ -855,7 +853,6 @@ void process_arithmetic_cmd(LIBEVENT_THREAD *t, mcp_parser_t *pr, mc_resp *resp,
     size_t nkey = pr->klen;
 
     assert(t != NULL);
-    resp->noreply = pr->noreply;
 
     if (nkey > KEY_MAX_LENGTH) {
         pout_string(resp, "CLIENT_ERROR bad command line format");
@@ -900,7 +897,6 @@ void process_delete_cmd(LIBEVENT_THREAD *t, mcp_parser_t *pr, mc_resp *resp) {
     uint32_t hv;
 
     assert(t != NULL);
-    resp->noreply = pr->noreply;
 
     // NOTE: removed a compatibility bodge from a decade ago.
     // delete used to take a "delay" argument, which was removed, but some
@@ -947,7 +943,6 @@ void process_touch_cmd(LIBEVENT_THREAD *t, mcp_parser_t *pr, mc_resp *resp) {
     item *it;
 
     assert(t != NULL);
-    resp->noreply = pr->noreply;
 
     if (nkey > KEY_MAX_LENGTH) {
         pout_string(resp, "CLIENT_ERROR bad command line format");

proto_text.c

@@ -388,26 +388,6 @@ int try_read_command_ascii(conn *c) {
     return 1;
 }
 
-static inline bool set_noreply_maybe(conn *c, mcp_parser_t *pr) {
-    int noreply_index = pr->tok.ntokens-1;
-
-    /*
-      NOTE: this function is not the first place where we are going to
-      send the reply.  We could send it instead from process_command()
-      if the request line has wrong number of tokens.  However parsing
-      malformed line for "noreply" option is not reliable anyway, so
-      it can't be helped.
-    */
-    if (noreply_index >= 0) {
-        int len = 0;
-        const char *noreply = mcmc_token_get(pr->request, &pr->tok, noreply_index, &len);
-        if (strncmp(noreply, "noreply", 7) == 0) {
-            c->resp->noreply = true;
-        }
-    }
-    return c->resp->noreply;
-}
-
 static void process_get_command_err(conn *c, const char *errstr) {
     // Use passed in error or rescue the last error while processing.
     char wbuf[WRITE_BUFFER_SIZE];
@@ -786,8 +766,6 @@ static void process_update_command(conn *c, mcp_parser_t *pr, mc_resp *resp, int
 static void process_verbosity_command(conn *c, mcp_parser_t *pr) {
     assert(c != NULL);
 
-    set_noreply_maybe(c, pr);
-
     uint32_t level;
     if (mcmc_token_get_u32(pr->request, &pr->tok, 1, &level) != MCMC_OK) {
         out_string(c, "CLIENT_ERROR bad command line format");
@@ -891,8 +869,6 @@ static void process_slabs_automove_command(conn *c, mcp_parser_t *pr) {
 
     assert(c != NULL);
 
-    set_noreply_maybe(c, pr);
-
     const char *subcmd = mcmc_token_get(pr->request, &pr->tok, 2, &len);
     if (strncmp(subcmd, "ratio", len) == 0) {
         if (ntokens < 4 || !mc_toktod(pr, 3, &ratio)) {
@@ -1003,8 +979,6 @@ static void process_memlimit_command(conn *c, mcp_parser_t *pr) {
     uint32_t memlimit;
     assert(c != NULL);
 
-    set_noreply_maybe(c, pr);
-
     if (mcmc_token_get_u32(pr->request, &pr->tok, 1, &memlimit) != MCMC_OK) {
         out_string(c, "ERROR");
     } else {
@@ -1036,8 +1010,6 @@ static void process_lru_command(conn *c, mcp_parser_t *pr) {
     int ntokens = pr->tok.ntokens;
     const char *subcmd = mcmc_token_get(pr->request, &pr->tok, SUBCOMMAND_TOKEN, &len);
 
-    set_noreply_maybe(c, pr);
-
     if (strncmp(subcmd, "tune", len) == 0 && ntokens >= 6) {
         if (!mc_toktou32(pr, 2, &pct_hot) ||
             !mc_toktou32(pr, 3, &pct_warm) ||
@@ -1087,7 +1059,6 @@ static void process_lru_command(conn *c, mcp_parser_t *pr) {
 }
 #ifdef EXTSTORE
 static void process_extstore_command(conn *c, mcp_parser_t *pr) {
-    set_noreply_maybe(c, pr);
     bool ok = true;
     int ntokens = pr->tok.ntokens;
     int len = 0;
@@ -1157,8 +1128,6 @@ static void process_flush_all_command(conn *c, mcp_parser_t *pr) {
     int32_t exptime = 0;
     rel_time_t new_oldest = 0;
 
-    set_noreply_maybe(c, pr);
-
     pthread_mutex_lock(&c->thread->stats.mutex);
     c->thread->stats.flush_cmds++;
     pthread_mutex_unlock(&c->thread->stats.mutex);
@@ -1436,7 +1405,6 @@ static void process_lru_crawler_command(conn *c, mcp_parser_t *pr) {
 }
 #ifdef TLS
 static void process_refresh_certs_command(conn *c, mcp_parser_t *pr) {
-    set_noreply_maybe(c, pr);
     char *errmsg = NULL;
     if (refresh_certs(&errmsg)) {
         out_string(c, "OK");
@@ -1522,6 +1490,7 @@ void process_command_ascii(conn *c, char *command, size_t cmdlen) {
 
     t->cur_sfd = c->sfd; // cuddle sfd for logging.
     int ret = process_request(&pr, command, cmdlen);
+    c->resp->noreply = pr.noreply;
     if (settings.verbose > 1) {
         fprintf(stderr, "<%d %.*s\n", t->cur_sfd, (int)cmdlen-2, command);
     }