Author: julianfoad
Date: Tue Apr 30 16:30:20 2013
New Revision: 1477715
URL: http://svn.apache.org/r1477715
Log:
In the 'fsfsfixer' script, change the default configuration from 'not
sharded' to 'sharded 1000', to match virtually all real repositories.
* contrib/server-side/fsfsfixer/fixer/find_good_id.py
Remove the sharding config from here, and import settings from
'fixer_config.py' instead, to keep all of the user settings together.
* contrib/server-side/fsfsfixer/fixer/fixer_config.py
Add a 'REVS_PER_SHARD' configuration setting here, set to 1000.
Modified:
subversion/trunk/contrib/server-side/fsfsfixer/fixer/find_good_id.py
subversion/trunk/contrib/server-side/fsfsfixer/fixer/fixer_config.py
Modified: subversion/trunk/contrib/server-side/fsfsfixer/fixer/find_good_id.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/contrib/server-side/fsfsfixer/fixer/find_good_id.py?rev=1477715&r1=1477714&r2=1477715&view=diff
==============================================================================
--- subversion/trunk/contrib/server-side/fsfsfixer/fixer/find_good_id.py
(original)
+++ subversion/trunk/contrib/server-side/fsfsfixer/fixer/find_good_id.py Tue
Apr 30 16:30:20 2013
@@ -1,12 +1,5 @@
#!/usr/bin/env python
-# PER-REPOSITORY CONFIGURATION
-#
-# The number of revs per shard of the repository being accessed, or None if
-# it is not sharded.
-# TODO: Read this from the db/format file.
-REVS_PER_SHARD=None
-
usage = """
Print the correct FSFS node-rev id, given one that is correct except for
its byte-offset part.
@@ -21,6 +14,7 @@ Example:
"""
import os, sys
+from fixer_config import *
class FixError(Exception):
"""An exception for any kind of inablility to repair the repository."""
Modified: subversion/trunk/contrib/server-side/fsfsfixer/fixer/fixer_config.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/contrib/server-side/fsfsfixer/fixer/fixer_config.py?rev=1477715&r1=1477714&r2=1477715&view=diff
==============================================================================
--- subversion/trunk/contrib/server-side/fsfsfixer/fixer/fixer_config.py
(original)
+++ subversion/trunk/contrib/server-side/fsfsfixer/fixer/fixer_config.py Tue
Apr 30 16:30:20 2013
@@ -8,3 +8,17 @@ SVNLOOK = 'svnlook'
# Verbosity: True for verbose, or False for quiet
VERBOSE = True
+
+# PER-REPOSITORY CONFIGURATION
+
+# The number of revs per shard of the repository being accessed, or 'None'
+# for a linear (that is, non-sharded) layout. This is 1000 for almost all
+# repositories in practice.
+#
+# The correct value can be found in the 'db/format' file in the repository.
+# The second line of that file will say something like 'layout sharded 1000'
+# or 'layout linear'.
+#
+# TODO: Read this value automatically from the db/format file.
+REVS_PER_SHARD=1000
+
