remove cache related stuff

Author: shreemaan-abhishek

patch/1.27.1.1/ngx_lua-enable_keepalive.patch

@@ -1,5 +1,5 @@
 diff --git src/ngx_http_lua_balancer.c src/ngx_http_lua_balancer.c
-index ae0f1380..3b4587f8 100644
+index ae0f1380..1d3fcb74 100644
 --- src/ngx_http_lua_balancer.c
 +++ src/ngx_http_lua_balancer.c
 @@ -31,10 +31,39 @@ typedef struct {
@@ -143,32 +143,75 @@ index ae0f1380..3b4587f8 100644
 
          lscf->balancer.original_init_upstream = uscf->peer.init_upstream;
 
-@@ -305,7 +343,7 @@ ngx_http_lua_balancer_init(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
+@@ -290,12 +328,9 @@ ngx_http_lua_balancer_init(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
+     ngx_uint_t                            bucket_cnt;
+     ngx_queue_t                          *buckets;
+     ngx_http_lua_srv_conf_t              *lscf;
+-    ngx_http_lua_balancer_ka_item_t      *cached;
+ 
+     lscf = ngx_http_conf_upstream_srv_conf(us, ngx_http_lua_module);
+ 
+-    ngx_conf_init_uint_value(lscf->balancer.max_cached, 32);
+-
+     if (lscf->balancer.original_init_upstream(cf, us) != NGX_OK) {
+         return NGX_ERROR;
+     }
+@@ -304,38 +339,6 @@ ngx_http_lua_balancer_init(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
+ 
      us->peer.init = ngx_http_lua_balancer_init_peer;
 
-     /* allocate cache items and add to free queue */
+-    /* allocate cache items and add to free queue */
+-
+-    cached = ngx_pcalloc(cf->pool,
+-                         sizeof(ngx_http_lua_balancer_ka_item_t)
+-                         * lscf->balancer.max_cached);
+-    if (cached == NULL) {
+-        return NGX_ERROR;
+-    }
+-
+-    ngx_queue_init(&lscf->balancer.cache);
+-    ngx_queue_init(&lscf->balancer.free);
+-
+-    for (i = 0; i < lscf->balancer.max_cached; i++) {
+-        ngx_queue_insert_head(&lscf->balancer.free, &cached[i].queue);
+-        cached[i].lscf = lscf;
+-    }
+-
+-    bucket_cnt = lscf->balancer.max_cached / 2;
+-    bucket_cnt = bucket_cnt > 0 ? bucket_cnt : 1;
+-    buckets = ngx_pcalloc(cf->pool, sizeof(ngx_queue_t) * bucket_cnt);
+-
+-    if (buckets == NULL) {
+-        return NGX_ERROR;
+-    }
+-
+-    for (i = 0; i < bucket_cnt; i++) {
+-        ngx_queue_init(&buckets[i]);
+-    }
+-
+-    lscf->balancer.buckets = buckets;
+-    lscf->balancer.bucket_cnt = bucket_cnt;
 -
-+                                         
-     cached = ngx_pcalloc(cf->pool,
-                          sizeof(ngx_http_lua_balancer_ka_item_t)
-                          * lscf->balancer.max_cached);
-@@ -387,6 +425,7 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
+     return NGX_OK;
+ }
+ 
+@@ -387,6 +390,7 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
      void                               *pdata;
      lua_State                          *L;
      ngx_int_t                           rc;
 +    ngx_queue_t                        *q;
      ngx_connection_t                   *c;
      ngx_http_request_t                 *r;
  #if (NGX_HTTP_SSL)
-@@ -394,6 +433,7 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
+@@ -394,6 +398,7 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
  #endif
      ngx_http_lua_ctx_t                 *ctx;
      ngx_http_lua_srv_conf_t            *lscf;
 +    ngx_http_lua_balancer_keepalive_item_t *item;
      ngx_http_lua_balancer_peer_data_t  *bp = data;
 
      ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-@@ -425,9 +465,12 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
+@@ -425,9 +430,12 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
 
      ctx->context = NGX_HTTP_LUA_CONTEXT_BALANCER;
 
@@ -181,7 +224,7 @@ index ae0f1380..3b4587f8 100644
      bp->keepalive_requests = 0;
      bp->keepalive_timeout = 0;
      bp->keepalive = 0;
-@@ -465,10 +508,10 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
+@@ -465,10 +473,10 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
          pc->local = bp->local;
      }
 
@@ -194,7 +237,7 @@ index ae0f1380..3b4587f8 100644
          pc->cached = 0;
          pc->connection = NULL;
 
-@@ -476,27 +519,59 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
+@@ -476,27 +484,59 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
              r->upstream->peer.tries += bp->more_tries;
          }
 
@@ -267,7 +310,7 @@ index ae0f1380..3b4587f8 100644
          }
 
          return NGX_OK;
-@@ -577,14 +652,12 @@ static void
+@@ -577,14 +617,12 @@ static void
  ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
      ngx_uint_t state)
  {
@@ -284,7 +327,7 @@ index ae0f1380..3b4587f8 100644
 
      ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
                     "lua balancer: free peer, tries: %ui", pc->tries);
-@@ -592,14 +665,16 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
+@@ -592,14 +630,16 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
      u = bp->request->upstream;
      c = pc->connection;
 
@@ -303,7 +346,7 @@ index ae0f1380..3b4587f8 100644
              if (state & NGX_PEER_FAILED
                  || c == NULL
                  || c->read->eof
-@@ -633,42 +708,41 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
+@@ -633,42 +673,41 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
                  goto invalid;
              }
 
@@ -365,7 +408,7 @@ index ae0f1380..3b4587f8 100644
 
              if (c->write->timer_set) {
                  ngx_del_timer(c->write);
-@@ -684,42 +758,6 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
+@@ -684,42 +723,6 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
              c->write->log = ngx_cycle->log;
              c->pool->log = ngx_cycle->log;
 
@@ -408,7 +451,7 @@ index ae0f1380..3b4587f8 100644
              if (c->read->ready) {
                  ngx_http_lua_balancer_close_handler(c->read);
              }
-@@ -728,9 +766,16 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
+@@ -728,9 +731,16 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
 
  invalid:
 
@@ -428,7 +471,7 @@ index ae0f1380..3b4587f8 100644
          }
 
          return;
-@@ -740,6 +785,123 @@ invalid:
+@@ -740,6 +750,123 @@ invalid:
  }
 
 
@@ -552,7 +595,7 @@ index ae0f1380..3b4587f8 100644
  static void
  ngx_http_lua_balancer_notify_peer(ngx_peer_connection_t *pc, void *data,
      ngx_uint_t type)
-@@ -755,6 +917,10 @@ ngx_http_lua_balancer_notify_peer(ngx_peer_connection_t *pc, void *data,
+@@ -755,6 +882,10 @@ ngx_http_lua_balancer_notify_peer(ngx_peer_connection_t *pc, void *data,
  static void
  ngx_http_lua_balancer_close(ngx_connection_t *c)
  {
@@ -563,7 +606,7 @@ index ae0f1380..3b4587f8 100644
  #if (NGX_HTTP_SSL)
      if (c->ssl) {
          c->ssl->no_wait_shutdown = 1;
-@@ -762,9 +928,6 @@ ngx_http_lua_balancer_close(ngx_connection_t *c)
+@@ -762,9 +893,6 @@ ngx_http_lua_balancer_close(ngx_connection_t *c)
 
          if (ngx_ssl_shutdown(c) == NGX_AGAIN) {
              c->ssl->handler = ngx_http_lua_balancer_close;
@@ -573,7 +616,7 @@ index ae0f1380..3b4587f8 100644
              return;
          }
      }
-@@ -773,8 +936,12 @@ ngx_http_lua_balancer_close(ngx_connection_t *c)
+@@ -773,8 +901,12 @@ ngx_http_lua_balancer_close(ngx_connection_t *c)
      ngx_destroy_pool(c->pool);
      ngx_close_connection(c);
 
@@ -588,7 +631,7 @@ index ae0f1380..3b4587f8 100644
  }
 
 
-@@ -789,7 +956,7 @@ ngx_http_lua_balancer_dummy_handler(ngx_event_t *ev)
+@@ -789,7 +921,7 @@ ngx_http_lua_balancer_dummy_handler(ngx_event_t *ev)
  static void
  ngx_http_lua_balancer_close_handler(ngx_event_t *ev)
  {
@@ -597,7 +640,7 @@ index ae0f1380..3b4587f8 100644
 
      int                n;
      char               buf[1];
-@@ -820,8 +987,10 @@ close:
+@@ -820,8 +952,10 @@ close:
      ngx_http_lua_balancer_close(c);
 
      ngx_queue_remove(&item->queue);
@@ -610,7 +653,7 @@ index ae0f1380..3b4587f8 100644
  }
 
 
-@@ -832,7 +1001,7 @@ ngx_http_lua_balancer_set_session(ngx_peer_connection_t *pc, void *data)
+@@ -832,7 +966,7 @@ ngx_http_lua_balancer_set_session(ngx_peer_connection_t *pc, void *data)
  {
      ngx_http_lua_balancer_peer_data_t  *bp = data;
 
@@ -619,7 +662,7 @@ index ae0f1380..3b4587f8 100644
          /* TODO */
          return NGX_OK;
      }
-@@ -846,7 +1015,7 @@ ngx_http_lua_balancer_save_session(ngx_peer_connection_t *pc, void *data)
+@@ -846,7 +980,7 @@ ngx_http_lua_balancer_save_session(ngx_peer_connection_t *pc, void *data)
  {
      ngx_http_lua_balancer_peer_data_t  *bp = data;
 
@@ -628,7 +671,7 @@ index ae0f1380..3b4587f8 100644
          /* TODO */
          return;
      }
-@@ -859,9 +1028,8 @@ ngx_http_lua_balancer_save_session(ngx_peer_connection_t *pc, void *data)
+@@ -859,9 +993,8 @@ ngx_http_lua_balancer_save_session(ngx_peer_connection_t *pc, void *data)
 
  int
  ngx_http_lua_ffi_balancer_set_current_peer(ngx_http_request_t *r,
@@ -640,7 +683,7 @@ index ae0f1380..3b4587f8 100644
  {
      ngx_url_t              url;
      ngx_http_lua_ctx_t    *ctx;
-@@ -920,32 +1088,15 @@ ngx_http_lua_ffi_balancer_set_current_peer(ngx_http_request_t *r,
+@@ -920,32 +1053,15 @@ ngx_http_lua_ffi_balancer_set_current_peer(ngx_http_request_t *r,
      if (url.addrs && url.addrs[0].sockaddr) {
          bp->sockaddr = url.addrs[0].sockaddr;
          bp->socklen = url.addrs[0].socklen;
@@ -676,7 +719,7 @@ index ae0f1380..3b4587f8 100644
 
      return NGX_OK;
  }
-@@ -1050,11 +1201,15 @@ ngx_http_lua_ffi_balancer_enable_keepalive(ngx_http_request_t *r,
+@@ -1050,11 +1166,15 @@ ngx_http_lua_ffi_balancer_enable_keepalive(ngx_http_request_t *r,
 
      bp = (ngx_http_lua_balancer_peer_data_t *) u->peer.data;
 
@@ -693,7 +736,7 @@ index ae0f1380..3b4587f8 100644
      bp->keepalive_timeout = (ngx_msec_t) timeout;
      bp->keepalive_requests = (ngx_uint_t) max_requests;
      bp->keepalive = 1;
-@@ -1375,138 +1530,4 @@ ngx_http_lua_balancer_keepalive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+@@ -1375,138 +1495,4 @@ ngx_http_lua_balancer_keepalive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
      return NGX_CONF_OK;
  }