Ticket #1103: mod_proxy.random.patch

src/mod_proxy.c

@@ -57 +57 @@
 typedef enum {
         PROXY_BALANCE_UNSET,
         PROXY_BALANCE_FAIR,
+        PROXY_BALANCE_RANDOM,
         PROXY_BALANCE_HASH,
         PROXY_BALANCE_RR
 } proxy_balance_t;
@@ -221 +222 @@
                         s->balance = PROXY_BALANCE_FAIR;
                 } else if (buffer_is_equal_string(p->balance_buf, CONST_STR_LEN("fair"))) {
                         s->balance = PROXY_BALANCE_FAIR;
+                } else if (buffer_is_equal_string(p->balance_buf, CONST_STR_LEN("random"))) {
+                        s->balance = PROXY_BALANCE_RANDOM;
                 } else if (buffer_is_equal_string(p->balance_buf, CONST_STR_LEN("round-robin"))) {
                         s->balance = PROXY_BALANCE_RR;
                 } else if (buffer_is_equal_string(p->balance_buf, CONST_STR_LEN("hash"))) {
                         s->balance = PROXY_BALANCE_HASH;
                 } else {
                         log_error_write(srv, __FILE__, __LINE__, "sb",
-                                        "proxy.balance has to be one of: fair, round-robin, hash, but not:", p->balance_buf);
+                                        "proxy.balance has to be one of: fair, random, round-robin, hash, but not:", p->balance_buf);
                         return HANDLER_ERROR;
                 }
 
@@ -1055 +1058 @@
         unsigned long last_max = ULONG_MAX;
         int max_usage = INT_MAX;
         int ndx = -1;
+        int rand_ndx, active_hosts;
         size_t k;
         buffer *fn;
         data_array *extension = NULL;
@@ -1173 +1177 @@
                 }
 
                 break;
+        case PROXY_BALANCE_RANDOM:
+                /* random balancing */
+                if (p->conf.debug) {
+                        log_error_write(srv, __FILE__, __LINE__,  "s",
+                                        "proxy - used random balancing");
+                }
+
+                active_hosts = 0;
+
+                for (k = 0; k < extension->value->used; k++) {
+                        data_proxy *host = (data_proxy *)extension->value->data[k];
+
+                        if (host->is_disabled) continue;
+
+                        active_hosts++;
+                }
+
+                rand_ndx = (int) (1.0 * active_hosts * rand()/(RAND_MAX));
+
+                active_hosts = 0;
+                for (k = 0, ndx = -1; k < extension->value->used; k++) {
+                        data_proxy *host = (data_proxy *)extension->value->data[k];
+
+                        if (host->is_disabled) continue;
+
+                        if (rand_ndx == active_hosts++) {
+                                ndx = k;
+                                break;
+                        }
+                }
+
+                break;
         case PROXY_BALANCE_RR:
                 /* round robin */
                 if (p->conf.debug) {