added downstream_conn_max config parsing

Change-Id: Icef738e732eae3b1205bcdfb50d59b8da6e4c2f6 Reviewed-on: http://review.northscale.com/2400 Reviewed-by: Jayesh Jose <jjose@zynga.com> Tested-by: Steve Yen <steve.yen@gmail.com>
steveyen · Sep 14, 2010 · 739a491 · 739a491
1 parent 481f960
commit 739a491
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/agent_stats.c b/agent_stats.c
@@ -455,6 +455,7 @@ static void proxy_stats_dump_behavior(ADD_STAT add_stats,
 
     if (level >= 1) {
         APPEND_PREFIX_STAT("downstream_max", "%u", b->downstream_max);
+        APPEND_PREFIX_STAT("downstream_conn_max", "%u", b->downstream_conn_max);
     }
 
     APPEND_PREFIX_STAT("downstream_weight",   "%u", b->downstream_weight);

diff --git a/cproxy.h b/cproxy.h
@@ -96,6 +96,8 @@ struct proxy_behavior {
     //
     uint32_t       cycle;               // IL: Clock resolution in millisecs.
     uint32_t       downstream_max;      // PL: Downstream concurrency.
+    uint32_t       downstream_conn_max; // PL: Max # of conns per thread
+                                        // and per host_ident.
     uint32_t       downstream_weight;   // SL: Server weight.
     uint32_t       downstream_retry;    // SL: How many times to retry a cmd.
     enum protocol  downstream_protocol; // SL: Favored downstream protocol.

diff --git a/cproxy_config.c b/cproxy_config.c
@@ -43,6 +43,7 @@ int cproxy_init_mcmux_mode(int proxy_port,
 proxy_behavior behavior_default_g = {
     .cycle = 0,
     .downstream_max = 4,
+    .downstream_conn_max = 4,
     .downstream_weight = 0,
     .downstream_retry = 1,
     .downstream_protocol = proxy_downstream_ascii_prot,
@@ -606,6 +607,8 @@ void cproxy_parse_behavior_key_val(char *key,
             behavior->cycle = strtol(val, NULL, 10);
         } else if (wordeq(key, "downstream_max")) {
             behavior->downstream_max = strtol(val, NULL, 10);
+        } else if (wordeq(key, "downstream_conn_max")) {
+            behavior->downstream_conn_max = strtol(val, NULL, 10);
         } else if (wordeq(key, "weight") ||
                    wordeq(key, "downstream_weight")) {
             behavior->downstream_weight = strtol(val, NULL, 10);
@@ -787,6 +790,7 @@ void cproxy_dump_behavior_ex(proxy_behavior *b, char *prefix, int level,
     }
     if (level >= 1) {
         vdump("downstream_max", "%u", b->downstream_max);
+        vdump("downstream_conn_max", "%u", b->downstream_conn_max);
     }
 
     vdump("downstream_weight",   "%u", b->downstream_weight);

diff --git a/doc/moxi/configuration.org b/doc/moxi/configuration.org
@@ -240,6 +240,7 @@ Some of the valid keys are (circa 2009/06)...
 
     uint32_t       cycle;               // IL: Clock resolution in millisecs.
     uint32_t       downstream_max;      // PL: Downstream concurrency.
+    uint32_t       downstream_conn_max; // PL: Max # of conns per thread per host_ident.
     uint32_t       downstream_weight;   // SL: Server weight.
     uint32_t       downstream_retry;    // SL: How many times to retry a cmd.
     enum protocol  downstream_protocol; // SL: Favored downstream protocol.