Author: prabhugs
Date: Tue Jan 29 10:14:37 2013
New Revision: 1439812
URL: http://svn.apache.org/viewvc?rev=1439812&view=rev
Log:
Implement svnadmin verify --keep-going, which would continue the verification
even if there is some corruption, after printing the errors to stderr.
* subversion/svnadmin/svnadmin.c
(svnadmin__cmdline_options_t): Add keep-going option.
(svnadmin_opt_state): Add keep-going option.
(subcommand_verify): Switch to the new svn_repos_verify_fs3 function instead
of svn_repos_verify_fs2, and pass the keep-going option.
(repos_notify_handler): Handle svn_repos_notify_failure notification by
printing warnings to stderr with the respective revision number.
* subversion/include/svn_repos.h
(svn_repos_notify_action_t): Add svn_repos_notify_failure to notify failure.
(svn_repos_verify_fs3): Newly added to handle "--keep-going" option.
(svn_repos_notify_t): Add "err", the error chain which indicates what went
wrong during verification.
* subversion/libsvn_repos/dump.c
(svn_repos_verify_fs3): Handle "keep-going". If "keep-going" is TRUE, the
error message is notified and verification process continues.
When a repository fails to verify, return an SVN_ERR_REPOS_CORRUPTED error
message and return a non-zero exit code.
(notify_verification_error): New function to notify the verification
failure error message.
(verify_one_revision): New wrapper function to perform all the error checks
for
a particular revision in one go.
* subversion/libsvn_repos/deprecated.c
(svn_repos_verify_fs2): Deprecate. Call svn_repos_verify_fs3 with
keep_going as FALSE by default to keep the old default implementation.
* subversion/tests/cmdline/svnadmin_tests.py
(verify_keep_going): New test case to test svnadmin verify and the new
switch --keep-going.
* subversion/include/svn_fs.h
(svn_fs_verify_rev): Fix the document string.
Modified:
subversion/branches/verify-keep-going/subversion/include/svn_error_codes.h
subversion/branches/verify-keep-going/subversion/include/svn_fs.h
subversion/branches/verify-keep-going/subversion/include/svn_repos.h
subversion/branches/verify-keep-going/subversion/libsvn_repos/deprecated.c
subversion/branches/verify-keep-going/subversion/libsvn_repos/dump.c
subversion/branches/verify-keep-going/subversion/svnadmin/svnadmin.c
subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py
Modified:
subversion/branches/verify-keep-going/subversion/include/svn_error_codes.h
URL:
http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_error_codes.h?rev=1439812&r1=1439811&r2=1439812&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_error_codes.h
(original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_error_codes.h
Tue Jan 29 10:14:37 2013
@@ -814,6 +814,10 @@ SVN_ERROR_START
SVN_ERR_REPOS_CATEGORY_START + 4,
"Bogus revision report")
+ SVN_ERRDEF(SVN_ERR_REPOS_CORRUPTED,
+ SVN_ERR_REPOS_CATEGORY_START + 5,
+ "Repository has corruptions")
+
/* This is analogous to SVN_ERR_FS_UNSUPPORTED_FORMAT. To avoid
* confusion with "versions" (i.e., releases) of Subversion, we
* started using the word "format" instead of "version". However,
Modified: subversion/branches/verify-keep-going/subversion/include/svn_fs.h
URL:
http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_fs.h?rev=1439812&r1=1439811&r2=1439812&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_fs.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_fs.h Tue Jan
29 10:14:37 2013
@@ -325,10 +325,10 @@ svn_fs_verify(const char *path,
* Use @a scratch_pool for temporary allocations.
*
* @note You probably don't want to use this directly. Take a look at
- * svn_repos_verify_fs2() instead, which does non-backend-specific
+ * svn_repos_verify_fs3() instead, which does non-backend-specific
* verifications as well.
*
-* @note To ensure a full verification using all tests and covering all
+ * @note To ensure a full verification using all tests and covering all
* revisions, you must call this function *and* #svn_fs_verify.
*
* @note Implementors, please do tests that cannot be done efficiently for
Modified: subversion/branches/verify-keep-going/subversion/include/svn_repos.h
URL:
http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_repos.h?rev=1439812&r1=1439811&r2=1439812&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_repos.h
(original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_repos.h Tue
Jan 29 10:14:37 2013
@@ -248,7 +248,10 @@ typedef enum svn_repos_notify_action_t
svn_repos_notify_load_skipped_rev,
/** The structure of a revision is being verified. @since New in 1.8. */
- svn_repos_notify_verify_struc_rev
+ svn_repos_notify_verify_struc_rev,
+
+ /** A revision is found with corruption/errors. @since New in 1.8. */
+ svn_repos_notify_failure
} svn_repos_notify_action_t;
@@ -321,6 +324,11 @@ typedef struct svn_repos_notify_t
/** For #svn_repos_notify_load_node_start, the path of the node. */
const char *path;
+ /** For #svn_repos_notify_failure, this error chain indicates what
+ went wrong during verification.
+ @since New in 1.8. */
+ svn_error_t *err;
+
/* NOTE: Add new fields at the end to preserve binary compatibility.
Also, if you add fields here, you have to update
svn_repos_notify_create(). */
@@ -2514,15 +2522,40 @@ svn_repos_node_from_baton(void *edit_bat
* through the @c HEAD revision.
*
* For every verified revision call @a notify_func with @a rev set to
- * the verified revision and @a warning_text @c NULL. For warnings call @a
- * notify_func with @a warning_text set.
+ * the verified revision and @a warning_text @c NULL.
+ *
+ * For every revision verification failure, if @a notify_func is not @c NULL,
+ * call @a notify_func with @a rev set to the corrupt revision and @err set to
+ * the corresponding error message.
*
* If @a cancel_func is not @c NULL, call it periodically with @a
* cancel_baton as argument to see if the caller wishes to cancel the
* verification.
*
+ * If @a keep_going is @c TRUE, the verify process notifies the error message
+ * and continues. If @a notify_func is @c NULL, the verification failure is
+ * not notified. Finally, return an error if there were any failures during
+ * verification, or SVN_NO_ERROR if there were no failures.
+ *
+ * @since New in 1.8.
+ */
+svn_error_t *
+svn_repos_verify_fs3(svn_repos_t *repos,
+ svn_revnum_t start_rev,
+ svn_revnum_t end_rev,
+ svn_boolean_t keep_going,
+ svn_repos_notify_func_t notify_func,
+ void *notify_baton,
+ svn_cancel_func_t cancel,
+ void *cancel_baton,
+ apr_pool_t *scratch_pool);
+
+/**
+ * Like svn_repos_verify_fs3(), but with @a keep_going set to @c FALSE.
* @since New in 1.7.
+ * @deprecated Provided for backward compatibility with the 1.7 API.
*/
+SVN_DEPRECATED
svn_error_t *
svn_repos_verify_fs2(svn_repos_t *repos,
svn_revnum_t start_rev,
Modified:
subversion/branches/verify-keep-going/subversion/libsvn_repos/deprecated.c
URL:
http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/libsvn_repos/deprecated.c?rev=1439812&r1=1439811&r2=1439812&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/libsvn_repos/deprecated.c
(original)
+++ subversion/branches/verify-keep-going/subversion/libsvn_repos/deprecated.c
Tue Jan 29 10:14:37 2013
@@ -728,6 +728,27 @@ svn_repos_dump_fs2(svn_repos_t *repos,
}
svn_error_t *
+svn_repos_verify_fs2(svn_repos_t *repos,
+ svn_revnum_t start_rev,
+ svn_revnum_t end_rev,
+ svn_repos_notify_func_t notify_func,
+ void *notify_baton,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *pool)
+{
+ return svn_error_trace(svn_repos_verify_fs3(repos,
+ start_rev,
+ end_rev,
+ FALSE,
+ notify_func,
+ notify_baton,
+ cancel_func,
+ cancel_baton,
+ pool));
+}
+
+svn_error_t *
svn_repos_verify_fs(svn_repos_t *repos,
svn_stream_t *feedback_stream,
svn_revnum_t start_rev,
Modified: subversion/branches/verify-keep-going/subversion/libsvn_repos/dump.c
URL:
http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/libsvn_repos/dump.c?rev=1439812&r1=1439811&r2=1439812&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/libsvn_repos/dump.c
(original)
+++ subversion/branches/verify-keep-going/subversion/libsvn_repos/dump.c Tue
Jan 29 10:14:37 2013
@@ -1362,6 +1362,71 @@ verify_close_directory(void *dir_baton,
return close_directory(dir_baton, pool);
}
+static void
+notify_verification_error(svn_revnum_t rev,
+ svn_error_t *err,
+ svn_repos_notify_func_t notify_func,
+ void *notify_baton,
+ apr_pool_t *pool)
+{
+ if (notify_func)
+ {
+ svn_repos_notify_t *notify_failure;
+ notify_failure = svn_repos_notify_create(svn_repos_notify_failure, pool);
+ notify_failure->err = err;
+ notify_failure->revision = rev;
+ notify_func(notify_baton, notify_failure, pool);
+ }
+}
+
+/* Verify revision REV in file system FS. */
+static svn_error_t *
+verify_one_revision(svn_fs_t *fs,
+ svn_revnum_t rev,
+ svn_repos_notify_func_t notify_func,
+ void *notify_baton,
+ svn_revnum_t start_rev,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *scratchpool)
+{
+ const svn_delta_editor_t *dump_editor;
+ void *dump_edit_baton;
+
+ svn_fs_root_t *to_root;
+ apr_hash_t *props;
+ const svn_delta_editor_t *cancel_editor;
+ void *cancel_edit_baton;
+
+ /* Get cancellable dump editor, but with our close_directory handler. */
+ SVN_ERR(get_dump_editor(&dump_editor, &dump_edit_baton,
+ fs, rev, "",
+ svn_stream_empty(scratchpool),
+ NULL, NULL,
+ verify_close_directory,
+ notify_func, notify_baton,
+ start_rev,
+ FALSE, TRUE, /* use_deltas, verify */
+ scratchpool));
+ SVN_ERR(svn_delta_get_cancellation_editor(cancel_func, cancel_baton,
+ dump_editor, dump_edit_baton,
+ &cancel_editor,
+ &cancel_edit_baton,
+ scratchpool));
+ SVN_ERR(svn_fs_revision_root(&to_root, fs, rev, scratchpool));
+ SVN_ERR(svn_repos_replay2(to_root, "", SVN_INVALID_REVNUM, FALSE,
+ cancel_editor, cancel_edit_baton,
+ NULL, NULL, scratchpool));
+
+ /* While our editor close_edit implementation is a no-op, we still
+ do this for completeness. */
+ SVN_ERR(cancel_editor->close_edit(cancel_edit_baton, scratchpool));
+
+ SVN_ERR(svn_fs_revision_proplist(&props, fs, rev, scratchpool));
+
+ return SVN_NO_ERROR;
+}
+
/* Baton type used for forwarding notifications from FS API to REPOS API. */
struct verify_fs2_notify_func_baton_t
{
@@ -1389,9 +1454,10 @@ verify_fs2_notify_func(svn_revnum_t revi
}
svn_error_t *
-svn_repos_verify_fs2(svn_repos_t *repos,
+svn_repos_verify_fs3(svn_repos_t *repos,
svn_revnum_t start_rev,
svn_revnum_t end_rev,
+ svn_boolean_t keep_going,
svn_repos_notify_func_t notify_func,
void *notify_baton,
svn_cancel_func_t cancel_func,
@@ -1405,6 +1471,8 @@ svn_repos_verify_fs2(svn_repos_t *repos,
svn_repos_notify_t *notify;
svn_fs_progress_notify_func_t verify_notify = NULL;
struct verify_fs2_notify_func_baton_t *verify_notify_baton = NULL;
+ svn_error_t *err;
+ svn_boolean_t found_corruption = FALSE;
/* Determine the current youngest revision of the filesystem. */
SVN_ERR(svn_fs_youngest_rev(&youngest, fs, pool));
@@ -1443,48 +1511,53 @@ svn_repos_verify_fs2(svn_repos_t *repos,
}
/* Verify global metadata and backend-specific data first. */
- SVN_ERR(svn_fs_verify(svn_fs_path(fs, pool), start_rev, end_rev,
- verify_notify, verify_notify_baton,
- cancel_func, cancel_baton, pool));
+ err= svn_fs_verify(svn_fs_path(fs, pool), start_rev, end_rev,
+ verify_notify, verify_notify_baton,
+ cancel_func, cancel_baton, pool);
+
+ if (err && !keep_going)
+ {
+ found_corruption = TRUE;
+ notify_verification_error(SVN_INVALID_REVNUM, err, notify_func,
+ notify_baton, iterpool);
+ svn_error_clear(err);
+ return svn_error_createf(SVN_ERR_REPOS_CORRUPTED, NULL,
+ _("Repository '%s' failed to verify"),
+ svn_dirent_local_style(svn_repos_path(repos,
+ pool),
+ pool));
+ }
+ else
+ {
+ if (err)
+ found_corruption = TRUE;
+ svn_error_clear(err);
+ }
for (rev = start_rev; rev <= end_rev; rev++)
{
- const svn_delta_editor_t *dump_editor;
- void *dump_edit_baton;
- const svn_delta_editor_t *cancel_editor;
- void *cancel_edit_baton;
- svn_fs_root_t *to_root;
- apr_hash_t *props;
+ svn_error_t *err;
svn_pool_clear(iterpool);
- /* Get cancellable dump editor, but with our close_directory handler. */
- SVN_ERR(get_dump_editor(&dump_editor, &dump_edit_baton,
- fs, rev, "",
- svn_stream_empty(iterpool),
- NULL, NULL,
- verify_close_directory,
- notify_func, notify_baton,
- start_rev,
- FALSE, TRUE, /* use_deltas, verify */
- iterpool));
- SVN_ERR(svn_delta_get_cancellation_editor(cancel_func, cancel_baton,
- dump_editor, dump_edit_baton,
- &cancel_editor,
- &cancel_edit_baton,
- iterpool));
+ /* Wrapper function to catch the possible errors. */
+ err = verify_one_revision(fs, rev, notify_func, notify_baton, start_rev,
+ cancel_func, cancel_baton, iterpool);
SVN_ERR(svn_fs_verify_rev(fs, rev, iterpool));
- SVN_ERR(svn_fs_revision_root(&to_root, fs, rev, iterpool));
- SVN_ERR(svn_repos_replay2(to_root, "", SVN_INVALID_REVNUM, FALSE,
- cancel_editor, cancel_edit_baton,
- NULL, NULL, iterpool));
- /* While our editor close_edit implementation is a no-op, we still
- do this for completeness. */
- SVN_ERR(cancel_editor->close_edit(cancel_edit_baton, iterpool));
-
- SVN_ERR(svn_fs_revision_proplist(&props, fs, rev, iterpool));
+ if (err)
+ {
+ found_corruption = TRUE;
+ notify_verification_error(rev, err, notify_func, notify_baton,
+ iterpool);
+ svn_error_clear(err);
+
+ if (keep_going)
+ continue;
+ else
+ break;
+ }
if (notify_func)
{
@@ -1503,5 +1576,11 @@ svn_repos_verify_fs2(svn_repos_t *repos,
/* Per-backend verification. */
svn_pool_destroy(iterpool);
+ if (found_corruption)
+ return svn_error_createf(SVN_ERR_REPOS_CORRUPTED, NULL,
+ _("Repository '%s' failed to verify"),
+ svn_dirent_local_style(svn_repos_path(repos,
+ pool),
+ pool));
return SVN_NO_ERROR;
}
Modified: subversion/branches/verify-keep-going/subversion/svnadmin/svnadmin.c
URL:
http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/svnadmin/svnadmin.c?rev=1439812&r1=1439811&r2=1439812&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/svnadmin/svnadmin.c
(original)
+++ subversion/branches/verify-keep-going/subversion/svnadmin/svnadmin.c Tue
Jan 29 10:14:37 2013
@@ -175,6 +175,7 @@ enum svnadmin__cmdline_options_t
{
svnadmin__version = SVN_OPT_FIRST_LONGOPT_ID,
svnadmin__incremental,
+ svnadmin__keep_going,
svnadmin__deltas,
svnadmin__ignore_uuid,
svnadmin__force_uuid,
@@ -280,6 +281,9 @@ static const apr_getopt_option_t options
{"pre-1.6-compatible", svnadmin__pre_1_6_compatible, 0,
N_("deprecated; see --compatible-version")},
+ {"keep-going", svnadmin__keep_going, 0,
+ N_("continue verifying after detecting a corruption")},
+
{"memory-cache-size", 'M', 1,
N_("size of the extra in-memory cache in MB used to\n"
" minimize redundant operations. Default:
16.\n"
@@ -471,7 +475,7 @@ static const svn_opt_subcommand_desc2_t
{"verify", subcommand_verify, {0}, N_
("usage: svnadmin verify REPOS_PATH\n\n"
"Verifies the data stored in the repository.\n"),
- {'r', 'q', 'M'} },
+ {'r', 'q', svnadmin__keep_going, 'M'} },
{ NULL, NULL, {0}, NULL, {0} }
};
@@ -501,6 +505,7 @@ struct svnadmin_opt_state
svn_boolean_t clean_logs; /* --clean-logs */
svn_boolean_t bypass_hooks; /* --bypass-hooks */
svn_boolean_t wait; /* --wait */
+ svn_boolean_t keep_going; /* --keep-going */
svn_boolean_t bypass_prop_validation; /*
--bypass-prop-validation */
enum svn_repos_load_uuid uuid_action; /* --ignore-uuid,
--force-uuid */
@@ -744,6 +749,16 @@ repos_notify_handler(void *baton,
notify->warning_str));
return;
+ case svn_repos_notify_failure:
+ if (notify->revision != SVN_INVALID_REVNUM)
+ svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+ _("* Error verifying revision
%ld.\n"),
+ notify->revision));
+ if (notify->err)
+ svn_handle_error2(notify->err, stderr, FALSE /* non-fatal */,
+ "svnadmin: ");
+ return;
+
case svn_repos_notify_dump_rev_end:
svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
_("* Dumped revision %ld.\n"),
@@ -1543,10 +1558,12 @@ subcommand_verify(apr_getopt_t *os, void
if (! opt_state->quiet)
progress_stream = recode_stream_create(stderr, pool);
- return svn_repos_verify_fs2(repos, lower, upper,
- !opt_state->quiet
- ? repos_notify_handler : NULL,
- progress_stream, check_cancel, NULL, pool);
+ return svn_error_trace(svn_repos_verify_fs3(repos, lower, upper,
+ opt_state->keep_going,
+ !opt_state->quiet
+ ? repos_notify_handler : NULL,
+ progress_stream, check_cancel,
+ NULL, pool));
}
/* This implements `svn_opt_subcommand_t'. */
@@ -2043,6 +2060,9 @@ sub_main(int argc, const char *argv[], a
opt_state.compatible_version = compatible_version;
}
break;
+ case svnadmin__keep_going:
+ opt_state.keep_going = TRUE;
+ break;
case svnadmin__fs_type:
SVN_INT_ERR(svn_utf_cstring_to_utf8(&opt_state.fs_type, opt_arg,
pool));
break;
Modified:
subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py?rev=1439812&r1=1439811&r2=1439812&view=diff
==============================================================================
---
subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py
(original)
+++
subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py
Tue Jan 29 10:14:37 2013
@@ -1840,6 +1840,92 @@ def recover_old(sbox):
svntest.main.run_svnadmin("recover", sbox.repo_dir)
+def verify_keep_going(sbox):
+ "svnadmin verify --keep-going test"
+
+ sbox.build(create_wc = False)
+ repo_url = sbox.repo_url
+ B_url = sbox.repo_url + '/B'
+ C_url = sbox.repo_url + '/C'
+
+ # Create A/B/E/bravo in r2.
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'mkdir', '-m', 'log_msg',
+ B_url)
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'mkdir', '-m', 'log_msg',
+ C_url)
+
+ r2 = fsfs_file(sbox.repo_dir, 'revs', '2')
+ fp = open(r2, 'wb')
+ fp.write("""id: 0-2.0.r2/0
+type: dir
+count: 0
+cpath: /B
+copyroot: 0 /
+
+PLAIN
+K 1
+A
+V 17
+dir 0-1.0.r1/3837
+K 1
+B
+V 14
+dir 0-2.0.r2/0
+K 4
+iota
+V 19
+file 11-1.0.r1/3951
+END
+ENDREP
+id: 0.0.r2/165
+type: dir
+pred: 0.0.r1/4198
+count: 2
+text: 2 59 93 0 ae352a67fd07433f009f7234d2ea47ac
+cpath: /
+copyroot: 0 /
+
+_0.0.t1-1 Add-dir false false /B
+
+
+165 290
+""")
+ fp.close()
+ exit_code, output, errput = svntest.main.run_svnadmin("verify",
+ "--keep-going",
+ sbox.repo_dir)
+
+ exp_err = ["* Verifying repository metadata ...\n",
+ "* Verified revision 0.\n",
+ "* Verified revision 1.\n",
+ "* Error verifying revision 2.\n",
+ "svnadmin: E160004: Invalid change kind in rev file\n",
+ "* Verified revision 3.\n",
+ "svnadmin: E165005: Repository
'svn-test-work/repositories/svnadmin_tests-31' failed to verify\n"]
+
+ if svntest.verify.verify_outputs("Unexpected error while running 'svnadmin
verify'.",
+ [], errput, None, exp_err):
+ raise svntest.Failure
+
+ exit_code, output, errput = svntest.main.run_svnadmin("verify",
+ sbox.repo_dir)
+
+ exp_err = ["* Verifying repository metadata ...\n",
+ "* Verified revision 0.\n",
+ "* Verified revision 1.\n",
+ "* Error verifying revision 2.\n",
+ "svnadmin: E160004: Invalid change kind in rev file\n",
+ "svnadmin: E165005: Repository
'svn-test-work/repositories/svnadmin_tests-31' failed to verify\n"]
+
+ if svntest.verify.verify_outputs("Unexpected error while running 'svnadmin
verify'.",
+ [], errput, None, exp_err):
+ raise svntest.Failure
+
+
+
########################################################################
# Run the tests
@@ -1876,6 +1962,7 @@ test_list = [ None,
locking,
mergeinfo_race,
recover_old,
+ verify_keep_going,
]
if __name__ == '__main__':
