svn commit: r1146507 - /subversion/trunk/subversion/libsvn_repos/dump.c

[da...@apache.org]

Author: danielsh
Date: Wed Jul 13 22:41:39 2011
New Revision: 1146507

URL: http://svn.apache.org/viewvc?rev=1146507&view=rev
Log:
Two tweaks to the verify invocation logic:

* subversion/libsvn_repos/dump.c
  (svn_repos_verify_fs2):
    Verify global/auxiliary data before verifying revisions.
    (If it fails, 'svnadmin dump' can still be used to at least
    sanity check the revisions data.)

    Also, only verify global/auxiliary data when verifying r0.  Plain
    'svnadmin verify' will trigger that, and 'svnadmin verify -rN' shouldn't
    go through this (expensive) check.

Modified:
    subversion/trunk/subversion/libsvn_repos/dump.c

Modified: subversion/trunk/subversion/libsvn_repos/dump.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/dump.c?rev=1146507&r1=1146506&r2=1146507&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/dump.c (original)
+++ subversion/trunk/subversion/libsvn_repos/dump.c Wed Jul 13 22:41:39 2011
@@ -1282,6 +1282,11 @@ svn_repos_verify_fs2(svn_repos_t *repos,
                                "(youngest revision is %ld)"),
                              end_rev, youngest);
 
+  /* Verify global/auxiliary data before verifying revisions. */
+  if (start_rev == 0)
+    SVN_ERR(svn_fs_verify(svn_fs_path(fs, pool), cancel_func, cancel_baton,
+                          pool));
+
   /* Create a notify object that we can reuse within the loop. */
   if (notify_func)
     notify = svn_repos_notify_create(svn_repos_notify_verify_rev_end,
@@ -1333,9 +1338,6 @@ svn_repos_verify_fs2(svn_repos_t *repos,
       notify_func(notify_baton, notify, iterpool);
     }
 
-  SVN_ERR(svn_fs_verify(svn_fs_path(fs, pool), cancel_func, cancel_baton,
-                        pool));
-
   /* Per-backend verification. */
   svn_pool_destroy(iterpool);