From 3682231f6319eb58557d02a6a15c9b1d39436415 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Aug 23 2017 09:45:12 +0000
Subject: Backport upstream's patch making gitolite faster for dist-git's needs


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/41b7885b77.patch b/41b7885b77.patch
new file mode 100644
index 0000000..38007c3
--- /dev/null
+++ b/41b7885b77.patch
@@ -0,0 +1,106 @@
+From 41b7885b77cfe992ad3c96d0b021ece51ce1b3e3 Mon Sep 17 00:00:00 2001
+From: Sitaram Chamarty <sitaram@atc.tcs.com>
+Date: Fri, 11 Aug 2017 19:01:11 +0530
+Subject: [PATCH] reduce stat() and other calls for huge installs
+
+Fedora has 42000 or so repos, and a 'gitolite compile' was taking too
+long.
+
+This set of changes reduces the number of stat() and other calls from 9
+to 2 per unchanged, existing repo.  (The expectation is that only a few
+repos' rules are being changed each time, so this helps somewhat
+optimise the others not to take the same amount of time).
+---
+ src/lib/Gitolite/Conf/Store.pm | 35 ++++++++++++++++++++++++++++-------
+ 1 file changed, 28 insertions(+), 7 deletions(-)
+
+diff --git a/src/lib/Gitolite/Conf/Store.pm b/src/lib/Gitolite/Conf/Store.pm
+index c7f9ab549..6809f6717 100644
+--- a/src/lib/Gitolite/Conf/Store.pm
++++ b/src/lib/Gitolite/Conf/Store.pm
+@@ -25,6 +25,8 @@ use Exporter 'import';
+ use Data::Dumper;
+ $Data::Dumper::Indent   = 1;
+ $Data::Dumper::Sortkeys = 1;
++use Fcntl;
++use GDBM_File;
+ 
+ use Gitolite::Rc;
+ use Gitolite::Common;
+@@ -41,6 +43,11 @@ my %groups;
+ my %configs;
+ my %split_conf;
+ 
++# reduce the number of unnecessary stat() calls for installations like Fedora,
++# which have (as of 2017-08) about 42000 repos.  Each compile will only
++# *really* change a few repos so this helps us not to touch the others.
++my %gl_conf_cache;
++
+ my @repolist;    # current repo list; reset on each 'repo ...' line
+ my $subconf = 'master';
+ my $nextseq = 0;
+@@ -188,10 +195,13 @@ sub new_repos {
+         next unless $repo =~ $REPONAME_PATT;    # skip repo patterns
+         next if $repo =~ m(^\@|EXTCMD/);        # skip groups and fake repos
+ 
+-        # use gl-conf as a sentinel
+-        hook_1($repo) if -d "$repo.git" and not -f "$repo.git/gl-conf";
++        # use gl-conf as a sentinel; if it exists, all is well
++        next if -f "$repo.git/gl-conf";
+ 
+-        if ( not -d "$repo.git" ) {
++        if (-d "$repo.git") {
++            # directory exists but sentinel missing?  Maybe a freshly imported repo?
++            hook_1($repo);
++        } else {
+             push @{ $rc{NEW_REPOS_CREATED} }, $repo;
+             trigger( 'PRE_CREATE', $repo );
+             new_repo($repo);
+@@ -237,16 +247,24 @@ sub hook_repos {
+ sub store {
+     trace(3);
+ 
++    my $dbf = "$rc{GL_ADMIN_BASE}/gl-conf.cache";
++    tie(%gl_conf_cache, 'GDBM_File', $dbf, O_RDWR|O_CREAT, 0666) or _die "Tie '$dbf' failed: $!";
++
+     # first write out the ones for the physical repos
+     _chdir( $rc{GL_REPO_BASE} );
+-    my $phy_repos = list_phy_repos(1);
+ 
+-    for my $repo ( @{$phy_repos} ) {
++    # list of repos (union of keys of %repos plus %configs)
++    my %kr_kc;
++    @kr_kc{ keys %repos } = ();
++    @kr_kc{ keys %configs } = ();
++    for my $repo ( keys %kr_kc ) {
+         store_1($repo);
+     }
+ 
+     _chdir( $rc{GL_ADMIN_BASE} );
+     store_common();
++
++    untie %gl_conf_cache;
+ }
+ 
+ sub parse_done {
+@@ -284,7 +302,7 @@ sub store_1 {
+     # warning: writes and *deletes* it from %repos and %configs
+     my ($repo) = shift;
+     trace( 3, $repo );
+-    return unless ( $repos{$repo} or $configs{$repo} ) and -d "$repo.git";
++    return unless -d "$repo.git";
+ 
+     my ( %one_repo, %one_config );
+ 
+@@ -301,7 +319,10 @@ sub store_1 {
+         $dumped_data .= Data::Dumper->Dump( [ \%one_config ], [qw(*one_config)] );
+     }
+ 
+-    _print( "$repo.git/gl-conf", $dumped_data );
++    if ( ($gl_conf_cache{$repo} || '') ne $dumped_data ) {
++        _print( "$repo.git/gl-conf", $dumped_data );
++        $gl_conf_cache{$repo} = $dumped_data;
++    }
+ 
+     $split_conf{$repo} = 1;
+ }
diff --git a/gitolite3.spec b/gitolite3.spec
index 31e8dbf..6e081ff 100644
--- a/gitolite3.spec
+++ b/gitolite3.spec
@@ -9,7 +9,7 @@
 Name:           gitolite3
 Epoch:          1
 Version:        3.6.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Highly flexible server for git directory version tracker
 
 Group:          Applications/System
@@ -18,6 +18,7 @@ URL:            http://github.com/sitaramc/gitolite
 Source0:        https://github.com/sitaramc/gitolite/archive/v%{version}.tar.gz
 Source1:        gitolite3-README-fedora
 #Patch0:         0001-security-fix-bug-in-pattern-to-detect-path-traversal.patch
+Patch0:         41b7885b77.patch
 
 BuildArch:      noarch
 BuildRequires:      perl-generators
@@ -46,7 +47,7 @@ elsewhere in the doc/ directory.
 %setup -qn gitolite-%{version}
 cp %{SOURCE1} .
 
-#%patch0 -p1
+%patch0 -p1
 
 %build
 #This page intentionally left blank.
@@ -92,6 +93,10 @@ exit 0
 
 
 %changelog
+* Wed Aug 23 2017 Pierre-Yves Chibon <pingou@pingoured.fr> - 1:3.6.7-3
+- Backport upstream patch for dist-git
+  Upstream: https://github.com/sitaramc/gitolite/commit/41b7885b77cfe992ad3c96d0b021ece51ce1b3e3
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.6.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild