From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/5] git-http-backend: remove process limit
Date: Sun, 22 May 2016 20:57:31 +0000 [thread overview]
Message-ID: <20160522205734.12316-3-e@80x24.org> (raw)
In-Reply-To: <20160522205734.12316-1-e@80x24.org>
We will figure out a different way to avoid overloading...
---
lib/PublicInbox/GitHTTPBackend.pm | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index b58cc30..35c3383 100644
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -11,14 +11,6 @@ use IO::File;
use PublicInbox::Spawn qw(spawn);
use HTTP::Date qw(time2str);
-# TODO: make configurable, but keep in mind it's better to have
-# multiple -httpd worker processes which are already scaled to
-# the proper number of CPUs and memory. git-pack-objects(1) may
-# also use threads and bust memory limits, too, so I recommend
-# limiting threads to 1 (via `pack.threads` knob in git) for serving.
-my $LIMIT = 1;
-my $nr_running = 0;
-
# n.b. serving "description" and "cloneurl" should be innocuous enough to
# not cause problems. serving "config" might...
my @text = qw[HEAD info/refs
@@ -54,7 +46,6 @@ sub r ($) {
sub serve {
my ($cgi, $git, $path) = @_;
- return serve_dumb($cgi, $git, $path) if $nr_running >= $LIMIT;
my $service = $cgi->param('service') || '';
if ($service =~ /\Agit-\w+-pack\z/ || $path =~ /\Agit-\w+-pack\z/) {
@@ -243,7 +234,6 @@ sub serve_smart {
$wpipe = $in = undef;
$buf = '';
my ($vin, $fh, $res);
- $nr_running++;
# Danga::Socket users, we queue up the read_enable callback to
# fire after pending writes are complete:
@@ -264,7 +254,6 @@ sub serve_smart {
# PublicInbox::HTTPD::Async::close:
$rpipe->close;
$rpipe = undef;
- $nr_running--;
}
if (defined $pid) {
my $e = $pid == waitpid($pid, 0) ?
next prev parent reply other threads:[~2016-05-22 20:57 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-22 20:57 [PATCH 0/5] a few more HTTP-async-related simplifications Eric Wong
2016-05-22 20:57 ` [PATCH 1/5] t/spawn.t: additional tests for popen_rd Eric Wong
2016-05-22 20:57 ` Eric Wong [this message]
2016-05-22 20:57 ` [PATCH 3/5] git-http-backend: simplify dumb serving Eric Wong
2016-05-22 20:57 ` [PATCH 4/5] http: rework async_pass support Eric Wong
2016-05-22 20:57 ` [PATCH 5/5] git-http-backend: switch to async_pass Eric Wong
2016-05-23 6:23 ` [PATCH 0/2] more git-http-backend cleanups Eric Wong
2016-05-23 6:23 ` [PATCH 1/2] git-http-backend: avoid Plack::Request parsing body Eric Wong
2016-05-23 6:23 ` [PATCH 2/2] git-http-backend: refactor to support cleanup Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160522205734.12316-3-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).