Changeset 1500

Timestamp:

01/03/2007 09:46:32 AM (20 months ago)

Author:

jakabosky

Message:

Added round-robin support to mod_fastcgi.

Location:

branches/lighttpd-1.4.x/src

Files:

• mod_fastcgi.c (modified) (5 diffs)
• mod_proxy.c (modified) (1 diff)

branches/lighttpd-1.4.x/src/mod_fastcgi.c

@@ -276 +276 @@
 
         int note_is_sent;
+        int last_used_ndx;
 
         fcgi_extension_host **hosts;
@@ -564 +565 @@
                 assert(fe);
                 fe->key = buffer_init();
+                fe->last_used_ndx = -1;
                 buffer_copy_string_buffer(fe->key, key);
 
@@ -2382 +2384 @@
                 /* append to read-buffer */
                 if (-1 == (r = read(hctx->fd, b->ptr, toread))) {
+                        if (errno == EAGAIN) return 0;
                         log_error_write(srv, __FILE__, __LINE__, "sds",
                                         "unexpected end-of-file (perhaps the fastcgi process died):",
@@ -2980 +2983 @@
                 int ndx, used = -1;
 
-                /* get best server */
-                for (k = 0, ndx = -1; k < hctx->ext->used; k++) {
-                        host = hctx->ext->hosts[k];
-
-                        /* we should have at least one proc that can do something */
-                        if (host->active_procs == 0) continue;
-
-                        if (used == -1 || host->load < used) {
-                                used = host->load;
-
-                                ndx = k;
+                /* check if the next server has no load. */
+                ndx = hctx->ext->last_used_ndx + 1;
+                if(ndx >= hctx->ext->used || ndx < 0) ndx = 0;
+                host = hctx->ext->hosts[ndx];
+                if (host->load > 0) {
+                        /* get backend with the least load. */
+                        for (k = 0, ndx = -1; k < hctx->ext->used; k++) {
+                                host = hctx->ext->hosts[k];
+
+                                /* we should have at least one proc that can do something */
+                                if (host->active_procs == 0) continue;
+
+                                if (used == -1 || host->load < used) {
+                                        used = host->load;
+
+                                        ndx = k;
+                                }
                         }
                 }
@@ -3006 +3015 @@
                 }
 
+                hctx->ext->last_used_ndx = ndx;
                 host = hctx->ext->hosts[ndx];
 

branches/lighttpd-1.4.x/src/mod_proxy.c

@@ -657 +657 @@
 
                 if (-1 == (r = read(hctx->fd, hctx->response->ptr + hctx->response->used - 1, b))) {
+                        if (errno == EAGAIN) return 0;
                         log_error_write(srv, __FILE__, __LINE__, "sds",
                                         "unexpected end-of-file (perhaps the proxy process died):",