You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2015/06/23 15:48:10 UTC
svn commit: r1687061 -
/subversion/trunk/subversion/libsvn_fs_fs/transaction.c
Author: ivan
Date: Tue Jun 23 13:48:10 2015
New Revision: 1687061
URL: http://svn.apache.org/r1687061
Log:
FSFS: Write revision properties directly to final destination without
creating temporary file and moving them in-place.
* subversion/libsvn_fs_fs/transaction.c
(write_final_revprop): Accept path to final revision properties file.
Write revision properties to it and flush changes to disk before close.
(commit_body): Adapt call to write_final_revprop() and remove
call to svn_fs_fs__move_into_place().
Modified:
subversion/trunk/subversion/libsvn_fs_fs/transaction.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/transaction.c?rev=1687061&r1=1687060&r2=1687061&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/transaction.c Tue Jun 23 13:48:10 2015
@@ -3337,41 +3337,31 @@ verify_locks(svn_fs_t *fs,
return SVN_NO_ERROR;
}
-/* Return in *PATH the path to a file containing the properties that
- make up the final revision properties file. This involves setting
- svn:date and removing any temporary properties associated with the
- commit flags. */
+/* Writes final revision properties to file PATH applying permissions
+ from file PERMS_REFERENCE. This involves setting svn:date and
+ removing any temporary properties associated with the commit flags. */
static svn_error_t *
-write_final_revprop(const char **path,
+write_final_revprop(const char *path,
+ const char *perms_reference,
svn_fs_txn_t *txn,
- const svn_fs_fs__id_part_t *txn_id,
apr_pool_t *pool)
{
apr_hash_t *txnprops;
- svn_boolean_t final_mods = FALSE;
svn_string_t date;
svn_string_t *client_date;
+ apr_file_t *revprop_file;
+ svn_stream_t *stream;
SVN_ERR(svn_fs_fs__txn_proplist(&txnprops, txn, pool));
/* Remove any temporary txn props representing 'flags'. */
- if (svn_hash_gets(txnprops, SVN_FS__PROP_TXN_CHECK_OOD))
- {
- svn_hash_sets(txnprops, SVN_FS__PROP_TXN_CHECK_OOD, NULL);
- final_mods = TRUE;
- }
-
- if (svn_hash_gets(txnprops, SVN_FS__PROP_TXN_CHECK_LOCKS))
- {
- svn_hash_sets(txnprops, SVN_FS__PROP_TXN_CHECK_LOCKS, NULL);
- final_mods = TRUE;
- }
+ svn_hash_sets(txnprops, SVN_FS__PROP_TXN_CHECK_OOD, NULL);
+ svn_hash_sets(txnprops, SVN_FS__PROP_TXN_CHECK_LOCKS, NULL);
client_date = svn_hash_gets(txnprops, SVN_FS__PROP_TXN_CLIENT_DATE);
if (client_date)
{
svn_hash_sets(txnprops, SVN_FS__PROP_TXN_CLIENT_DATE, NULL);
- final_mods = TRUE;
}
/* Update commit time to ensure that svn:date revprops remain ordered if
@@ -3381,18 +3371,22 @@ write_final_revprop(const char **path,
date.data = svn_time_to_cstring(apr_time_now(), pool);
date.len = strlen(date.data);
svn_hash_sets(txnprops, SVN_PROP_REVISION_DATE, &date);
- final_mods = TRUE;
}
- if (final_mods)
- {
- SVN_ERR(set_txn_proplist(txn->fs, txn_id, txnprops, TRUE, pool));
- *path = path_txn_props_final(txn->fs, txn_id, pool);
- }
- else
- {
- *path = path_txn_props(txn->fs, txn_id, pool);
- }
+ /* Create new revprops file. Tell OS to truncate existing file,
+ since file may already exists from failed transaction. */
+ SVN_ERR(svn_io_file_open(&revprop_file, path,
+ APR_WRITE | APR_CREATE | APR_TRUNCATE
+ | APR_BUFFERED, APR_OS_DEFAULT, pool));
+
+ stream = svn_stream_from_aprfile2(revprop_file, TRUE, pool);
+ SVN_ERR(svn_hash_write2(txnprops, stream, SVN_HASH_TERMINATOR, pool));
+ SVN_ERR(svn_stream_close(stream));
+
+ SVN_ERR(svn_io_file_flush_to_disk(revprop_file, pool));
+ SVN_ERR(svn_io_file_close(revprop_file, pool));
+
+ SVN_ERR(svn_io_copy_perms(perms_reference, path, pool));
return SVN_NO_ERROR;
}
@@ -3457,7 +3451,7 @@ commit_body(void *baton, apr_pool_t *poo
struct commit_baton *cb = baton;
fs_fs_data_t *ffd = cb->fs->fsap_data;
const char *old_rev_filename, *rev_filename, *proto_filename;
- const char *revprop_filename, *final_revprop;
+ const char *revprop_filename;
const svn_fs_id_t *root_id, *new_root_id;
apr_uint64_t start_node_id;
apr_uint64_t start_copy_id;
@@ -3610,12 +3604,11 @@ commit_body(void *baton, apr_pool_t *poo
remove the transaction directory later. */
SVN_ERR(unlock_proto_rev(cb->fs, txn_id, proto_file_lockcookie, pool));
- /* Move the revprops file into place. */
+ /* Write final revprops file. */
SVN_ERR_ASSERT(! svn_fs_fs__is_packed_revprop(cb->fs, new_rev));
- SVN_ERR(write_final_revprop(&revprop_filename, cb->txn, txn_id, pool));
- final_revprop = svn_fs_fs__path_revprops(cb->fs, new_rev, pool);
- SVN_ERR(svn_fs_fs__move_into_place(revprop_filename, final_revprop,
- old_rev_filename, pool));
+ revprop_filename = svn_fs_fs__path_revprops(cb->fs, new_rev, pool);
+ SVN_ERR(write_final_revprop(revprop_filename, old_rev_filename,
+ cb->txn, pool));
/* Update the 'current' file. */
SVN_ERR(verify_as_revision_before_current_plus_plus(cb->fs, new_rev, pool));